From patchwork Mon Jun 17 03:42:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13570 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 5B5C9447BCA for ; Mon, 17 Jun 2019 06:49:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46C35689D68; Mon, 17 Jun 2019 06:49:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 301236899F9 for ; Mon, 17 Jun 2019 06:49:26 +0300 (EEST) Received: by mail-wr1-f68.google.com with SMTP id n4so162151wrs.3 for ; Sun, 16 Jun 2019 20:49:26 -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=fisag8849cBnECwUzwgdMgW76KM5QJu0L0UJI6zOaEKQNGGQnU6oFfnnwgShMKeW7/ OGwi+Ie8xCA0Yt/FeWejdibJZWWPc7l1G2wXhBBI5R2m4xa+6kAc//11QDWum9j+OnjV 0QrEiyPnd0mdhtu6KTyxZIeB8plLZz/mygTqm+wPmEyAZPAUTS+4AZ9TD4F2ALTY4DKp RZXrtQQhU1DKmWbggrG4N2AUHJtaLr0m5FpNle1Q60xrtIGiam67K0IktSKcEkgSlNYx kGqIuimVwqnPqzwSPjZaHj+ujoERtE6jN2LpAgMSukWhYxWzhfZiMLwvq6vQGDYy5zWB Y32A== 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=flv+VrmUaj5Yqd5iB4p/9A6yJ3DvfFdNb5npzoalpJveUP9TAq4SQ9OqzfABmOvRg+ xN/Wm6Rks0v7hj0qXr3PSf8cAgtwiKwodstTq4FaK+SEF75bSco8Lp1RSkXeRCZu4T1B CxaM8Paqc4uJif6iRP20YmPihF2FOhAo1PJsslddNWQgUVa7rUWNg4p6C/y1G4j6g5wf VgNrpIzdUarBntG7zfTnisyXZxaH5tlJ1hmiQVtjyfEJbTb0oHXWeTiN8g+JWHsGAzZM S10+smrzBVH+VPLaOq5YaeapcMQENoWcoF+0uegBUdwY5b7SEnQQ/xVUN+aG2grzo28t i9Og== X-Gm-Message-State: APjAAAWEh22OqE6UdI8o/U0hJvF5aUgrLi0ly2Nz3aPGRpixXMjb5d2x 6GdpK+GNgFfipr+b/e2HWbeU2gk9 X-Google-Smtp-Source: APXvYqzPfQSvXygKqcUQr8oFeZ3RYYf1lD4h8Au6xxvGuWsAyYNLxOa5BwtAWOCSxpJRK02Qn5pwmA== X-Received: by 2002:adf:c5c1:: with SMTP id v1mr56183229wrg.129.1560743046458; Sun, 16 Jun 2019 20:44:06 -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.05 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 16 Jun 2019 20:44:06 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Jun 2019 05:42:21 +0200 Message-Id: <20190617034223.21195-17-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 16/18] 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; }