diff mbox series

[FFmpeg-devel,1/3] test: hlsenc: Make the hls_fmp4 sample file name match the target

Message ID 20200802064128.15055-1-martin@martin.st
State Accepted
Commit 59c4cf05096c92ddf280a35940a3eb5d777bb554
Headers show
Series [FFmpeg-devel,1/3] test: hlsenc: Make the hls_fmp4 sample file name match the target
Related show

Checks

Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Martin Storsjö Aug. 2, 2020, 6:41 a.m. UTC
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.)
---
 tests/fate/hlsenc.mak | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Comments

Steven Liu Aug. 2, 2020, 2:33 p.m. UTC | #1
Martin Storsjö <martin@martin.st> 于2020年8月2日周日 下午3:06写道:
>
> 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.)
> ---
>  tests/fate/hlsenc.mak | 6 +++---
>  1 file 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
> --
> 2.17.1
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

LGTM


Thanks
Steven
diff mbox series

Patch

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