highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vp56.h: Move VP8-only functions to vp8.c

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2022-07-22 23:29:29 +02:00
parent f3fef1259c
commit 062599d786
2 changed files with 35 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
libavcodec/vp56.h
View File

@ -339,7 +339,7 @@ static int vp56_rac_gets(VP56RangeCoder *c, int bits)
return value; return value;
} }
static int vp8_rac_get_uint(VP56RangeCoder *c, int bits) static av_unused int vp8_rac_get_uint(VP56RangeCoder *c, int bits)
{ {
int value = 0; int value = 0;
@ -350,22 +350,6 @@ static int vp8_rac_get_uint(VP56RangeCoder *c, int bits)
return value; return value;
} }
// fixme: add 1 bit to all the calls to this?
static av_unused int vp8_rac_get_sint(VP56RangeCoder *c, int bits)
{
int v;
if (!vp8_rac_get(c))
return 0;
v = vp8_rac_get_uint(c, bits);
if (vp8_rac_get(c))
v = -v;
return v;
}
// P(7) // P(7)
static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits) static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits)
{ {
@ -373,12 +357,6 @@ static av_unused int vp56_rac_gets_nn(VP56RangeCoder *c, int bits)
return v + !v; return v + !v;
} }
static av_unused int vp8_rac_get_nn(VP56RangeCoder *c)
{
int v = vp8_rac_get_uint(c, 7) << 1;
return v + !v;
}
static av_always_inline static av_always_inline
int vp56_rac_get_tree(VP56RangeCoder *c, int vp56_rac_get_tree(VP56RangeCoder *c,
const VP56Tree *tree, const VP56Tree *tree,
@ -407,16 +385,4 @@ static av_always_inline int vp8_rac_get_tree(VP56RangeCoder *c, const int8_t (*t
return -i; return -i;
} }
// DCTextra
static av_always_inline int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob)
{
int v = 0;
do {
v = (v<<1) + vp56_rac_get_prob(c, *prob++);
} while (*prob);
return v;
}
#endif /* AVCODEC_VP56_H */ #endif /* AVCODEC_VP56_H */

34
libavcodec/vp8.c
View File

@ -52,6 +52,40 @@
#define VPX(vp7, f) vp8_ ## f #define VPX(vp7, f) vp8_ ## f
#endif #endif
// fixme: add 1 bit to all the calls to this?
static int vp8_rac_get_sint(VP56RangeCoder *c, int bits)
{
int v;
if (!vp8_rac_get(c))
return 0;
v = vp8_rac_get_uint(c, bits);
if (vp8_rac_get(c))
v = -v;
return v;
}
static int vp8_rac_get_nn(VP56RangeCoder *c)
{
int v = vp8_rac_get_uint(c, 7) << 1;
return v + !v;
}
// DCTextra
static int vp8_rac_get_coeff(VP56RangeCoder *c, const uint8_t *prob)
{
int v = 0;
do {
v = (v<<1) + vp56_rac_get_prob(c, *prob++);
} while (*prob);
return v;
}
static void free_buffers(VP8Context *s) static void free_buffers(VP8Context *s)
{ {
int i; int i;