diff mbox series

[FFmpeg-devel] tests/fate: move TTML-in-MP4 tests from subtitles.mak to mov.mak

Message ID 20210825195259.48125-1-jeebjp@gmail.com
State Accepted
Commit d48232fb4cdb55b3add08cef89c222a60d0896a9
Headers show
Series [FFmpeg-devel] tests/fate: move TTML-in-MP4 tests from subtitles.mak to mov.mak | expand

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Jan Ekström Aug. 25, 2021, 7:52 p.m. UTC 
subtitles.mak utilizes a more strict comparator and - to be honest -
the tests feel more at home in this location.
---
 tests/fate/mov.mak                                      | 4 ++++
 tests/fate/subtitles.mak                                | 4 ----
 tests/ref/fate/{sub-ttml-mp4-dfxp => mov-mp4-ttml-dfxp} | 4 ++--
 tests/ref/fate/{sub-ttml-mp4-stpp => mov-mp4-ttml-stpp} | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename tests/ref/fate/{sub-ttml-mp4-dfxp => mov-mp4-ttml-dfxp} (90%)
 rename tests/ref/fate/{sub-ttml-mp4-stpp => mov-mp4-ttml-stpp} (90%)

Comments

Martin Storsjö Aug. 25, 2021, 7:58 p.m. UTC | #1 
On Wed, 25 Aug 2021, Jan Ekström wrote:

> subtitles.mak utilizes a more strict comparator and - to be honest -
> the tests feel more at home in this location.
> ---

LGTM, although your commit message forgets to point out the relevant 
effect of it - we're not just doing this for sorting things in the most 
matching bucket, but because those tests were broken on Windows. Please 
mention that and mention that it was due to fate-sub-% getting 
CMP=rawdiff.

// Martin
Jan Ekström Aug. 25, 2021, 8:21 p.m. UTC | #2 
On Wed, Aug 25, 2021 at 10:58 PM Martin Storsjö <martin@martin.st> wrote:
>
> On Wed, 25 Aug 2021, Jan Ekström wrote:
>
> > subtitles.mak utilizes a more strict comparator and - to be honest -
> > the tests feel more at home in this location.
> > ---
>
> LGTM, although your commit message forgets to point out the relevant
> effect of it - we're not just doing this for sorting things in the most
> matching bucket, but because those tests were broken on Windows. Please
> mention that and mention that it was due to fate-sub-% getting
> CMP=rawdiff.
>

Thanks, applied with a better explanation part as
d48232fb4cdb55b3add08cef89c222a60d0896a9 .

Jan
diff mbox series

Patch

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/sub-ttml-mp4-dfxp b/tests/ref/fate/mov-mp4-ttml-dfxp
similarity index 90%
rename from tests/ref/fate/sub-ttml-mp4-dfxp
rename to tests/ref/fate/mov-mp4-ttml-dfxp
index 0172e5b7e6..e24b5d618b 100644
--- a/tests/ref/fate/sub-ttml-mp4-dfxp
+++ b/tests/ref/fate/mov-mp4-ttml-dfxp
@@ -1,5 +1,5 @@ 
-2e7e01c821c111466e7a2844826b7f6d *tests/data/fate/sub-ttml-mp4-dfxp.mp4
-8519 tests/data/fate/sub-ttml-mp4-dfxp.mp4
+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
diff --git a/tests/ref/fate/sub-ttml-mp4-stpp b/tests/ref/fate/mov-mp4-ttml-stpp
similarity index 90%
rename from tests/ref/fate/sub-ttml-mp4-stpp
rename to tests/ref/fate/mov-mp4-ttml-stpp
index a5165b568d..77bd23b7bf 100644
--- a/tests/ref/fate/sub-ttml-mp4-stpp
+++ b/tests/ref/fate/mov-mp4-ttml-stpp
@@ -1,5 +1,5 @@ 
-cbd2c7ff864a663b0d893deac5a0caec *tests/data/fate/sub-ttml-mp4-stpp.mp4
-8547 tests/data/fate/sub-ttml-mp4-stpp.mp4
+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