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 8716E49971
for <ffmpegdev@gitmailbox.com>; Mon, 24 Mar 2025 14:51:31 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5515D687B79;
Mon, 24 Mar 2025 16:51:27 +0200 (EET)
Received: from mail-oi1-f173.google.com (mail-oi1-f173.google.com
[209.85.167.173])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EA0AC687B52
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 16:51:20 +0200 (EET)
Received: by mail-oi1-f173.google.com with SMTP id
5614622812f47-3f546cbf71cso2633323b6e.0
for <ffmpeg-devel@ffmpeg.org>; Mon, 24 Mar 2025 07:51:20 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1742827878; x=1743432678; darn=ffmpeg.org;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:from:to:cc:subject:date
:message-id:reply-to;
bh=oDy+QvIlyEWscmB7coxP1CKfwyShopFw1Tn6bPsRCQo=;
b=dYS+vOkvNDlGBA7bTe4paA1oJQ7dqLDgP59Y5UijuLJY4SIYaYowuxVUMuMAy7E4OQ
Ir/Z+kyLDXXbDZlVy3KtRi4yd6U8kbIyubeuGZ9TEdOgvf4Esw5vRfVZ7tj9S3rbfQrt
bnueyzsbCOU5ycnjkge7yYM74fP+7RQ1HRQ6Zi/r0lVl2AgwkFEkp66VtGpphQo9F9p4
WAvZZiujmNWpd3NBkfRRV08X0dDdaqKw1SWCDyfa01VtZXZDG6RdTe3uf/u6f7xP83ot
V3mczE1wO5kjERYlq1FGo1XADFNfhrDTA6pnZqW5QqH1BCBLSWfEaan/zuIx2FVJN5F/
I5hA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1742827878; x=1743432678;
h=content-transfer-encoding:mime-version:references:in-reply-to
:message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc
:subject:date:message-id:reply-to;
bh=oDy+QvIlyEWscmB7coxP1CKfwyShopFw1Tn6bPsRCQo=;
b=LOhw0RubB7QM95XaWC87KUL8BjBsXwNR/HhClZ5fXEqY+2+3rsowbH4T9T6Gj1r1LY
7AJN/PcOgYinjGLZyDNEzh7qpQUlxlHAssApS9TjQDIh6+2g6VRQF6pZ6CYqcG/mwolK
v9n1ZdRbZ1YoMLbcMNP1yN6QSfBlMgLKvHcjq00pbmLb7rOyLC2s9EqcZiawRLa1ynoz
L0/dj+kQxo41bAESEibzOgUtfVtLfls8meRQpJiW0X+g2RVYfYBWqHAbL4DkNF7QNNXc
TWQj7poilWpeX23P0Aed8BHKhin6BTuYxjGMXw3xgPEuk55ulz1ckiMBklv4b9PumDdi
GNug==
X-Gm-Message-State: AOJu0Yx5eo1mVRIJ8UyzFmLJ0hgcbIPe3ezrk0FJiJT3QQXQOuVkCdyB
2X2WNoDZbFjzzENFe/9FFLMoCuIvnoB8KMishpIQWBrO2z3DIDpzeakQ0wsH
X-Gm-Gg: ASbGncsC6MDco7IgtUjCW5iBw15uoOFuBybrhzoNP4k6VKsLH9ywUOKhN205Lngr2Gg
gj+bOnCBAl0IME/t/ge5lAv4ni9BI0hHpKHZDohhbcXOBSVpMjYK45a43Ptk3tH/9tcj5f22Cg/
iU4Cx8r45mXdlLjgWEZLeIEQM2atv6kbxL6b5JhSyxcwnDm+Mxajv4Xn7V3+n5qvZcA+7UyBRKF
mf2gi2e0xS0WKi/ZRhfXYNwlfGJuQaKJqYDk7M43OX9vZLHs+7qh7HJsXi2x5EgW2oI9wxIqNXv
O+fJjBTUiOxMIgGtrAo5+FnQ1mTbGm9wXQADvjhGDOhDVZMbHmcXBE6NzTbxwOGPnhNohldFrIf
aC+y8TrS1
X-Google-Smtp-Source: AGHT+IHQ1yb9TDDTjW68AtYs9pv8LSGOzNrySsh1Lr3EJO6GzVmgHr5KP+Qd4za9TY81DWr4KDO8TA==
X-Received: by 2002:a05:6808:158e:b0:3fe:aeaf:26a5 with SMTP id
5614622812f47-3febf788226mr7557274b6e.31.1742827878279;
Mon, 24 Mar 2025 07:51:18 -0700 (PDT)
Received: from localhost.localdomain ([2607:fb90:e335:ccc9:113:6fea:db60:5cff])
by smtp.gmail.com with ESMTPSA id
5614622812f47-3febf6e956fsm1612030b6e.16.2025.03.24.07.51.15
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Mon, 24 Mar 2025 07:51:16 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Mon, 24 Mar 2025 09:50:52 -0500
Message-Id: <20250324145059.16593-2-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250324145059.16593-1-romain.beauxis@gmail.com>
References: <20250324145059.16593-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v9 1/8] libavcodec/decode.c: intercept
`AV_PKT_DATA_METADATA_UPDATE` packet extra data,
attach them to the next decoded frame with the same PTS.
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>
Cc: Romain Beauxis <romain.beauxis@gmail.com>
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/20250324145059.16593-2-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavcodec/decode.c | 131 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 131 insertions(+)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index 2a0d8152a6..10eefe7ad9 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -39,6 +39,7 @@
#include "libavutil/mastering_display_metadata.h"
#include "libavutil/mem.h"
#include "libavutil/stereo3d.h"
+#include "libavutil/tree.h"
#include "avcodec.h"
#include "avcodec_internal.h"
@@ -97,8 +98,114 @@ typedef struct DecodeContext {
int lcevc_frame;
int width;
int height;
+
+ struct AVTreeNode *pending_metadata;
} DecodeContext;
+typedef struct PendingMetadata {
+ int64_t pts;
+ uint8_t *data;
+ size_t size;
+} PendingMetadata;
+
+static int compare_pending_metadata(const void *left, const void *right)
+{
+ PendingMetadata *left_packet = (PendingMetadata *)left;
+ PendingMetadata *right_packet = (PendingMetadata *)right;
+
+ if (left_packet->pts == right_packet->pts)
+ return 0;
+ if (left_packet->pts < right_packet->pts)
+ return -1;
+ return 1;
+}
+
+static int insert_pending_metadata(struct AVTreeNode **pending_metadata,
+ int64_t pts, const uint8_t *data,
+ size_t size)
+{
+ struct AVTreeNode *next = NULL;
+ PendingMetadata *pending = NULL;
+ PendingMetadata *ret;
+
+ next = av_tree_node_alloc();
+ if (!next)
+ goto fail;
+
+ pending = av_malloc(sizeof(PendingMetadata));
+ if (!pending)
+ goto fail;
+
+ pending->pts = pts;
+ pending->data = av_malloc(size);
+ pending->size = size;
+
+ if (!pending->data)
+ goto fail;
+
+ memcpy(pending->data, data, size);
+
+ ret = av_tree_insert(pending_metadata, pending, compare_pending_metadata,
+ &next);
+
+ // If node alrady exist, we update with the latest value.
+ if (ret && ret != pending) {
+ av_free(ret->data);
+ ret->data = pending->data;
+ ret->size = pending->size;
+ av_free(next);
+ av_free(pending);
+ }
+
+ return 0;
+
+fail:
+ if (pending && pending->data)
+ av_free(pending->data);
+ av_free(pending);
+ av_free(next);
+ return AVERROR(ENOMEM);
+}
+
+static void remove_pending_metadata(struct AVTreeNode **pending_metadata,
+ PendingMetadata *pending)
+{
+ struct AVTreeNode *next = NULL;
+
+ av_tree_insert(pending_metadata, pending, compare_pending_metadata,
+ &next);
+
+ av_free(pending->data);
+ av_free(pending);
+ av_free(next);
+}
+
+static int free_pending_entry(void *opaque, void *pending)
+{
+ av_free(((PendingMetadata *)pending)->data);
+ av_free(pending);
+ return 0;
+}
+
+static void free_pending_metadata(struct AVTreeNode **pending_metadata)
+{
+ av_tree_enumerate(*pending_metadata, NULL, NULL, free_pending_entry);
+
+ av_tree_destroy(*pending_metadata);
+ *pending_metadata = NULL;
+}
+
+static PendingMetadata *find_pending_metadata(
+ struct AVTreeNode *pending_metadata, int64_t pts)
+{
+ PendingMetadata pending;
+
+ pending.pts = pts;
+
+ return av_tree_find(pending_metadata, &pending, compare_pending_metadata,
+ NULL);
+}
+
static DecodeContext *decode_ctx(AVCodecInternal *avci)
{
return (DecodeContext *)avci;
@@ -729,6 +836,8 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke
{
AVCodecInternal *avci = avctx->internal;
DecodeContext *dc = decode_ctx(avci);
+ const uint8_t *side_metadata;
+ size_t size;
int ret;
if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec))
@@ -746,6 +855,14 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke
ret = av_packet_ref(avci->buffer_pkt, avpkt);
if (ret < 0)
return ret;
+
+ side_metadata = av_packet_get_side_data(avpkt, AV_PKT_DATA_METADATA_UPDATE, &size);
+ if (avpkt->pts != AV_NOPTS_VALUE && side_metadata) {
+ ret = insert_pending_metadata(&dc->pending_metadata, avpkt->pts,
+ side_metadata, size);
+ if (ret < 0)
+ return ret;
+ }
} else
dc->draining_started = 1;
@@ -815,6 +932,8 @@ fail:
int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
{
AVCodecInternal *avci = avctx->internal;
+ DecodeContext *dc = decode_ctx(avci);
+ PendingMetadata *pending;
int ret;
if (avci->buffer_frame->buf[0]) {
@@ -884,6 +1003,17 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
}
}
#endif
+
+ if (frame->pts != AV_NOPTS_VALUE) {
+ pending = find_pending_metadata(dc->pending_metadata, frame->pts);
+ if (pending) {
+ ret = av_packet_unpack_dictionary(pending->data, pending->size,
+ &frame->metadata);
+ remove_pending_metadata(&dc->pending_metadata, pending);
+ if (ret) goto fail;
+ }
+ }
+
return 0;
fail:
av_frame_unref(frame);
@@ -2320,4 +2450,5 @@ void ff_decode_internal_uninit(AVCodecContext *avctx)
DecodeContext *dc = decode_ctx(avci);
av_refstruct_unref(&dc->lcevc);
+ free_pending_metadata(&dc->pending_metadata);
}
--
2.39.5 (Apple Git-154)
_______________________________________________
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".