diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-10-25 13:39:47 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-10-25 13:39:47 +0000 |
| commit | 50eb9cbc44bb79f67188e77a734ce2d66644eb54 (patch) | |
| tree | 502dcb22eb29fa7e6f9798be3ca8da012d4fc370 /libavcodec/mpegvideo.c | |
| parent | 6e2d5f1aeabd0abbe2ee4ff9d24c4c4ce384d77c (diff) | |
| download | ffmpeg-50eb9cbc44bb79f67188e77a734ce2d66644eb54.tar.gz | |
idct_permutation_type variable, so the permutation type can quickly be identified
Originally committed as revision 1071 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo.c')
| -rw-r--r-- | libavcodec/mpegvideo.c | 40 |
1 files changed, 36 insertions, 4 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 1bf2cb4496..2ec1ea397b 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -69,6 +69,18 @@ static const unsigned short aanscales[64] = { 4520, 6270, 5906, 5315, 4520, 3552, 2446, 1247 }; +/* Input permutation for the simple_idct_mmx */ +static const UINT8 simple_mmx_permutation[64]={ + 0x00, 0x08, 0x04, 0x09, 0x01, 0x0C, 0x05, 0x0D, + 0x10, 0x18, 0x14, 0x19, 0x11, 0x1C, 0x15, 0x1D, + 0x20, 0x28, 0x24, 0x29, 0x21, 0x2C, 0x25, 0x2D, + 0x12, 0x1A, 0x16, 0x1B, 0x13, 0x1E, 0x17, 0x1F, + 0x02, 0x0A, 0x06, 0x0B, 0x03, 0x0E, 0x07, 0x0F, + 0x30, 0x38, 0x34, 0x39, 0x31, 0x3C, 0x35, 0x3D, + 0x22, 0x2A, 0x26, 0x2B, 0x23, 0x2E, 0x27, 0x2F, + 0x32, 0x3A, 0x36, 0x3B, 0x33, 0x3E, 0x37, 0x3F, +}; + static UINT8 h263_chroma_roundtab[16] = { 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, }; @@ -187,13 +199,11 @@ int DCT_common_init(MpegEncContext *s) if(s->avctx->idct_algo==FF_IDCT_INT){ s->idct_put= ff_jref_idct_put; s->idct_add= ff_jref_idct_add; - for(i=0; i<64; i++) - s->idct_permutation[i]= (i & 0x38) | ((i & 6) >> 1) | ((i & 1) << 2); + s->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; }else{ //accurate/default s->idct_put= simple_idct_put; s->idct_add= simple_idct_add; - for(i=0; i<64; i++) - s->idct_permutation[i]= i; + s->idct_permutation_type= FF_NO_IDCT_PERM; } #ifdef HAVE_MMX @@ -212,6 +222,28 @@ int DCT_common_init(MpegEncContext *s) MPV_common_init_armv4l(); #endif + switch(s->idct_permutation_type){ + case FF_NO_IDCT_PERM: + for(i=0; i<64; i++) + s->idct_permutation[i]= i; + break; + case FF_LIBMPEG2_IDCT_PERM: + for(i=0; i<64; i++) + s->idct_permutation[i]= (i & 0x38) | ((i & 6) >> 1) | ((i & 1) << 2); + break; + case FF_SIMPLE_IDCT_PERM: + for(i=0; i<64; i++) + s->idct_permutation[i]= simple_mmx_permutation[i]; + break; + case FF_TRANSPOSE_IDCT_PERM: + for(i=0; i<64; i++) + s->idct_permutation[i]= ((i&7)<<3) | (i>>3); + break; + default: + fprintf(stderr, "Internal error, IDCT permutation not set\n"); + return -1; + } + /* load & permutate scantables note: only wmv uses differnt ones |