Re: [FFmpeg-devel] [PATCH] fate: fix filter-hls tests dependencies

2016-03-03 Thread James Almer 
On 3/3/2016 7:43 AM, Michael Niedermayer wrote:
> On Thu, Mar 03, 2016 at 12:55:55AM -0300, James Almer wrote:
>> Signed-off-by: James Almer 
>> ---
>>  tests/fate/filter-audio.mak| 15 +--
>>  tests/ref/fate/{filter-hls2 => filter-hls} |  0
>>  2 files changed, 9 insertions(+), 6 deletions(-)
>>  rename tests/ref/fate/{filter-hls2 => filter-hls} (100%)
> 
> LGTM
> 
> thx

Pushed

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] fate: fix filter-hls tests dependencies

2016-03-03 Thread Michael Niedermayer 
On Thu, Mar 03, 2016 at 12:55:55AM -0300, James Almer wrote:
> Signed-off-by: James Almer 
> ---
>  tests/fate/filter-audio.mak| 15 +--
>  tests/ref/fate/{filter-hls2 => filter-hls} |  0
>  2 files changed, 9 insertions(+), 6 deletions(-)
>  rename tests/ref/fate/{filter-hls2 => filter-hls} (100%)

LGTM

thx

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

The misfortune of the wise is better than the prosperity of the fool.
-- Epicurus


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] fate: fix filter-hls tests dependencies

2016-03-02 Thread James Almer 
Signed-off-by: James Almer 
---
 tests/fate/filter-audio.mak| 15 +--
 tests/ref/fate/{filter-hls2 => filter-hls} |  0
 2 files changed, 9 insertions(+), 6 deletions(-)
 rename tests/ref/fate/{filter-hls2 => filter-hls} (100%)

diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak
index fee48fb..b7bc979 100644
--- a/tests/fate/filter-audio.mak
+++ b/tests/fate/filter-audio.mak
@@ -3,12 +3,15 @@ fate-filter-adelay: tests/data/asynth-44100-2.wav
 fate-filter-adelay: SRC = $(TARGET_PATH)/tests/data/asynth-44100-2.wav
 fate-filter-adelay: CMD = framecrc -i $(SRC) -af adelay=42
 
-FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER 
AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls1 
fate-filter-hls2
-fate-filter-hls1: CMD = run ffmpeg -f lavfi -i 
"aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t)::d=20" -f segment -segment_time 10 
-map 0 -flags +bitexact -codec:a mp2fixed \
-   -segment_list 
$(TARGET_PATH)/tests/data/hls-list.m3u8 
$(TARGET_PATH)/tests/data/hls-out-%03d.ts
-fate-filter-hls1: REF = /dev/null
-fate-filter-hls2: fate-filter-hls1
-fate-filter-hls2: CMD = framecrc -flags +bitexact -i 
$(TARGET_PATH)/tests/data/hls-list.m3u8
+tests/data/hls-list.m3u8: TAG = GEN
+tests/data/hls-list.m3u8: ffmpeg$(PROGSSUF)$(EXESUF) | tests/data
+   $(M)$(TARGET_EXEC) $(TARGET_PATH)/$< \
+-f lavfi -i "aevalsrc=cos(2*PI*t)*sin(2*PI*(440+4*t)*t)::d=20" -f 
segment -segment_time 10 -map 0 -flags +bitexact -codec:a mp2fixed \
+-segment_list $(TARGET_PATH)/$@ -y 
$(TARGET_PATH)/tests/data/hls-out-%03d.ts 2>/dev/null
+
+FATE_AFILTER-$(call ALLYES, HLS_DEMUXER MPEGTS_MUXER MPEGTS_DEMUXER 
AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls
+fate-filter-hls: tests/data/hls-list.m3u8
+fate-filter-hls: CMD = framecrc -flags +bitexact -i 
$(TARGET_PATH)/tests/data/hls-list.m3u8
 
 FATE_AMIX += fate-filter-amix-simple
 fate-filter-amix-simple: CMD = ffmpeg -filter_complex amix -i $(SRC) -ss 3 -i 
$(SRC1) -f f32le -
diff --git a/tests/ref/fate/filter-hls2 b/tests/ref/fate/filter-hls
similarity index 100%
rename from tests/ref/fate/filter-hls2
rename to tests/ref/fate/filter-hls
-- 
2.7.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel