From patchwork Mon Jun 17 03:42:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13573 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 8C810447BCA for ; Mon, 17 Jun 2019 06:49:55 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7911268A130; Mon, 17 Jun 2019 06:49:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EFABB689A7A for ; Mon, 17 Jun 2019 06:49:53 +0300 (EEST) Received: by mail-wm1-f68.google.com with SMTP id 207so7645179wma.1 for ; Sun, 16 Jun 2019 20:49:53 -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=1q+hCbA7wIMKZnLxY3rm8ew24oaMMAZI0jUEAjNwIs8=; b=rfoz0lPLfusRiTv5Lc7zkObimxGDN+XLTclBGDKI4KyvS9uueGN1mnQwfIO8FYG2Xn 6120YUgwJAD3OI+Q7EFCqnhXL8LPpZBQ1qKGBknBYVFdGXkHv9IK0ladIdCXhR1g1zcc 2RuMGipcVo99LYlze7mb1Ej/JBGANlc4zfluQf2KbfSww8a5E91d3rzEaSRoFEWCbY5j 40QgIdTWOHNpOdnP3o/VKmbOUSTdCk1vrQTmybxoQlIo1dAOqy/pFtyhn0p2sKoaNBry HrSa+L/27vaQRw+8kih7OsziApcDQnUZIIbKJpN4yXki/6jGylq78+jthyYl8lgY6BlP ld+Q== 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=1q+hCbA7wIMKZnLxY3rm8ew24oaMMAZI0jUEAjNwIs8=; b=fjHsDSOoj6dawrJw3n5acbn9EPnSLQmlTaNdbDFmfCGS5SKbma5yzY4EMLL5yTy/KG KMEt1v3BnIJJ9Iq87xr3uouTl3Pe3NpighDOlN/V2AIArWReMmrzzmQby69H98k6qTUL UEa3XBFyk5JgdD9TCbeOFsYDJhzyCTEuPZckpbuKDlgr1ffIMZ3KkNRZ+ZAwr2hYG+BJ h4j4VszU4Jj6Gzo4xXGNlnFtmL78EYyv9YwtUndMlHlqpF0NdLQnAYFd/WatDObn+soK /USnRRfAaeJklOUY6tCiI+oxVLXVgxuoQstG9xsEUdZ9AxPx2KnYJfMNOt5uvKSe/u+5 qgSQ== X-Gm-Message-State: APjAAAV2n/QxS8lScyCqouotii4vp8e/YjhlQgi1cU7NfcU0b/isn5gD gpRqJXrXSmhs4PyhlR0XIK3vBltz X-Google-Smtp-Source: APXvYqxDqXLPaf4SgyANbUlrcx1Q1QOS7WfviipY2jmQAtNE5zpRvQiAxQnT6il0BLP7m1gDOFWZ5g== X-Received: by 2002:a1c:b6d4:: with SMTP id g203mr16598280wmf.19.1560743042928; Sun, 16 Jun 2019 20:44:02 -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.44.02 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 16 Jun 2019 20:44:02 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2019 05:42:17 +0200 Message-Id: <20190617034223.21195-13-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 12/18] h264_redundant_pps: 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 h264_redundant_pps 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/h264_redundant_pps_bsf.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 8526b5b4c4..f8b0f9ac0a 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -66,19 +66,18 @@ static int h264_redundant_pps_fixup_slice(H264RedundantPPSContext *ctx, return 0; } -static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out) +static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *pkt) { H264RedundantPPSContext *ctx = bsf->priv_data; - AVPacket *in; CodedBitstreamFragment *au = &ctx->access_unit; int au_has_sps; 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->input, au, in); + err = ff_cbs_read_packet(ctx->input, au, pkt); if (err < 0) goto fail; @@ -94,7 +93,7 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out) goto fail; if (!au_has_sps) { av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS " - "at %"PRId64".\n", in->pts); + "at %"PRId64".\n", pkt->pts); ff_cbs_delete_unit(ctx->input, au, i); } } @@ -105,21 +104,15 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *out) } } - err = ff_cbs_write_packet(ctx->output, out, au); - if (err < 0) - goto fail; - - - err = av_packet_copy_props(out, in); + err = ff_cbs_write_packet(ctx->output, pkt, au); if (err < 0) goto fail; err = 0; fail: ff_cbs_fragment_reset(ctx->output, au); - av_packet_free(&in); if (err < 0) - av_packet_unref(out); + av_packet_unref(pkt); return err; }