diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 16:59:13 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-22 17:09:59 +0400 |
| commit | eb2f499e37ee8c890836f80c3ffba57e971fe514 (patch) | |
| tree | 1feebb950c73a6f710459f998795525e9b9828fb /tests | |
| parent | 766f0552012480934b65a1935d272f6c8cf756fe (diff) | |
| parent | 9146e872c643fb8f20f9043f1b93a3cddfad15c6 (diff) | |
Merge commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6'
* commit '9146e872c643fb8f20f9043f1b93a3cddfad15c6':
Revert "fate: Use wmv2 IDCT for wmv2 tests"
Conflicts:
tests/fate-run.sh
tests/fate/vcodec.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/fate-run.sh | 3 | ||||
| -rw-r--r-- | tests/fate/vcodec.mak | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 95bc9703ca..0520d62f7d 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -128,7 +128,6 @@ 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" @@ -140,7 +139,7 @@ enc_dec(){ -f $enc_fmt -y $tencfile || return do_md5sum $encfile echo $(wc -c $encfile) - ffmpeg $DEC_OPTS $ddc_opt -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ + ffmpeg $8 $DEC_OPTS -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 b12c112e8d..f10e80c3e7 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 $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DDCOPTS)" +fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p $(RAWDECOPTS)" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p -vsync 0 $(DECOPTS)" -keep "$(DECINOPTS)" fate-vsynth%: CMP_UNIT = 1 fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) @@ -91,7 +91,7 @@ fate-vsynth%-jpegls: DECOPTS = -sws_flags area FATE_VCODEC-$(call ENCDEC, JPEG2000, AVI) += j2k fate-vsynth%-j2k: ENCOPTS = -qscale 7 -strict experimental -pix_fmt rgb24 -fate-vsynth%-j2k: DDCOPTS = -vcodec j2k -strict experimental +fate-vsynth%-j2k: DECINOPTS = -vcodec j2k -strict experimental FATE_VCODEC-$(call ENCDEC, LJPEG MJPEG, AVI) += ljpeg fate-vsynth%-ljpeg: ENCOPTS = -strict -1 @@ -268,8 +268,7 @@ FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1 fate-vsynth%-wmv1: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2 -fate-vsynth%-wmv2: DDCOPTS = -idct auto -fate-vsynth%-wmv2: ENCOPTS = -qscale 10 -idct auto +fate-vsynth%-wmv2: ENCOPTS = -qscale 10 FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv fate-vsynth%-yuv: CODEC = rawvideo |