From e6bc38fd49c94726b45d5d5cc2b756ad8ec49ee0 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sun, 20 Jan 2013 22:12:35 -0800 Subject: wmv2: move IDCT to its own DSP context. This allows us to remove FF_IDCT_WMV2, which serves no practical purpose other than to be able to select the WMV2 IDCT for MPEG (or vice versa) and get corrupt output. Fate tests for all wmv2-related tests change, because (for some obscure reason) they forced use of the MPEG IDCT. You would get the same changes previously by not using -idct simple in the fate test (or replacing it with -idct auto). --- libavcodec/Makefile | 4 +- libavcodec/dsputil.c | 89 ------------------------------- libavcodec/dsputil.h | 1 - libavcodec/wmv2.c | 22 ++++++-- libavcodec/wmv2.h | 2 + libavcodec/wmv2dec.c | 4 -- libavcodec/wmv2dsp.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ libavcodec/wmv2dsp.h | 34 ++++++++++++ 8 files changed, 202 insertions(+), 99 deletions(-) create mode 100644 libavcodec/wmv2dsp.c create mode 100644 libavcodec/wmv2dsp.h (limited to 'libavcodec') diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 024e5cfb5f..3f8f28004c 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -410,10 +410,10 @@ OBJS-$(CONFIG_WMAVOICE_DECODER) += wmavoice.o \ celp_filters.o \ acelp_vectors.o acelp_filters.o OBJS-$(CONFIG_WMV1_DECODER) += msmpeg4.o msmpeg4data.o -OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o \ +OBJS-$(CONFIG_WMV2_DECODER) += wmv2dec.o wmv2.o wmv2dsp.o \ msmpeg4.o msmpeg4data.o \ intrax8.o intrax8dsp.o -OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o \ +OBJS-$(CONFIG_WMV2_ENCODER) += wmv2enc.o wmv2.o wmv2dsp.o \ msmpeg4.o msmpeg4enc.o msmpeg4data.o \ mpeg4videodec.o ituh263dec.o h263dec.o OBJS-$(CONFIG_WNV1_DECODER) += wnv1.o diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index d0544a4c7a..251fb0c2d9 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2482,90 +2482,6 @@ static void vector_clip_int32_c(int32_t *dst, const int32_t *src, int32_t min, } while (len > 0); } -#define W0 2048 -#define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */ -#define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */ -#define W3 2408 /* 2048*sqrt (2)*cos (3*pi/16) */ -#define W4 2048 /* 2048*sqrt (2)*cos (4*pi/16) */ -#define W5 1609 /* 2048*sqrt (2)*cos (5*pi/16) */ -#define W6 1108 /* 2048*sqrt (2)*cos (6*pi/16) */ -#define W7 565 /* 2048*sqrt (2)*cos (7*pi/16) */ - -static void wmv2_idct_row(short * b) -{ - int s1,s2; - int a0,a1,a2,a3,a4,a5,a6,a7; - /*step 1*/ - a1 = W1*b[1]+W7*b[7]; - a7 = W7*b[1]-W1*b[7]; - a5 = W5*b[5]+W3*b[3]; - a3 = W3*b[5]-W5*b[3]; - a2 = W2*b[2]+W6*b[6]; - a6 = W6*b[2]-W2*b[6]; - a0 = W0*b[0]+W0*b[4]; - a4 = W0*b[0]-W0*b[4]; - /*step 2*/ - s1 = (181*(a1-a5+a7-a3)+128)>>8;//1,3,5,7, - s2 = (181*(a1-a5-a7+a3)+128)>>8; - /*step 3*/ - b[0] = (a0+a2+a1+a5 + (1<<7))>>8; - b[1] = (a4+a6 +s1 + (1<<7))>>8; - b[2] = (a4-a6 +s2 + (1<<7))>>8; - b[3] = (a0-a2+a7+a3 + (1<<7))>>8; - b[4] = (a0-a2-a7-a3 + (1<<7))>>8; - b[5] = (a4-a6 -s2 + (1<<7))>>8; - b[6] = (a4+a6 -s1 + (1<<7))>>8; - b[7] = (a0+a2-a1-a5 + (1<<7))>>8; -} -static void wmv2_idct_col(short * b) -{ - int s1,s2; - int a0,a1,a2,a3,a4,a5,a6,a7; - /*step 1, with extended precision*/ - a1 = (W1*b[8*1]+W7*b[8*7] + 4)>>3; - a7 = (W7*b[8*1]-W1*b[8*7] + 4)>>3; - a5 = (W5*b[8*5]+W3*b[8*3] + 4)>>3; - a3 = (W3*b[8*5]-W5*b[8*3] + 4)>>3; - a2 = (W2*b[8*2]+W6*b[8*6] + 4)>>3; - a6 = (W6*b[8*2]-W2*b[8*6] + 4)>>3; - a0 = (W0*b[8*0]+W0*b[8*4] )>>3; - a4 = (W0*b[8*0]-W0*b[8*4] )>>3; - /*step 2*/ - s1 = (181*(a1-a5+a7-a3)+128)>>8; - s2 = (181*(a1-a5-a7+a3)+128)>>8; - /*step 3*/ - b[8*0] = (a0+a2+a1+a5 + (1<<13))>>14; - b[8*1] = (a4+a6 +s1 + (1<<13))>>14; - b[8*2] = (a4-a6 +s2 + (1<<13))>>14; - b[8*3] = (a0-a2+a7+a3 + (1<<13))>>14; - - b[8*4] = (a0-a2-a7-a3 + (1<<13))>>14; - b[8*5] = (a4-a6 -s2 + (1<<13))>>14; - b[8*6] = (a4+a6 -s1 + (1<<13))>>14; - b[8*7] = (a0+a2-a1-a5 + (1<<13))>>14; -} -void ff_wmv2_idct_c(short * block){ - int i; - - for(i=0;i<64;i+=8){ - wmv2_idct_row(block+i); - } - for(i=0;i<8;i++){ - wmv2_idct_col(block+i); - } -} -/* XXX: those functions should be suppressed ASAP when all IDCTs are - converted */ -static void ff_wmv2_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block) -{ - ff_wmv2_idct_c(block); - put_pixels_clamped_c(block, dest, line_size); -} -static void ff_wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block) -{ - ff_wmv2_idct_c(block); - add_pixels_clamped_c(block, dest, line_size); -} static void ff_jref_idct_put(uint8_t *dest, int line_size, DCTELEM *block) { ff_j_rev_dct (block); @@ -2650,11 +2566,6 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->idct_add= ff_jref_idct_add; c->idct = ff_j_rev_dct; c->idct_permutation_type= FF_LIBMPEG2_IDCT_PERM; - }else if(avctx->idct_algo==FF_IDCT_WMV2){ - c->idct_put= ff_wmv2_idct_put_c; - c->idct_add= ff_wmv2_idct_add_c; - c->idct = ff_wmv2_idct_c; - c->idct_permutation_type= FF_NO_IDCT_PERM; }else if(avctx->idct_algo==FF_IDCT_FAAN){ c->idct_put= ff_faanidct_put; c->idct_add= ff_faanidct_add; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 6121c9d7f0..c0645a1eba 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -46,7 +46,6 @@ void ff_fdct248_islow_8(DCTELEM *data); void ff_fdct248_islow_10(DCTELEM *data); void ff_j_rev_dct (DCTELEM *data); -void ff_wmv2_idct_c(DCTELEM *data); void ff_fdct_mmx(DCTELEM *block); void ff_fdct_mmxext(DCTELEM *block); diff --git a/libavcodec/wmv2.c b/libavcodec/wmv2.c index a3dcbb37ae..595630f2ca 100644 --- a/libavcodec/wmv2.c +++ b/libavcodec/wmv2.c @@ -28,8 +28,24 @@ av_cold void ff_wmv2_common_init(Wmv2Context * w){ MpegEncContext * const s= &w->s; - ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], ff_wmv2_scantableA); - ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], ff_wmv2_scantableB); + ff_wmv2dsp_init(&w->wdsp); + ff_init_scantable_permutation(s->dsp.idct_permutation, + w->wdsp.idct_perm); + ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[0], + ff_wmv2_scantableA); + ff_init_scantable(s->dsp.idct_permutation, &w->abt_scantable[1], + ff_wmv2_scantableB); + ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable, + ff_wmv1_scantable[1]); + ff_init_scantable(s->dsp.idct_permutation, &s->intra_h_scantable, + ff_wmv1_scantable[2]); + ff_init_scantable(s->dsp.idct_permutation, &s->intra_v_scantable, + ff_wmv1_scantable[3]); + ff_init_scantable(s->dsp.idct_permutation, &s->inter_scantable, + ff_wmv1_scantable[0]); + s->dsp.idct_put = w->wdsp.idct_put; + s->dsp.idct_add = w->wdsp.idct_add; + s->dsp.idct = NULL; } static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int stride, int n){ @@ -38,7 +54,7 @@ static void wmv2_add_block(Wmv2Context *w, DCTELEM *block1, uint8_t *dst, int st if (s->block_last_index[n] >= 0) { switch(w->abt_type_table[n]){ case 0: - s->dsp.idct_add (dst, stride, block1); + w->wdsp.idct_add(dst, stride, block1); break; case 1: ff_simple_idct84_add(dst , stride, block1); diff --git a/libavcodec/wmv2.h b/libavcodec/wmv2.h index 80f36ccddb..82075670e0 100644 --- a/libavcodec/wmv2.h +++ b/libavcodec/wmv2.h @@ -25,6 +25,7 @@ #include "dsputil.h" #include "mpegvideo.h" #include "intrax8.h" +#include "wmv2dsp.h" #define SKIP_TYPE_NONE 0 #define SKIP_TYPE_MPEG 1 @@ -35,6 +36,7 @@ typedef struct Wmv2Context{ MpegEncContext s; IntraX8Context x8; + WMV2DSPContext wdsp; int j_type_bit; int j_type; int abt_flag; diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index c1fd4ee0a3..077928357e 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -447,10 +447,6 @@ int ff_wmv2_decode_mb(MpegEncContext *s, DCTELEM block[6][64]) static av_cold int wmv2_decode_init(AVCodecContext *avctx){ Wmv2Context * const w= avctx->priv_data; - if(avctx->idct_algo==FF_IDCT_AUTO){ - avctx->idct_algo=FF_IDCT_WMV2; - } - if(ff_msmpeg4_decode_init(avctx) < 0) return -1; diff --git a/libavcodec/wmv2dsp.c b/libavcodec/wmv2dsp.c new file mode 100644 index 0000000000..85a9db1d75 --- /dev/null +++ b/libavcodec/wmv2dsp.c @@ -0,0 +1,145 @@ +/* + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "libavutil/attributes.h" +#include "libavutil/common.h" +#include "avcodec.h" +#include "wmv2dsp.h" + +#define W0 2048 +#define W1 2841 /* 2048*sqrt (2)*cos (1*pi/16) */ +#define W2 2676 /* 2048*sqrt (2)*cos (2*pi/16) */ +#define W3 2408 /* 2048*sqrt (2)*cos (3*pi/16) */ +#define W4 2048 /* 2048*sqrt (2)*cos (4*pi/16) */ +#define W5 1609 /* 2048*sqrt (2)*cos (5*pi/16) */ +#define W6 1108 /* 2048*sqrt (2)*cos (6*pi/16) */ +#define W7 565 /* 2048*sqrt (2)*cos (7*pi/16) */ + +static void wmv2_idct_row(short * b) +{ + int s1, s2; + int a0, a1, a2, a3, a4, a5, a6, a7; + + /* step 1 */ + a1 = W1 * b[1] + W7 * b[7]; + a7 = W7 * b[1] - W1 * b[7]; + a5 = W5 * b[5] + W3 * b[3]; + a3 = W3 * b[5] - W5 * b[3]; + a2 = W2 * b[2] + W6 * b[6]; + a6 = W6 * b[2] - W2 * b[6]; + a0 = W0 * b[0] + W0 * b[4]; + a4 = W0 * b[0] - W0 * b[4]; + + /* step 2 */ + s1 = (181 * (a1 - a5 + a7 - a3) + 128) >> 8; // 1, 3, 5, 7 + s2 = (181 * (a1 - a5 - a7 + a3) + 128) >> 8; + + /* step 3 */ + b[0] = (a0 + a2 + a1 + a5 + (1 << 7)) >> 8; + b[1] = (a4 + a6 + s1 + (1 << 7)) >> 8; + b[2] = (a4 - a6 + s2 + (1 << 7)) >> 8; + b[3] = (a0 - a2 + a7 + a3 + (1 << 7)) >> 8; + b[4] = (a0 - a2 - a7 - a3 + (1 << 7)) >> 8; + b[5] = (a4 - a6 - s2 + (1 << 7)) >> 8; + b[6] = (a4 + a6 - s1 + (1 << 7)) >> 8; + b[7] = (a0 + a2 - a1 - a5 + (1 << 7)) >> 8; +} + +static void wmv2_idct_col(short * b) +{ + int s1, s2; + int a0, a1, a2, a3, a4, a5, a6, a7; + + /* step 1, with extended precision */ + a1 = (W1 * b[8 * 1] + W7 * b[8 * 7] + 4) >> 3; + a7 = (W7 * b[8 * 1] - W1 * b[8 * 7] + 4) >> 3; + a5 = (W5 * b[8 * 5] + W3 * b[8 * 3] + 4) >> 3; + a3 = (W3 * b[8 * 5] - W5 * b[8 * 3] + 4) >> 3; + a2 = (W2 * b[8 * 2] + W6 * b[8 * 6] + 4) >> 3; + a6 = (W6 * b[8 * 2] - W2 * b[8 * 6] + 4) >> 3; + a0 = (W0 * b[8 * 0] + W0 * b[8 * 4] ) >> 3; + a4 = (W0 * b[8 * 0] - W0 * b[8 * 4] ) >> 3; + + /* step 2 */ + s1 = (181 * (a1 - a5 + a7 - a3) + 128) >> 8; + s2 = (181 * (a1 - a5 - a7 + a3) + 128) >> 8; + + /* step 3 */ + b[8 * 0] = (a0 + a2 + a1 + a5 + (1 << 13)) >> 14; + b[8 * 1] = (a4 + a6 + s1 + (1 << 13)) >> 14; + b[8 * 2] = (a4 - a6 + s2 + (1 << 13)) >> 14; + b[8 * 3] = (a0 - a2 + a7 + a3 + (1 << 13)) >> 14; + + b[8 * 4] = (a0 - a2 - a7 - a3 + (1 << 13)) >> 14; + b[8 * 5] = (a4 - a6 - s2 + (1 << 13)) >> 14; + b[8 * 6] = (a4 + a6 - s1 + (1 << 13)) >> 14; + b[8 * 7] = (a0 + a2 - a1 - a5 + (1 << 13)) >> 14; +} + +static void wmv2_idct_add_c(uint8_t *dest, int line_size, DCTELEM *block) +{ + int i; + + for (i = 0; i < 64; i += 8) + wmv2_idct_row(block + i); + for (i = 0; i < 8; i++) + wmv2_idct_col(block + i); + + for (i = 0; i < 8; i++) { + dest[0] = av_clip_uint8(dest[0] + block[0]); + dest[1] = av_clip_uint8(dest[1] + block[1]); + dest[2] = av_clip_uint8(dest[2] + block[2]); + dest[3] = av_clip_uint8(dest[3] + block[3]); + dest[4] = av_clip_uint8(dest[4] + block[4]); + dest[5] = av_clip_uint8(dest[5] + block[5]); + dest[6] = av_clip_uint8(dest[6] + block[6]); + dest[7] = av_clip_uint8(dest[7] + block[7]); + dest += line_size; + block += 8; + } +} + +static void wmv2_idct_put_c(uint8_t *dest, int line_size, DCTELEM *block) +{ + int i; + + for (i = 0; i < 64; i += 8) + wmv2_idct_row(block + i); + for (i = 0; i < 8; i++) + wmv2_idct_col(block + i); + + for (i = 0; i < 8; i++) { + dest[0] = av_clip_uint8(block[0]); + dest[1] = av_clip_uint8(block[1]); + dest[2] = av_clip_uint8(block[2]); + dest[3] = av_clip_uint8(block[3]); + dest[4] = av_clip_uint8(block[4]); + dest[5] = av_clip_uint8(block[5]); + dest[6] = av_clip_uint8(block[6]); + dest[7] = av_clip_uint8(block[7]); + dest += line_size; + block += 8; + } +} + +av_cold void ff_wmv2dsp_init(WMV2DSPContext *c) +{ + c->idct_add = wmv2_idct_add_c; + c->idct_put = wmv2_idct_put_c; + c->idct_perm = FF_NO_IDCT_PERM; +} diff --git a/libavcodec/wmv2dsp.h b/libavcodec/wmv2dsp.h new file mode 100644 index 0000000000..eaffcfc537 --- /dev/null +++ b/libavcodec/wmv2dsp.h @@ -0,0 +1,34 @@ +/* + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_WMV2DSP_H +#define AVCODEC_WMV2DSP_H + +#include +#include "dsputil.h" + +typedef struct WMV2DSPContext { + void (*idct_add)(uint8_t *dest, int line_size, DCTELEM *block); + void (*idct_put)(uint8_t *dest, int line_size, DCTELEM *block); + + int idct_perm; +} WMV2DSPContext; + +void ff_wmv2dsp_init(WMV2DSPContext *c); + +#endif /* AVCODEC_WMV2DSP_H */ -- cgit v1.2.3