Re: [FFmpeg-devel] [PATCH] fate: add filter-hls
On Tue, Mar 01, 2016 at 04:59:46AM +0100, Michael Niedermayer wrote: > On Tue, Mar 01, 2016 at 12:32:27AM -0300, James Almer wrote: > > On 3/1/2016 12:24 AM, Michael Niedermayer wrote: > > > On Tue, Mar 01, 2016 at 12:17:33AM -0300, James Almer wrote: > > >> On 2/29/2016 11:47 PM, Michael Niedermayer wrote: > > >>> +fate-filter-hls2: tests/data/hls-list.m3u8 > > >> > > >> Why not just add fate-filter-hls1 as dep here, and get rid of the m3u8 > > >> target above? > > > > > > i think that isnt correct > > > consider that the m3u8 has been build previously and the user runs > > > make fate-filter-hls2 > > > the hls1 test should not run in that case, its not needed > > > > Doesn't seem to be the case, though. At least not on msys2/mingw64: > > ok, simpliied as you suggested then ... and applied [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB The bravest are surely those who have the clearest vision of what is before them, glory and danger alike, and yet notwithstanding go out to meet it. -- Thucydides signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] fate: add filter-hls
On Tue, Mar 01, 2016 at 12:32:27AM -0300, James Almer wrote: > On 3/1/2016 12:24 AM, Michael Niedermayer wrote: > > On Tue, Mar 01, 2016 at 12:17:33AM -0300, James Almer wrote: > >> On 2/29/2016 11:47 PM, Michael Niedermayer wrote: > >>> +fate-filter-hls2: tests/data/hls-list.m3u8 > >> > >> Why not just add fate-filter-hls1 as dep here, and get rid of the m3u8 > >> target above? > > > > i think that isnt correct > > consider that the m3u8 has been build previously and the user runs > > make fate-filter-hls2 > > the hls1 test should not run in that case, its not needed > > Doesn't seem to be the case, though. At least not on msys2/mingw64: ok, simpliied as you suggested then ... [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB In a rich man's house there is no place to spit but his face. -- Diogenes of Sinope signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] fate: add filter-hls
On 3/1/2016 12:24 AM, Michael Niedermayer wrote: > On Tue, Mar 01, 2016 at 12:17:33AM -0300, James Almer wrote: >> On 2/29/2016 11:47 PM, Michael Niedermayer wrote: >>> +fate-filter-hls2: tests/data/hls-list.m3u8 >> >> Why not just add fate-filter-hls1 as dep here, and get rid of the m3u8 >> target above? > > i think that isnt correct > consider that the m3u8 has been build previously and the user runs > make fate-filter-hls2 > the hls1 test should not run in that case, its not needed Doesn't seem to be the case, though. At least not on msys2/mingw64: $ make testclean $ make fate-filter-hls2 HOSTCC tests/base64.o HOSTLD tests/base64.exe HOSTCC tests/tiny_psnr.o HOSTLD tests/tiny_psnr.exe HOSTCC tests/tiny_ssim.o HOSTLD tests/tiny_ssim.exe TESTfilter-hls1 TESTfilter-hls2 $ make fate-filter-hls2 TESTfilter-hls1 TESTfilter-hls2 ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] fate: add filter-hls
On Tue, Mar 01, 2016 at 12:17:33AM -0300, James Almer wrote: > On 2/29/2016 11:47 PM, Michael Niedermayer wrote: > > --- > > tests/fate/filter-audio.mak |7 + > > tests/ref/fate/filter-hls2 | 768 > > +++ > > 2 files changed, 775 insertions(+) > > create mode 100644 tests/ref/fate/filter-hls1 > > create mode 100644 tests/ref/fate/filter-hls2 > > > > diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak > > index 85a36d2..a330a93 100644 > > --- a/tests/fate/filter-audio.mak > > +++ b/tests/fate/filter-audio.mak > > @@ -3,6 +3,13 @@ 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 MOV_MUXER MOV_DEMUXER > > AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls1 > > fate-filter-hls2 > > Shouldn't it be MPEGTS instead of MOV? fixed > > > +tests/data/hls-list.m3u8: fate-filter-hls1 > > +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 > > Add a "fate-filter-hls1: REF = /dev/null" line here to avoid the empty ref > file. fixed > > > +fate-filter-hls2: tests/data/hls-list.m3u8 > > Why not just add fate-filter-hls1 as dep here, and get rid of the m3u8 target > above? i think that isnt correct consider that the m3u8 has been build previously and the user runs make fate-filter-hls2 the hls1 test should not run in that case, its not needed [...] -- Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB It is dangerous to be right in matters on which the established authorities are wrong. -- Voltaire signature.asc Description: Digital signature ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
Re: [FFmpeg-devel] [PATCH] fate: add filter-hls
On 2/29/2016 11:47 PM, Michael Niedermayer wrote: > --- > tests/fate/filter-audio.mak |7 + > tests/ref/fate/filter-hls2 | 768 > +++ > 2 files changed, 775 insertions(+) > create mode 100644 tests/ref/fate/filter-hls1 > create mode 100644 tests/ref/fate/filter-hls2 > > diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak > index 85a36d2..a330a93 100644 > --- a/tests/fate/filter-audio.mak > +++ b/tests/fate/filter-audio.mak > @@ -3,6 +3,13 @@ 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 MOV_MUXER MOV_DEMUXER > AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls1 > fate-filter-hls2 Shouldn't it be MPEGTS instead of MOV? > +tests/data/hls-list.m3u8: fate-filter-hls1 > +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 Add a "fate-filter-hls1: REF = /dev/null" line here to avoid the empty ref file. > +fate-filter-hls2: tests/data/hls-list.m3u8 Why not just add fate-filter-hls1 as dep here, and get rid of the m3u8 target above? > +fate-filter-hls2: 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 - > fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm > diff --git a/tests/ref/fate/filter-hls1 b/tests/ref/fate/filter-hls1 > new file mode 100644 > index 000..e69de29 No comments about the actual test, but it trust you it's ok. ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
[FFmpeg-devel] [PATCH] fate: add filter-hls
--- tests/fate/filter-audio.mak |7 + tests/ref/fate/filter-hls2 | 768 +++ 2 files changed, 775 insertions(+) create mode 100644 tests/ref/fate/filter-hls1 create mode 100644 tests/ref/fate/filter-hls2 diff --git a/tests/fate/filter-audio.mak b/tests/fate/filter-audio.mak index 85a36d2..a330a93 100644 --- a/tests/fate/filter-audio.mak +++ b/tests/fate/filter-audio.mak @@ -3,6 +3,13 @@ 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 MOV_MUXER MOV_DEMUXER AEVALSRC_FILTER LAVFI_INDEV MP2FIXED_ENCODER) += fate-filter-hls1 fate-filter-hls2 +tests/data/hls-list.m3u8: fate-filter-hls1 +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-hls2: tests/data/hls-list.m3u8 +fate-filter-hls2: 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 - fate-filter-amix-simple: REF = $(SAMPLES)/filter/amix_simple.pcm diff --git a/tests/ref/fate/filter-hls1 b/tests/ref/fate/filter-hls1 new file mode 100644 index 000..e69de29 diff --git a/tests/ref/fate/filter-hls2 b/tests/ref/fate/filter-hls2 new file mode 100644 index 000..30bd96fb --- /dev/null +++ b/tests/ref/fate/filter-hls2 @@ -0,0 +1,768 @@ +#tb 0: 1/44100 +0, 0, 0, 1152, 2304, 0x907cb7fa +0, 1152, 1152, 1152, 2304, 0xb8dc7525 +0, 2304, 2304, 1152, 2304, 0x3e7d6905 +0, 3456, 3456, 1152, 2304, 0xef47877b +0, 4608, 4608, 1152, 2304, 0xfe916b7e +0, 5760, 5760, 1152, 2304, 0xe3d08cde +0, 6912, 6912, 1152, 2304, 0xff7f86cf +0, 8064, 8064, 1152, 2304, 0x843e6f95 +0, 9216, 9216, 1152, 2304, 0x81577c26 +0, 10368, 10368, 1152, 2304, 0x04a085d5 +0, 11520, 11520, 1152, 2304, 0x1c5a76f5 +0, 12672, 12672, 1152, 2304, 0x4ee78623 +0, 13824, 13824, 1152, 2304, 0x8ec861dc +0, 14976, 14976, 1152, 2304, 0x0ca179d8 +0, 16128, 16128, 1152, 2304, 0xc6da750f +0, 17280, 17280, 1152, 2304, 0xf6bf79b5 +0, 18432, 18432, 1152, 2304, 0x97b88a43 +0, 19584, 19584, 1152, 2304, 0xf13c7b9c +0, 20736, 20736, 1152, 2304, 0xdfba83af +0, 21888, 21888, 1152, 2304, 0xc9467d4b +0, 23040, 23040, 1152, 2304, 0xbbb58e2b +0, 24192, 24192, 1152, 2304, 0x3a1078ea +0, 25344, 25344, 1152, 2304, 0xe9587a5c +0, 26496, 26496, 1152, 2304, 0xef5a8039 +0, 27648, 27648, 1152, 2304, 0x9d5f782f +0, 28800, 28800, 1152, 2304, 0x1a548291 +0, 29952, 29952, 1152, 2304, 0x07517701 +0, 31104, 31104, 1152, 2304, 0x78127d6e +0, 32256, 32256, 1152, 2304, 0x62e2788a +0, 33408, 33408, 1152, 2304, 0x29397ad9 +0, 34560, 34560, 1152, 2304, 0x45da82d6 +0, 35712, 35712, 1152, 2304, 0x8ed66e51 +0, 36864, 36864, 1152, 2304, 0x660775cd +0, 38016, 38016, 1152, 2304, 0x802c767a +0, 39168, 39168, 1152, 2304, 0xcc055840 +0, 40320, 40320, 1152, 2304, 0x701b7eaf +0, 41472, 41472, 1152, 2304, 0x8290749f +0, 42624, 42624, 1152, 2304, 0x2c7b7d30 +0, 43776, 43776, 1152, 2304, 0xe4f17743 +0, 44928, 44928, 1152, 2304, 0x0e747d6e +0, 46080, 46080, 1152, 2304, 0xbe7775a0 +0, 47232, 47232, 1152, 2304, 0xcf797673 +0, 48384, 48384, 1152, 2304, 0x29cb7800 +0, 49536, 49536, 1152, 2304, 0xfc947890 +0, 50688, 50688, 1152, 2304, 0x62757fc6 +0, 51840, 51840, 1152, 2304, 0x098876d0 +0, 52992, 52992, 1152, 2304, 0xa9567ee2 +0, 54144, 54144, 1152, 2304, 0xe3bb9173 +0, 55296, 55296, 1152, 2304, 0xcc2d6dee +0, 56448, 56448, 1152, 2304, 0xe94591ab +0, 57600, 57600, 1152, 2304, 0x5c7588de +0, 58752, 58752, 1152, 2304, 0xfd83643c +0, 59904, 59904, 1152, 2304, 0x528177f1 +0, 61056, 61056, 1152, 2304, 0x65d08474 +0, 62208, 62208, 1152,
