Signed-off-by: James Almer <[email protected]>
---
tests/fate-run.sh | 4 ++--
tests/fate/lavf-container.mak | 28 +++++++++++++++-------------
tests/ref/lavf-fate/mv_hevc.mp4 | 3 +++
3 files changed, 20 insertions(+), 15 deletions(-)
create mode 100644 tests/ref/lavf-fate/mv_hevc.mp4
diff --git a/tests/fate-run.sh b/tests/fate-run.sh
index 6ae0320c60..35f8da6be0 100755
--- a/tests/fate-run.sh
+++ b/tests/fate-run.sh
@@ -401,8 +401,8 @@ lavf_container_fate()
cleanfiles="$cleanfiles $file"
input="${target_samples}/$1"
do_avconv $file -auto_conversion_filters $DEC_OPTS $2 -i "$input" \
- "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec copy
|| return
- do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i
$target_path/$file $3
+ $3 "$ENC_OPTS -metadata title=lavftest" -vcodec copy -acodec
copy || return
+ do_avconv_crc $file -auto_conversion_filters $DEC_OPTS -i
$target_path/$file $4
}
lavf_image(){
diff --git a/tests/fate/lavf-container.mak b/tests/fate/lavf-container.mak
index fbd95070d0..8c306ddeda 100644
--- a/tests/fate/lavf-container.mak
+++ b/tests/fate/lavf-container.mak
@@ -76,6 +76,7 @@ FATE_LAVF_CONTAINER_FATE-$(call ALLYES, IVF_DEMUXER
AV1_DECODER AV1_PARSER MATRO
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, EVC_DEMUXER EVC_PARSER MOV_MUXER)
+= evc.mp4
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, H264_DEMUXER H264_PARSER MOV_MUXER)
+= h264.mp4
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, HEVC_DEMUXER HEVC_PARSER
EXTRACT_EXTRADATA_BSF MOV_MUXER) += hevc.mp4
+FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MOV_DEMUXER MOV_MUXER)
+= mv_hevc.mp4
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, VVC_DEMUXER VVC_PARSER MOV_MUXER)
+= vvc.mp4
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGG_MUXER)
+= vp3.ogg
FATE_LAVF_CONTAINER_FATE-$(call ALLYES, MATROSKA_DEMUXER OGV_MUXER)
+= vp8.ogg
@@ -90,19 +91,20 @@ FATE_LAVF_CONTAINER_FATE =
$(FATE_LAVF_CONTAINER_FATE-yes:%=fate-lavf-fate-%)
$(FATE_LAVF_CONTAINER_FATE): REF =
$(SRC_PATH)/tests/ref/lavf-fate/$(@:fate-lavf-fate-%=%)
$(FATE_LAVF_CONTAINER_FATE): $(AREF) $(VREF)
-fate-lavf-fate-av1.mp4: CMD = lavf_container_fate
"av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy"
-fate-lavf-fate-av1.mkv: CMD = lavf_container_fate
"av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "-c:v copy"
-fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" "-c:v
copy"
-fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264"
"" "-c:v copy"
-fate-lavf-fate-hevc.mp4: CMD = lavf_container_fate
"hevc-conformance/HRD_A_Fujitsu_2.bit" "" "-c:v copy"
-fate-lavf-fate-vvc.mp4: CMD = lavf_container_fate
"vvc-conformance/VPS_A_3.bit" "" "-c:v copy"
-fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv"
"-idct auto"
-fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" ""
"-acodec copy"
-fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" "-acodec
copy"
-fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit"
"" "-acodec copy"
-fate-lavf-fate-qtrle_mace6.mov: CMD = lavf_container_fate
"qtrle/Animation-16Greys.mov" "-idct auto"
-fate-lavf-fate-cram.avi: CMD = lavf_container_fate "cram/toon.avi" "-idct auto"
-fate-lavf-fate-hevc.flv: CMD = lavf_container_fate "mkv/hdr10tags-both.mkv" ""
"-c:v copy"
+fate-lavf-fate-av1.mp4: CMD = lavf_container_fate
"av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "" "-c:v copy"
+fate-lavf-fate-av1.mkv: CMD = lavf_container_fate
"av1-test-vectors/av1-1-b8-05-mv.ivf" "-c:v av1" "" "-c:v copy"
+fate-lavf-fate-evc.mp4: CMD = lavf_container_fate "evc/akiyo_cif.evc" "" ""
"-c:v copy"
+fate-lavf-fate-h264.mp4: CMD = lavf_container_fate "h264/intra_refresh.h264"
"" "" "-c:v copy"
+fate-lavf-fate-hevc.mp4: CMD = lavf_container_fate
"hevc-conformance/HRD_A_Fujitsu_2.bit" "" "" "-c:v copy"
+fate-lavf-fate-vvc.mp4: CMD = lavf_container_fate
"vvc-conformance/VPS_A_3.bit" "" "" "-c:v copy"
+fate-lavf-fate-vp3.ogg: CMD = lavf_container_fate "vp3/coeff_level64.mkv" ""
"-idct auto"
+fate-lavf-fate-vp8.ogg: CMD = lavf_container_fate "vp8/RRSF49-short.webm" ""
"" "-acodec copy"
+fate-lavf-fate-latm: CMD = lavf_container_fate "aac/al04_44.mp4" "" ""
"-acodec copy"
+fate-lavf-fate-mp3: CMD = lavf_container_fate "mp3-conformance/he_32khz.bit"
"" "" "-acodec copy"
+fate-lavf-fate-mv_hevc.mp4: CMD = lavf_container_fate "hevc/multiview.mov" ""
"-strict -1" "-c:v copy"
+fate-lavf-fate-qtrle_mace6.mov: CMD = lavf_container_fate
"qtrle/Animation-16Greys.mov" "" "-idct auto"
+fate-lavf-fate-cram.avi: CMD = lavf_container_fate "cram/toon.avi" "" "-idct
auto"
+fate-lavf-fate-hevc.flv: CMD = lavf_container_fate "mkv/hdr10tags-both.mkv" ""
"" "-c:v copy"
FATE_SAMPLES_FFMPEG += $(FATE_LAVF_CONTAINER_FATE)
fate-lavf-fate fate-lavf: $(FATE_LAVF_CONTAINER_FATE)
diff --git a/tests/ref/lavf-fate/mv_hevc.mp4 b/tests/ref/lavf-fate/mv_hevc.mp4
new file mode 100644
index 0000000000..d5e814a682
--- /dev/null
+++ b/tests/ref/lavf-fate/mv_hevc.mp4
@@ -0,0 +1,3 @@
+d4f9c8eea63b2ad5509baffe31c2ebaa *tests/data/lavf-fate/lavf.mv_hevc.mp4
+154864 tests/data/lavf-fate/lavf.mv_hevc.mp4
+tests/data/lavf-fate/lavf.mv_hevc.mp4 CRC=0x977a0cbb
--
2.45.2
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
