aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-10 17:34:45 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-04-18 02:04:42 +0200
commit3d76d4bf7f83aff9403825f6b2b7816e5e9675ce (patch)
treec2964134b87a4ad08928169ad73ea9024ea33871
parent0c09d531d64d687fdda58a5f9d9a662e7d0e6dab (diff)
downloadffmpeg-3d76d4bf7f83aff9403825f6b2b7816e5e9675ce.tar.gz
fate/mov: Add test for muxing cover images
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--tests/fate/mov.mak12
-rw-r--r--tests/ref/fate/mov-cover-image43
2 files changed, 53 insertions, 2 deletions
diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak
index 957bd5ca4e..4c1014be92 100644
--- a/tests/fate/mov.mak
+++ b/tests/fate/mov.mak
@@ -37,8 +37,6 @@ FATE_SAMPLES_AVCONV += $(FATE_MOV)
FATE_SAMPLES_FFPROBE += $(FATE_MOV_FFPROBE)
FATE_SAMPLES_FASTSTART += $(FATE_MOV_FASTSTART)
-fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART)
-
# Make sure we handle edit lists correctly in normal cases.
fate-mov-1elist-noctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-noctts.mov
fate-mov-1elist-1ctts: CMD = framemd5 -i $(TARGET_SAMPLES)/mov/mov-1elist-1ctts.mov
@@ -127,3 +125,13 @@ fate-mov-faststart-4gb-overflow: REF = bc875921f151871e787c4b4023269b29
fate-mov-mp4-with-mov-in24-ver: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_entries stream=codec_name -select_streams 1 $(TARGET_SAMPLES)/mov/mp4-with-mov-in24-ver.mp4
fate-mov-mp4-extended-atom: CMD = run ffprobe$(PROGSSUF)$(EXESUF) -show_packets -print_format compact -select_streams v $(TARGET_SAMPLES)/mov/extended_atom_size_probe
+
+FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \
+ SCALE_FILTER PNG_ENCODER PNG_DECODER \
+ MP4_MUXER FRAMECRC_MUXER PIPE_PROTOCOL) \
+ += fate-mov-cover-image
+fate-mov-cover-image: CMD = transcode mov $(TARGET_SAMPLES)/cover_art/Owner-iTunes_9.0.3.15.m4a mp4 "-map 0 -map 0:v -c:a copy -c:v:0 copy -filter:v:1 scale -c:v:1 png" "-map 0 -t 0.1 -c copy" "" "-show_entries stream_disposition=attached_pic:stream=index,codec_name"
+
+FATE_SAMPLES_FFMPEG_FFPROBE += $(FATE_MOV_FFMPEG_FFPROBE-yes)
+
+fate-mov: $(FATE_MOV) $(FATE_MOV_FFPROBE) $(FATE_MOV_FASTSTART) $(FATE_MOV_FFMPEG_FFPROBE-yes)
diff --git a/tests/ref/fate/mov-cover-image b/tests/ref/fate/mov-cover-image
new file mode 100644
index 0000000000..e65e4ee36f
--- /dev/null
+++ b/tests/ref/fate/mov-cover-image
@@ -0,0 +1,43 @@
+4e92f776010bd7a727c11bf8c34cde1e *tests/data/fate/mov-cover-image.mp4
+1011919 tests/data/fate/mov-cover-image.mp4
+#extradata 0: 2, 0x00340022
+#tb 0: 1/44100
+#media_type 0: audio
+#codec_id 0: aac
+#sample_rate 0: 44100
+#channel_layout 0: 3
+#channel_layout_name 0: stereo
+#tb 1: 1/90000
+#media_type 1: video
+#codec_id 1: mjpeg
+#dimensions 1: 600x600
+#sar 1: 96/96
+#tb 2: 1/90000
+#media_type 2: video
+#codec_id 2: png
+#dimensions 2: 600x600
+#sar 2: 1/1
+0, -2112, -2112, 1024, 6, 0x027e00e8, F=0x5, S=1, 10, 0x02c80048
+0, -1088, -1088, 1024, 6, 0x027e00e8, F=0x5
+0, -64, -64, 1024, 6, 0x027e00e8
+1, 0, 0, 0, 25441, 0xe82503b0
+2, 0, 0, 0, 32657, 0x080255d2
+0, 960, 960, 1024, 6, 0x027e00e8
+0, 1984, 1984, 1024, 6, 0x027e00e8
+0, 3008, 3008, 1024, 6, 0x027e00e8
+0, 4032, 4032, 1024, 6, 0x027e00e8
+[STREAM]
+index=0
+codec_name=aac
+DISPOSITION:attached_pic=0
+[/STREAM]
+[STREAM]
+index=1
+codec_name=mjpeg
+DISPOSITION:attached_pic=1
+[/STREAM]
+[STREAM]
+index=2
+codec_name=png
+DISPOSITION:attached_pic=1
+[/STREAM]