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 E18364CFD8
for <ffmpegdev@gitmailbox.com>; Tue, 15 Apr 2025 22:22:50 +0000 (UTC)
Received: from [127.0.1.1] (localhost [127.0.0.1])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 82AE3687D5E;
Wed, 16 Apr 2025 01:22:48 +0300 (EEST)
Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com
[209.85.210.54])
by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3F58E687D32
for <ffmpeg-devel@ffmpeg.org>; Wed, 16 Apr 2025 01:22:42 +0300 (EEST)
Received: by mail-ot1-f54.google.com with SMTP id
46e09a7af769-72c7332128eso2970782a34.0
for <ffmpeg-devel@ffmpeg.org>; Tue, 15 Apr 2025 15:22:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1744755761; x=1745360561; 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=VbFQ2gxVtAbaFmD1ui5Kt9jS3dwn14E8Vy7BkRp2qEk=;
b=l6QsDBT/kccdaHWgEGZgfVsV+oYW8W2COu0fndoHV8hqZnanbT9Iw6p3oxAnR4XUsV
9MA38+d5eeNrD8wDLwVxKa8+7SNZIDxkHQgj/QS6sDLPiJMNOYHYCzxn4V5uJruC/ctp
0cxH/ntUMSSSgSoOVphmkuHbJSaXKTYjmSb7OeFfJF2xO8f3MlVXAyI3/INo3ktDVmep
3mLVsjonglGTE8piXrSU6HdjKW99GH5WNlVuIi4xvREn08vPqa1cWUYf5yPMBxa7MsWZ
iCtTYox90dUHIco047SQn+cCLC6VOYiOCaARsC0i1XiY4CCoY/8AR6wK4HeE0PoiczD0
Kz9g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1744755761; x=1745360561;
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=VbFQ2gxVtAbaFmD1ui5Kt9jS3dwn14E8Vy7BkRp2qEk=;
b=MDXZEV4JD74NKdSIX6+tNxS6OIkYgwGnGpahKcPApMpYrrW4F8Mq/+LhcfFmScHyh0
0GtRmsLBzoTtfDoI8fYYBd0WVFY1gc/CJUawnkd6DbJwqsR6+GvGhUSMnWFoHYNm1LC/
lloXXOJHNI89fAEflgKhFQbrcChsEMokJfdia6iIXdQmCudBKKothF/pejbApwOjyHRL
0NUXZaChMu5pWb0EcQM7aWe57lPg0JNwkMD4FW7hPEX3AQFUyXiusFdXivFwn/qi+dTL
6IJTEj+WftoIEx+Mz/yRoV6eFQGyQgXO/iQgswUXAXJ3c6d0u4W8il4Sh0hjpQiiqX7R
U+Yg==
X-Gm-Message-State: AOJu0Yx/r2w9BWWJK8Y9yNiibt0nzxCOBnuPcJLjTX31iPlP5ltEFCjl
u2Dn8H/wxESDM6jrzQ30lu1tlRO2VWyKKz75Be0oxBZ5AyWnYWcyEVRaupF9
X-Gm-Gg: ASbGncs9zHl8vXL6HJXadLe4Xe3IGVz+dYvFXcDrTA6I9HEoqdfAn4jsl76UkPBDUU/
ZfC0bwAUaBsoKfXw43zccsTEmsxf3tUbPHcl9OkUDiFI5mAuJ2OC8H3DfgkN0vLS08n4vipsQk8
DdgJF4X/7qXuWdbb7fCXMzAWMGYCMnBXUVZNfmlJjsnJCr0Pa3kTWdu56yLNKRcdKgJD/YSn/l1
TtLNMpkeqXEYCepDapWbCkx1inuNEF8ABr2nnQaOBDnoakJ+3vnpdsN/Mc2CU/2pylUfkWx98ju
rDERUUk6LgT8D+Ag6x4UAC0KZQtz0pVfIMLGtNwAYmtvJg1BapnyygclNd8mn+owYXSQ+Qy+ZkX
QJOjxr3HI7oB7n8SXGzw=
X-Google-Smtp-Source: AGHT+IHi67OJHqmAEpN20YSo2V+TTi9gQnZ2mew4aJ9PhgZv6AVGqVlOOR+BpQGdke4GR8Hn3PnWZw==
X-Received: by 2002:a05:6830:61cb:b0:727:2ff3:e045 with SMTP id
46e09a7af769-72ec1aa3b22mr680335a34.6.1744755760607;
Tue, 15 Apr 2025 15:22:40 -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
46e09a7af769-72e73e4d7edsm2576615a34.47.2025.04.15.15.22.40
(version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256);
Tue, 15 Apr 2025 15:22:40 -0700 (PDT)
From: Romain Beauxis <romain.beauxis@gmail.com>
To: ffmpeg-devel@ffmpeg.org
Date: Tue, 15 Apr 2025 17:22:29 -0500
Message-Id: <20250415222236.78392-2-romain.beauxis@gmail.com>
X-Mailer: git-send-email 2.39.5 (Apple Git-154)
In-Reply-To: <20250415222236.78392-1-romain.beauxis@gmail.com>
References: <20250415222236.78392-1-romain.beauxis@gmail.com>
MIME-Version: 1.0
Subject: [FFmpeg-devel] [PATCH v12 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/20250415222236.78392-2-romain.beauxis@gmail.com/>
List-Archive: <https://master.gitmailbox.com/ffmpegdev/>
List-Post: <mailto:ffmpegdev@gitmailbox.com>
---
libavcodec/decode.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/libavcodec/decode.c b/libavcodec/decode.c
index fca0c7ff58..06d899a9dd 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)
@@ -702,6 +704,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 +723,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;
@@ -788,6 +800,7 @@ fail:
int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
{
AVCodecInternal *avci = avctx->internal;
+ DecodeContext *dc = decode_ctx(avci);
int ret;
if (avci->buffer_frame->buf[0]) {
@@ -810,6 +823,11 @@ int ff_decode_receive_frame(AVCodecContext *avctx, AVFrame *frame)
avctx->frame_num++;
+ 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);
@@ -2220,4 +2238,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".