From patchwork Sat May 30 16:05:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20011 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 B305744AA6F for ; Sat, 30 May 2020 19:10:27 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B62C868B19B; Sat, 30 May 2020 19:06:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8E13F68B10E for ; Sat, 30 May 2020 19:06:51 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id t18so7190584wru.6 for ; Sat, 30 May 2020 09:06:51 -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=tpS+qpl4Jmjq9ZNHJ42G31dyhZBOlZfxajnQ/HMRuns=; b=qd6Hpz0RnXIzIauozM7bNSv6YZOWWZNeC5dvu+B6hOZkWWesHRrvGhydwL1K7IpWYl uTh7pkGYVbFUVhNQU5U+8WsU/H3m1w5pHfgMAaxnDsEIrwLsE266cDnzG1z1HQuB/hDV esBnhFz7TxO2z9nw3xl/QXNzpK0SI/VkDIX0GbPoB77CKvDJZkRmTyn6tT4dW+4crNrP Fdsam1IJ4WkqaLQhKM6672u2NmeeQvTvOIkoZZgtPRBIOVENdGnhTcDm4Mx/FCsgYELc K2ifzXF5Rn8MVjEZI1vPduCT7a44h7nCn2PJnbJwBowCzIPGIAItM0O3H0Vm7ImAbvA7 YTjw== 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=tpS+qpl4Jmjq9ZNHJ42G31dyhZBOlZfxajnQ/HMRuns=; b=tJSF1d92ZOD/kisZUxG2T+NvxTKH0PsvC+qqI+IXakz7xF7BtJL2TGZg4AiKWfeeWg EAswgZB/CUC9b/33ddVpyTh0PjVo/t2FdEIxCjG8IqTzC4svbzRiTpTIw1BOCRhUG7/8 rp4jH1rNny6jg6qzRV5v2qHs8dhFvwOFSvj3WUMlTRNrzr7JItlnkq2qppYEo3Dz9vmN z9IQz1LZsfYmrPpl+yGgBJAiILfrsA1VH6UNEZFmcWdQFTfXVrd6/84hsONcf3YwJiu5 D3HGjI226aUPaKrRYpyvjU/UrjG7wW4sbKwH4NDPgFOCZBhkUvAw7JaL8EXb02r6/J2O xTnQ== X-Gm-Message-State: AOAM533HGqSXRhZYYvjom9Y/iPvRAA5yCq91zSMHQGlfXyqdXY5xG3dl nOrWUnCE637lpscBn+vziC8KPJgC X-Google-Smtp-Source: ABdhPJz9u4gZs4oSkquqtYOmXWjkn8Zfu+eqkEeUY+o7nd6rCdyrF3ocL1GFovOuzIo9zAh07Nk7jQ== X-Received: by 2002:adf:e3c4:: with SMTP id k4mr13726525wrm.262.1590854810754; Sat, 30 May 2020 09:06:50 -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.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:50 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:37 +0200 Message-Id: <20200530160541.29517-32-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 32/36] avcodec/mp3_header_decompress_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/mp3_header_decompress_bsf.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c index 3d357dd27e..29ab5721ef 100644 --- a/libavcodec/mp3_header_decompress_bsf.c +++ b/libavcodec/mp3_header_decompress_bsf.c @@ -26,28 +26,25 @@ #include "mpegaudiodata.h" -static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) +static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *pkt) { - AVPacket *in; uint32_t header; int sample_rate= ctx->par_in->sample_rate; int sample_rate_index=0; int lsf, mpeg25, bitrate_index, frame_size, offset, ret; + AVBufferRef *out = NULL; const uint8_t *buf; int buf_size; - ret = ff_bsf_get_packet(ctx, &in); + ret = ff_bsf_get_packet_ref(ctx, pkt); if (ret < 0) return ret; - buf = in->data; - buf_size = in->size; + buf = pkt->data; + buf_size = pkt->size; header = AV_RB32(buf); if(ff_mpa_check_header(header) >= 0){ - av_packet_move_ref(out, in); - av_packet_free(&in); - return 0; } @@ -89,14 +86,9 @@ static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) offset++; } - ret = av_new_packet(out, frame_size); + ret = ff_buffer_padded_realloc(&out, frame_size); if (ret < 0) goto fail; - ret = av_packet_copy_props(out, in); - if (ret < 0) { - av_packet_unref(out); - goto fail; - } memcpy(out->data + offset, buf, buf_size); if(ctx->par_in->channels==2){ @@ -118,10 +110,13 @@ static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) header |= 1 << 16; // protection_bit AV_WB32(out->data, header); + ff_packet_replace_buffer(pkt, out); + ret = 0; fail: - av_packet_free(&in); + if (ret < 0) + av_packet_unref(pkt); return ret; }