diff options
Diffstat (limited to 'ffmpeg/libavcodec/bfin/vp3_bfin.c')
| -rw-r--r-- | ffmpeg/libavcodec/bfin/vp3_bfin.c | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/ffmpeg/libavcodec/bfin/vp3_bfin.c b/ffmpeg/libavcodec/bfin/vp3_bfin.c index 366955b..868c431 100644 --- a/ffmpeg/libavcodec/bfin/vp3_bfin.c +++ b/ffmpeg/libavcodec/bfin/vp3_bfin.c @@ -28,33 +28,38 @@ #include "vp3_bfin.h" /* Intra iDCT offset 128 */ -static void ff_bfin_vp3_idct_put (uint8_t *dest, int line_size, int16_t *block) +static void bfin_vp3_idct_put(uint8_t *dest, int line_size, int16_t *block) { - uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128; + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP + 128; int i,j; ff_bfin_vp3_idct (block); for (i=0;i<8;i++) for (j=0;j<8;j++) - dest[line_size*i+j]=cm[block[i*8+j]]; + dest[line_size*i + j] = cm[block[j*8 + i]]; memset(block, 0, 128); } /* Inter iDCT */ -static void ff_bfin_vp3_idct_add (uint8_t *dest, int line_size, int16_t *block) +static void bfin_vp3_idct_add(uint8_t *dest, int line_size, int16_t *block) { + const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + int i, j; + ff_bfin_vp3_idct (block); - ff_bfin_add_pixels_clamped (block, dest, line_size); + for (i = 0; i < 8; i++) + for (j = 0; j < 8; j++) + dest[line_size*i + j] = cm[dest[line_size*i + j] + block[j*8 + i]]; memset(block, 0, 128); } av_cold void ff_vp3dsp_init_bfin(VP3DSPContext *c, int flags) { - // 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; + if (!(flags & CODEC_FLAG_BITEXACT)) { + c->idct_add = bfin_vp3_idct_add; + c->idct_put = bfin_vp3_idct_put; + } } |