From patchwork Fri Aug 16 03:05:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14549 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 1C2684485F3 for ; Fri, 16 Aug 2019 06:22:25 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 081CA68AD6A; Fri, 16 Aug 2019 06:22:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 71E8D68ACF2 for ; Fri, 16 Aug 2019 06:22:18 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id z11so177651wrt.4 for ; Thu, 15 Aug 2019 20:22:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=UlGkr3SLFnptswV658U+eEDI0rgAAtENCAeYakKgmcU=; b=rVbVKwydVhj/mv4bDU7XqY1g46VKXUFGVxiwgq8asWHyiDGkhdsRee5n0qAjBb2D0f 9kPIXGFUBNAgUdxhDkvfHLh6RCqclKRc/OpywyxmSafpz60/TdT7GUSgnwmfqPAz9MDb Z/pdcoIM0aG15iKY4hftRrHTak5NNX5Yrc0BMdu1grrnVgbFUTIUWWPUatw7QiRzzxwe SVVzrSRqh9omYMB1vM4ccoyZkpnAuY8lHC6MxJ84ORvyocoqL9JGp6O8D0dSFpaXFtzd yZ+sQ1ZkcTOoSLQC/X4PJhE/vpR3oo9fvJ/LkV0SCIZxaZZxbPuHVxwDtra38cjaCNtC yrLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UlGkr3SLFnptswV658U+eEDI0rgAAtENCAeYakKgmcU=; b=k9TObbnFcJp2Hzts9Eb245Vmwue7mKfQEEDuhsLnRKkHhbZpU5DVJOigskxFKyCH8Z stBHNt9BvQ9o51ZZrXXCIWyFDiEqJv6On81+MvlkeZ5AKYbod5WLMj5ZwbXCKf0rJlQA mDBApfZBEfkFstYJ6FLrME0xdsZJPnS4g1cWA2EkzfVHEarmCc037VhMeMJ68rM/qDWO WsnCiJshNl7byt0GxkyJAjxq0Yr4TxR26Evw4OB0XotFs1x/koLCRCO5QSLdFBCyIH5v wk1xy8CWX6Bj0MaBdLoP33jBySwHih5sDCHZ5UKifjseFprnpnJOimm786XbLf7L6Cva +VPw== X-Gm-Message-State: APjAAAUiQZVN2nLwus2O+B3QLZHfvm977V16fXeRtgm/+hFB27rwJlXx 0CN7OxWSvwONkoPqQTKoXIGVUbMv X-Google-Smtp-Source: APXvYqz3uH+pn/7W9S5f7o9PqtjdbTZIXq+J6usxNdnmcyITBaOQSZiWdx4lbXTwbFjbXj+4be3/ww== X-Received: by 2002:adf:dc03:: with SMTP id t3mr7663930wri.80.1565925233463; Thu, 15 Aug 2019 20:13:53 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b69.dynamic.kabel-deutschland.de. [188.192.139.105]) by smtp.gmail.com with ESMTPSA id x20sm8501603wrg.10.2019.08.15.20.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Aug 2019 20:13:53 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Aug 2019 05:05:31 +0200 Message-Id: <20190816030531.4775-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190816030531.4775-1-andreas.rheinhardt@gmail.com> References: <20190816030531.4775-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/11] avformat/internal: Remove packet for extract_extradata 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" The effective lifetime of the packet does not extend beyond the extract_extradata in libavformat/utils.c, so the packet can simply be put on the stack there. This allows to remove the allocation and the corresponding frees. Signed-off-by: Andreas Rheinhardt --- libavformat/internal.h | 1 - libavformat/utils.c | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index d6a039c497..2574d2da0c 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -182,7 +182,6 @@ struct AVStreamInternal { * supported) */ struct { AVBSFContext *bsf; - AVPacket *pkt; int inited; } extract_extradata; diff --git a/libavformat/utils.c b/libavformat/utils.c index 64516a6a81..d3cd4b4167 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3491,10 +3491,6 @@ static int extract_extradata_init(AVStream *st) if (!ret) goto finish; - sti->extract_extradata.pkt = av_packet_alloc(); - if (!sti->extract_extradata.pkt) - return AVERROR(ENOMEM); - ret = av_bsf_alloc(f, &sti->extract_extradata.bsf); if (ret < 0) goto fail; @@ -3516,14 +3512,13 @@ finish: return 0; fail: av_bsf_free(&sti->extract_extradata.bsf); - av_packet_free(&sti->extract_extradata.pkt); return ret; } static int extract_extradata(AVStream *st, AVPacket *pkt) { AVStreamInternal *sti = st->internal; - AVPacket *pkt_ref; + AVPacket pkt1, *pkt_ref = &pkt1; int ret; if (!sti->extract_extradata.inited) { @@ -3535,7 +3530,6 @@ static int extract_extradata(AVStream *st, AVPacket *pkt) if (sti->extract_extradata.inited && !sti->extract_extradata.bsf) return 0; - pkt_ref = sti->extract_extradata.pkt; ret = av_packet_ref(pkt_ref, pkt); if (ret < 0) return ret; @@ -4171,7 +4165,6 @@ find_stream_info_err: avcodec_close(ic->streams[i]->internal->avctx); av_freep(&ic->streams[i]->info); av_bsf_free(&ic->streams[i]->internal->extract_extradata.bsf); - av_packet_free(&ic->streams[i]->internal->extract_extradata.pkt); } if (ic->pb) av_log(ic, AV_LOG_DEBUG, "After avformat_find_stream_info() pos: %"PRId64" bytes read:%"PRId64" seeks:%d frames:%d\n", @@ -4369,7 +4362,6 @@ static void free_stream(AVStream **pst) } av_freep(&st->internal->priv_pts); av_bsf_free(&st->internal->extract_extradata.bsf); - av_packet_free(&st->internal->extract_extradata.pkt); } av_freep(&st->internal);