From patchwork Wed Sep 26 06:00:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Kale X-Patchwork-Id: 10486 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:1286:0:0:0:0:0 with SMTP id 6-v6csp335020jap; Tue, 25 Sep 2018 23:08:02 -0700 (PDT) X-Google-Smtp-Source: ACcGV6006+zD1EPTbogQB5SO1gGlswFyz1X6TsEbE9kMJe19T8DtYMQp2r6LUKowHzBeD1hFXLMs X-Received: by 2002:adf:80a3:: with SMTP id 32-v6mr3607482wrl.231.1537942082855; Tue, 25 Sep 2018 23:08:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1537942082; cv=none; d=google.com; s=arc-20160816; b=kgR0AOPLLH38/XJFUQRqKbrT4ZdMaaW8qUsb833n4BEGi/xCSRB7Z8x5dOOFDPVrQ5 9hSV11T70QK4OSJuBXLKbi4i286gByBr/ApE9xjXUGm2w5CmD/lVLPGzCnUw1d0wRQ2F 6PFGSWbiMeDoHRQq8afxmExjklYARGRi9B5NhJE/uBA+tsIhKCRr5ifxKVlEk0chhnXC GQ6HdqaSb8+pQbgyYo8EUZ3JLULF7+MvlfzX+6YwyDtqa3FErNUeuG0scd1NTS9vicTh PTeryQKERCBnRQOG5p1JtXAsPUaV62TWANkSM0fmyIEyVpANNw59TQABB5L5Ip5JjKK/ nTfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-language:mime-version:user-agent:date :message-id:from:to:dkim-signature:delivered-to; bh=MPsrvFPRTxKd9+7jpm24f538RR3GF74twSzstiih+lU=; b=nqz8r/vWhTZD99/e06qezhaf0EFrntKNRhMTy2CGcR2BDtaF/zNIdzfhL+96Wz3Wzc oe/g2lMOOBC08TK12Yz4DCMDdkMNokhZAq40XcPLGgEmknL7IMwNy/8DVwdYj0EPu98G ZKXIYJONqMio/1UYp0BBZsIlvoXYjWITTV+d2vSPj5d9kjY/h52IkXD/T7B/T15SYCTl xDXl7SaLP5GNl8c+YvvXHZFnP/nGB5I3tQerxVEa7AJqFNcNq+Vta49iNlUBVfIusXt7 AqEX2K9vVqx28iWyi3NeiLl68z0yhrI7ksM+orbfIBK6Y8g1yJhh1M94/puTDNroUfTd wJEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@hotstar-com.20150623.gappssmtp.com header.s=20150623 header.b=rkpyIgzK; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m62-v6si4102467wmd.126.2018.09.25.23.08.02; Tue, 25 Sep 2018 23:08:02 -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; dkim=neutral (body hash did not verify) header.i=@hotstar-com.20150623.gappssmtp.com header.s=20150623 header.b=rkpyIgzK; 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 99F0F68A50B; Wed, 26 Sep 2018 09:07:44 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 887F768A0C6 for ; Wed, 26 Sep 2018 09:07:38 +0300 (EEST) Received: by mail-pf1-f175.google.com with SMTP id j8-v6so12889665pff.6 for ; Tue, 25 Sep 2018 23:07:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotstar-com.20150623.gappssmtp.com; s=20150623; h=to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=QX0UokK+TjjMmnlRo2eaoGh2itQPFDZM71ia/lajkX0=; b=rkpyIgzKIybvo53JBkWfJ5tnL/Tt3M/40v5YmI+1hWPvxkdnXRW+rSIhBzjwMdJ3xu mJPJmpaNJdCGiB+pT2Mg4o9a3lu7PXqpn1cTba9Le4s9SCpypVS78WCviRx1/dqNLKoC NyVZBltc5+RAjFz5fxxOct/DM8KjyhHQP3LXBfu/VAJVUoKZ0qxPIn2g/i0JM9Q35W+b lmSewrRduIpeeI+wQrjeSZXVWxgfBe3U7Ts2U1kvso+4nkkdTknq/2qDV8TYP3BzqsuP JKMOq6+gQM6+1D824i0c7oy72dkmXpRpE2/hRV8KlB/CpBu71qptkN/zMSeUM92RGdjT pC5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language:content-transfer-encoding; bh=QX0UokK+TjjMmnlRo2eaoGh2itQPFDZM71ia/lajkX0=; b=CO/EtKHvXyJNsruHytLh+oEs5oCe4I7eaGW8TtZPtiID8N49FkfhhSuyg2MuVsezY2 B0cLBdM2faWn87IdkgYQk7Lxe0BYwHVQ1jI9gNg3lBqwi1H9loleOt2TkPJmVC570JOK Ug9M+u3S7syd5bougQz9FWX3qWk21OJ358BT2B8/SZCiKlBbxJpa3ZeMCm1kcrAPz3ze xZnk06uipDcRRMoWTj3TYA2Npmpi6LtUxhNGO9xZ/L/vPTsuduaDFjpK9KbquWZRbbNK ljMChf60HF9spUL5rp94Ol0OjEsOghV4US93cbCwxTv0wgEea56kj6EYy5mlCND/Z8f7 e3yQ== X-Gm-Message-State: ABuFfois9PHI1iukcmwoFWz9EExE/QnR66AvbuM91Lc7qLhjZvy8T2jh Xht7bqFxh6alBnlqxkREkw7etfxyuhc= X-Received: by 2002:a17:902:bd97:: with SMTP id q23-v6mr946539pls.266.1537941645408; Tue, 25 Sep 2018 23:00:45 -0700 (PDT) Received: from [10.0.2.15] ([14.142.189.250]) by smtp.gmail.com with ESMTPSA id t22-v6sm1062958pfk.141.2018.09.25.23.00.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Sep 2018 23:00:44 -0700 (PDT) To: ffmpeg-devel@ffmpeg.org From: Amit Kale Message-ID: <86614dd7-fbbf-b601-dfe8-ee7efadff742@hotstar.com> Date: Wed, 26 Sep 2018 11:30:41 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH 4/4] Delay freeing of hls stream data 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This patch delays freeing of hls stream data, so that it's available for bandwidth calculation. Otherwise the previous patches would cause a segfault in this code. Signed-off-by: Amit Kale Index: ffmpeg/libavformat/hlsenc.c =================================================================== --- ffmpeg.orig/libavformat/hlsenc.c +++ ffmpeg/libavformat/hlsenc.c @@ -2447,10 +2447,13 @@ failed: av_freep(&vs->vtt_m3u8_name); avformat_free_context(vtt_oc); } + av_free(old_filename); + } + for (i = 0; i < hls->nb_varstreams; i++) { + vs = &hls->var_streams[i]; 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);