har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/vp3dsp: move vp3 init loop filter function to vp3dsp

Browse Source 
This is also used by the VP6 decoder.

Signed-off-by: Peter Ross <pross@xvid.org>
This commit is contained in:
Peter Ross 2019-01-13 14:55:53 +11:00
parent 260f1960e7
commit 1dfd7aecf2
3 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libavcodec/vp3.c
View File

@ -416,27 +416,7 @@ static void init_dequantizer(Vp3DecodeContext *s, int qpi)
*/
static void init_loop_filter(Vp3DecodeContext *s)
{
int *bounding_values = s->bounding_values_array + 127;
int filter_limit;
int x;
int value;
filter_limit = s->filter_limit_values[s->qps[0]];
av_assert0(filter_limit < 128U);
/* set up the bounding values */
memset(s->bounding_values_array, 0, 256 * sizeof(int));
for (x = 0; x < filter_limit; x++) {
bounding_values[-x] = -x;
bounding_values[x] = x;
}
for (x = value = filter_limit; x < 128 && value; x++, value--) {
bounding_values[ x] = value;
bounding_values[-x] = -value;
}
if (value)
bounding_values[128] = value;
bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202;
ff_vp3dsp_set_bounding_values(s->bounding_values_array, s->filter_limit_values[s->qps[0]]);
}
/*

32
libavcodec/vp3dsp.c
View File

@ -27,6 +27,7 @@
#include "libavutil/attributes.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/avassert.h"
#include "avcodec.h"
#include "rnd_avg.h"
@ -296,3 +297,34 @@ av_cold void ff_vp3dsp_init(VP3DSPContext *c, int flags)
if (ARCH_MIPS)
ff_vp3dsp_init_mips(c, flags);
}
/*
* This function initializes the loop filter boundary limits if the frame's
* quality index is different from the previous frame's.
*
* where sizeof(bounding_values_array) is 256 * sizeof(int)
*
* The filter_limit_values may not be larger than 127.
*/
void ff_vp3dsp_set_bounding_values(int * bounding_values_array, int filter_limit)
{
int *bounding_values = bounding_values_array + 127;
int x;
int value;
av_assert0(filter_limit < 128U);
/* set up the bounding values */
memset(bounding_values_array, 0, 256 * sizeof(int));
for (x = 0; x < filter_limit; x++) {
bounding_values[-x] = -x;
bounding_values[x] = x;
}
for (x = value = filter_limit; x < 128 && value; x++, value--) {
bounding_values[ x] = value;
bounding_values[-x] = -value;
}
if (value)
bounding_values[128] = value;
bounding_values[129] = bounding_values[130] = filter_limit * 0x02020202;
}

2
libavcodec/vp3dsp.h
View File

@ -51,4 +51,6 @@ void ff_vp3dsp_init_ppc(VP3DSPContext *c, int flags);
void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags);
void ff_vp3dsp_init_mips(VP3DSPContext *c, int flags);
void ff_vp3dsp_set_bounding_values(int * bound_values_array, int filter_limit);
#endif /* AVCODEC_VP3DSP_H */