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 368494C4AD
for <ffmpegdev@gitmailbox.com>; Fri, 4 Apr 2025 21:15:22 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9778F68B745;
Sat, 5 Apr 2025 00:15:05 +0300 (EEST)
Received: from mail-oo1-f43.google.com (mail-oo1-f43.google.com
[209.85.161.43])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3B67E68B5E2
for <ffmpeg-devel@ffmpeg.org>; Sat, 5 Apr 2025 00:14:59 +0300 (EEST)
Received: by mail-oo1-f43.google.com with SMTP id
006d021491bc7-6021e3daeabso1161786eaf.3
for <ffmpeg-devel@ffmpeg.org>; Fri, 04 Apr 2025 14:14:59 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1743801297; x=1744406097; 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=tS4qVpRajqXlnZ0d+T3ma5hSVMte84o+vIYrtw8Tuqs=;
b=czHLg32FD4dai5M4Sws5IhQKin/QwXLopxcBvrSuYeF6652J5HCtyM+DUVjv3VIx6r
FCd48cuaoGoOkZNi/yOxVkzXiXOqGfW/RRjwVyWxNcjKUVSCsg9DwnYmCepxe0TxMx+1
EMwWjl/MjLgPFGjV4lWlBnz9i0EzC2mBUXqY4Ip1u9x3SU/jCGZKd3i7QYDvKYDFp5sw
Kesm0RCyV8amiq9zC29jbRYhoMOZONjhplHgSyt+hlO22mDxmlEvUhRqac5WlYXwq5qr
Pl8HE7IDxnApWC41vSPOM5JxxGRqeE4Qn6Q1rqIy9HuAWVN1AHXYRlPzh1YHmOmFcaE1
B+ug==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1743801297; x=1744406097;
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=tS4qVpRajqXlnZ0d+T3ma5hSVMte84o+vIYrtw8Tuqs=;
b=c/8qF35I7Ii+5V3hQ58AdN6B+Rdcfn0App6tTKl9qo9L1OiP1gS+7R3lnDFJNzgl27
rOHP7qpEaIHKOGJdh0OJqVC5HRbX8ip1aZhcgn9ESk3TGoCOtIUwXQurKwDfDg5TwxK3
YJKn6tKweolBDW+HhcqnRGRI91iIvGC7oveIgHq4xToLBjfyLE6Z4/ET6InPIghe3I2A
fmu0jPArl73lMWSmc89JrTOvgZ+JydB9P8lfP8CXAWSoeyw7fOH46yCtUcsMKFyZ7/aZ
7EQZr2hQG/orLCGunX2w+2Y+x53COb8pbxZY2OEnRHcTZleKYd1Li/QW4qMTBJmlbKyM
dX7A==
X-Gm-Message-State: AOJu0YzaSPbMOY/wqgr2xbYhJkx2Bm0XFPOt2EQH8ypUTlMlfX+U6/aU
NbVbo0bXdp69VF3AhmSOo3foYsBXaLUlxQ/TpnqKifo4gCL6nMlbh/XMxdoo
X-Gm-Gg: ASbGncu8gJhqh/Q+8tsPOsA39DwN9mw6A+lp3ylcHvk9C/XO1fjSWBh7rLR9MxxNxI0
fZOoNpXURMXf0qm0wdzicRKXjz+zy+GFGQLRDSJ4JK9WIC36IYd45l0OWnjWuYdGcm3yF4+2Bxr
HDkT3jc2SvAeFaIM8JAcxTjAxLcJbAS1JAOwcO13W5noFZWBYjtzuaHCQ9p+uUAFALD6yvw+KnV
JrkvRAy+oMgdDmm/ugg5NeF7W+LHRYU4/qviUcqs7Tx3zI7o8SUwQFSghTYf0Xiqdz7u3gNXNLn
gwsctOjhmnWWcZ/Mc0Uu5GSyDuJ8lFeFWe/LfYdsSOOvxHymbL3tkBrMvdwJg8TIftj1wiDazx5
2h+N+e4h56KRu
X-Google-Smtp-Source: AGHT+IGEnDoy6jPIe8wd3oDTrCLUhi2f/Rnntsu1HK9MH+l01Ej+pd5LKqlYjBrrwoFCRo+VhvejMg==
X-Received: by 2002:a05:6820:1999:b0:603:f777:97fe with SMTP id
006d021491bc7-6041fc79b58mr480932eaf.0.1743801297224;
Fri, 04 Apr 2025 14:14:57 -0700 (PDT)
Received: from mac.lan (ip72-211-125-114.no.no.cox.net. [72.211.125.114])
by smtp.gmail.com with ESMTPSA id
006d021491bc7-6040c4ea9e1sm788661eaf.17.2025.04.04.14.14.56
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Fri, 04 Apr 2025 14:14:56 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Fri, 4 Apr 2025 16:14:44 -0500
Message-Id: <20250404211451.91394-2-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250404211451.91394-1-romain.beauxis@gmail.com>
References: <20250404211451.91394-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v11 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/20250404211451.91394-2-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavcodec/decode.c | 130 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 130 insertions(+)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index fca0c7ff58..39d054bdea 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;
@@ -702,6 +809,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))
@@ -719,6 +828,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;
@@ -788,6 +905,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]) {
@@ -810,6 +929,16 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
avctx->frame_num++;
+ 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);
@@ -2220,4 +2349,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".