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>
This commit is contained in:
@@ -292,14 +292,15 @@ stream_remux(){
|
|||||||
enc_fmt=$4
|
enc_fmt=$4
|
||||||
stream_maps=$5
|
stream_maps=$5
|
||||||
final_decode=$6
|
final_decode=$6
|
||||||
ffprobe_opts=$7
|
final_encode=$7
|
||||||
|
ffprobe_opts=$8
|
||||||
encfile="${outdir}/${test}.${enc_fmt}"
|
encfile="${outdir}/${test}.${enc_fmt}"
|
||||||
test $keep -ge 1 || cleanfiles="$cleanfiles $encfile"
|
test $keep -ge 1 || cleanfiles="$cleanfiles $encfile"
|
||||||
tsrcfile=$(target_path $srcfile)
|
tsrcfile=$(target_path $srcfile)
|
||||||
tencfile=$(target_path $encfile)
|
tencfile=$(target_path $encfile)
|
||||||
ffmpeg -f $src_fmt $src_opts -i $tsrcfile $stream_maps -codec copy $FLAGS \
|
ffmpeg -f $src_fmt $src_opts -i $tsrcfile $stream_maps -codec copy $FLAGS \
|
||||||
-f $enc_fmt -y $tencfile || return
|
-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
|
-f framecrc - || return
|
||||||
test -z "$ffprobe_opts" || \
|
test -z "$ffprobe_opts" || \
|
||||||
run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return
|
run ffprobe${PROGSUF}${EXECSUF} -bitexact $ffprobe_opts $tencfile || return
|
||||||
|
@@ -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_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" \
|
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_FFMPEG_FFPROBE += $(FATE_FLVENC_FFMPEG_FFPROBE-yes)
|
||||||
FATE_SAMPLES_FFMPEG += $(FATE_ENHANCED_FLVENC_FFMPEG-yes)
|
FATE_SAMPLES_FFMPEG += $(FATE_ENHANCED_FLVENC_FFMPEG-yes)
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
# This tests that a 16-bit pcm_dvd stream is correctly remuxed in mpegps
|
# 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-$(call DEMMUX, MPEGPS, MPEG1SYSTEM) += fate-mpegps-remuxed-pcm-demux
|
||||||
fate-mpegps-remuxed-pcm-demux: $(SAMPLES)/mpegps/pcm_aud.mpg
|
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_SAMPLES_FFMPEG += $(FATE_MPEGPS-yes)
|
||||||
fate-mpegps: $(FATE_MPEGPS-yes)
|
fate-mpegps: $(FATE_MPEGPS-yes)
|
||||||
|
Reference in New Issue
Block a user