From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 08F2F4D124 for ; Mon, 17 Feb 2025 16:19:55 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 9233468B379; Mon, 17 Feb 2025 18:19:40 +0200 (EET) Received: from mail-yw1-f176.google.com (mail-yw1-f176.google.com [209.85.128.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 35B6C68B379 for ; Mon, 17 Feb 2025 18:19:34 +0200 (EET) Received: by mail-yw1-f176.google.com with SMTP id 00721157ae682-6f678a27787so38641137b3.1 for ; Mon, 17 Feb 2025 08:19:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739809172; x=1740413972; 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=cAPQcrilHvN473WVZTnDsexGDEfophti5HoDJgRdb2I=; b=njTtQ+mAv76W54RsUoLnjT1apSNB9yPiV1GGifkiiMvfe2UfPP1SWQwW/E5CgRZahT UgMl+rLPQGWem4rWbD+CAla02c2ZaI6fbw+LvDfTQrouWLcis48wbnlJjkcXzNH1J1Ap XtGNcogi/fR8hNNkxCn77Wy1IL3LzMpwlRDAfqZN8D60YOuBgDWyFYGtqHh14BrVkij4 dDMyTpCE+1Xc0lbJv6OkWw36ynPEdwHmjhiZMxqk3pmMNecd7XHvIOM3wM+InNckpRth CGTnpO2WrfGkAC8wuVMj8dYF0POPqBKPOvFtzcrUIxbJsKpc/ysGB0wsfCN9de7i2zdT 52FA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739809172; x=1740413972; 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=cAPQcrilHvN473WVZTnDsexGDEfophti5HoDJgRdb2I=; b=RHtxb64AQ/zpJkYgkIA1FfDAxt+QTgNr/8HzzguMOqtgLMa2O3IXS9WUDBjWWNv1wl qex7oZJSL7/QO4YjuEBUDyrBdVnv3ols+mLAF8GRV0Pcra8FbgCBG/ssbRzAMiXSbvt1 3YvnpAcgIjn9Ic5ODePrQBYjhDC7krtE+Me55HPbaYUHq4FTQVrhQSTGZB0vZyAnK91x /EnFlgw7KEytJ62J1LSIBANIScXGgcOaGiYUCaX6lsaBo2CMqZrc36A2v7uNZtLg1YGk M8eb007iNN/6fmKNxrHLIfib2BB/PcISUqTFv+oXsfosYhpjEq6WZqXBZpS3khGmQVLU 48lA== X-Gm-Message-State: AOJu0YxErNkGF4WmcC4tJ3cBMpsL0IgI7c/reFSO0sUWrJDSIMXqDZ+h b0YgLLtldBQDIo8pPouYTNRx2pocuXqPJzAkTN0zbpCIJEvoDEYR2KVSiA== X-Gm-Gg: ASbGncsXepKxiYVpzUUuWltDeb1ntqmAhIfXMEy1lgm0SQOT1OTDDW4DwwaQHqTNNiq uUlnYP458aWaRkoeDQwPKoQ0xlB9bC5B9fG0PB/ezdeYJuy5OWcAtJRLiomFiRH+ciuNvQi2dDa Xy6WiTjXL9IqC8gU0KsflIHj+duTpy7xiRqt21Qa7cdOca40YLwkIjPDCvUYIEI3Uds40Cg0gEg X0fS0MQxD61C/71OsGy+7KjF/9EtHNYvLdIfRoTUACtcY4f6rvJOBN9Vdhh1yRjuIP+stp6lSo+ Vd6kOTCQAwIdFIXnubF3XndJVYXTgB0Fxq2fTs6Or+/kBj7uGFZUBA== X-Google-Smtp-Source: AGHT+IG0XiDbJ2KwDAUVj07Fx1WZt0yHjMi7/hQ1LnMqDxb1KyBzIEgRKHzKXpga4zzLTwtTEjL/cw== X-Received: by 2002:a05:690c:4b01:b0:6f0:237e:fc4c with SMTP id 00721157ae682-6fb5828c566mr84024247b3.12.1739809172207; Mon, 17 Feb 2025 08:19:32 -0800 (PST) Received: from localhost.localdomain ([2607:fb91:fef:2a0c:58ec:790:2715:af11]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fb3605b553sm21488177b3.30.2025.02.17.08.19.30 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 17 Feb 2025 08:19:31 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Mon, 17 Feb 2025 10:19:16 -0600 Message-Id: <20250217161921.76121-2-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250217161921.76121-1-romain.beauxis@gmail.com> References: <20250217161921.76121-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 1/6] libavcodec: Add generic metadata injection using AV_PKT_DATA_METADATA_UPDATE X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Romain Beauxis Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: libavcodec/decode.c: intercept `AV_PKT_DATA_METADATA_UPDATE` packet extra data, attach them to the next decoded frame. The metadata needs to be cached because there is no guarantee that each packet will generate a decoded frame immediately. `AV_PKT_DATA_METADATA_UPDATE` does not seem used in `libavcodec` at the moment so regression risks seem low. This generic mechanism could be reused to support more in-band metadata update in the future. --- libavcodec/decode.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index cac7e620d2..96e2f0ce95 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); @@ -2314,4 +2333,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".