diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-12 07:28:12 -0700 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-12 22:54:10 +0100 |
| commit | d85c9b036e65afa05dcc8fbf37813ef4a05db1f3 (patch) | |
| tree | cdf7469df86a63771fa6a2df5ef9ee4db9be2a95 /libavcodec/bfin | |
| parent | db594f65ec4e4a8d85113f309f3d9c31959b48e3 (diff) | |
vp3/x86: use full transpose for all IDCTs.
This way, the special IDCT permutations are no longer needed. Bfin code
is disabled until someone updates it. This is similar to how H264 does
it, and removes the dsputil dependency imposed by the scantable code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/bfin')
| -rw-r--r-- | libavcodec/bfin/vp3_bfin.c | 10 | ||||
| -rw-r--r-- | libavcodec/bfin/vp3_bfin.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/bfin/vp3_bfin.c b/libavcodec/bfin/vp3_bfin.c index e823a045b1..366955b58c 100644 --- a/libavcodec/bfin/vp3_bfin.c +++ b/libavcodec/bfin/vp3_bfin.c @@ -28,7 +28,7 @@ #include "vp3_bfin.h" /* Intra iDCT offset 128 */ -void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, int16_t *block) +static void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, int16_t *block) { uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128; int i,j; @@ -43,7 +43,7 @@ void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, int16_t *block) } /* Inter iDCT */ -void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, int16_t *block) +static void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, int16_t *block) { ff_bfin_vp3_idct (block); ff_bfin_add_pixels_clamped (block, dest, line_size); @@ -53,6 +53,8 @@ void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, int16_t *block) av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags) { - c->idct_add = ff_bfin_vp3_idct_add; - c->idct_put = ff_bfin_vp3_idct_put; + // FIXME: these functions are disabled because they expect unpermutated + // IDCT coefficients as input, but the coefficients are transposed + //c->idct_add = ff_bfin_vp3_idct_add; + //c->idct_put = ff_bfin_vp3_idct_put; } diff --git a/libavcodec/bfin/vp3_bfin.h b/libavcodec/bfin/vp3_bfin.h index f0bf824951..e832de749a 100644 --- a/libavcodec/bfin/vp3_bfin.h +++ b/libavcodec/bfin/vp3_bfin.h @@ -23,7 +23,5 @@ #include <stdint.h> void ff_bfin_vp3_idct(int16_t *block); -void ff_bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block); -void ff_bfin_vp3_idct_add(uint8_t *dest, int line_size, int16_t *block); #endif /* AVCODEC_BFIN_VP3_BFIN_H */ |