From patchwork Mon Jun 17 03:42:07 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13576 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 D6398447E17 for ; Mon, 17 Jun 2019 06:50:08 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BC969689A81; Mon, 17 Jun 2019 06:50:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3D966801A4 for ; Mon, 17 Jun 2019 06:50:06 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id 207so7645467wma.1 for ; Sun, 16 Jun 2019 20:50:06 -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=NEYrF1IkWPEQIaIcgZQSmHKRl8v+HemQtVdLY0k+tzQ=; b=ieIZTlYK1bG5W7sblnD6qMYpeGo11iy2/u/NWTVLY1kJoestO8LmYZpJlYJbkWqsAp DNxGfv60kQZ89uzlIACNOlZNAG1PlkHAhcuKmKSBx/1GF4DyIYSHm+x2QOiBfuD8MUwP tPtKb9Sh9mu7P00Fi/O1XR1YxPx6B4pzx6PvzoJlyykU5PZtTtvTOWrzLeDoegHt8yEN UqbXHdQxajGpSc9wHlg/gfZblD6fE/6EUU0+cH/b0sQrXeuhmHyVvPpYOVMXP5u3GI8j 3ehmzmGA3PPGw+s9IPBgv6D9E4JsyjxxormsvxDZhYzlLT1RhbJfiBnnhQ2+EstxjN6P ZpEA== 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=NEYrF1IkWPEQIaIcgZQSmHKRl8v+HemQtVdLY0k+tzQ=; b=mj8X66k5Bw0ti26QadoA53+giJgXYjdflnUOc9IG/nCPgoy1GLBxtplXPPHZD5o7Bw LXUSi1m5H+r6Pb2yLfeensxUV3CVOmoTXnfI8VHOm631Tp4wKaXiXn9KSm++XUtO45GM 3GHqLKVCg3T5eGOp5g9MbMxoqPs38LFtK7Y5GDhA3rc+zh80sDDnRT0WWddZzgJxrTzS QXZxGDPbqYdHg+5qQf0fnNidMBycLUK+TF1/OP4mQ6GUOWPYvKGWdCHn3HoXY5CIFGMV XnhfKZeBsLk/1+rOq8gVCcN06qgZ8cyQDyku8GAy44XBRo4QOChlHdYuxD1hUMxEdBAA LiRg== X-Gm-Message-State: APjAAAVIO6dM1TvtT9TI15sYUvRwBteUaaNf0pTAuohPd7LiOZI4gZaf I62wVZyz//kTCWNdSs8aeYZPq7Gn X-Google-Smtp-Source: APXvYqw3tCnJI/5LqTXBvHBBXp7fR5C0YAcEW48DeQH7YkiDxLoNamS/JfDevI7pEPv4u3xH1dNZmw== X-Received: by 2002:a1c:448b:: with SMTP id r133mr17323707wma.114.1560743034593; Sun, 16 Jun 2019 20:43:54 -0700 (PDT) Received: from localhost.localdomain (ipbcc063db.dynamic.kabel-deutschland.de. [188.192.99.219]) by smtp.gmail.com with ESMTPSA id x83sm9632889wmb.42.2019.06.16.20.43.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 16 Jun 2019 20:43:54 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2019 05:42:07 +0200 Message-Id: <20190617034223.21195-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> References: <20190617034223.21195-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/18] av1_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 av1_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/av1_metadata_bsf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index fe208feaf5..e294d7a24e 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -116,19 +116,18 @@ static int av1_metadata_update_sequence_header(AVBSFContext *bsf, return 0; } -static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *out) +static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { AV1MetadataContext *ctx = bsf->priv_data; - AVPacket *in = NULL; CodedBitstreamFragment *frag = &ctx->access_unit; AV1RawOBU td, *obu; 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; @@ -173,23 +172,18 @@ static int av1_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; }