From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <ffmpeg-devel-bounces@ffmpeg.org>
Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100])
by master.gitmailbox.com (Postfix) with ESMTPS id C07454C03F
for <ffmpegdev@gitmailbox.com>; Fri, 2 May 2025 01:44:52 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 771D268B459;
Fri, 2 May 2025 04:44:40 +0300 (EEST)
Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com
[209.85.214.169])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC265687BF2
for <ffmpeg-devel@ffmpeg.org>; Fri, 2 May 2025 04:44:32 +0300 (EEST)
Received: by mail-pl1-f169.google.com with SMTP id
d9443c01a7336-22435603572so17930645ad.1
for <ffmpeg-devel@ffmpeg.org>; Thu, 01 May 2025 18:44:32 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1746150271; x=1746755071; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:from:to:cc:subject:date:message-id
:reply-to; bh=brZOUD18XP7wB9cVSTpO6ti7J7PQwA7DYLEsIVgO/TY=;
b=WfEk+6JPy6rwJyMddICj1rLpCF7L/UxLpdBJopgfHkdB1TCa8pMr8ET6bPIgAYbDxJ
NGJfsBRtefffCAVjhEvacXVN88H1Kd4AP+6VhqFiTt41qs7pdolbKi5h9gsrWoagvwYt
uG7z711i1m94KZA6CXwZxJk7n124ArQZ6n13rg8iWG3oI4Cr7X34/PHDlv/9IKpD04nE
PutBnEOVdAWIHjn5V4rBwRCn0BBRAQKTgUB/t49z7JGMtvqi+BmuoZBUVUW1bYvzu4jX
WoJOytreKJ9xkX77bgq4jV5dURWq2RFmrjo5qIzO8rKRycZlkxUSsgdd//e2mDXGDuxO
+Hcg==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1746150271; x=1746755071;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=brZOUD18XP7wB9cVSTpO6ti7J7PQwA7DYLEsIVgO/TY=;
b=JFJ6+AFjOxmTKBDUCFy836lRpi1VMn8xxr1Pxy+UEIQukDl4L5LaPoqDaVh6jTWcIM
iG9MZttydbdmWZ4W7JOkk5yCieHSvTYfQ1nkW+iPSyukTy0/K2mAIjhepeEiTckITxHx
On2rgskw5AMPAWs7KQ649CgCRhTjYgzbYKqzsmpT+5kRfxM7/uDAAIpJl2xkOnj0eDHz
oLEiIe8XdKzUPPIAYAEdAFMm/aeYU0O90V1CwegUIxxDIkDC6u0oHYYXhEm3bhnt6F2i
d9Dzu1neF4Vxx7XuLouVD2eAUefz5XM/dmgLnTtCw2N1a7BMEFE5XOUEZL4l5eGVoldo
CyKg==
X-Gm-Message-State: AOJu0YyzFBwFJJuuOv1jSRXLZi2XoxlGtM5AA+z0Nus4cdSCDGkmIs2C
1e62OH+mYqNqVeAyTKiDy1wT9m6cF0f0yD7DcAI01kt9Z5gyo0GiFMUDKg==
X-Gm-Gg: ASbGnctQaucSBfR3si48Iq6NjfEVIByAZx2TdLVXnB4t5eO3Lxy0eO/ehv2gWfLgzxA
yfm8nGvGdc7466t+M8dA43MRPIbtksZSKvlWtSQbopJ9PrAWWBE/hcoMQSX2ghJ23HLhdNKGV1B
OII+wjsCzZql8HZXPvho0CvF9bO7Hb6RZSqVHWiFssi68fp9dO9bUOSqRpHddghT6iEL8qKTxqP
W6semuGL4zFdjCUMMYcG+Kun4V/7sFDexphx2kJD/BiHDtQZVFhwmm+PNyq6FLSRKAsOxSJVHZU
isa4LKnjIkia6mN8tFTqScLpjxhwDjcSJBj7ia+fLliTdsxOhXrCcv3EFQ==
X-Google-Smtp-Source: AGHT+IG4t0V8n/40z9DclFlAyphXgg9UPstE5JZZ50mYEkj28ulW/DQBh3OFCyOUIVaAJJ9VzRm0/Q==
X-Received: by 2002:a17:903:11ce:b0:224:216e:3342 with SMTP id
d9443c01a7336-22e103a96f4mr16597215ad.43.1746150270714;
Thu, 01 May 2025 18:44:30 -0700 (PDT)
Received: from localhost.localdomain ([2800:2121:b000:82e:158:550d:a133:719f])
by smtp.gmail.com with ESMTPSA id
d9443c01a7336-22e108fb924sm3086715ad.140.2025.05.01.18.44.29
for <ffmpeg-devel@ffmpeg.org>
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 01 May 2025 18:44:30 -0700 (PDT)
From: James Almer <jamrial@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Thu, 1 May 2025 22:44:14 -0300
Message-ID: <20250502014414.3404-2-jamrial@gmail.com>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250502014414.3404-1-jamrial@gmail.com>
References: <20250502014414.3404-1-jamrial@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/apv_parser: use ff_cbs_read_buf()
X-BeenThere: ffmpeg-devel@ffmpeg.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: FFmpeg development discussions and patches <ffmpeg-devel.ffmpeg.org>
List-Unsubscribe: <https://ffmpeg.org/mailman/options/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=unsubscribe>
List-Archive: <https://ffmpeg.org/pipermail/ffmpeg-devel>
List-Post: <mailto:ffmpeg-devel@ffmpeg.org>
List-Help: <mailto:ffmpeg-devel-request@ffmpeg.org?subject=help>
List-Subscribe: <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>,
<mailto:ffmpeg-devel-request@ffmpeg.org?subject=subscribe>
Reply-To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: ffmpeg-devel-bounces@ffmpeg.org
Sender: "ffmpeg-devel" <ffmpeg-devel-bounces@ffmpeg.org>
Archived-At: <https://master.gitmailbox.com/ffmpegdev/20250502014414.3404-2-jamrial@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
Removes an unecessary data copying.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavcodec/apv_parser.c | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/libavcodec/apv_parser.c b/libavcodec/apv_parser.c
index bd1894146c..25b80285a5 100644
--- a/libavcodec/apv_parser.c
+++ b/libavcodec/apv_parser.c
@@ -16,6 +16,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include "libavutil/avassert.h"
+#include "libavutil/buffer.h"
+
#include "avcodec.h"
#include "apv.h"
#include "cbs.h"
@@ -34,6 +37,11 @@ static const enum AVPixelFormat apv_format_table[5][5] = {
{ AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA444P10, AV_PIX_FMT_YUVA444P12, AV_PIX_FMT_GRAY14, AV_PIX_FMT_YUVA444P16 },
};
+static void dummy_free(void *opaque, uint8_t *data)
+{
+ av_assert0(opaque == data);
+}
+
static int parse(AVCodecParserContext *s,
AVCodecContext *avctx,
const uint8_t **poutbuf, int *poutbuf_size,
@@ -41,6 +49,7 @@ static int parse(AVCodecParserContext *s,
{
APVParseContext *p = s->priv_data;
CodedBitstreamFragment *au = &p->au;
+ AVBufferRef *ref = NULL;
int ret;
*poutbuf = buf;
@@ -48,7 +57,12 @@ static int parse(AVCodecParserContext *s,
p->cbc->log_ctx = avctx;
- ret = ff_cbs_read(p->cbc, au, buf, buf_size);
+ ref = av_buffer_create((uint8_t *)buf, buf_size, dummy_free,
+ (void *)buf, AV_BUFFER_FLAG_READONLY);
+ if (!ref)
+ goto end;
+
+ ret = ff_cbs_read_buf(p->cbc, au, ref);
if (ret < 0) {
av_log(avctx, AV_LOG_ERROR, "Failed to parse access unit.\n");
goto end;
@@ -92,6 +106,9 @@ static int parse(AVCodecParserContext *s,
end:
ff_cbs_fragment_reset(au);
+ if (ref)
+ av_assert1(av_buffer_get_ref_count(ref) == 1);
+ av_buffer_unref(&ref);
p->cbc->log_ctx = NULL;
return buf_size;
--
2.49.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".