- 21 2月, 2017 1 次提交
-
-
由 Steven Liu 提交于
check if proto is null before av_strcasecmp CID: 1401346 Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 18 2月, 2017 1 次提交
-
-
由 Steven Liu 提交于
When the http method is not set, the method will use POST for ts, PUT for m3u8, it is not unify, now set it unify. This ticket id: #5315 Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc> Reviewed-by: NMoritz Barsnick <barsnick@gmx.net> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 13 2月, 2017 1 次提交
-
-
由 Bela Bodecs 提交于
hls-encoder currenlty does not provide stream level metadata to mpegts muxer. This patch fixes track #3848 bug. Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 11 2月, 2017 1 次提交
-
-
由 Steven Liu 提交于
When user use the hls_wrap, there have many problem: 1. some platform refersh the old but usefull segment 2. CDN(Content Delivery Network) Deliver HLS not friendly The hls_wrap is used to wrap segments for use little space, now user can use hls_list_size and hls_flags delete_segments instead it. Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc> Reviewed-by: NCarl Eugen Hoyos <ceffmpeg@gmail.com> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 07 2月, 2017 1 次提交
-
-
由 Aman Gupta 提交于
Adds a `-hls_flags +temp_file` which will write segment data to filename.tmp, and then rename to filename when the segment is complete. This patch is similar in spirit to one used in Plex's ffmpeg fork, and allows a transcoding webserver to ensure incomplete segment files are never served up accidentally. Reviewed-by: NHendrik Leppkes <h.leppkes@gmail.com> Reviewed-by: NBodecs Bela <bodecsb@vivanet.hu> Signed-off-by: NAman Gupta <aman@tmm1.net> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 24 1月, 2017 2 次提交
-
-
由 Steven Liu 提交于
Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
由 Steven Liu 提交于
Reviewed-by: NBodecs Bela <bodecsb@vivanet.hu> Reviewed-by: NJames Almer <jamrial@gmail.com> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 20 1月, 2017 1 次提交
-
-
由 Steven Liu 提交于
When use http method to delete the old segments, there is only io_open, hove not io_close yet, this patch is used to fix it Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 19 1月, 2017 1 次提交
-
-
由 Steven Liu 提交于
when push hls to http server, the old segemnts can not delete by hls formats. so add the http option into hls_delete_old_segments Reported-by: NYin Jiaoyuan <yinjiaoyuan@163.com> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 18 1月, 2017 1 次提交
-
-
由 Steven Liu 提交于
Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 13 1月, 2017 2 次提交
-
-
由 Steven Liu 提交于
because the oc have been potint to hls->avf or hls->vtt_avf here is not needed point once again Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
由 Steven Liu 提交于
when hlsenc use flag second_level_segment_index, second_level_segment_size and second_level_segment_duration, the rename is ok but the output filename always use the old filename so move the rename operation after the close the ts file and before open new segment Reported-by: NChristian Johannesen <chrisjohannesen@gmail.com> Reviewed-by: NBodecs Bela <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 12 1月, 2017 2 次提交
-
-
由 Nicolas George 提交于
-
由 Bodecs Bela 提交于
start_number option starts the playlist sequence number (#EXT-X-MEDIA-SEQUENCE) from the specified number. Unless hls_flags single_file is set, it also specifies starting sequence numbers of segment and subtitle filenames. Sometimes it is usefull to have unique starting numbers at each run, but currently it is only achiveable by setting this parameter manually. This patch enables to specify start_number source parameter by introducing hls_start_number_source with 3 possible values: generic/epoch/datetime. This ensures to set start sequence number automatically for practically unique numbers. Generic option is the default and this is the curent behaviour: start_number option value specifies the start sequence number. (start_number default value is 0) If hls_start_number_source is set to epoch, then the start number will be the seconds since epoch (1970-01-01 00:00:00). If set to datetime, then the start sequence number will be based on the current date/time value as YYYYmmddHHMMSS. e.g. 20161231235659. Hls speficication allows 64 bit integers as sequence numbers. This patch also changes some code where only 32 bit integer values were handled correctly. Reviewed-by: NMoritz Barsnick <barsnick@gmx.net> Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 11 1月, 2017 2 次提交
-
-
由 Steven Liu 提交于
when the segments largest duration value is look like 4.000000, the EXT-X-TARGETDURATION value should equ 4. it's wrong when hlsenc use ceil, so fix it. Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
由 Steven Liu 提交于
problem fix ticket: #6067 Tested-by: Pero Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 06 1月, 2017 1 次提交
-
-
由 Steven Liu 提交于
CID: 1398228 Passing null pointer dirname to strlen, which dereferences it. Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 05 1月, 2017 3 次提交
-
-
由 Bela Bodecs 提交于
in get_default_pattern_localtime_fmt the default pattern contains %Y%m%d%H%I%S but the original intention was %Y%m%d%H%M%S Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
由 Steven Liu 提交于
fix CID: 1398364 Resource leak refine the code of the new options Reviewed-by: NBodecs Bela <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
由 Bela Bodecs 提交于
A wrong, unitialized variable is used for testing. This patch fixes this typo. Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 03 1月, 2017 1 次提交
-
-
由 Bela Bodecs 提交于
1st: This patch makes it possible to put actual segment file size (measured in bytes) and/or duration (calculated in microseconds) into segment filenames. This feature is useful when post-processing live streaming access log files. New behaviour works only when -use_localtime option is set and second_level_segment_size or/and second_level_segment_duration new hls_flags are specified. %%s is the placeholder for size and %%t for duration in hls_segment_filename option. Fix sized trailing zeropadding also works eg. %%09s or %%023t. A command to test new features: ./ffmpeg -loglevel info -y -f lavfi -i color=c=red:size=640x480:r=25 -f lavfi -i sine=f=440:b=4:r=44100 -c:v mpeg2video -g 25 -acodec aac -cutoff 20000 -ac 2 -ar 44100 -ab 192k -f hls -hls_time 3 -hls_list_size 5 -hls_flags second_level_segment_index+second_level_segment_size+second_level_segment_duration -use_localtime 1 -use_localtime_mkdir 1 -hls_segment_filename "segment_%Y%m%d%H%M%S_%%04d_%%08s_%%013t.ts" stream.m3u8 2nd: doc/muxers: beside second_level_segment_duration and second_level_segment_size, added some more details and example to hls_segment_filename, use_localtime, use_localtime_mkdir, hls_flags. hls_flags option list reformatted to table Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 01 1月, 2017 2 次提交
-
-
由 Bela Bodecs 提交于
Current implementation of finding duplicate segment filenames may fail if use_localtime_mkdir and use_localtime are in effect and segment_filename option expression contains subdirectories with date/time specifiers. This patch fixes this false behaviour. Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
由 Bela Bodecs 提交于
in hlcenc.c, in the hls_write_header() function the default format string for strftime() function contains %s specifier when use_localtime is true. This %s specifier will insert the seconds since EPOCH. But %s is not available on all system/environment. This patch check %s availabilty at runtine and alter the default format string if necessary. Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 29 12月, 2016 1 次提交
-
-
由 Bela Bodecs 提交于
When delete_segments hls_flag is specified, deleting old segments may fail in certain cases when use_localtime_mkdir is in effect and hls_segment_filename expression contains subdirs. This patch fixes this behaviour. Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 27 12月, 2016 2 次提交
-
-
由 Bodecs Bela 提交于
in filenames Putting date/time values into segment filenames is very usefull. But to produce non-conflicting segment filenames with -use_localtime option with date/time values in hls_segment_filename option, sometimes is not enough. Like in cases when multiple segments produced in the same second. But hlsenc currently does not make possible to use segment index (%d) at the same time whe use_localtime is in effect, due to identifier conflict. This patch makes possible to use strftime identifiers and still put segment index (%d) at same time in segment filenames by introducing second_level_segment_index flag. When -use_localtime is active, identifier %d is for month day index, so %%d is the segment index placeholder. This enhanced behaviour only exists when new second_level_segment_index flag is specified. For instance putting 'segment_%Y%m%d%H%M%S_%%05d.ts' value into -hls_segment_filename option and specifing -hls_flags second_level_segment_index and -use_localtime 1, may produce segment filename as 'segment_20161230235758_00002.ts' An example: ffmpeg -loglevel info -y -f lavfi -i color=c=red:size=640x480:r=25 -f lavfi -i anullsrc=r=44100:cl=stereo -c:v mpeg2video -g 25 -acodec aac -cutoff 20000 -ac 2 -ar 44100 -ab 192k -f hls -hls_time 3 -hls_list_size 5 -hls_flags delete_segments+second_level_segment_index -use_localtime 1 -hls_segment_filename "segment_%Y%m%d%H%M%S_%%05d.ts" stream.m3u8 will produce segments filenames: .... segment_20161227005902_00013.ts segment_20161227005902_00014.ts segment_20161227005902_00015.ts segment_20161227005903_00016.ts segment_20161227005903_00017.ts segment_20161227005903_00018.ts segment_20161227005903_00019.ts segment_20161227005903_00020.ts .... Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu>
-
由 Jesper Ek 提交于
initial_prog_date_time shouldn't be adjusted when deleting segments from disk, but rather when segments are removed from the playlist. Signed-off-by: NJesper Ek <deadbeef84@gmail.com> Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 26 12月, 2016 1 次提交
-
-
由 Bela Bodecs 提交于
ffmpeg-devel with use_localtime parameter hlsenc may produce identical filenames for different but still existing segments. It happens when hls_segment_filename contains syntacticaly correct but inadequate format parameters. Currently there is no any log message when such a situaton occurs but these cases should be avoided in most times. This patch generate warning log messages in these cases. ticketID: #6043 Signed-off-by: NBela Bodecs <bodecsb@vivanet.hu> Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
-
- 07 12月, 2016 1 次提交
-
-
由 Steven Liu 提交于
when use fix ticket 2nd problem. command line test step: rm -rf output*;./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v copy -f hls -hls_time 4 -hls_list_size 5 -hls_flags +delete_segments -hls_flags +append_list -hls_flags +omit_endlist -hls_flags +discont_start -t 50 output.m3u8 ./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v libx264 -g 4 -f hls -hls_time 4 -hls_list_size 5 -hls_flags +delete_segments -hls_flags +append_list -hls_flags +omit_endlist -hls_flags +discont_start -t 5 output.m3u8 ./ffmpeg -i ~/Movies/objectC/facebook.mp4 -an -c:v libx264 -g 4 -f hls -hls_time 4 -hls_list_size 5 -hls_flags +delete_segments -hls_flags +append_list -hls_flags +omit_endlist -hls_flags +discont_start -t 5 output.m3u8 result: #EXTM3U #EXT-X-VERSION:3 #EXT-X-TARGETDURATION:5 #EXT-X-MEDIA-SEQUENCE:6 #EXTINF:4.120000, output6.ts #EXT-X-DISCONTINUITY #EXTINF:4.000000, output7.ts #EXTINF:0.960000, output8.ts #EXT-X-DISCONTINUITY #EXTINF:4.000000, output9.ts #EXTINF:0.960000, output10.ts Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 05 12月, 2016 1 次提交
-
-
由 Steven Liu 提交于
add EXT-X-DISCONTINUITY tag at the position of the append point. Signed-off-by: NSteven Liu <lq@chinaffmpeg.org>
-
- 12 11月, 2016 1 次提交
-
-
由 Robert Nagy 提交于
Fixes https://trac.ffmpeg.org/ticket/5940#ticketReviewed-by: NMichael Niedermayer <<michael@niedermayer.cc>> Signed-off-by: NRobert Nagy <ronag89@gmail.com> Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
-
- 02 11月, 2016 2 次提交
-
-
由 Michael Niedermayer 提交于
breaks API Found-by: jamrial This reverts commit 1a956c64.
-
由 rogerdpack 提交于
Signed-off-by: Nrogerdpack <rogerpack2005@gmail.com> Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
-
- 10 10月, 2016 1 次提交
-
-
由 Moritz Barsnick 提交于
Signed-off-by: NMoritz Barsnick <barsnick@gmx.net> Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
-
- 04 10月, 2016 1 次提交
-
-
由 liuqi_123 提交于
before patch: localhost:osx liuqi$ tree 20160926/ 20160926/ └── file-20160909 └── 26 └── 16 └── 15 ├── 46 │ ├── 13.ts │ ├── 25.ts │ ├── 36.ts │ ├── 45.ts │ └── 54.ts └── 47 ├── 04.ts ├── 14.ts ├── 24.ts └── 35.ts 6 directories, 9 files localhost:osx liuqi$ cat out.m3u8 #EXTM3U #EXT-X-VERSION:3 #EXT-X-TARGETDURATION:12 #EXT-X-MEDIA-SEQUENCE:0 #EXTINF:11.360000, 13.ts #EXTINF:10.800000, 25.ts #EXTINF:9.120000, 36.ts #EXTINF:8.760000, 45.ts #EXTINF:10.200000, 54.ts #EXTINF:10.720000, 04.ts #EXTINF:9.600000, 14.ts #EXTINF:10.600000, 24.ts #EXTINF:8.760000, 35.ts #EXT-X-ENDLIST after patch: localhost:osx liuqi$ tree 20160926/ 20160926/ └── file-20160909 └── 26 └── 16 └── 15 ├── 46 │ ├── 13.ts │ ├── 25.ts │ ├── 36.ts │ ├── 45.ts │ └── 54.ts └── 47 ├── 04.ts ├── 14.ts ├── 24.ts └── 35.ts 6 directories, 9 files localhost:osx liuqi$ cat out.m3u8 #EXTM3U #EXT-X-VERSION:3 #EXT-X-TARGETDURATION:12 #EXT-X-MEDIA-SEQUENCE:0 #EXTINF:11.360000, 20160926/file-20160909/26/16/15/46/13.ts #EXTINF:10.800000, 20160926/file-20160909/26/16/15/46/25.ts #EXTINF:9.120000, 20160926/file-20160909/26/16/15/46/36.ts #EXTINF:8.760000, 20160926/file-20160909/26/16/15/46/45.ts #EXTINF:10.200000, 20160926/file-20160909/26/16/15/46/54.ts #EXTINF:10.720000, 20160926/file-20160909/26/16/15/47/04.ts #EXTINF:9.600000, 20160926/file-20160909/26/16/15/47/14.ts #EXTINF:10.600000, 20160926/file-20160909/26/16/15/47/24.ts #EXTINF:8.760000, 20160926/file-20160909/26/16/15/47/35.ts #EXT-X-ENDLIST Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
-
- 01 10月, 2016 1 次提交
-
-
由 liuqi_123 提交于
when use use_localtime_mkdir to create multi level dir, ffmpeg give error message: ffmpeg -re -i ~/Movies/objectC/facebook.mp4 -c copy -use_localtime 1 -use_localtime_mkdir 1 -hls_segment_filename '%Y%m%d/file-%Y%m%d/%s.ts' out.m3u8 error message: Could not create directory 20160926/file-20160926 with use_localtime_mkdir add mkdir_p for support the multi level dir Reviewed-by: NMichael Niedermayer <michael@niedermayer.cc> Tested-by: Zuo Genyu <1515161258@qq.com> (Windows) Signed-off-by: Steven Liu <lingjiujianke@gmail.com>
-
- 24 9月, 2016 1 次提交
-
-
由 liuqi_123 提交于
refine EXT-X-BYTERANGE tag, the spec link: https://tools.ietf.org/html/draft-pantos-http-live-streaming-19#section-4.3.2.2 the apple doc: https://developer.apple.com/library/ios/technotes/tn2288/_index.html# //apple_ref/doc/uid/DTS40012238-CH1-BYTE_RANGE_SUPPORT_FOR_SEGMENTS command line: ./ffmpeg -i ~/Movies/objectC/a.mp4 -c copy -f hls -hls_time 7 -hls_list_size 0 -hls_segment_size 2500000 -t 40 output-test.m3u8 output: localhost:ffmpeg liuqi$ ll *.ts ;cat output-test.m3u8 -rw-r--r-- 1 liuqi staff 2792176 9 12 14:44 output-test0.ts -rw-r--r-- 1 liuqi staff 3112528 9 12 14:44 output-test3.ts -rw-r--r-- 1 liuqi staff 3377420 9 12 14:44 output-test6.ts -rw-r--r-- 1 liuqi staff 1228016 9 12 14:44 output-test7.ts #EXTM3U #EXT-X-VERSION:4 #EXT-X-TARGETDURATION:10 #EXT-X-MEDIA-SEQUENCE:0 #EXTINF:9.021000, #EXT-X-BYTERANGE:1334988@0 output-test0.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:721356@1334988 output-test0.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:735832@2056344 output-test0.ts #EXTINF:6.000000, #EXT-X-BYTERANGE:1645940@0 output-test3.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:715152@1645940 output-test3.ts #EXTINF:3.000000, #EXT-X-BYTERANGE:751436@2361092 output-test3.ts #EXTINF:9.000000, #EXT-X-BYTERANGE:3377420@0 output-test6.ts #EXTINF:3.960000, #EXT-X-BYTERANGE:1228016@0 output-test7.ts #EXT-X-ENDLIST localhost:ffmpeg liuqi$ ticket-id: #5839 Signed-off-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
-
- 15 9月, 2016 1 次提交
-
-
由 Michael Niedermayer 提交于
This should fix the code on windows Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
-
- 14 9月, 2016 2 次提交
-
-
由 Michael Niedermayer 提交于
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
-
由 Michael Niedermayer 提交于
Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
-
- 08 9月, 2016 1 次提交
-
-
由 Michael Niedermayer 提交于
Reviewed-by: Steven Liu <lingjiujianke@gmail.com> Signed-off-by: NMichael Niedermayer <michael@niedermayer.cc>
-