From patchwork Sat May 30 16:05:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20017 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 8FA1544AC08 for ; Sat, 30 May 2020 19:11:28 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7843668B119; Sat, 30 May 2020 19:06:56 +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 3EB6168AFA1 for ; Sat, 30 May 2020 19:06:49 +0300 (EEST) Received: by mail-wm1-f65.google.com with SMTP id f5so7145491wmh.2 for ; Sat, 30 May 2020 09:06:49 -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=6eBSeExlYUVUSCn81gmFVQcs0mXZjL509uEWIEuZEvI=; b=NrDYg8mFxRm8eFr5xo3mTOFqLjOZqpbzqKB1c8V26L/2E4eEA2WjPqkpaySemGwCoe 4/rmItF+4/UFSOOZ5s9h1uOdDjALRzWFL37DQB8uCgCNwpuaE5mYGh5rKJ/fCKWRxndt DOE8MAJZM4x6/SLVRSyem3KRrCBOyCgHR2PTkiOsN0N5FaV6RkpEnjYFUvQ2YRPalRfd tvwq+T/4jGsMWGJjO3d9M+mZHeLlrjaWs9+ZoWBAaHt1uk+RVY6tmc8L2tPQfmP7VKk0 fqJCRXnQTrwW89WUYEefHFKC4wB8az7qAN9JeYRYeV44N8/GhWkx12DkRd9U5qQ82ufu fbow== 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=6eBSeExlYUVUSCn81gmFVQcs0mXZjL509uEWIEuZEvI=; b=Raby0w7l/2RPBag2dL0Px1vzq2ApObc1UfjIVdOvID/hZzbUJ1iSO8ctKUWrHiMpfb n+mGLDbw8uqWykye+OiaXre1wWZgSQdgYCMJq55o+mLLGz2qF8rK6yqYaDIl3D3sJGaS jMYYAofwLp92BtoWtY+Y+XiUTE4lnSk2V4FvRscXNI+v/7jgyDNFMt1tKuiOiWd4Fx8t bhuEea3Ftc/sr4RFEZ1qQHZIf8aI+YnOK3h98iQ+t7oRd1fvRpcHhoaV9RZDI6XOFlu1 L7vNMuJXqHjUwnGeVZ470pxc/OPrfFTqrTmEHQGfU0O+5eLXXfDT8oqSwVaQx4EG5LD/ gEqg== X-Gm-Message-State: AOAM530+b1YxZw669dkkBsehORVkp4vQOD8f0OKsKoRfIMcbj7lksIXI PWkpQDSXGTUDfVqfR+LySjb34Sgb X-Google-Smtp-Source: ABdhPJyo9YGf7ah0uj5Hye1DOJu43eWAVvr/RyJrdvF4VyMdLaWWGGAomlo5hpcN/zb7PRHif6F7CA== X-Received: by 2002:a1c:305:: with SMTP id 5mr13447484wmd.60.1590854808268; Sat, 30 May 2020 09:06:48 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:47 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:35 +0200 Message-Id: <20200530160541.29517-30-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 30/36] avcodec/imx_dump_header_bsf: Remove intermediate packet 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 ends using separate packets for in- and output. Instead, the input is read directly into the packet destined for output via ff_bsf_get_packet_ref() and only the buffer-related fields are modified; the others are not touched. Signed-off-by: Andreas Rheinhardt --- libavcodec/imx_dump_header_bsf.c | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/libavcodec/imx_dump_header_bsf.c b/libavcodec/imx_dump_header_bsf.c index e2b6a15591..95f8f31f66 100644 --- a/libavcodec/imx_dump_header_bsf.c +++ b/libavcodec/imx_dump_header_bsf.c @@ -30,39 +30,35 @@ #include "bytestream.h" -static int imx_dump_header(AVBSFContext *ctx, AVPacket *out) +static int imx_dump_header(AVBSFContext *ctx, AVPacket *pkt) { /* MXF essence element key */ static const uint8_t imx_header[16] = { 0x06,0x0e,0x2b,0x34,0x01,0x02,0x01,0x01,0x0d,0x01,0x03,0x01,0x05,0x01,0x01,0x00 }; - AVPacket *in; + AVBufferRef *out = NULL; int ret = 0; uint8_t *out_buf; - ret = ff_bsf_get_packet(ctx, &in); + ret = ff_bsf_get_packet_ref(ctx, pkt); if (ret < 0) return ret; - ret = av_new_packet(out, in->size + 20); - if (ret < 0) - goto fail; + ret = ff_buffer_padded_realloc(&out, pkt->size + 20U); + if (ret < 0) { + av_packet_unref(pkt); + return ret; + } out_buf = out->data; bytestream_put_buffer(&out_buf, imx_header, 16); bytestream_put_byte(&out_buf, 0x83); /* KLV BER long form */ - bytestream_put_be24(&out_buf, in->size); - bytestream_put_buffer(&out_buf, in->data, in->size); + bytestream_put_be24(&out_buf, pkt->size); + bytestream_put_buffer(&out_buf, pkt->data, pkt->size); - ret = av_packet_copy_props(out, in); - if (ret < 0) - goto fail; + ff_packet_replace_buffer(pkt, out); -fail: - if (ret < 0) - av_packet_unref(out); - av_packet_free(&in); - return ret; + return 0; } static const enum AVCodecID codec_ids[] = {