From patchwork Sat Dec 22 15:48:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Steven X-Patchwork-Id: 11519 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 A0E9944C65C for ; Sat, 22 Dec 2018 17:48:51 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5AE7568B010; Sat, 22 Dec 2018 17:48:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26BF068B009 for ; Sat, 22 Dec 2018 17:48:40 +0200 (EET) X-QQ-mid: bizesmtp16t1545493716t8ug3ksb Received: from localhost (unknown [47.90.47.25]) by esmtp4.qq.com (ESMTP) with id ; Sat, 22 Dec 2018 23:48:36 +0800 (CST) X-QQ-SSF: 01100000008000F0FNF1000A0000000 X-QQ-FEAT: oHiIVEz9/LG1mOhyN+hUwc9DMCsuNbkP6hYEetPnjERWByMKdQnm/QdGXZRKk ukHIgRfNdT7B/c357h1ORQ52GmX43rHG7fs+IOTjA0KfsZVeraW5x+0l5ClBbUPswWXPCAl iZZrZsxkEywGi3juPOF1XEqNB86IeSoYBL9UlgSsAbZ90n8FNa1AkupXQHDr9ezv/HmQtRJ U3bMDXpN/S4UbUdZGMc890EJSu86CQ/7JBVF6U/P6dVsJ3VXUj7UxdL8SqCEtptInE/HCp+ aLWBS/S5UL3fvPBhW7sERkzByuGpoMebJypQ== X-QQ-GoodBg: 0 From: Steven Liu To: ffmpeg-devel@ffmpeg.org Date: Sat, 22 Dec 2018 23:48:27 +0800 Message-Id: <20181222154827.13332-1-lq@chinaffmpeg.org> X-Mailer: git-send-email 2.10.1.382.ga23ca1b.dirty In-Reply-To: <8BCE6B1A-F55E-4886-BED3-111EEFCFA5CC@chinaffmpeg.org> References: <8BCE6B1A-F55E-4886-BED3-111EEFCFA5CC@chinaffmpeg.org> X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:chinaffmpeg.org:qybgforeign:qybgforeign2 X-QQ-Bgrelay: 1 Subject: [FFmpeg-devel] [PATCH v2] avformat/hlsenc: free variant streams after write all variant streams info 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: 7631 Signed-off-by: Steven Liu --- libavformat/hlsenc.c | 48 +++++++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/libavformat/hlsenc.c b/libavformat/hlsenc.c index bdd2a113bd..d96b9eb179 100644 --- a/libavformat/hlsenc.c +++ b/libavformat/hlsenc.c @@ -2360,6 +2360,34 @@ static int hls_write_packet(AVFormatContext *s, AVPacket *pkt) return ret; } +static void hls_free_variant_streams(struct HLSContext *hls) +{ + int i = 0; + AVFormatContext *vtt_oc = NULL; + VariantStream *vs = NULL; + + for (i = 0; i < hls->nb_varstreams; i++) { + vs = &hls->var_streams[i]; + vtt_oc = vs->vtt_avf; + + av_freep(&vs->basename); + av_freep(&vs->base_output_dirname); + av_freep(&vs->fmp4_init_filename); + if (vtt_oc) { + av_freep(&vs->vtt_basename); + av_freep(&vs->vtt_m3u8_name); + } + + hls_free_segments(vs->segments); + hls_free_segments(vs->old_segments); + av_freep(&vs->m3u8_name); + av_freep(&vs->streams); + av_freep(&vs->agroup); + av_freep(&vs->ccgroup); + av_freep(&vs->baseurl); + } +} + static int hls_write_trailer(struct AVFormatContext *s) { HLSContext *hls = s->priv_data; @@ -2450,31 +2478,17 @@ failed: av_write_trailer(vtt_oc); vs->size = avio_tell(vs->vtt_avf->pb) - vs->start_pos; ff_format_io_close(s, &vtt_oc->pb); + avformat_free_context(vtt_oc); } - av_freep(&vs->basename); - av_freep(&vs->base_output_dirname); avformat_free_context(oc); vs->avf = NULL; hls_window(s, 1, vs); - - av_freep(&vs->fmp4_init_filename); - if (vtt_oc) { - av_freep(&vs->vtt_basename); - av_freep(&vs->vtt_m3u8_name); - avformat_free_context(vtt_oc); - } - - hls_free_segments(vs->segments); - hls_free_segments(vs->old_segments); av_free(old_filename); - av_freep(&vs->m3u8_name); - av_freep(&vs->streams); - av_freep(&vs->agroup); - av_freep(&vs->ccgroup); - av_freep(&vs->baseurl); } + hls_free_variant_streams(hls); + for (i = 0; i < hls->nb_ccstreams; i++) { ClosedCaptionsStream *ccs = &hls->cc_streams[i]; av_freep(&ccs->ccgroup);