diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-24 11:55:16 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-06-30 07:58:46 -0700 |
| commit | e3fcb14347466095839c2a3c47ebecff02da891e (patch) | |
| tree | 38fbcef2c592faae3610887dbda3ab333181d1dc /libavcodec/intrax8.c | |
| parent | adcb8392c9b185fd8a91a95fa256d15ab1432a30 (diff) | |
| download | ffmpeg-e3fcb14347466095839c2a3c47ebecff02da891e.tar.gz | |
dsputil: Split off IDCT bits into their own context
Diffstat (limited to 'libavcodec/intrax8.c')
| -rw-r--r-- | libavcodec/intrax8.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 2bda7233f7..d37eb793cd 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -24,6 +24,7 @@ #include "avcodec.h" #include "error_resilience.h" #include "get_bits.h" +#include "idctdsp.h" #include "mpegvideo.h" #include "msmpeg4data.h" #include "intrax8huf.h" @@ -440,7 +441,7 @@ lut2[q>12][c]={ static void x8_ac_compensation(IntraX8Context * const w, int const direction, int const dc_level){ MpegEncContext * const s= w->s; int t; -#define B(x,y) s->block[0][s->dsp.idct_permutation[(x)+(y)*8]] +#define B(x, y) s->block[0][s->idsp.idct_permutation[(x) + (y) * 8]] #define T(x) ((x) * dc_level + 0x8000) >> 16; switch(direction){ case 0: @@ -646,9 +647,9 @@ static int x8_decode_intra_mb(IntraX8Context* const w, const int chroma){ s->current_picture.f->linesize[!!chroma] ); } if(!zeros_only) - s->dsp.idct_add ( s->dest[chroma], - s->current_picture.f->linesize[!!chroma], - s->block[0] ); + s->idsp.idct_add(s->dest[chroma], + s->current_picture.f->linesize[!!chroma], + s->block[0]); block_placed: @@ -698,9 +699,9 @@ av_cold void ff_intrax8_common_init(IntraX8Context * w, MpegEncContext * const s assert(s->mb_width>0); w->prediction_table=av_mallocz(s->mb_width*2*2);//two rows, 2 blocks per cannon mb - ff_init_scantable(s->dsp.idct_permutation, &w->scantable[0], ff_wmv1_scantable[0]); - ff_init_scantable(s->dsp.idct_permutation, &w->scantable[1], ff_wmv1_scantable[2]); - ff_init_scantable(s->dsp.idct_permutation, &w->scantable[2], ff_wmv1_scantable[3]); + ff_init_scantable(s->idsp.idct_permutation, &w->scantable[0], ff_wmv1_scantable[0]); + ff_init_scantable(s->idsp.idct_permutation, &w->scantable[1], ff_wmv1_scantable[2]); + ff_init_scantable(s->idsp.idct_permutation, &w->scantable[2], ff_wmv1_scantable[3]); ff_intrax8dsp_init(&w->dsp); } |