diff options
| author | James Almer <jamrial@gmail.com> | 2024-03-08 10:19:07 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2024-03-08 10:38:55 -0300 |
| commit | 901165516c5281ed74e6c77cc3e6ae46f924b884 (patch) | |
| tree | 677dfc75fc0b04759051dd4172df8a296b1d4cb8 | |
| parent | e6d933404ff1085b6c4ec031f736b1bee6e46b57 (diff) | |
| download | ffmpeg-901165516c5281ed74e6c77cc3e6ae46f924b884.tar.gz | |
fate/flvenc: force the av1 decoder in all steps for fate-enhanced-flv-av1
Tested-by: Steven Liu <lingjiujianke@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | tests/fate-run.sh | 5 | ||||
| -rw-r--r-- | tests/fate/flvenc.mak | 2 | ||||
| -rw-r--r-- | tests/fate/mpegps.mak | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tests/fate-run.sh b/tests/fate-run.sh index 2de560354f..0fead78c58 100755 --- a/tests/fate-run.sh +++ b/tests/fate-run.sh @@ -292,14 +292,15 @@ stream_remux(){ enc_fmt=$4 stream_maps=$5 final_decode=$6 - ffprobe_opts=$7 + final_encode=$7 + ffprobe_opts=$8 encfile="${outdir}/${test}.${enc_fmt}" test $keep -ge 1 || cleanfiles="$cleanfiles $encfile" tsrcfile=$(target_path $srcfile) tencfile=$(target_path $encfile) ffmpeg -f $src_fmt $src_opts -i $tsrcfile $stream_maps -codec copy $FLAGS \ -f $enc_fmt -y $tencfile || return - ffmpeg $DEC_OPTS -i $tencfile $ENC_OPTS $FLAGS $final_decode \ + ffmpeg $DEC_OPTS $final_decode -i $tencfile $ENC_OPTS $FLAGS $final_encode \ -f framecrc - || return test -z "$ffprobe_opts" || \ run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return diff --git a/tests/fate/flvenc.mak b/tests/fate/flvenc.mak index 3cfe930e43..e3703a8cc5 100644 --- a/tests/fate/flvenc.mak +++ b/tests/fate/flvenc.mak @@ -11,7 +11,7 @@ fate-enhanced-flv-vp9: CMD = transcode ivf $(TARGET_SAMPLES)/vp9-test-vectors/vp FATE_ENHANCED_FLVENC_FFMPEG-$(call REMUX, FLV IVF, FLV_DEMUXER AV1_DECODER AV1_PARSER) += fate-enhanced-flv-av1 fate-enhanced-flv-av1: CMD = stream_remux ivf $(TARGET_SAMPLES)/av1/seq_hdr_op_param_info.ivf "-c:v av1" \ - flv "-c copy" "-c copy" + flv "-c copy" "-c:v av1" "-c copy" FATE_FFMPEG_FFPROBE += $(FATE_FLVENC_FFMPEG_FFPROBE-yes) FATE_SAMPLES_FFMPEG += $(FATE_ENHANCED_FLVENC_FFMPEG-yes) diff --git a/tests/fate/mpegps.mak b/tests/fate/mpegps.mak index ae301fd5e1..43cd2aa22b 100644 --- a/tests/fate/mpegps.mak +++ b/tests/fate/mpegps.mak @@ -1,7 +1,7 @@ # This tests that a 16-bit pcm_dvd stream is correctly remuxed in mpegps FATE_MPEGPS-$(call DEMMUX, MPEGPS, MPEG1SYSTEM) += fate-mpegps-remuxed-pcm-demux fate-mpegps-remuxed-pcm-demux: $(SAMPLES)/mpegps/pcm_aud.mpg -fate-mpegps-remuxed-pcm-demux: CMD = stream_remux "mpeg" "$(TARGET_SAMPLES)/mpegps/pcm_aud.mpg" "" "mpeg" "-map 0:a:0" "-codec copy" +fate-mpegps-remuxed-pcm-demux: CMD = stream_remux "mpeg" "$(TARGET_SAMPLES)/mpegps/pcm_aud.mpg" "" "mpeg" "-map 0:a:0" "" "-codec copy" FATE_SAMPLES_FFMPEG += $(FATE_MPEGPS-yes) fate-mpegps: $(FATE_MPEGPS-yes) |