From patchwork Sat Nov 21 15:14:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vignesh Ravichandran X-Patchwork-Id: 23933 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id A7B9444A68B for ; Sat, 21 Nov 2020 17:22:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71D7968BA23; Sat, 21 Nov 2020 17:22:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F3E768B9DD for ; Sat, 21 Nov 2020 17:22:13 +0200 (EET) Received: by mail-qv1-f66.google.com with SMTP id y11so6204388qvu.10 for ; Sat, 21 Nov 2020 07:22:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=urEgqYiCMVemJXMjTZrN1jWMowQeexHu/vWUjeS8Oso=; b=ptQDWu0JfQCcwnREQQ5sJwuvmlcs6ZFzNOlvMCjvMQKT7kONzlXIK6JxNziQlvI2pj 02OZOmPVlNKx4bDssOqHB1moF1eQTyaemAzstUFkSw5680ZtpXBGvEedKPHJ8BKVs+8w GcY55A0abQbyy5EIq9GQa+jaQ1KzR0+sJuV7zluUgNQ3auK44PCjTsVJ7rndKuwPi5b8 /emqbrqa/m9NhKAPTjpcWAgsJYqQeEng6HB9dADzRLM6bp2nJHWIUKavvUFWpNS+m66q XoCpmq1og1i6p1vE/gxxAGHC6KQlB6XTOwMqK2uwaZio3LiEnxYjbzh7pudVX52VbtVX XWEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=urEgqYiCMVemJXMjTZrN1jWMowQeexHu/vWUjeS8Oso=; b=HKOlPWdChW68wxG1H9Fk2sZ2SWBYKjeUeDB0K16ZygZdyi1/Y6tATsr/WT1L/PmnyI FCMsGY87Ny8E1H+Zy2r5QbGDNfRIiPJMva+1TT6JwB1t+Gh2rkiOoOyoj1OCehmXxi2q EKJEIEwSjxpQLZ+s4Z+A3LoP3EVXFTaWz2w+tBWXy4UM5wXQDnOXwT44vlosHlFni2h6 79wma3DJmuuGpEoic+B9kDQ+HnVOLsIS/Wu9U65nT7+JXS2vbtFyOZh/66KWzzdPjlOi kPs9G4DF+OskKIUyT+TuQYQH8+vZ5/EfKMdJZA3W4Dhhlmq6vZKuUHbrNksDoEcRiM21 ERkw== X-Gm-Message-State: AOAM532Jnw1iBoJNcqzRBVvbFGu0FW/jloewRJ1hBucfI6ir2rULwS1H BtdCaYyNDZKSun7chogPdCV4oRqrQtCdmA== X-Google-Smtp-Source: ABdhPJwqMn59+5n7+B3qzR+MbcVZPrmZWyJ9/V7UKpKVCr7onkvW58uHkAiChV+ECQ60Q+t7vMOQWQ== X-Received: by 2002:a17:902:b613:b029:d9:56e:d93c with SMTP id b19-20020a170902b613b02900d9056ed93cmr18032623pls.14.1605971692174; Sat, 21 Nov 2020 07:14:52 -0800 (PST) Received: from localhost.localdomain ([122.164.136.135]) by smtp.gmail.com with ESMTPSA id k23sm2169911pfk.50.2020.11.21.07.14.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 21 Nov 2020 07:14:51 -0800 (PST) From: Vignesh Ravichandran To: ffmpeg-devel@ffmpeg.org Date: Sat, 21 Nov 2020 20:44:36 +0530 Message-Id: <20201121151436.6103-1-vignesh.ravichandran02@gmail.com> X-Mailer: git-send-email 2.24.2 (Apple Git-127) MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/hls: Fixes #EXT-X-PROGRAM-DATE-TIME value of existing segments from getting over written with new value when appending new segments to an existing playlist file X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Vignesh Ravichandran Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Vignesh Ravichandran --- libavformat/hlsenc.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index cbfd8f7c0d..030a2d3b97 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -88,6 +88,7 @@ typedef struct HLSSegment { char iv_string[KEYSIZE*2 + 1]; struct HLSSegment *next; + double discont_program_date_time; } HLSSegment; typedef enum HLSFlags { @@ -1124,6 +1125,7 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, en->keyframe_size = vs->video_keyframe_size; en->next = NULL; en->discont = 0; + en->discont_program_date_time = 0; if (vs->discontinuity) { en->discont = 1; @@ -1148,7 +1150,8 @@ static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls, if (hls->max_nb_segments && vs->nb_entries >= hls->max_nb_segments) { en = vs->segments; - vs->initial_prog_date_time += en->duration; + if (!en->next->discont_program_date_time && !en->discont_program_date_time) + vs->initial_prog_date_time += en->duration; vs->segments = en->next; if (en && hls->flags & HLS_DELETE_SEGMENTS && #if FF_API_HLS_WRAP @@ -1182,6 +1185,8 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs char line[MAX_URL_SIZE]; const char *ptr; const char *end; + int is_discont_detected = 0; + double discont_program_date_time = 0; if ((ret = ffio_open_whitelist(&in, url, AVIO_FLAG_READ, &s->interrupt_callback, NULL, @@ -1211,6 +1216,7 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs } else if (av_strstart(line, "#EXT-X-DISCONTINUITY", &ptr)) { is_segment = 1; vs->discontinuity = 1; + is_discont_detected = 1; } else if (av_strstart(line, "#EXTINF:", &ptr)) { is_segment = 1; vs->duration = atof(ptr); @@ -1236,7 +1242,23 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs av_strlcpy(vs->iv_string, ptr, sizeof(vs->iv_string)); } } - + } else if (av_strstart(line, "#EXT-X-PROGRAM-DATE-TIME:", &ptr) && is_discont_detected) { + struct tm program_date_time; + int y,M,d,h,m,s; + double ms; + sscanf(ptr, "%d-%d-%dT%d:%d:%d.%lf", &y, &M, &d, &h, &m, &s, &ms); + + program_date_time.tm_year = y - 1900; + program_date_time.tm_mon = M - 1; + 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_isdst = -1; + + discont_program_date_time = mktime(&program_date_time); + discont_program_date_time += (double)(ms / 1000); + is_discont_detected = 0; } else if (av_strstart(line, "#", NULL)) { continue; } else if (line[0]) { @@ -1250,8 +1272,9 @@ static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs is_segment = 0; new_start_pos = avio_tell(vs->avf->pb); vs->size = new_start_pos - vs->start_pos; - vs->initial_prog_date_time -= vs->duration; // this is a previously existing segment ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size); + vs->last_segment->discont_program_date_time = discont_program_date_time; + discont_program_date_time += vs->duration; if (ret < 0) goto fail; vs->start_pos = new_start_pos; @@ -1572,7 +1595,11 @@ static int hls_window(AVFormatContext *s, int last, VariantStream *vs) ret = ff_hls_write_file_entry(byterange_mode ? hls->m3u8_out : vs->out, en->discont, byterange_mode, en->duration, hls->flags & HLS_ROUND_DURATIONS, en->size, en->pos, hls->baseurl, - en->filename, prog_date_time_p, en->keyframe_size, en->keyframe_pos, hls->flags & HLS_I_FRAMES_ONLY); + en->filename, + en->discont_program_date_time ? &en->discont_program_date_time : prog_date_time_p, + en->keyframe_size, en->keyframe_pos, hls->flags & HLS_I_FRAMES_ONLY); + if (en->discont_program_date_time) + en->discont_program_date_time -= en->duration; if (ret < 0) { av_log(s, AV_LOG_WARNING, "ff_hls_write_file_entry get error\n"); }