From patchwork Sun Mar 11 17:58:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7903 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp801550jad; Sun, 11 Mar 2018 11:00:01 -0700 (PDT) X-Google-Smtp-Source: AG47ELvEvJpm7z+AVGL6ew9j9VSdJU3X5IQLIevEPctefY6TugAPZv2eujHLfYMn/MjstrTveBBq X-Received: by 10.28.15.10 with SMTP id 10mr3584716wmp.75.1520791201906; Sun, 11 Mar 2018 11:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520791201; cv=none; d=google.com; s=arc-20160816; b=TycVdVYhTxEP8ft1pTIXyZZ0ev+qsfuXMLwERmTrXFzPdUDTr8Xf8ipiTFKFW6aTPP 1Arf6seU0fjD5MAdXkRRwl+PHTPBe4XLOFUR35A9efeyxK8JKO2nG4IXfjsM5nGnnRB5 zEwIfH1DTgi9eOpjp0dRviRa9P5z0MWB9er5usDVkKgxvHldNej+BHgSn7SlG0id/qgl HdeDYUzhkH67sDZqoSwoa1NdT835qYrT3Yb7ZfqazG1Bfq5LQdHusuO7wd6ohPg9lZiq tcbC3jimV6tbuPvsEWhlnJ3TznAtpKZjZYRQEEcaD5xllRhwnEr2TCZcssF/g0uladR/ DHcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=iqc4c4dDte5AGaVvieuQeMvF5+0S9jc/nN2QVnBNcD8=; b=0IEZxmn+5Q+9wjZNhDMzysejANNjzvmLyBKN5Gf4Y8tv8Diq1CJUyILNN18nqUPTeO 8PIq3eJgNKRbt3r+gagfKKD9reL/3BU9Ez4fB0P8bt0hI8FWKh0xjSyrtLC80D5acnhV caGb9g3VAN/L4XJ1cWn0zgILTg/wJIS0kD8spBt5RDioip07MbUcB+Zp18Cq1kCnGGAd 1wL7eq3tpycRzNhzFojx8ZupUjWI2KHGdNFnExV/01ud8OqtYMgJ5mQ3IclA574L0O0I JMrHxUUZrFHMnSIuGVgVKvhWEElBpCbQvi1gwWHuHVB6xfSRkPpCeL5IJH5xv1M88+Vw mesw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=s8wYlcc8; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l11si4250652wrf.365.2018.03.11.11.00.01; Sun, 11 Mar 2018 11:00: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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=s8wYlcc8; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 179E7689F29; Sun, 11 Mar 2018 19:59:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 57555689F29 for ; Sun, 11 Mar 2018 19:59:35 +0200 (EET) Received: by mail-qk0-f193.google.com with SMTP id z197so9087669qkb.6 for ; Sun, 11 Mar 2018 10:59:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=QKoX+1zupoXDE8Sbh1qDB7vFLXQ/ubxsH7vG3exRNVA=; b=s8wYlcc81LAiWChGw3jilAaabc80Ey503hBmFRC+iVoh8vSzR3bt4cpZ9Sja96yKu+ RyJcNXQ1gh1YuD0C9jkFp3o33q45GwcXwyiXqbyMheCYznZwJ0Ed9/zJTdH0HHzi8qLF nVPNjENtMVHJwxGDILzGdrZ+HkOrIhhwqtwSZosGkx/eJgfUAk8dDolYLmEwXqlV8OhD QQB98rQ7gQVP2uwzrgVlB6/RuT+SitDLmORTEcg32Pz33pkdRsnDaZkYTAyUf2osItCe hwZUV9f3gcoEpUuPAhNJu7BYK/IPzX9qfgxlP6Btbjc5Nd2gJ+DHXuVHNeIYL5sQiliO 2J2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=QKoX+1zupoXDE8Sbh1qDB7vFLXQ/ubxsH7vG3exRNVA=; b=cSK/bySqHGWGEjOFXgbgt4nLU5ARthpyBxbETcVHUmV4KvOmFMlq72Y5xC+k98zIkp lfsTqGyBPd4sdB1AITSReBaosXKpEN6HxtJDfW9g0psqrd+29yVl5nCukatWVh9U+sFs JB5sDA3CF/hDe0boPpbBq5Go/TiLg9S+BORQNtDslqv2R1TNrINakZ8cZLATiXgLlIAt STjpOib1Q94jDkL/4C+bSvQ4/XmsTxaMgOJ/bL/B2k2oDNHaauX142LPOfu9ZbYZYAYo XaSt9wITMhQ8k77WA6hCY/5nvENW9oMXVxFeXcxb14Dyw5dphh1C+p5QYRITBZk3eaxc S2DA== X-Gm-Message-State: AElRT7HBOmGyWm0K7LhhJsYADLKndb2HO5L9bUQde1L1UxuuXQe7plFq dpo+o8ptruKjQfSaT51Twp8cFw== X-Received: by 10.55.204.155 with SMTP id n27mr6998901qkl.198.1520791184495; Sun, 11 Mar 2018 10:59:44 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id 16sm4029946qtp.88.2018.03.11.10.59.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 10:59:44 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 14:58:50 -0300 Message-Id: <20180311175854.10096-2-jamrial@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180311175854.10096-1-jamrial@gmail.com> References: <20180311175854.10096-1-jamrial@gmail.com> Subject: [FFmpeg-devel] [PATCH 2/6] avcodec/extract_extradata: move the reference in the bsf internal buffer 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" There's no need to allocate a new packet for it. Signed-off-by: James Almer --- libavcodec/extract_extradata_bsf.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libavcodec/extract_extradata_bsf.c b/libavcodec/extract_extradata_bsf.c index 64017b6fb7..711814576c 100644 --- a/libavcodec/extract_extradata_bsf.c +++ b/libavcodec/extract_extradata_bsf.c @@ -280,21 +280,20 @@ static int extract_extradata_init(AVBSFContext *ctx) static int extract_extradata_filter(AVBSFContext *ctx, AVPacket *out) { ExtractExtradataContext *s = ctx->priv_data; - AVPacket *in; uint8_t *extradata = NULL; int extradata_size; int ret = 0; - ret = ff_bsf_get_packet(ctx, &in); + ret = ff_bsf_get_packet_ref(ctx, out); if (ret < 0) return ret; - ret = s->extract(ctx, in, &extradata, &extradata_size); + ret = s->extract(ctx, out, &extradata, &extradata_size); if (ret < 0) goto fail; if (extradata) { - ret = av_packet_add_side_data(in, AV_PKT_DATA_NEW_EXTRADATA, + ret = av_packet_add_side_data(out, AV_PKT_DATA_NEW_EXTRADATA, extradata, extradata_size); if (ret < 0) { av_freep(&extradata); @@ -302,10 +301,10 @@ static int extract_extradata_filter(AVBSFContext *ctx, AVPacket *out) } } - av_packet_move_ref(out, in); + return 0; fail: - av_packet_free(&in); + av_packet_unref(out); return ret; }