From patchwork Sun Mar 11 17:58:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 7905 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp801683jad; Sun, 11 Mar 2018 11:00:09 -0700 (PDT) X-Google-Smtp-Source: AG47ELtN5naaXt7MLIWmBrWwJaV0LKyd3v82kXgmT8qEWQyOntZ06li/0v8sOxS5pUJRWWhfoNci X-Received: by 10.28.141.4 with SMTP id p4mr3909137wmd.59.1520791209235; Sun, 11 Mar 2018 11:00:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1520791209; cv=none; d=google.com; s=arc-20160816; b=UFShbKJjh0cNjuzHIo6aoQg37jctTTkhcdEEm616ryL6FPjeAtQ0HDrqTJCxeUFqpL pYNV2zWJTDKUbkYPFTXjpsz663pfBYqrAuIO/t0gJbr524RAUKO5FyS4OhIiY3MxTTSu fT+dY2sx2UcWEriLgsXHyzYr7Z92mOkC+xrF/X97u13O5+cSCPG2Ji/ldg3BDcrCoVNw NFa8KsAI95zbTYpTBL6553VD9LGDBSjBoJQ58WGLpoVWunGQeVVbPK6SQlU4UbQw5gos ePLi62Nrc8q7Cv02HoL6JqMOAIGTkrvML+rOboi0swVm5Cbp+OR/r5zkPsXWtf+TlWjj 2gIg== 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=keX8anhX3QSzetLxadqxBMS0eRbb5Yv1exMwn1/qTS0=; b=UtiCDMlEhcfpIt+OosD2xhwc9/x7kpZK5HSpjn2y3wFYpyX9llXX2aD59JuIJ5bML7 nswaOx/myh8TXCiEMJwCzAvGgOQLrYxoqHbnLO45Mly3nxEubxpr5Z9Jk7WRU/YaNKrH wG5+PjEyrMYfpOsatzGUr5TtJ5Z9322jgu1so1r775vrkmtJ0W3lYxZz/Qj2zuVJGot2 kBAfjqcb2cFQO+HBIB1Gblqr611NXcjDjPWptopSLRNRcDjwX0j3IJaFwTa8L3FSi8DU QRxn3ClDhfynfHqJTV+RMafFM/4dmoWB9Sy2DZ0MVq6P/aMlWsp2oTk6Xmrmbs0/duZA qwog== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=OUyiTqe2; 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 j4si2174662wme.66.2018.03.11.11.00.08; Sun, 11 Mar 2018 11:00:09 -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=OUyiTqe2; 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 82FDD68A1D8; 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-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99A84689F24 for ; Sun, 11 Mar 2018 19:59:36 +0200 (EET) Received: by mail-qk0-f195.google.com with SMTP id f84so3646892qke.12 for ; Sun, 11 Mar 2018 10:59:46 -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=etbTjyq4LBwFU4udZ5seDF/mlLTdTSuL7N0ZQW1+Rpc=; b=OUyiTqe2UMJSkAh2J3CHwRxITksMdE2AY/6AVrRJv4S0+JSlghOOUb7DPsyAJWG4Vn DcCTT1NA6+4nWIHwaogLnbDDPD4tnP/jtYlCcqJqVQtpOI/Iqq6MT+XhfIaUwRSFfWI0 CNw6FAWonfVG8fPYtNjIidTX1f1i4/WOC+Io928HAiWm4A5wX7GsafAjv6eQ7GOKRQci 5HAOXvZpBecsuIemRztD2T+IrmkxJa8lSrmwKdbCGJvFJvT3WXf+o3O+7pNUF+VX/RlW Eo7BssdWChEEbM4OSSjcaytEHg8CQb1M7z8veRRFJPk1CW5wC2597iESYytUxtHy3INc NFSQ== 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=etbTjyq4LBwFU4udZ5seDF/mlLTdTSuL7N0ZQW1+Rpc=; b=j5vEV+QI6EYT8kSzUdWJUxV5rLz82bqk6emsgGdafkWhfurg62BJSe6Jb/HYTt52IS QZcjwL1gJITZIEO41wEswng6HLS24dh8C4FUldUeghffgjGQM9Yz2W0cNyc9mTR06jYw 1Kc4bWb0++EHAV1VWEytaBZCEACJPLm/4LsWNLp5CSdiP4d/FNnAhKx/P1NNHdr53ZLY WS6BuG34zMO0hjjy/27nJWX5MKWxhzmBobfHvlzCAjX5fQZN/5Ex0MrlvRt2Kw9EklHR HhCIQ2wEcjfKzuQpYIo06TDFZt1cBjyeaj5Q5ry/j2fJm20l1lw8MDynxFP376bOPpMm y7pg== X-Gm-Message-State: AElRT7GFy7QeHloB9H3ln7cVy/B/SXzMV79ymA3fJwmgqsUgJtr701Tl saJ1kal84zVHFXf7zmAYvuqPNw== X-Received: by 10.55.40.140 with SMTP id o12mr8252754qko.216.1520791185795; Sun, 11 Mar 2018 10:59:45 -0700 (PDT) Received: from localhost.localdomain ([190.188.171.140]) by smtp.gmail.com with ESMTPSA id 16sm4029946qtp.88.2018.03.11.10.59.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 11 Mar 2018 10:59:45 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 11 Mar 2018 14:58:51 -0300 Message-Id: <20180311175854.10096-3-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 3/6] avcodec/remove_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/remove_extradata_bsf.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/libavcodec/remove_extradata_bsf.c b/libavcodec/remove_extradata_bsf.c index a54bbdbacf..d44cc8be92 100644 --- a/libavcodec/remove_extradata_bsf.c +++ b/libavcodec/remove_extradata_bsf.c @@ -42,26 +42,22 @@ static int remove_extradata(AVBSFContext *ctx, AVPacket *out) { RemoveExtradataContext *s = ctx->priv_data; - AVPacket *in; int ret; - ret = ff_bsf_get_packet(ctx, &in); + ret = ff_bsf_get_packet_ref(ctx, out); if (ret < 0) return ret; if (s->parser && s->parser->parser->split) { if (s->freq == REMOVE_FREQ_ALL || - (s->freq == REMOVE_FREQ_NONKEYFRAME && !(in->flags & AV_PKT_FLAG_KEY)) || - (s->freq == REMOVE_FREQ_KEYFRAME && in->flags & AV_PKT_FLAG_KEY)) { - int i = s->parser->parser->split(s->avctx, in->data, in->size); - in->data += i; - in->size -= i; + (s->freq == REMOVE_FREQ_NONKEYFRAME && !(out->flags & AV_PKT_FLAG_KEY)) || + (s->freq == REMOVE_FREQ_KEYFRAME && out->flags & AV_PKT_FLAG_KEY)) { + int i = s->parser->parser->split(s->avctx, out->data, out->size); + out->data += i; + out->size -= i; } } - av_packet_move_ref(out, in); - av_packet_free(&in); - return 0; }