Ticket #8989: ffmpeg_defect_ticket_8989_wip_fix_vignesh_ravichandran_3.patch

File ffmpeg_defect_ticket_8989_wip_fix_vignesh_ravichandran_3.patch, 5.2 KB (added by VigneshRavichandran, 6 years ago)

  • libavformat/hlsenc.c 

    From ac611fad0ac91051e9f91490ef79545dd142eddc Mon Sep 17 00:00:00 2001
From: Vignesh Ravichandran <vignesh.ravichandran02@gmail.com>
Date: Tue, 17 Nov 2020 18:19:36 +0530
Subject: [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

Signed-off-by: Vignesh Ravichandran <vignesh.ravichandran02@gmail.com>
---
 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 b typedef struct HLSSegment {  
    8888    char iv_string[KEYSIZE*2 + 1];
    8989
    9090    struct HLSSegment *next;
     91    double discont_program_date_time;
    9192} HLSSegment;
    9293
    9394typedef enum HLSFlags {
    … … static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls,  
    11241125    en->keyframe_size     = vs->video_keyframe_size;
    11251126    en->next     = NULL;
    11261127    en->discont  = 0;
     1128    en->discont_program_date_time = 0;
    11271129
    11281130    if (vs->discontinuity) {
    11291131        en->discont = 1;
    … … static int hls_append_segment(struct AVFormatContext *s, HLSContext *hls,  
    11481150
    11491151    if (hls->max_nb_segments && vs->nb_entries >= hls->max_nb_segments) {
    11501152        en = vs->segments;
    1151         vs->initial_prog_date_time += en->duration;
     1153        if (!en->next->discont_program_date_time && !en->discont_program_date_time)
     1154            vs->initial_prog_date_time += en->duration;
    11521155        vs->segments = en->next;
    11531156        if (en && hls->flags & HLS_DELETE_SEGMENTS &&
    11541157#if FF_API_HLS_WRAP
    … … static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs  
    11821185    char line[MAX_URL_SIZE];
    11831186    const char *ptr;
    11841187    const char *end;
     1188    int is_discont_detected = 0;
     1189    double discont_program_date_time = 0;
    11851190
    11861191    if ((ret = ffio_open_whitelist(&in, url, AVIO_FLAG_READ,
    11871192                                   &s->interrupt_callback, NULL,
    … … static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs  
    12111216        } else if (av_strstart(line, "#EXT-X-DISCONTINUITY", &ptr)) {
    12121217            is_segment = 1;
    12131218            vs->discontinuity = 1;
     1219            is_discont_detected = 1;
    12141220        } else if (av_strstart(line, "#EXTINF:", &ptr)) {
    12151221            is_segment = 1;
    12161222            vs->duration = atof(ptr);
    … … static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs  
    12361242                    av_strlcpy(vs->iv_string, ptr, sizeof(vs->iv_string));
    12371243                }
    12381244            }
    1239 
     1245        } else if (av_strstart(line, "#EXT-X-PROGRAM-DATE-TIME:", &ptr) && is_discont_detected) {
     1246            struct tm program_date_time;
     1247            int y,M,d,h,m,s;
     1248            double ms;
     1249            sscanf(ptr, "%d-%d-%dT%d:%d:%d.%lf", &y, &M, &d, &h, &m, &s, &ms);
     1250
     1251            program_date_time.tm_year = y - 1900;
     1252            program_date_time.tm_mon = M - 1;
     1253            program_date_time.tm_mday = d;
     1254            program_date_time.tm_hour = h;
     1255            program_date_time.tm_min = m;
     1256            program_date_time.tm_sec = s;
     1257            program_date_time.tm_isdst = -1;
     1258
     1259            discont_program_date_time = mktime(&program_date_time);
     1260            discont_program_date_time += (double)(ms / 1000);
     1261            is_discont_detected = 0;
    12401262        } else if (av_strstart(line, "#", NULL)) {
    12411263            continue;
    12421264        } else if (line[0]) {
    … … static int parse_playlist(AVFormatContext *s, const char *url, VariantStream *vs  
    12501272                is_segment = 0;
    12511273                new_start_pos = avio_tell(vs->avf->pb);
    12521274                vs->size = new_start_pos - vs->start_pos;
    1253                 vs->initial_prog_date_time -= vs->duration; // this is a previously existing segment
    12541275                ret = hls_append_segment(s, hls, vs, vs->duration, vs->start_pos, vs->size);
     1276                vs->last_segment->discont_program_date_time = discont_program_date_time;
     1277                discont_program_date_time += vs->duration;
    12551278                if (ret < 0)
    12561279                    goto fail;
    12571280                vs->start_pos = new_start_pos;
    … … static int hls_window(AVFormatContext *s, int last, VariantStream *vs)  
    15721595        ret = ff_hls_write_file_entry(byterange_mode ? hls->m3u8_out : vs->out, en->discont, byterange_mode,
    15731596                                      en->duration, hls->flags & HLS_ROUND_DURATIONS,
    15741597                                      en->size, en->pos, hls->baseurl,
    1575                                       en->filename, prog_date_time_p, en->keyframe_size, en->keyframe_pos, hls->flags & HLS_I_FRAMES_ONLY);
     1598                                      en->filename,
     1599                                      en->discont_program_date_time ? &en->discont_program_date_time : prog_date_time_p,
     1600                                      en->keyframe_size, en->keyframe_pos, hls->flags & HLS_I_FRAMES_ONLY);
     1601        if (en->discont_program_date_time)
     1602            en->discont_program_date_time -= en->duration;
    15761603        if (ret < 0) {
    15771604            av_log(s, AV_LOG_WARNING, "ff_hls_write_file_entry get error\n");
    15781605        }