[libav-commits] fate: Use wmv2 IDCT for wmv2 tests

Ronald S. Bultje git at libav.org
Mon Jan 21 08:07:21 CET 2013


Module: libav
Branch: master
Commit: ce378f0dd0c4e5350b3280e6b3e8d6b46fe4b0a3

Author:    Ronald S. Bultje <rsbultje at gmail.com>
Committer: Luca Barbato <lu_zero at gentoo.org>
Date:      Sat Jan 19 12:04:06 2013 -0800

fate: Use wmv2 IDCT for wmv2 tests

---

 libavcodec/wmv2enc.c  |    4 ++++
 tests/fate-run.sh     |    3 ++-
 tests/fate/vcodec.mak |    5 +++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libavcodec/wmv2enc.c b/libavcodec/wmv2enc.c
index 4643835..ee6136b 100644
--- a/libavcodec/wmv2enc.c
+++ b/libavcodec/wmv2enc.c
@@ -55,6 +55,10 @@ static int encode_ext_header(Wmv2Context *w){
 static av_cold int wmv2_encode_init(AVCodecContext *avctx){
     Wmv2Context * const w= avctx->priv_data;
 
+    if(avctx->idct_algo==FF_IDCT_AUTO){
+        avctx->idct_algo=FF_IDCT_WMV2;
+    }
+
     if(ff_MPV_encode_init(avctx) < 0)
         return -1;
 
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index d1633e8..9c23b67 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -128,6 +128,7 @@ enc_dec(){
     enc_opt=$4
     dec_fmt=$5
     dec_opt=$6
+    ddc_opt=$8
     encfile="${outdir}/${test}.${enc_fmt}"
     decfile="${outdir}/${test}.out.${dec_fmt}"
     cleanfiles="$cleanfiles $decfile"
@@ -139,7 +140,7 @@ enc_dec(){
         -f $enc_fmt -y $tencfile || return
     do_md5sum $encfile
     echo $(wc -c $encfile)
-    avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
+    avconv $DEC_OPTS $ddc_opt -i $tencfile $ENC_OPTS $dec_opt $FLAGS \
         -f $dec_fmt -y $tdecfile || return
     do_md5sum $decfile
     tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift
diff --git a/tests/fate/vcodec.mak b/tests/fate/vcodec.mak
index 5a5b703..cc33010 100644
--- a/tests/fate/vcodec.mak
+++ b/tests/fate/vcodec.mak
@@ -2,7 +2,7 @@ fate-vsynth1-%: SRC = tests/data/vsynth1.yuv
 fate-vsynth2-%: SRC = tests/data/vsynth2.yuv
 fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@)))
 fate-vsynth%: FMT = avi
-fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep
+fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep "$(DDCOPTS)"
 fate-vsynth%: CMP_UNIT = 1
 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%)
 
@@ -218,7 +218,8 @@ FATE_VCODEC-$(call ENCDEC, WMV1, AVI)   += wmv1
 fate-vsynth%-wmv1:               ENCOPTS = -qscale 10
 
 FATE_VCODEC-$(call ENCDEC, WMV2, AVI)   += wmv2
-fate-vsynth%-wmv2:               ENCOPTS = -qscale 10
+fate-vsynth%-wmv2:               DDCOPTS = -idct auto
+fate-vsynth%-wmv2:               ENCOPTS = -qscale 10 -idct auto
 
 FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv
 fate-vsynth%-yuv:                CODEC = rawvideo



More information about the libav-commits mailing list