Unified · Split
| @@ -55,6 +55,10 @@ static int encode_ext_header(Wmv2Context *w){ · 54 unmodified lines | |||
| 55 | static av_cold int wmv2_encode_init(AVCodecContext *avctx){ | 55 | static av_cold int wmv2_encode_init(AVCodecContext *avctx){ |
| 56 | Wmv2Context * const w= avctx->priv_data; | 56 | Wmv2Context * const w= avctx->priv_data; |
| 57 | 57 | ||
| 58 | if(avctx->idct_algo==FF_IDCT_AUTO){ | ||
| 59 | avctx->idct_algo=FF_IDCT_WMV2; | ||
| 60 | } | ||
| 61 | |||
| 58 | if(ff_MPV_encode_init(avctx) < 0) | 62 | if(ff_MPV_encode_init(avctx) < 0) |
| 59 | return -1; | 63 | return -1; |
| 60 | 64 | ||
| @@ -128,6 +128,7 @@ enc_dec(){ · 127 unmodified lines | |||
| 128 | enc_opt=$4 | 128 | enc_opt=$4 |
| 129 | dec_fmt=$5 | 129 | dec_fmt=$5 |
| 130 | dec_opt=$6 | 130 | dec_opt=$6 |
| 131 | ddc_opt=$8 | ||
| 131 | encfile="${outdir}/${test}.${enc_fmt}" | 132 | encfile="${outdir}/${test}.${enc_fmt}" |
| 132 | decfile="${outdir}/${test}.out.${dec_fmt}" | 133 | decfile="${outdir}/${test}.out.${dec_fmt}" |
| 133 | cleanfiles="$cleanfiles $decfile" | 134 | cleanfiles="$cleanfiles $decfile" |
| @@ -139,7 +140,7 @@ enc_dec(){ · 5 unmodified lines | |||
| 139 | -f $enc_fmt -y $tencfile || return | 140 | -f $enc_fmt -y $tencfile || return |
| 140 | do_md5sum $encfile | 141 | do_md5sum $encfile |
| 141 | echo $(wc -c $encfile) | 142 | echo $(wc -c $encfile) |
| 142 | avconv $DEC_OPTS -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ | 143 | avconv $DEC_OPTS $ddc_opt -i $tencfile $ENC_OPTS $dec_opt $FLAGS \ |
| 143 | -f $dec_fmt -y $tdecfile || return | 144 | -f $dec_fmt -y $tdecfile || return |
| 144 | do_md5sum $decfile | 145 | do_md5sum $decfile |
| 145 | tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift | 146 | tests/tiny_psnr $srcfile $decfile $cmp_unit $cmp_shift |
| @@ -2,7 +2,7 @@ fate-vsynth1-%: SRC = tests/data/vsynth1.yuv · 1 unmodified line | |||
| 2 | fate-vsynth2-%: SRC = tests/data/vsynth2.yuv | 2 | fate-vsynth2-%: SRC = tests/data/vsynth2.yuv |
| 3 | fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) | 3 | fate-vsynth%: CODEC = $(word 3, $(subst -, ,$(@))) |
| 4 | fate-vsynth%: FMT = avi | 4 | fate-vsynth%: FMT = avi |
| 5 | fate-vsynth%: CMD = enc_dec "rawvideo -s 352x288 -pix_fmt yuv420p" $(SRC) $(FMT) "-c $(CODEC) $(ENCOPTS)" rawvideo "-s 352x288 -pix_fmt yuv420p $(DECOPTS)" -keep | 5 | 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)" |
| 6 | fate-vsynth%: CMP_UNIT = 1 | 6 | fate-vsynth%: CMP_UNIT = 1 |
| 7 | fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) | 7 | fate-vsynth%: REF = $(SRC_PATH)/tests/ref/vsynth/$(@:fate-%=%) |
| 8 | 8 | ||
| @@ -218,7 +218,8 @@ FATE_VCODEC-$(call ENCDEC, WMV1, AVI) += wmv1 · 209 unmodified lines | |||
| 218 | fate-vsynth%-wmv1: ENCOPTS = -qscale 10 | 218 | fate-vsynth%-wmv1: ENCOPTS = -qscale 10 |
| 219 | 219 | ||
| 220 | FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2 | 220 | FATE_VCODEC-$(call ENCDEC, WMV2, AVI) += wmv2 |
| 221 | fate-vsynth%-wmv2: ENCOPTS = -qscale 10 | 221 | fate-vsynth%-wmv2: DDCOPTS = -idct auto |
| 222 | fate-vsynth%-wmv2: ENCOPTS = -qscale 10 -idct auto | ||
| 222 | 223 | ||
| 223 | FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv | 224 | FATE_VCODEC-$(call ENCDEC, RAWVIDEO, AVI) += yuv |
| 224 | fate-vsynth%-yuv: CODEC = rawvideo | 225 | fate-vsynth%-yuv: CODEC = rawvideo |