From patchwork Sat May 30 16:05:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20018 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 56D7244AC08 for ; Sat, 30 May 2020 19:11:39 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 35A1668B11A; Sat, 30 May 2020 19:06:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C25B68AFD8 for ; Sat, 30 May 2020 19:06:50 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id e1so7211323wrt.5 for ; Sat, 30 May 2020 09:06:50 -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=gmuJiDHhmtdCKCiALo/tWx/v99QNJOo+HNBraVW3+vc=; b=sfcnSct0i9icaL7A3niwZM9PX6ac7jQ9Q5QnpRBwowo6AEnDpM7bRlDMd1gGx2PdrD zBjm/ijrV6g8khRn0qoxzArzCpAYYiGVKyKVaXarpnsGPBKKHiieEQiGaqok4jaruxlW QCj7hf9HE1gtxrQ43tn6q5e0WjuNxXpAkOlt2gRJt85xWYclUF9FucLGEkhWxezgOWuP n7RGtToMovdZFZnnIeecXh3rBOriji6pR4XKvVQY0D9gNG5NaPisWJM310tKvLfYlaHZ XrBKAlwlEEjz3I9qLg7isMqPXv0qG7l+MeyIjSyjqx06YzF4urK4HMowjkHFWOpr13VR hwSw== 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=gmuJiDHhmtdCKCiALo/tWx/v99QNJOo+HNBraVW3+vc=; b=bBZ9O61HLzRt9nMOAbqZmxQwe1lVTLmZ7x5MaL4VGNCSHjX9QYvUMhVW2qMwg8nb/Y lxKDzRNSscmoUaI1eZ9GGQEc2G3mGZwGnky5eU1nBbicCVWhA1SiGP/MruRZXHwRbaHG 2g4XGke7iILBa2DQl67CqTkZKVzvkB485n553py2POP75NnHEkJwGk08sSlCnMciUSiC rnsRj0IWws8sDuTAFk+z7DW59vbYw1Y70Qxewwg78pEG+b8kOY9jqenbUugITdL/EBnH w1h1rPmltz22UjSSTPqzr2AV0jacojVnLydFnWDnb/n2aPI7UgPLQsq1SLUU+0dxGyFD GE2A== X-Gm-Message-State: AOAM532mzE6/HbNDQuxDO5k/Zc4wfVQpRereCqmYpSia93NHYjS5HpHU 1/9bkDB5MUS1RC30DTNY8pRPByPh X-Google-Smtp-Source: ABdhPJwC0Y7Tnb2Bx38qXSn8AnTrNMtTbl549wPPtju//Xv+aJxVLSOtgmizQinTOv86tiIXgc8nUg== X-Received: by 2002:adf:a50e:: with SMTP id i14mr2109832wrb.21.1590854809510; Sat, 30 May 2020 09:06:49 -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.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:48 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:36 +0200 Message-Id: <20200530160541.29517-31-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 31/36] avcodec/mjpeg2jpeg_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/mjpeg2jpeg_bsf.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c index b30f391bf9..dc729cfd95 100644 --- a/libavcodec/mjpeg2jpeg_bsf.c +++ b/libavcodec/mjpeg2jpeg_bsf.c @@ -77,40 +77,40 @@ static uint8_t *append_dht_segment(uint8_t *buf) return buf; } -static int mjpeg2jpeg_filter(AVBSFContext *ctx, AVPacket *out) +static int mjpeg2jpeg_filter(AVBSFContext *ctx, AVPacket *pkt) { - AVPacket *in; + AVBufferRef *out = NULL; int ret = 0; int input_skip, output_size; uint8_t *output; - ret = ff_bsf_get_packet(ctx, &in); + ret = ff_bsf_get_packet_ref(ctx, pkt); if (ret < 0) return ret; - if (in->size < 12) { + if (pkt->size < 12) { av_log(ctx, AV_LOG_ERROR, "input is truncated\n"); ret = AVERROR_INVALIDDATA; goto fail; } - if (AV_RB16(in->data) != 0xffd8) { + if (AV_RB16(pkt->data) != 0xffd8) { av_log(ctx, AV_LOG_ERROR, "input is not MJPEG\n"); ret = AVERROR_INVALIDDATA; goto fail; } - if (in->data[2] == 0xff && in->data[3] == APP0) { - input_skip = (in->data[4] << 8) + in->data[5] + 4; + if (pkt->data[2] == 0xff && pkt->data[3] == APP0) { + input_skip = AV_RB16(pkt->data + 4) + 4; } else { input_skip = 2; } - if (in->size < input_skip) { + if (pkt->size < input_skip) { av_log(ctx, AV_LOG_ERROR, "input is truncated\n"); ret = AVERROR_INVALIDDATA; goto fail; } - output_size = in->size - input_skip + + output_size = pkt->size - input_skip + sizeof(jpeg_header) + dht_segment_size; - ret = av_new_packet(out, output_size); + ret = ff_buffer_padded_realloc(&out, output_size); if (ret < 0) goto fail; @@ -118,16 +118,13 @@ static int mjpeg2jpeg_filter(AVBSFContext *ctx, AVPacket *out) output = append(output, jpeg_header, sizeof(jpeg_header)); output = append_dht_segment(output); - output = append(output, in->data + input_skip, in->size - input_skip); + output = append(output, pkt->data + input_skip, pkt->size - input_skip); - 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); + av_packet_unref(pkt); return ret; }