From d48232fb4cdb55b3add08cef89c222a60d0896a9 Mon Sep 17 00:00:00 2001 From: Jan Ekström Date: Wed, 25 Aug 2021 22:28:19 +0300 Subject: tests/fate: move TTML-in-MP4 tests from subtitles.mak to mov.mak subtitles.mak's fate-sub tests utilize a more strict comparator ("rawdiff"), which causes the tests fail in case of white space differences, such as CRLF vs LF. This in turn causes these ffprobe-using TTML-in-MP4 tests to fail on non-LF systems such as Windows or wine. --- tests/fate/mov.mak | 4 ++++ tests/fate/subtitles.mak | 4 ---- tests/ref/fate/mov-mp4-ttml-dfxp | 44 ++++++++++++++++++++++++++++++++++++++++ tests/ref/fate/mov-mp4-ttml-stpp | 44 ++++++++++++++++++++++++++++++++++++++++ tests/ref/fate/sub-ttml-mp4-dfxp | 44 ---------------------------------------- tests/ref/fate/sub-ttml-mp4-stpp | 44 ---------------------------------------- 6 files changed, 92 insertions(+), 92 deletions(-) create mode 100644 tests/ref/fate/mov-mp4-ttml-dfxp create mode 100644 tests/ref/fate/mov-mp4-ttml-stpp delete mode 100644 tests/ref/fate/sub-ttml-mp4-dfxp delete mode 100644 tests/ref/fate/sub-ttml-mp4-stpp (limited to 'tests') diff --git a/tests/fate/mov.mak b/tests/fate/mov.mak index 4c1014be92..0c9177aa81 100644 --- a/tests/fate/mov.mak +++ b/tests/fate/mov.mak @@ -132,6 +132,10 @@ FATE_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL MOV_DEMUXER MJPEG_DECODER \ += 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_MOV_FFMPEG_FFPROBE-$(call ALLYES, FILE_PROTOCOL SRT_DEMUXER MOV_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER MOV_MUXER) += fate-mov-mp4-ttml-stpp fate-mov-mp4-ttml-dfxp +fate-mov-mp4-ttml-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" +fate-mov-mp4-ttml-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" + 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/fate/subtitles.mak b/tests/fate/subtitles.mak index 880109f201..ee65afe35b 100644 --- a/tests/fate/subtitles.mak +++ b/tests/fate/subtitles.mak @@ -109,10 +109,6 @@ fate-sub-dvb: CMD = framecrc -i $(TARGET_SAMPLES)/sub/dvbsubtest_filter.ts -map FATE_SUBTITLES-$(call ALLYES, FILE_PROTOCOL PIPE_PROTOCOL SRT_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER) += fate-sub-ttmlenc fate-sub-ttmlenc: CMD = fmtstdout ttml -i $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt -FATE_SUBTITLES-$(call ALLYES, FILE_PROTOCOL SRT_DEMUXER MOV_DEMUXER SUBRIP_DECODER TTML_ENCODER TTML_MUXER MOV_MUXER) += fate-sub-ttml-mp4-stpp fate-sub-ttml-mp4-dfxp -fate-sub-ttml-mp4-stpp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" -fate-sub-ttml-mp4-dfxp: CMD = transcode srt $(TARGET_SAMPLES)/sub/SubRip_capability_tester.srt mp4 "-map 0:s -c:s ttml -time_base:s 1:1000 -tag:s dfxp -strict unofficial" "-map 0 -c copy" "" "-of json -show_entries packet:stream=index,codec_type,codec_tag_string,codec_tag,codec_name,time_base,start_time,duration_ts,duration,nb_frames,nb_read_packets:stream_tags" - FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes) FATE_SUBTITLES += $(FATE_SUBTITLES-yes) diff --git a/tests/ref/fate/mov-mp4-ttml-dfxp b/tests/ref/fate/mov-mp4-ttml-dfxp new file mode 100644 index 0000000000..e24b5d618b --- /dev/null +++ b/tests/ref/fate/mov-mp4-ttml-dfxp @@ -0,0 +1,44 @@ +2e7e01c821c111466e7a2844826b7f6d *tests/data/fate/mov-mp4-ttml-dfxp.mp4 +8519 tests/data/fate/mov-mp4-ttml-dfxp.mp4 +#tb 0: 1/1000 +#media_type 0: data +#codec_id 0: none +0, 0, 0, 68500, 7866, 0x456c36b7 +{ + "packets": [ + { + "codec_type": "data", + "stream_index": 0, + "pts": 0, + "pts_time": "0.000000", + "dts": 0, + "dts_time": "0.000000", + "duration": 68500, + "duration_time": "68.500000", + "size": "7866", + "pos": "44", + "flags": "K_" + } + ], + "programs": [ + + ], + "streams": [ + { + "index": 0, + "codec_type": "data", + "codec_tag_string": "dfxp", + "codec_tag": "0x70786664", + "time_base": "1/1000", + "start_time": "0.000000", + "duration_ts": 68500, + "duration": "68.500000", + "nb_frames": "1", + "nb_read_packets": "1", + "tags": { + "language": "und", + "handler_name": "SubtitleHandler" + } + } + ] +} diff --git a/tests/ref/fate/mov-mp4-ttml-stpp b/tests/ref/fate/mov-mp4-ttml-stpp new file mode 100644 index 0000000000..77bd23b7bf --- /dev/null +++ b/tests/ref/fate/mov-mp4-ttml-stpp @@ -0,0 +1,44 @@ +cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/mov-mp4-ttml-stpp.mp4 +8547 tests/data/fate/mov-mp4-ttml-stpp.mp4 +#tb 0: 1/1000 +#media_type 0: data +#codec_id 0: none +0, 0, 0, 68500, 7866, 0x456c36b7 +{ + "packets": [ + { + "codec_type": "data", + "stream_index": 0, + "pts": 0, + "pts_time": "0.000000", + "dts": 0, + "dts_time": "0.000000", + "duration": 68500, + "duration_time": "68.500000", + "size": "7866", + "pos": "44", + "flags": "K_" + } + ], + "programs": [ + + ], + "streams": [ + { + "index": 0, + "codec_type": "data", + "codec_tag_string": "stpp", + "codec_tag": "0x70707473", + "time_base": "1/1000", + "start_time": "0.000000", + "duration_ts": 68500, + "duration": "68.500000", + "nb_frames": "1", + "nb_read_packets": "1", + "tags": { + "language": "und", + "handler_name": "SubtitleHandler" + } + } + ] +} diff --git a/tests/ref/fate/sub-ttml-mp4-dfxp b/tests/ref/fate/sub-ttml-mp4-dfxp deleted file mode 100644 index 0172e5b7e6..0000000000 --- a/tests/ref/fate/sub-ttml-mp4-dfxp +++ /dev/null @@ -1,44 +0,0 @@ -2e7e01c821c111466e7a2844826b7f6d *tests/data/fate/sub-ttml-mp4-dfxp.mp4 -8519 tests/data/fate/sub-ttml-mp4-dfxp.mp4 -#tb 0: 1/1000 -#media_type 0: data -#codec_id 0: none -0, 0, 0, 68500, 7866, 0x456c36b7 -{ - "packets": [ - { - "codec_type": "data", - "stream_index": 0, - "pts": 0, - "pts_time": "0.000000", - "dts": 0, - "dts_time": "0.000000", - "duration": 68500, - "duration_time": "68.500000", - "size": "7866", - "pos": "44", - "flags": "K_" - } - ], - "programs": [ - - ], - "streams": [ - { - "index": 0, - "codec_type": "data", - "codec_tag_string": "dfxp", - "codec_tag": "0x70786664", - "time_base": "1/1000", - "start_time": "0.000000", - "duration_ts": 68500, - "duration": "68.500000", - "nb_frames": "1", - "nb_read_packets": "1", - "tags": { - "language": "und", - "handler_name": "SubtitleHandler" - } - } - ] -} diff --git a/tests/ref/fate/sub-ttml-mp4-stpp b/tests/ref/fate/sub-ttml-mp4-stpp deleted file mode 100644 index a5165b568d..0000000000 --- a/tests/ref/fate/sub-ttml-mp4-stpp +++ /dev/null @@ -1,44 +0,0 @@ -cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/sub-ttml-mp4-stpp.mp4 -8547 tests/data/fate/sub-ttml-mp4-stpp.mp4 -#tb 0: 1/1000 -#media_type 0: data -#codec_id 0: none -0, 0, 0, 68500, 7866, 0x456c36b7 -{ - "packets": [ - { - "codec_type": "data", - "stream_index": 0, - "pts": 0, - "pts_time": "0.000000", - "dts": 0, - "dts_time": "0.000000", - "duration": 68500, - "duration_time": "68.500000", - "size": "7866", - "pos": "44", - "flags": "K_" - } - ], - "programs": [ - - ], - "streams": [ - { - "index": 0, - "codec_type": "data", - "codec_tag_string": "stpp", - "codec_tag": "0x70707473", - "time_base": "1/1000", - "start_time": "0.000000", - "duration_ts": 68500, - "duration": "68.500000", - "nb_frames": "1", - "nb_read_packets": "1", - "tags": { - "language": "und", - "handler_name": "SubtitleHandler" - } - } - ] -} -- cgit v1.2.3