From patchwork Wed Jun 19 23:45:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13626 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 936CB448AA5 for ; Thu, 20 Jun 2019 02:55:49 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 70F8B68AB3C; Thu, 20 Jun 2019 02:55:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B0D468AB18 for ; Thu, 20 Jun 2019 02:55:43 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id x15so1170126wmj.3 for ; Wed, 19 Jun 2019 16:55:43 -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=blMGFBA6swIw+J7Lkc58gHlyGtHEIgyhzcYvQwP6a3w=; b=rz4ksDiuIjM/+oEEkAm+W6Ma/dk+uBjeMdr67y4VtvpYdEID1WzicisasGn4u7bmf8 LCsdWj5y5U31UBFDhl8GlmcXOasEflUI5UxFw1hUq9C9jWxg1zog6LnbLUPW5CsJ7kTJ h/P2Pvb2ABQIYdsaCeiuk0lr6J744HwBhefn26NOhzQbg/5IzKrbHut1SwUqgAIjScT6 p/5FeLMqJw7/SBUNnlZpk8oT00kndB6J4WSU99nO85QuFoTEQRxxvfnJrQMrNKTv7mac NMNugzVlwQXfAwECCcFOlrV0Kvmpdz0XcKZNF0FBdB4lIk+7e3cHN2TByrJLNiDD4A+5 iy5g== 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=blMGFBA6swIw+J7Lkc58gHlyGtHEIgyhzcYvQwP6a3w=; b=BUNaomb4YzLwxGVALxC4kQ48oTQZ43ZUWjvA3XIFcFW6Cquh0LcUDxh+WvT8qa4b8M 8hgzsC+2yiv1Y53eqiUapOyLNyKfgWohbMhloosU+YlXNifjyrE8JrllA7zw0zDXDrft AjvHeKsGB6SoD7I2/26z+Fs/SxDVU0UdLJQ5s7e+6b0L3PDYVyP3XKDG7hmoqHyWXgiO J1hw0dBKIqOuJ+NuzSFAO15/TBPUUk5b1dwFI9FBV0C3sXdtIIKu++q5jUVC+WvUeUB8 /w4xhqfxjahiheGMmuaTkKZ/EiwRk2852pYL+XINSyQEo5mlPBPxyAKnEKGeSXrd0vNn M40w== X-Gm-Message-State: APjAAAUseDeVAE3g4iJdMmFcvZ1Pi4hj93KvMtFZ2VOoscegRzotvibN Z5oIvFIL3f+xOG6h4H2gMpLqh3Sv X-Google-Smtp-Source: APXvYqxfHm1k/8Sw0nlK+vnJk0cPvSliDo67tXf+HFc5V7JEVUuoXzd3h6V6NAgABEVbrQ35arsnlg== X-Received: by 2002:a1c:4484:: with SMTP id r126mr10371366wma.27.1560988542360; Wed, 19 Jun 2019 16:55:42 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id t63sm2758989wmt.6.2019.06.19.16.55.41 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 16:55:41 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 01:45:09 +0200 Message-Id: <20190619234521.15619-11-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619234521.15619-1-andreas.rheinhardt@gmail.com> References: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> <20190619234521.15619-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 19/31] vp9_metadata: Avoid allocations and copies of packet structures 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" This commit changes vp9_metadata to (a) use ff_bsf_get_packet_ref instead of ff_bsf_get_packet (thereby avoiding one malloc and free per filtered packet) and (b) to use only one packet structure at all, thereby avoiding a call to av_packet_copy_props. (b) has been made possible by the recent changes to ff_cbs_write_packet. Signed-off-by: Andreas Rheinhardt --- libavcodec/vp9_metadata_bsf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libavcodec/vp9_metadata_bsf.c b/libavcodec/vp9_metadata_bsf.c index b79f08af6c..1bde1b96aa 100644 --- a/libavcodec/vp9_metadata_bsf.c +++ b/libavcodec/vp9_metadata_bsf.c @@ -37,18 +37,17 @@ typedef struct VP9MetadataContext { } VP9MetadataContext; -static int vp9_metadata_filter(AVBSFContext *bsf, AVPacket *out) +static int vp9_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { VP9MetadataContext *ctx = bsf->priv_data; - AVPacket *in = NULL; CodedBitstreamFragment *frag = &ctx->fragment; int err, i; - err = ff_bsf_get_packet(bsf, &in); + err = ff_bsf_get_packet_ref(bsf, pkt); if (err < 0) return err; - err = ff_cbs_read_packet(ctx->cbc, frag, in); + err = ff_cbs_read_packet(ctx->cbc, frag, pkt); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to read packet.\n"); goto fail; @@ -74,23 +73,18 @@ static int vp9_metadata_filter(AVBSFContext *bsf, AVPacket *out) } } - err = ff_cbs_write_packet(ctx->cbc, out, frag); + err = ff_cbs_write_packet(ctx->cbc, pkt, frag); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Failed to write packet.\n"); goto fail; } - err = av_packet_copy_props(out, in); - if (err < 0) - goto fail; - err = 0; fail: ff_cbs_fragment_reset(ctx->cbc, frag); if (err < 0) - av_packet_unref(out); - av_packet_free(&in); + av_packet_unref(pkt); return err; }