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 7E83C4E46E
for <ffmpegdev@gitmailbox.com>; Tue, 11 Mar 2025 16:55:44 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 61CDF68E113;
Tue, 11 Mar 2025 18:55:37 +0200 (EET)
Received: from mail-yw1-f175.google.com (mail-yw1-f175.google.com
[209.85.128.175])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38DA368E192
for <ffmpeg-devel@ffmpeg.org>; Tue, 11 Mar 2025 18:55:23 +0200 (EET)
Received: by mail-yw1-f175.google.com with SMTP id
00721157ae682-6fedefb1c9cso23453857b3.0
for <ffmpeg-devel@ffmpeg.org>; Tue, 11 Mar 2025 09:55:23 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741712121; x=1742316921; 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=xWcAbjOHUbWUzY/mqrGN9uyqlTNA1z7JbYH6lXQ6aDo=;
b=Q5cxa14xRquiCDOwp4pn/4ut4d8r9b8jyLOElA9Ffb8ir0RIe6q1sgSIcONnlWqUSK
Wd4L/zeKG35DdqDAmb7wBmjR4W1wAGDebdgfjEClFG7T24fGwpXlBGD55mFESNkG2I3t
YNnnjbZc/NdQflhYeO1E8JvAzTFVCFLn/XAYNn7YVBlLX5FX3OgJZAkf2oLS9267MwUK
lCaixsLBbsSTEVy6ehhUUkDylU43iFNdeCodhvCLyIN7xmQ1vLyPSDeAKHedgMq2XJJ+
8o/zgHpB0AoafkAHjYW2uTv9w7G//BeA2Tm5xk6BCk37LGSy8meZsKnNptE9is2+oewV
5CpQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741712121; x=1742316921;
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=xWcAbjOHUbWUzY/mqrGN9uyqlTNA1z7JbYH6lXQ6aDo=;
b=kT1Ds7/SBdaAq0Y06LlCTwyGTPMvz+RiU+UoFzj+ulJ3TYlbaPZQcfbExMZ2Y2b3IQ
jP4XmazylyX3T8jhfwwi1agUmzRkQeEh4mTXZH8uoakhDrywpyjrsMStU5Bv4TOpTr1y
wmOFPk2yT2o2mUHJNSbJzNX6i2U6BWhNyXTnNM4IqMTim6bFI4M1XqKUGp8vNmNkEeGm
MdZlB8Z+alMHOMPAMOBC3kG5P3EOd2iM2Aon2c+ie9aQZ5f0axwFnD9pd/vvETWbDGbN
na6rNM+KqeffWwY/jWQYzwpa1+F0I0wVzd1xg6pZBzqYWwnpFkFcd1tv2PxFZ/U5aWJ4
tW3g==
X-Gm-Message-State: AOJu0Yz6jYe6SUyswk7rc6brso42N1fWmRgXGWMYRXrryRdVCfGlo+P2
8xZCowAg3lxu7VSavHZyxe2luvQNQNTHJE5j55aqcfdNCcPBSggtEcKtaTqM
X-Gm-Gg: ASbGncv7oU5deKbmTI79eSHekxjKqp/2+iNFoFkgAZOyCmTO0phjW3YUzmLfcMJnIDo
WDr+qRTtj89p6BmAOPy8uyK8HdEadaPQXy8mop5tkpTkqXO0o9bpOKMldtYtfQmiYiLdN+1uxWx
EuLB8IQGnDjVetCJS5K0f/FJ3jtmh3Lv3eyFNo0ich5FYr8W2FWGbNg7e83SyrqBzfyG+jk6vfz
09Qd2GL6i99e4Wj/7brNLXq2F+vdyX4+KUoIjg3H4DbLJNjgYALzSu8F1kn/t6T9Md+vMsaYv7c
ZkFM92IiTtQqeLvbi/XGSRi25SyzK8dIkDAQ0UaJ1ka8KU4EsRwwTR33i2flzlBBT1ijGeW/PCj
dNlKlSINl83CToRjfzq8=
X-Google-Smtp-Source: AGHT+IGakNErt8PZ6IcoiVLtR5gx/JFFOz1JQogE7DuYhVJ/MKaY9P301n2Vpozx/6xeC9jittKztw==
X-Received: by 2002:a05:690c:6f12:b0:6fd:42c8:3c6a with SMTP id
00721157ae682-6febf3dfa4bmr249202737b3.34.1741712121346;
Tue, 11 Mar 2025 09:55:21 -0700 (PDT)
Received: from localhost.localdomain ([2607:fb90:ee62:1559:4ce8:9cd:68c0:bf98])
by smtp.gmail.com with ESMTPSA id
00721157ae682-6feb2c64b57sm27544217b3.119.2025.03.11.09.55.20
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Tue, 11 Mar 2025 09:55:20 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 11 Mar 2025 11:55:06 -0500
Message-Id: <20250311165513.17834-2-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250311165513.17834-1-romain.beauxis@gmail.com>
References: <20250311165513.17834-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v8 1/8] libavcodec/decode.c: intercept
`AV_PKT_DATA_METADATA_UPDATE` packet extra data,
attach them to the next decoded frame.
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/20250311165513.17834-2-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavcodec/decode.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index c5a577f4f1..8907e4e5a2 100644
--- a/libavcodec/decode.c
+++ b/libavcodec/decode.c
@@ -97,6 +97,8 @@ typedef struct DecodeContext {
int lcevc_frame;
int width;
int height;
+
+ AVDictionary *pending_metadata;
} DecodeContext;
static DecodeContext *decode_ctx(AVCodecInternal *avci)
@@ -729,6 +731,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 +750,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 (side_metadata) {
+ av_dict_free(&dc->pending_metadata);
+ ret = av_packet_unpack_dictionary(side_metadata, size, &dc->pending_metadata);
+ if (ret < 0)
+ return ret;
+ }
} else
dc->draining_started = 1;
@@ -815,6 +827,7 @@ fail:
int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
{
AVCodecInternal *avci = avctx->internal;
+ DecodeContext *dc = decode_ctx(avci);
int ret;
if (!avcodec_is_open(avctx) || !av_codec_is_decoder(avctx->codec))
@@ -887,6 +900,12 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
}
}
#endif
+
+ if (dc->pending_metadata) {
+ av_dict_copy(&frame->metadata, dc->pending_metadata, AV_DICT_APPEND);
+ av_dict_free(&dc->pending_metadata);
+ }
+
return 0;
fail:
av_frame_unref(frame);
@@ -2323,4 +2342,5 @@ void ff_decode_internal_uninit(AVCodecContext *avctx)
DecodeContext *dc = decode_ctx(avci);
av_refstruct_unref(&dc->lcevc);
+ av_dict_free(&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".