summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2020-08-02 00:20:27 +0300
committerMartin Storsjö <martin@martin.st>2020-08-03 23:52:13 +0300
commit59c4cf05096c92ddf280a35940a3eb5d777bb554 (patch)
tree391bbb64a22581242eb700a2129707fb9c1df8bd
parentacaed62ad1f4ba8f1c6c84d15a99cee03b1322b6 (diff)
test: hlsenc: Make the hls_fmp4 sample file name match the target
Previously, with the file name not matching the target, the files were regenerated every time fate is rerun - contrary to the other test targets in the same file. (While regenerating it every time might be desireable, as that's what the test is about, the file at least has a dependency on the ffmpeg executable, making them regenerated every time the executable is updated - and this change at least makes it consistent with the rest.) Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r--tests/fate/hlsenc.mak6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak
index c56a541f43..d4ce26457d 100644
--- a/tests/fate/hlsenc.mak
+++ b/tests/fate/hlsenc.mak
@@ -85,8 +85,8 @@ FATE_HLSENC-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILT
fate-hls-list-size: tests/data/hls_list_size.m3u8
fate-hls-list-size: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_list_size.m3u8 -vf setpts=N*23
-tests/data/hls_segment_type_fmp4.m3u8: TAG = GEN
-tests/data/hls_segment_type_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+tests/data/hls_fmp4.m3u8: TAG = GEN
+tests/data/hls_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
$(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
-f lavfi -re -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t):d=5" -map 0 -codec:a mp2fixed \
-hls_segment_type mpegts -hls_fmp4_init_filename now.mp4 -hls_list_size 0 \
@@ -94,7 +94,7 @@ tests/data/hls_segment_type_fmp4.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
$(TARGET_PATH)/tests/data/hls_fmp4.m3u8 2>/dev/null
FATE_HLSENC-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-hls-fmp4
-fate-hls-fmp4: tests/data/hls_segment_type_fmp4.m3u8
+fate-hls-fmp4: tests/data/hls_fmp4.m3u8
fate-hls-fmp4: CMD = framecrc -flags +bitexact -i $(TARGET_PATH)/tests/data/hls_fmp4.m3u8 -vf setpts=N*23
tests/data/hls_fmp4_ac3.m3u8: TAG = GEN