From patchwork Wed Jun 19 23:45: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: 13624 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 435AE448AA5 for ; Thu, 20 Jun 2019 02:55:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0E36E68AB33; Thu, 20 Jun 2019 02:55:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 56C1468AB0C for ; Thu, 20 Jun 2019 02:55:41 +0300 (EEST) Received: by mail-wm1-f66.google.com with SMTP id s3so1175810wms.2 for ; Wed, 19 Jun 2019 16:55:41 -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=hdBaylxxKtJ84BhdlRw2GNW3OzgWkh/pKVq5f4sYor4=; b=CCTqNOTxUABLVS1X3+JkYzVxRPWM2gCmbavSva0MPg/93HiRxHTk63wWixVz7yOXOE Z+TKI7WKRv9M18JM64oCgTpQvIlPyj66BlzZ2+STkLO7Bd5COq45o2oAVucqjjXg96HP cD+xACtWBR4uewyxrvFUvgdxLms7BHV5OT9R0IgSLyT5+XGq3IreVfbTOUkdNVMAXOsn Ux7L4NihBX6LEEc7e+wKMtGtLcFe2QytYakjscAsVT6ZtSYZnVVMEbi0Ws89uUfQ9ks9 y+SwFlPhXb6SPgtNB+HJ+pn+plCQ2+Mp/Dzdx8uOfV9eytdRYq8SbBVxdc8rdaFEM20c 4JwQ== 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=hdBaylxxKtJ84BhdlRw2GNW3OzgWkh/pKVq5f4sYor4=; b=iLk0otyOm7sjrTEjOpVPiFOpvXClIQ1aU5VUCHXDGLI4fP9GJP07dNMdm/ouhqufQj NuAjdDJ8v017+JD9h4E2+zjHq2st/vK8DjvK6IbuptF+7ItbaWH7RHMMAQpj+OnPlAhs e4RGaYPHXgx1szf7FpjFkiAiPUz5Zy8phLtpxRophsHmNw+AcprOmYk/6XinLnYZ4m9h McfQdy8sDS+BZ1zjxpr3AeGiRPa6Xe0ViUga8aAyxsy2bTgxnnE195PTZy3e2vETezY2 EkwL4+4I3TrPkZzfj4rp6gPF7awOJBQLreHMJfCS99DiZBk1GQiikKHit/7+eW95f/ZB tm7Q== X-Gm-Message-State: APjAAAXv6DcTQf4TUClwegqAgJR5kNvcbYbVNc0AxipLtY5CvwDCoBy0 CLhhTYz7/iq4NBY9XRwAIGw2Fkl0 X-Google-Smtp-Source: APXvYqzy2k7IgC7r9QeVfw0wOQSyHzH2ol/uXu12Q9MrtxZE1mst7yMX2ZqjOklqfHUzaFyYdKThgg== X-Received: by 2002:a1c:35c2:: with SMTP id c185mr9978775wma.58.1560988540639; Wed, 19 Jun 2019 16:55:40 -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.39 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Wed, 19 Jun 2019 16:55:40 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 20 Jun 2019 01:45:07 +0200 Message-Id: <20190619234521.15619-9-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 17/31] mpeg2_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 mpeg2_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/mpeg2_metadata_bsf.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/libavcodec/mpeg2_metadata_bsf.c b/libavcodec/mpeg2_metadata_bsf.c index ba3a74afda..082137d786 100644 --- a/libavcodec/mpeg2_metadata_bsf.c +++ b/libavcodec/mpeg2_metadata_bsf.c @@ -179,18 +179,17 @@ static int mpeg2_metadata_update_fragment(AVBSFContext *bsf, return 0; } -static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *out) +static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) { MPEG2MetadataContext *ctx = bsf->priv_data; - AVPacket *in = NULL; CodedBitstreamFragment *frag = &ctx->fragment; int err; - 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; @@ -202,23 +201,18 @@ static int mpeg2_metadata_filter(AVBSFContext *bsf, AVPacket *out) goto fail; } - 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; }