diff mbox series

[FFmpeg-devel] fate/hlsend: rework the ffprobe dependency of hls-fmp4_ac3

Message ID 20210124213354.1517-1-jamrial@gmail.com
State New
Headers show
Series [FFmpeg-devel] fate/hlsend: rework the ffprobe dependency of hls-fmp4_ac3
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

James Almer Jan. 24, 2021, 9:33 p.m. UTC
Add it to the existing +FATE_SAMPLES_FFPROBE list of ffprobe dependant tests
instead.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 tests/fate/hlsenc.mak | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

Comments

Andreas Rheinhardt Jan. 24, 2021, 10:08 p.m. UTC | #1
James Almer:
> Add it to the existing +FATE_SAMPLES_FFPROBE list of ffprobe dependant tests
> instead.
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  tests/fate/hlsenc.mak | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak
> index 02f041a7c2..30b81344f1 100644
> --- a/tests/fate/hlsenc.mak
> +++ b/tests/fate/hlsenc.mak
> @@ -105,9 +105,10 @@ tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
>  	-hls_time 2 -hls_segment_filename "$(TARGET_PATH)/tests/data/hls_fmp4_ac3_%d.m4s" \
>  	$(TARGET_PATH)/tests/data/hls_fmp4_ac3.m3u8 2>/dev/null
>  
> -FATE_HLSENC-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3
> -fate-hls-fmp4_ac3: ffprobe$(PROGSSUF)$(EXESUF) tests/data/hls_fmp4_ac3.m3u8
> +FATE_HLSENC_PROBE-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3
> +fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8
>  fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4
>  
>  FATE_SAMPLES_FFMPEG += $(FATE_HLSENC-yes)
> -fate-hlsenc: $(FATE_HLSENC-yes)
> +FATE_SAMPLES_FFPROBE += $(FATE_HLSENC_PROBE-yes)
> +fate-hlsenc: $(FATE_HLSENC-yes) $(FATE_HLSENC_PROBE-yes)
> 
Why not FATE_SAMPLES_FFMPEG_FFPROBE? After all, it needs FFmpeg for the
input file.

- Andreas
James Almer Jan. 24, 2021, 10:15 p.m. UTC | #2
On 1/24/2021 7:08 PM, Andreas Rheinhardt wrote:
> James Almer:
>> Add it to the existing +FATE_SAMPLES_FFPROBE list of ffprobe dependant tests
>> instead.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>>   tests/fate/hlsenc.mak | 7 ++++---
>>   1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak
>> index 02f041a7c2..30b81344f1 100644
>> --- a/tests/fate/hlsenc.mak
>> +++ b/tests/fate/hlsenc.mak
>> @@ -105,9 +105,10 @@ tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
>>   	-hls_time 2 -hls_segment_filename "$(TARGET_PATH)/tests/data/hls_fmp4_ac3_%d.m4s" \
>>   	$(TARGET_PATH)/tests/data/hls_fmp4_ac3.m3u8 2>/dev/null
>>   
>> -FATE_HLSENC-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3
>> -fate-hls-fmp4_ac3: ffprobe$(PROGSSUF)$(EXESUF) tests/data/hls_fmp4_ac3.m3u8
>> +FATE_HLSENC_PROBE-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3
>> +fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8
>>   fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4
>>   
>>   FATE_SAMPLES_FFMPEG += $(FATE_HLSENC-yes)
>> -fate-hlsenc: $(FATE_HLSENC-yes)
>> +FATE_SAMPLES_FFPROBE += $(FATE_HLSENC_PROBE-yes)
>> +fate-hlsenc: $(FATE_HLSENC-yes) $(FATE_HLSENC_PROBE-yes)
>>
> Why not FATE_SAMPLES_FFMPEG_FFPROBE? After all, it needs FFmpeg for the
> input file.
> 
> - Andreas

You're right. Changed locally then. Will push later.
diff mbox series

Patch

diff --git a/tests/fate/hlsenc.mak b/tests/fate/hlsenc.mak
index 02f041a7c2..30b81344f1 100644
--- a/tests/fate/hlsenc.mak
+++ b/tests/fate/hlsenc.mak
@@ -105,9 +105,10 @@  tests/data/hls_fmp4_ac3.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
 	-hls_time 2 -hls_segment_filename "$(TARGET_PATH)/tests/data/hls_fmp4_ac3_%d.m4s" \
 	$(TARGET_PATH)/tests/data/hls_fmp4_ac3.m3u8 2>/dev/null
 
-FATE_HLSENC-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3
-fate-hls-fmp4_ac3: ffprobe$(PROGSSUF)$(EXESUF) tests/data/hls_fmp4_ac3.m3u8
+FATE_HLSENC_PROBE-$(call ALLYES, HLS_DEMUXER EAC3_DEMUXER) += fate-hls-fmp4_ac3
+fate-hls-fmp4_ac3: tests/data/hls_fmp4_ac3.m3u8
 fate-hls-fmp4_ac3: CMD = probeaudiostream $(TARGET_PATH)/tests/data/now_ac3.mp4
 
 FATE_SAMPLES_FFMPEG += $(FATE_HLSENC-yes)
-fate-hlsenc: $(FATE_HLSENC-yes)
+FATE_SAMPLES_FFPROBE += $(FATE_HLSENC_PROBE-yes)
+fate-hlsenc: $(FATE_HLSENC-yes) $(FATE_HLSENC_PROBE-yes)