diff --git a/tests/fate/ffmpeg.mak b/tests/fate/ffmpeg.mak index 360e62ebbe..57028a7936 100644 --- a/tests/fate/ffmpeg.mak +++ b/tests/fate/ffmpeg.mak @@ -267,3 +267,16 @@ FATE_FFMPEG-$(call ENCDEC2, MPEG2VIDEO, FFV1, NUT, HSTACK_FILTER PIPE_PROTOCOL F # test matching by stream disposition fate-ffmpeg-spec-disposition: CMD = framecrc -i $(TARGET_SAMPLES)/mpegts/pmtchange.ts -map '0:disp:visual_impaired+descriptions:1' -c copy FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MPEGTS,,) += fate-ffmpeg-spec-disposition + +# test heif image merging using internally defined filtegraphs +# picking the stream group if not mapping any specific stream +fate-ffmpeg-heif-merge: CMD = framecrc -i $(TARGET_SAMPLES)/heif-conformance/C007.heic +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MOV, HEVC, HEVC_PARSER) += fate-ffmpeg-heif-merge + +# mapping the stream group +fate-ffmpeg-heif-merge-mapped: CMD = framecrc -i $(TARGET_SAMPLES)/heif-conformance/C007.heic -map '[0:g:0]' +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MOV, HEVC, HEVC_PARSER) += fate-ffmpeg-heif-merge-mapped + +# binding the internal filtegraph with a caller defined filtergraph +fate-ffmpeg-heif-merge-filtergraph: CMD = framecrc -i $(TARGET_SAMPLES)/heif-conformance/C007.heic -filter_complex "sws_flags=+accurate_rnd+bitexact\;[0:g:0]scale=w=1280:h=720[out]" -map "[out]" +FATE_SAMPLES_FFMPEG-$(call FRAMECRC, MOV, HEVC, HEVC_PARSER SCALE_FILTER) += fate-ffmpeg-heif-merge-filtergraph diff --git a/tests/ref/fate/ffmpeg-heif-merge b/tests/ref/fate/ffmpeg-heif-merge new file mode 100644 index 0000000000..4ccc3274f5 --- /dev/null +++ b/tests/ref/fate/ffmpeg-heif-merge @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 2560x1440 +#sar 0: 0/1 +0, 0, 0, 1, 5529600, 0x3bf5d001 diff --git a/tests/ref/fate/ffmpeg-heif-merge-filtergraph b/tests/ref/fate/ffmpeg-heif-merge-filtergraph new file mode 100644 index 0000000000..dfc8c7d868 --- /dev/null +++ b/tests/ref/fate/ffmpeg-heif-merge-filtergraph @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 1280x720 +#sar 0: 0/1 +0, 0, 0, 1, 1382400, 0x0f97ebd5 diff --git a/tests/ref/fate/ffmpeg-heif-merge-mapped b/tests/ref/fate/ffmpeg-heif-merge-mapped new file mode 100644 index 0000000000..4ccc3274f5 --- /dev/null +++ b/tests/ref/fate/ffmpeg-heif-merge-mapped @@ -0,0 +1,6 @@ +#tb 0: 1/1 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 2560x1440 +#sar 0: 0/1 +0, 0, 0, 1, 5529600, 0x3bf5d001