| Message ID | 181e6bf8-5068-8315-fcb4-70253f31f454@vivanet.hu |
|---|---|
| State | Superseded |
| Headers | show |
2017-01-10 17:42 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: > > > 2017.01.10. 6:53 keltezéssel, Steven Liu írta: > >> 2017-01-08 8:22 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>: >> >> >>> 2017-01-08 1:37 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>> >>> >>>> 2017.01.07. 0:32 keltezéssel, Steven Liu írta: >>>> >>>> 2017-01-07 0:47 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>>>> >>>>> >>>>> 2017.01.06. 17:33 keltezéssel, Steven Liu írta: >>>>>> >>>>>> 2017-01-07 0:22 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>>>>> >>>>>>> >>>>>>> 2017.01.06. 16:50 keltezéssel, Steven Liu írta: >>>>>>> >>>>>>>> 2017-01-06 22:07 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>>>>>>> >>>>>>>> Dear All, >>>>>>>>> >>>>>>>>> in avformat/hlsenc the 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 set start_number parameter automatically for >>>>>>>>>> practically unique numbers. If start_number is set to -1, then >>>>>>>>>> the start number will be the seconds since epoch (1970-01-01 >>>>>>>>>> 00:00:00). >>>>>>>>>> If set to -2, then the start number will be based on the current >>>>>>>>>> date/time value as YYYYmmddHHMMSS. e.g. 20161231235659. >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> thank you, >>>>>>>>>> >>>>>>>>>> Bela Bodecs >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> _______________________________________________ >>>>>>>>>> ffmpeg-devel mailing list >>>>>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>>>>> >>>>>>>>>> >>>>>>>>>> Two question: >>>>>>>>>> >>>>>>>>>> 1. char b[21]; Why this is 21 ? >>>>>>>>>> >>>>>>>>> you are right, 15 is enough. >>>>>>>>> >>>>>>>>> 2. + {"start_number", "set first number in the sequence", >>>>>>>> >>>>>>>> OFFSET(start_sequence),AV_OPT_TYPE_INT64, {.i64 = 0}, -2, >>>>>>>>> INT64_MAX, >>>>>>>>> E}, >>>>>>>>> Why is this -2 and the help message maybe need more infomation, for >>>>>>>>> example >>>>>>>>> -2 mean -1 mean 0 mean, and default value. >>>>>>>>> >>>>>>>>> yes, I have altered now but I have written verbosly into the doc >>>>>>>>> >>>>>>>>> (muxers.texi), here: >>>>>>>> >>>>>>>> +If set to -1, then the start number will be the seconds since epoch >>>>>>>> (1970-01-01 00:00:00). >>>>>>>> +If set to -2, then the start number will be based on the current >>>>>>>> date/time as YYYYmmddHHMMSS. e.g. 20161231235759. >>>>>>>> +Default value is 0. >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> >>>>>>>> ffmpeg-devel mailing list >>>>>>>> >>>>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>>>> >>>>>>>>> I have enclosed a fixed version. A have changed some code, where >>>>>>>>> greater >>>>>>>>> >>>>>>>>> than 32 bit long sequence numbers were not handled correctly. >>>>>>>> (av_get_frame_filename2) >>>>>>>> >>>>>>>> thank you. >>>>>>>> Bela Bodecs >>>>>>>> >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> ffmpeg-devel mailing list >>>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>>> >>>>>>>> >>>>>>>> + {"start_number", "set first number in the sequence, 0 is >>>>>>>> default, >>>>>>>> >>>>>>>> -1: >>>>>>> second since epoch, -2: current datetime as YYYYMMDDhhmmss, actual >>>>>>> value >>>>>>> otherwise", OFFSET(start_sequence),AV_OPT_TYPE_INT64, {.i64 = 0}, >>>>>>> -2, >>>>>>> INT64_MAX, E}, >>>>>>> >>>>>>> I have check this option, i think add flag to control the >>>>>>> start_number >>>>>>> maybe better, >>>>>>> for example: >>>>>>> hls_flags >>>>>>> hls_playlist_type >>>>>>> >>>>>>> maybe add a start_number_flags is better, What about you think? >>>>>>> >>>>>>> Using hls_flags is not enough to specify different values for them. >>>>>>> >>>>>> NO, i am not mean use hls_flags, i mean you can creat a new flags, >>>>>> >>>>> start_number_flags >>>>> generic >>>>> epoch >>>>> datetime >>>>> >>>>> Ok, I see it. May I implement it? >>>> >>>> >>>> yes, of course ;-) >>> >>> >>>> I thought that there should be 3 options beside this start_number >>>>> option. >>>>> >>>>> hls_start_number_playlist, hls_start_number_segment and >>>>>> hls_start_number_vtt >>>>>> Using start_number and any of the new 3 ones would be mutualy >>>>>> exlusive. >>>>>> >>>>>> This way anybody could use the old option (start_number) and it won't >>>>>> break the current behaviour. >>>>>> But those who want to have finer control, they may use the new >>>>>> options. >>>>>> >>>>>> of course -start_number x has the same effect as using >>>>>> -hls_start_number_playlist x -hls_start_number_segment x >>>>>> -hls_start_number_vtt x >>>>>> >>>>>> >>>>>> >>>>>> _______________________________________________ >>>>>> >>>>>> ffmpeg-devel mailing list >>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>> >>>>>>> _______________________________________________ >>>>>>> >>>>>> ffmpeg-devel mailing list >>>>>> ffmpeg-devel@ffmpeg.org >>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>> >>>>>> _______________________________________________ >>>>>> >>>>> ffmpeg-devel mailing list >>>>> ffmpeg-devel@ffmpeg.org >>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>> >>>>> _______________________________________________ >>>> ffmpeg-devel mailing list >>>> ffmpeg-devel@ffmpeg.org >>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>> >>>> >>> Hi Bodecs, >> >> If you don't have enough time, i think i can do it together with >> you;) >> > here it is. > > _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > +typedef enum { + HLS_START_SEQUNCE_AS_START_NUMBER = 0, + HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH = -1, + HLS_START_SEQUNCE_AS_FORMATTED_DATETIME = -2, // YYYYMMDDhhmmss +} StartSequenceSourceType; is this better? + av_log(hls, AV_LOG_VERBOSE, "Found playlist sequence number was smaller than specified start sequence number: %"PRId64" < %"PRId64", omitting\n", tmp_sequence, hls->start_sequence); this line is too long , + if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH || hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) { + time_t t = time(NULL); // we will need it in either case + if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH) { + hls->start_sequence = (int64_t)t; + } else if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) { + char b[15]; + struct tm *p, tmbuf; + if (!(p = localtime_r(&t, &tmbuf))) + return AVERROR(ENOMEM); + if (!strftime(b, sizeof(b), "%Y%m%d%H%M%S", p)) + return AVERROR(ENOMEM); + hls->start_sequence = strtoll(b, NULL, 10); + } + av_log(hls, AV_LOG_DEBUG, "start_number evaluated to %"PRId64"\n", hls->start_sequence); + } Why twice if here? patch probe ok, My English is poor, and wait English master to review your document :D
On Tue, Jan 10, 2017 at 10:42:21 +0100, Bodecs Bela wrote: > Hls speficication allow 64 bit integers as sequence numbers. This patch ^ specification allows > +typedef enum { > + HLS_START_SEQUNCE_AS_START_NUMBER, > + HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH, > + HLS_START_SEQUNCE_AS_FORMATTED_DATETIME, // YYYYMMDDhhmmss ^ correct spelling would be SEQUENCE :) Otherwise, grammar looks okay to me. Missing documentation in doc/muxers.texi. Moritz
2017.01.10. 13:02 keltezéssel, Moritz Barsnick írta: > On Tue, Jan 10, 2017 at 10:42:21 +0100, Bodecs Bela wrote: >> Hls speficication allow 64 bit integers as sequence numbers. This patch > ^ specification allows > >> +typedef enum { >> + HLS_START_SEQUNCE_AS_START_NUMBER, >> + HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH, >> + HLS_START_SEQUNCE_AS_FORMATTED_DATETIME, // YYYYMMDDhhmmss > ^ correct spelling would be SEQUENCE :) > > Otherwise, grammar looks okay to me. > > Missing documentation in doc/muxers.texi. my patch included the muxers.texi also. > > Moritz > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
2017.01.10. 12:10 keltezéssel, Steven Liu írta: > 2017-01-10 17:42 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: > >> >> 2017.01.10. 6:53 keltezéssel, Steven Liu írta: >> >>> 2017-01-08 8:22 GMT+08:00 Steven Liu <lingjiujianke@gmail.com>: >>> >>> >>>> 2017-01-08 1:37 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>>> >>>> >>>>> 2017.01.07. 0:32 keltezéssel, Steven Liu írta: >>>>> >>>>> 2017-01-07 0:47 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>>>>> >>>>>> 2017.01.06. 17:33 keltezéssel, Steven Liu írta: >>>>>>> 2017-01-07 0:22 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>>>>>> >>>>>>>> 2017.01.06. 16:50 keltezéssel, Steven Liu írta: >>>>>>>> >>>>>>>>> 2017-01-06 22:07 GMT+08:00 Bodecs Bela <bodecsb@vivanet.hu>: >>>>>>>>> >>>>>>>>> Dear All, >>>>>>>>>> in avformat/hlsenc the 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 set start_number parameter automatically for >>>>>>>>>>> practically unique numbers. If start_number is set to -1, then >>>>>>>>>>> the start number will be the seconds since epoch (1970-01-01 >>>>>>>>>>> 00:00:00). >>>>>>>>>>> If set to -2, then the start number will be based on the current >>>>>>>>>>> date/time value as YYYYmmddHHMMSS. e.g. 20161231235659. >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> thank you, >>>>>>>>>>> >>>>>>>>>>> Bela Bodecs >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> _______________________________________________ >>>>>>>>>>> ffmpeg-devel mailing list >>>>>>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>>>>>> >>>>>>>>>>> >>>>>>>>>>> Two question: >>>>>>>>>>> >>>>>>>>>>> 1. char b[21]; Why this is 21 ? >>>>>>>>>>> >>>>>>>>>> you are right, 15 is enough. >>>>>>>>>> >>>>>>>>>> 2. + {"start_number", "set first number in the sequence", >>>>>>>>> OFFSET(start_sequence),AV_OPT_TYPE_INT64, {.i64 = 0}, -2, >>>>>>>>>> INT64_MAX, >>>>>>>>>> E}, >>>>>>>>>> Why is this -2 and the help message maybe need more infomation, for >>>>>>>>>> example >>>>>>>>>> -2 mean -1 mean 0 mean, and default value. >>>>>>>>>> >>>>>>>>>> yes, I have altered now but I have written verbosly into the doc >>>>>>>>>> >>>>>>>>>> (muxers.texi), here: >>>>>>>>> +If set to -1, then the start number will be the seconds since epoch >>>>>>>>> (1970-01-01 00:00:00). >>>>>>>>> +If set to -2, then the start number will be based on the current >>>>>>>>> date/time as YYYYmmddHHMMSS. e.g. 20161231235759. >>>>>>>>> +Default value is 0. >>>>>>>>> >>>>>>>>> _______________________________________________ >>>>>>>>> >>>>>>>>> ffmpeg-devel mailing list >>>>>>>>> >>>>>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>>>>> >>>>>>>>>> I have enclosed a fixed version. A have changed some code, where >>>>>>>>>> greater >>>>>>>>>> >>>>>>>>>> than 32 bit long sequence numbers were not handled correctly. >>>>>>>>> (av_get_frame_filename2) >>>>>>>>> >>>>>>>>> thank you. >>>>>>>>> Bela Bodecs >>>>>>>>> >>>>>>>>> >>>>>>>>> _______________________________________________ >>>>>>>>> ffmpeg-devel mailing list >>>>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>>>> >>>>>>>>> >>>>>>>>> + {"start_number", "set first number in the sequence, 0 is >>>>>>>>> default, >>>>>>>>> >>>>>>>>> -1: >>>>>>>> second since epoch, -2: current datetime as YYYYMMDDhhmmss, actual >>>>>>>> value >>>>>>>> otherwise", OFFSET(start_sequence),AV_OPT_TYPE_INT64, {.i64 = 0}, >>>>>>>> -2, >>>>>>>> INT64_MAX, E}, >>>>>>>> >>>>>>>> I have check this option, i think add flag to control the >>>>>>>> start_number >>>>>>>> maybe better, >>>>>>>> for example: >>>>>>>> hls_flags >>>>>>>> hls_playlist_type >>>>>>>> >>>>>>>> maybe add a start_number_flags is better, What about you think? >>>>>>>> >>>>>>>> Using hls_flags is not enough to specify different values for them. >>>>>>>> >>>>>>> NO, i am not mean use hls_flags, i mean you can creat a new flags, >>>>>>> >>>>>> start_number_flags >>>>>> generic >>>>>> epoch >>>>>> datetime >>>>>> >>>>>> Ok, I see it. May I implement it? >>>>> >>>>> yes, of course ;-) >>>> >>>>> I thought that there should be 3 options beside this start_number >>>>>> option. >>>>>> >>>>>> hls_start_number_playlist, hls_start_number_segment and >>>>>>> hls_start_number_vtt >>>>>>> Using start_number and any of the new 3 ones would be mutualy >>>>>>> exlusive. >>>>>>> >>>>>>> This way anybody could use the old option (start_number) and it won't >>>>>>> break the current behaviour. >>>>>>> But those who want to have finer control, they may use the new >>>>>>> options. >>>>>>> >>>>>>> of course -start_number x has the same effect as using >>>>>>> -hls_start_number_playlist x -hls_start_number_segment x >>>>>>> -hls_start_number_vtt x >>>>>>> >>>>>>> >>>>>>> >>>>>>> _______________________________________________ >>>>>>> >>>>>>> ffmpeg-devel mailing list >>>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>>> >>>>>>>> _______________________________________________ >>>>>>>> >>>>>>> ffmpeg-devel mailing list >>>>>>> ffmpeg-devel@ffmpeg.org >>>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>>> >>>>>>> _______________________________________________ >>>>>>> >>>>>> ffmpeg-devel mailing list >>>>>> ffmpeg-devel@ffmpeg.org >>>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>>> >>>>>> _______________________________________________ >>>>> ffmpeg-devel mailing list >>>>> ffmpeg-devel@ffmpeg.org >>>>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>>>> >>>>> >>>> Hi Bodecs, >>> If you don't have enough time, i think i can do it together with >>> you;) >>> >> here it is. >> >> _______________________________________________ >>> ffmpeg-devel mailing list >>> ffmpeg-devel@ffmpeg.org >>> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >>> >> >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> > +typedef enum { > + HLS_START_SEQUNCE_AS_START_NUMBER = 0, > + HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH = -1, > + HLS_START_SEQUNCE_AS_FORMATTED_DATETIME = -2, // YYYYMMDDhhmmss > +} StartSequenceSourceType; > is this better? > > + av_log(hls, AV_LOG_VERBOSE, "Found playlist sequence number > was smaller than specified start sequence number: %"PRId64" < %"PRId64", > omitting\n", tmp_sequence, hls->start_sequence); > > this line is too long , > > > > > + if (hls->start_sequence_source_type == > HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH || hls->start_sequence_source_type > == HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) { > + time_t t = time(NULL); // we will need it in either case > + if (hls->start_sequence_source_type == > HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH) { > + hls->start_sequence = (int64_t)t; > + } else if (hls->start_sequence_source_type == > HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) { > + char b[15]; > + struct tm *p, tmbuf; > + if (!(p = localtime_r(&t, &tmbuf))) > + return AVERROR(ENOMEM); > + if (!strftime(b, sizeof(b), "%Y%m%d%H%M%S", p)) > + return AVERROR(ENOMEM); > + hls->start_sequence = strtoll(b, NULL, 10); > + } > + av_log(hls, AV_LOG_DEBUG, "start_number evaluated to %"PRId64"\n", > hls->start_sequence); > + } > > > Why twice if here? > > this line (first) is common in each branch: time_t t = time(NULL); // we will need it in either case and this line (last) is also common: av_log(hls, AV_LOG_DEBUG, "start ... So with the first compound if I spare two lines > patch probe ok, > > My English is poor, and wait English master to review your document :D > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On Tue, Jan 10, 2017 at 16:02:34 +0100, Bodecs Bela wrote: > > Missing documentation in doc/muxers.texi. > my patch included the muxers.texi also. D'uh, sorry! ;)
2017.01.10. 22:02 keltezéssel, Moritz Barsnick írta: > On Tue, Jan 10, 2017 at 16:02:34 +0100, Bodecs Bela wrote: >>> Missing documentation in doc/muxers.texi. >> my patch included the muxers.texi also. > D'uh, sorry! ;) Will you please review it? > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
On Wed, Jan 11, 2017 at 23:52:53 +0100, Bodecs Bela wrote: > >> my patch included the muxers.texi also. > > D'uh, sorry! ;) > Will you please review it? LGTM. It's even close to perfect. Moritz
2017-01-12 20:34 GMT+08:00 Moritz Barsnick <barsnick@gmx.net>: > On Wed, Jan 11, 2017 at 23:52:53 +0100, Bodecs Bela wrote: > > >> my patch included the muxers.texi also. > > > D'uh, sorry! ;) > > Will you please review it? > > LGTM. It's even close to perfect. > > Moritz > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > http://ffmpeg.org/mailman/listinfo/ffmpeg-devel > Reviewed-by: Moritz Barsnick <barsnick@gmx.net> Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> --- doc/muxers.texi | 29 ++++++++++++++++++++++++++-- libavformat/hlsenc.c | 54 +++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 70 insertions(+), 13 deletions(-) applied Thanks
From 5222dc3bb369186a7a185c4a133503b1ea694885 Mon Sep 17 00:00:00 2001 From: Bela Bodecs <bodecsb@vivanet.hu> Date: Fri, 6 Jan 2017 14:52:08 +0100 Subject: [PATCH] avformat/hlsenc: hls_start_number_source and start_number 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 allow 64 bit integers as sequence numbers. This patch also changes some code where only 32 bit integer values were handled correctly. Signed-off-by: Bela Bodecs <bodecsb@vivanet.hu> --- doc/muxers.texi | 29 +++++++++++++++++++++++++++-- libavformat/hlsenc.c | 51 ++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/doc/muxers.texi b/doc/muxers.texi index 351cd8c..26a8f2d 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -416,9 +416,34 @@ This option is useful to avoid to fill the disk with many segment files, and limits the maximum number of segment files written to disk to @var{wrap}. + +@item hls_start_number_source +Start the playlist sequence number (@code{#EXT-X-MEDIA-SEQUENCE}) according to the specified source. +Unless @code{hls_flags single_file} is set, it also specifies source of starting sequence numbers of +segment and subtitle filenames. In any case, if @code{hls_flags append_list} +is set and read playlist sequence number is greater than the specified start sequence number, +then that value will be used as start value. + +It accepts the following values: + +@table @option + +@item generic (default) +Set the starting sequence numbers according to @var{start_number} option value. + +@item epoch +The start number will be the seconds since epoch (1970-01-01 00:00:00) + +@item datetime +The start number will be based on the current date/time as YYYYmmddHHMMSS. e.g. 20161231235759. + +@end table + @item start_number @var{number} -Start the playlist sequence number from @var{number}. Default value is -0. +Start the playlist sequence number (@code{#EXT-X-MEDIA-SEQUENCE}) from the specified @var{number} +when @var{hls_start_number_source} value is @var{generic}. (This is the default case.) +Unless @code{hls_flags single_file} is set, it also specifies starting sequence numbers of segment and subtitle filenames. +Default value is 0. @item hls_allow_cache @var{allowcache} Explicitly set whether the client MAY (1) or MUST NOT (0) cache media segments. diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index eeb450a..0fb5b95 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -39,6 +39,12 @@ #include "internal.h" #include "os_support.h" +typedef enum { + HLS_START_SEQUNCE_AS_START_NUMBER, + HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH, + HLS_START_SEQUNCE_AS_FORMATTED_DATETIME, // YYYYMMDDhhmmss +} StartSequenceSourceType; + #define KEYSIZE 16 #define LINE_BUFFER_SIZE 1024 @@ -83,6 +89,7 @@ typedef struct HLSContext { unsigned number; int64_t sequence; int64_t start_sequence; + uint32_t start_sequence_source_type; // enum StartSequenceSourceType AVOutputFormat *oformat; AVOutputFormat *vtt_oformat; @@ -586,7 +593,13 @@ static int parse_playlist(AVFormatContext *s, const char *url) while (!avio_feof(in)) { read_chomp_line(in, line, sizeof(line)); if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) { - hls->sequence = atoi(ptr); + int64_t tmp_sequence = strtoll(ptr, NULL, 10); + if (tmp_sequence < hls->sequence) + av_log(hls, AV_LOG_VERBOSE, "Found playlist sequence number was smaller than specified start sequence number: %"PRId64" < %"PRId64", omitting\n", tmp_sequence, hls->start_sequence); + else { + av_log(hls, AV_LOG_DEBUG, "Found playlist sequence number: %"PRId64"\n", tmp_sequence); + hls->sequence = tmp_sequence; + } } else if (av_strstart(line, "#EXT-X-DISCONTINUITY", &ptr)) { is_segment = 1; hls->discontinuity = 1; @@ -797,9 +810,8 @@ static int hls_start(AVFormatContext *s) av_strlcpy(vtt_oc->filename, c->vtt_basename, sizeof(vtt_oc->filename)); } else if (c->max_seg_size > 0) { - if (av_get_frame_filename2(oc->filename, sizeof(oc->filename), - c->basename, c->wrap ? c->sequence % c->wrap : c->sequence, - AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + if (replace_int_data_in_filename(oc->filename, sizeof(oc->filename), + c->basename, 'd', c->wrap ? c->sequence % c->wrap : c->sequence) < 1) { av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s', you can try to use -use_localtime 1 with it\n", c->basename); return AVERROR(EINVAL); } @@ -874,16 +886,14 @@ static int hls_start(AVFormatContext *s) } av_free(fn_copy); } - } else if (av_get_frame_filename2(oc->filename, sizeof(oc->filename), - c->basename, c->wrap ? c->sequence % c->wrap : c->sequence, - AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + } else if (replace_int_data_in_filename(oc->filename, sizeof(oc->filename), + c->basename, 'd', c->wrap ? c->sequence % c->wrap : c->sequence) < 1) { av_log(oc, AV_LOG_ERROR, "Invalid segment filename template '%s' you can try to use -use_localtime 1 with it\n", c->basename); return AVERROR(EINVAL); } if( c->vtt_basename) { - if (av_get_frame_filename2(vtt_oc->filename, sizeof(vtt_oc->filename), - c->vtt_basename, c->wrap ? c->sequence % c->wrap : c->sequence, - AV_FRAME_FILENAME_FLAGS_MULTIPLE) < 0) { + if (replace_int_data_in_filename(vtt_oc->filename, sizeof(vtt_oc->filename), + c->vtt_basename, 'd', c->wrap ? c->sequence % c->wrap : c->sequence) < 1) { av_log(vtt_oc, AV_LOG_ERROR, "Invalid segment filename template '%s'\n", c->vtt_basename); return AVERROR(EINVAL); } @@ -971,6 +981,22 @@ static int hls_write_header(AVFormatContext *s) int basename_size; int vtt_basename_size; + if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH || hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) { + time_t t = time(NULL); // we will need it in either case + if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH) { + hls->start_sequence = (int64_t)t; + } else if (hls->start_sequence_source_type == HLS_START_SEQUNCE_AS_FORMATTED_DATETIME) { + char b[15]; + struct tm *p, tmbuf; + if (!(p = localtime_r(&t, &tmbuf))) + return AVERROR(ENOMEM); + if (!strftime(b, sizeof(b), "%Y%m%d%H%M%S", p)) + return AVERROR(ENOMEM); + hls->start_sequence = strtoll(b, NULL, 10); + } + av_log(hls, AV_LOG_DEBUG, "start_number evaluated to %"PRId64"\n", hls->start_sequence); + } + hls->sequence = hls->start_sequence; hls->recording_time = (hls->init_time ? hls->init_time : hls->time) * AV_TIME_BASE; hls->start_pts = AV_NOPTS_VALUE; @@ -1349,7 +1375,10 @@ static const AVOption options[] = { {"event", "EVENT playlist", 0, AV_OPT_TYPE_CONST, {.i64 = PLAYLIST_TYPE_EVENT }, INT_MIN, INT_MAX, E, "pl_type" }, {"vod", "VOD playlist", 0, AV_OPT_TYPE_CONST, {.i64 = PLAYLIST_TYPE_VOD }, INT_MIN, INT_MAX, E, "pl_type" }, {"method", "set the HTTP method", OFFSET(method), AV_OPT_TYPE_STRING, {.str = NULL}, 0, 0, E}, - + {"hls_start_number_source", "set source of first number in sequence", OFFSET(start_sequence_source_type), AV_OPT_TYPE_INT, {.i64 = HLS_START_SEQUNCE_AS_START_NUMBER }, 0, HLS_START_SEQUNCE_AS_FORMATTED_DATETIME, E, "start_sequence_source_type" }, + {"generic", "start_number value (default)", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUNCE_AS_START_NUMBER }, INT_MIN, INT_MAX, E, "start_sequence_source_type" }, + {"epoch", "seconds since epoch", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUNCE_AS_SECONDS_SINCE_EPOCH }, INT_MIN, INT_MAX, E, "start_sequence_source_type" }, + {"datetime", "current datetime as YYYYMMDDhhmmss", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_START_SEQUNCE_AS_FORMATTED_DATETIME }, INT_MIN, INT_MAX, E, "start_sequence_source_type" }, { NULL }, }; -- 2.5.3.windows.1