From patchwork Mon Dec 5 23:47:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 1695 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1897988vsa; Mon, 5 Dec 2016 15:48:51 -0800 (PST) X-Received: by 10.28.25.134 with SMTP id 128mr94682wmz.37.1480981731360; Mon, 05 Dec 2016 15:48:51 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id km9si17010844wjb.282.2016.12.05.15.48.49; Mon, 05 Dec 2016 15:48:51 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 20EC2689D09; Tue, 6 Dec 2016 01:48:37 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg252.qq.com (SMTPBG252.QQ.COM [183.60.52.105]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C6606689ACF for ; Tue, 6 Dec 2016 01:48:29 +0200 (EET) X-QQ-mid: bizesmtp13t1480981679thezr4im Received: from localhost (unknown [58.96.181.81]) by esmtp4.qq.com (ESMTP) with id ; Tue, 06 Dec 2016 07:47:58 +0800 (CST) X-QQ-SSF: 01100000008000F0F610B00A0000000 X-QQ-FEAT: 9NFkmNiL4hcmN7ffru721q0t8x4YGQL5mzG/7xtl03GDbK36WFfJO7iN7TqYt RTeG6vF+369f5alKgbtJ9DcePWgwtgLkG2ggm+oV+oB0/baTpqaugQsbnVy4E4XdHJp62ol MKC+9o6Zc+Yd55peDB7RPsGa4/EIEupVKb0r4vF+2qvuXdOXGwBqX2Ugkt4GtpMJWkaGWp9 3L95FsNi5yKWrbMNyaltXGalMSNSeVr2B/GjR762znWQLR8iEelBj2UE/oIuAv+xQRKXg+o zaoA== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Tue, 6 Dec 2016 07:47:54 +0800 Message-Id: <20161205234754.14668-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: save the EXT-X-DISCONTINUITY from old list 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: Steven Liu , Steven Liu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 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: Steven Liu Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 0e55a31..acf3a30 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -459,6 +459,9 @@ static int parse_playlist(AVFormatContext *s, const char *url) read_chomp_line(in, line, sizeof(line)); if (av_strstart(line, "#EXT-X-MEDIA-SEQUENCE:", &ptr)) { hls->sequence = atoi(ptr); + } else if (av_strstart(line, "#EXT-X-DISCONTINUITY", &ptr)) { + is_segment = 1; + hls->discontinuity = 1; } else if (av_strstart(line, "#EXTINF:", &ptr)) { is_segment = 1; hls->duration = atof(ptr);