From patchwork Tue Apr 25 23:30:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 3491 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.3.129 with SMTP id 123csp70183vsd; Tue, 25 Apr 2017 16:31:01 -0700 (PDT) X-Received: by 10.223.129.134 with SMTP id 6mr11096644wra.185.1493163061691; Tue, 25 Apr 2017 16:31:01 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 42si31724208wrk.214.2017.04.25.16.31.00; Tue, 25 Apr 2017 16:31:01 -0700 (PDT) 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 25B33689958; Wed, 26 Apr 2017 02:30:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbg179.qq.com (SMTPBG179.QQ.COM [119.147.194.222]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 33B6B680964 for ; Wed, 26 Apr 2017 02:30:48 +0300 (EEST) X-QQ-mid: bizesmtp4t1493163014t2ekv5zji Received: from localhost (unknown [221.222.199.218]) by esmtp4.qq.com (ESMTP) with id ; Wed, 26 Apr 2017 07:30:13 +0800 (CST) X-QQ-SSF: 01100000000000F0FF30B00A0000000 X-QQ-FEAT: 2PHmmy4qbuK3Sjt5KGdU1hTMVJTG3rAR8eIKnxMzFh/nmpu9xcyOUuLmcxDB7 o3mJbS4vP3VOLfTD81onsjeVKktjlivE5HFLj7r9v6W3y1dmo+3oPXFAlLK5VR6ueTMD1B1 K6oDOQbLW+8ASxziFeWSh3sxcGLgX6m1SIft6hvsr7J8QaZ3SaGONmCjlRDAeAhW0/q3J7G 2of4oP8TFVokqjuy8Tp8Yv2peLn3J+suMTjwRxXPXN9Y6sdbt15AQ4ZNNHlaRnxgRV52dqQ SAvw== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Wed, 26 Apr 2017 07:30:11 +0800 Message-Id: <20170425233011.66282-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.11.0 (Apple Git-81) X-QQ-SENDSIZE: 520 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH] avformat/hlsenc: hold old key info when append 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" fix ticket id: #6353 Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index 27c8e3355d..3ec0f330fb 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -810,6 +810,7 @@ static int parse_playlist(AVFormatContext *s, const char *url) int64_t new_start_pos; char line[1024]; const char *ptr; + const char *end; if ((ret = ffio_open_whitelist(&in, url, AVIO_FLAG_READ, &s->interrupt_callback, NULL, @@ -842,6 +843,29 @@ static int parse_playlist(AVFormatContext *s, const char *url) } else if (av_strstart(line, "#EXTINF:", &ptr)) { is_segment = 1; hls->duration = atof(ptr); + } else if (av_stristart(line, "#EXT-X-KEY:", &ptr)) { + ptr = av_stristr(line, "URI=\""); + if (ptr) { + ptr += strlen("URI=\""); + end = av_stristr(ptr, ","); + if (end) { + av_strlcpy(hls->key_uri, ptr, end - ptr); + } else { + av_strlcpy(hls->key_uri, ptr, sizeof(hls->key_uri)); + } + } + + ptr = av_stristr(line, "IV=0x"); + if (ptr) { + ptr += strlen("IV=0x"); + end = av_stristr(ptr, ","); + if (end) { + av_strlcpy(hls->iv_string, ptr, end - ptr); + } else { + av_strlcpy(hls->iv_string, ptr, sizeof(hls->iv_string)); + } + } + } else if (av_strstart(line, "#", NULL)) { continue; } else if (line[0]) {