From patchwork Sat May 30 16:05:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 20014 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 9706744AA6F for ; Sat, 30 May 2020 19:10:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 71F3568B13A; Sat, 30 May 2020 19:06:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1783C68B0C4 for ; Sat, 30 May 2020 19:06:44 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id c3so7122189wru.12 for ; Sat, 30 May 2020 09:06:44 -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=RyP2Vog+jWokv2ZR7nBghAh2Ibz0gjwky51/38kt50o=; b=Y2mdPqIkMBKs9mxCxlM1SyFKEhZacxPcHRHAyJCIsXEH/nnZc/4pVaW5UOWN+fXS2i TmV1q2qCLBpyDZEh+x5jgGJs/244qUtqfIhXMZ5J15LuuxFKwb69S7WGN0Bw3Enwdn0G EIQP8BHOcR/NwClknZYZ+6xatbmEmTWsG+tQYWtfs6XzGGagEcy7tiJ61wBas9kjRJht 524FkHP8ebqOqJEm6WRhj4xr6r0B0RjH67uLHgAuO5kcsPzuwezBhssgXTK1Hl6q3bgm hEvpmgFJT7z5yMxo6Z1tXhjSUNfjJ55RNA/b4yDAp+3qYWX0C4RSeLebSk52re9yMZyc OXKg== 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=RyP2Vog+jWokv2ZR7nBghAh2Ibz0gjwky51/38kt50o=; b=tCZsmIh8tTI55zlW88EpHSgCvtBpRRqD1G7cVSQTswPHet48n2EoZR9bJBOrb0+4Uh +p8Aw4XL50DQVHVA4H/Xlp6uRJK+fDApNelfZ+diYnKsebj1MLMoyo3hoSy52aazZFtZ a6z6pafUEFCeeX2+uhoEuvUEHyckyLNhq5IITrhHmGY3zZwSyO//11DcVO9XJ1GCJlwB h+fAiSG5t/Ias440FwturaUoroKB8b9rY/9YO7GTT6tunxWDxdHjGgIc1hWkYedxV2xK HGakGSLQ1P0WxpLNT2YqTfdeM6g+wdURsQnaJ+75JyBkcR0QkTCOTJj6PH0er1/WKYye GnxQ== X-Gm-Message-State: AOAM533wLCovecKCqzKmnQA03pr6xpJwcTlY9VhFM79qchbnkXOPlLxm TUfu/GZM+bfhTtRY0zqlY8ZDhDk4 X-Google-Smtp-Source: ABdhPJxmaUQ+h5MD5h3NVA+cCJbOU+XSytTNed5Y5JCbSDjlc3opl3qnBPf75Leedi12ZNdpDnrbJw== X-Received: by 2002:a5d:6750:: with SMTP id l16mr13885397wrw.295.1590854803174; Sat, 30 May 2020 09:06:43 -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.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:42 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:31 +0200 Message-Id: <20200530160541.29517-26-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 26/36] avcodec/mjpega_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/mjpega_dump_header_bsf.c | 39 +++++++++++++---------------- 1 file changed, 17 insertions(+), 22 deletions(-) diff --git a/libavcodec/mjpega_dump_header_bsf.c b/libavcodec/mjpega_dump_header_bsf.c index 4608fe550b..2d49b042ec 100644 --- a/libavcodec/mjpega_dump_header_bsf.c +++ b/libavcodec/mjpega_dump_header_bsf.c @@ -31,29 +31,27 @@ #include "mjpeg.h" -static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) +static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *pkt) { - AVPacket *in; uint8_t *out_buf; unsigned dqt = 0, dht = 0, sof0 = 0; int ret = 0, i; - ret = ff_bsf_get_packet(ctx, &in); + ret = ff_bsf_get_packet_ref(ctx, pkt); if (ret < 0) return ret; - for (i = 0; i < in->size - 3; i++) { - if (in->data[i] == 0xff) { - switch (in->data[i + 1]) { + for (i = 0; i < pkt->size - 3; i++) { + if (pkt->data[i] == 0xff) { + switch (pkt->data[i + 1]) { case DQT: dqt = i + 46U; break; case DHT: dht = i + 46U; break; case SOF0: sof0 = i + 46U; break; case SOS: - ret = av_new_packet(out, in->size + 44U); - if (ret < 0) - goto fail; + { + AVBufferRef *out = NULL; - ret = av_packet_copy_props(out, in); + ret = ff_buffer_padded_realloc(&out, pkt->size + 44U); if (ret < 0) goto fail; @@ -65,24 +63,22 @@ static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) bytestream_put_be16(&out_buf, 42); /* size */ bytestream_put_be32(&out_buf, 0); bytestream_put_buffer(&out_buf, "mjpg", 4); - bytestream_put_be32(&out_buf, in->size + 44U); /* field size */ - bytestream_put_be32(&out_buf, in->size + 44U); /* pad field size */ - bytestream_put_be32(&out_buf, 0); /* next ptr */ + bytestream_put_be32(&out_buf, pkt->size + 44U); /* field size */ + bytestream_put_be32(&out_buf, pkt->size + 44U); /* pad field size */ + bytestream_put_be32(&out_buf, 0); /* next ptr */ bytestream_put_be32(&out_buf, dqt); /* quant off */ bytestream_put_be32(&out_buf, dht); /* huff off */ bytestream_put_be32(&out_buf, sof0); /* image off */ bytestream_put_be32(&out_buf, i + 46U); /* scan off */ - bytestream_put_be32(&out_buf, i + 46U + AV_RB16(in->data + i + 2)); /* data off */ - bytestream_put_buffer(&out_buf, in->data + 2, in->size - 2); /* skip already written SOI */ + bytestream_put_be32(&out_buf, i + 46U + AV_RB16(pkt->data + i + 2)); /* data off */ + bytestream_put_buffer(&out_buf, pkt->data + 2, pkt->size - 2); /* skip already written SOI */ - out->size = out_buf - out->data; - av_packet_free(&in); + ff_packet_replace_buffer(pkt, out); return 0; + } case APP1: - if (i + 12U <= in->size && AV_RL32(in->data + i + 8) == AV_RL32("mjpg")) { + if (i + 12U <= pkt->size && AV_RL32(pkt->data + i + 8) == AV_RL32("mjpg")) { av_log(ctx, AV_LOG_ERROR, "bitstream already formatted\n"); - av_packet_move_ref(out, in); - av_packet_free(&in); return 0; } } @@ -90,8 +86,7 @@ static int mjpega_dump_header(AVBSFContext *ctx, AVPacket *out) } av_log(ctx, AV_LOG_ERROR, "No valid SOS marker in bitstream\n"); fail: - av_packet_unref(out); - av_packet_free(&in); + av_packet_unref(pkt); return AVERROR_INVALIDDATA; }