diff mbox series

[FFmpeg-devel] avformat/hlsenc: Handle when fractional seconds not set and error out when init_program_date_time can't be parsed

Message ID 20231027212853.47999-1-davejohansen@gmail.com
State New
Headers show
Series [FFmpeg-devel] avformat/hlsenc: Handle when fractional seconds not set and error out when init_program_date_time can't be parsed | expand

Checks

Context Check Description
yinshiyou/configure_loongarch64 warning Failed to apply patch
andriy/configure_x86 warning Failed to apply patch

Commit Message

David Johansen Oct. 27, 2023, 9:28 p.m. UTC 
---
 libavformat/hlsenc.c | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)
diff mbox series

Patch

diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c
index f613e35984..e1714d4eed 100644
--- a/libavformat/hlsenc.c
+++ b/libavformat/hlsenc.c
@@ -1253,9 +1253,11 @@  static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls,
 
 static double parse_iso8601(const char *ptr) {
     struct tm program_date_time;
-    int y,M,d,h,m,s;
-    double ms;
-    if (sscanf(ptr, "%d-%d-%dT%d:%d:%d.%lf", &y, &M, &d, &h, &m, &s, &ms) != 7) {
+    int y,M,d,h,m;
+    double s;
+    int num_scanned = sscanf(ptr, "%d-%d-%dT%d:%d:%lf", &y, &M, &d, &h, &m, &s);
+
+    if (num_scanned < 6) {
         return -1;
     }
 
@@ -1264,10 +1266,10 @@  static double parse_iso8601(const char *ptr) {
     program_date_time.tm_mday = d;
     program_date_time.tm_hour = h;
     program_date_time.tm_min = m;
-    program_date_time.tm_sec = s;
+    program_date_time.tm_sec = 0;
     program_date_time.tm_isdst = -1;
 
-    return mktime(&program_date_time) + (double)(ms / 1000);
+    return mktime(&program_date_time) + s;
 }
 
 static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs)
@@ -2937,7 +2939,17 @@  static int hls_init(AVFormatContext *s)
     char *p = NULL;
     int http_base_proto = ff_is_http_proto(s->url);
     int fmp4_init_filename_len = strlen(hls->fmp4_init_filename) + 1;
-    double initial_program_date_time = hls->init_program_date_time ? parse_iso8601(hls->init_program_date_time) : av_gettime() / 1000000.0;
+    double initial_program_date_time;
+
+    if (hls->init_program_date_time) {
+        initial_program_date_time = parse_iso8601(hls->init_program_date_time);
+        if (initial_program_date_time < 0) {
+            av_log(s, AV_LOG_ERROR, "Invalid init_program_date_time\n");
+            return AVERROR(EINVAL);
+        }
+    } else {
+        initial_program_date_time = av_gettime() / 1000000.0;
+    }
 
     if (hls->use_localtime) {
         pattern = get_default_pattern_localtime_fmt(s);
@@ -3216,7 +3228,7 @@  static const AVOption options[] = {
     {"split_by_time", "split the hls segment by time which user set by hls_time", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SPLIT_BY_TIME }, 0, UINT_MAX,   E, "flags"},
     {"append_list", "append the new segments into old hls segment list", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_APPEND_LIST }, 0, UINT_MAX,   E, "flags"},
     {"program_date_time", "add EXT-X-PROGRAM-DATE-TIME", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_PROGRAM_DATE_TIME }, 0, UINT_MAX,   E, "flags"},
-    {"init_program_date_time", "Time to start program date time at", OFFSET(init_program_date_time), AV_OPT_TYPE_STRING, .flags = E},
+    {"init_program_date_time", "Time to start program date time at (must be %Y-%m-%dT%H:%M:%S and timezone is ignored)", OFFSET(init_program_date_time), AV_OPT_TYPE_STRING, .flags = E},
     {"second_level_segment_index", "include segment index in segment filenames when use_localtime", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SECOND_LEVEL_SEGMENT_INDEX }, 0, UINT_MAX,   E, "flags"},
     {"second_level_segment_duration", "include segment duration in segment filenames when use_localtime", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SECOND_LEVEL_SEGMENT_DURATION }, 0, UINT_MAX,   E, "flags"},
     {"second_level_segment_size", "include segment size in segment filenames when use_localtime", 0, AV_OPT_TYPE_CONST, {.i64 = HLS_SECOND_LEVEL_SEGMENT_SIZE }, 0, UINT_MAX,   E, "flags"},