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 EDEEA4CDA7 for ; Tue, 25 Feb 2025 22:02:05 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AE7C168CAF5; Wed, 26 Feb 2025 00:01:55 +0200 (EET) Received: from mail-yw1-f172.google.com (mail-yw1-f172.google.com [209.85.128.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CFCC68CA58 for ; Wed, 26 Feb 2025 00:01:49 +0200 (EET) Received: by mail-yw1-f172.google.com with SMTP id 00721157ae682-6f47ed1f40dso44281757b3.1 for ; Tue, 25 Feb 2025 14:01:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740520907; x=1741125707; 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=Mn+2MaStuLfSh9Nx7QNAkBIm0USMNkH8saLu3ZiI+Vg=; b=R7mhXAuCoan9jHXbabiykFygDM+RwZ+pmrtTR0+0NiTBwRcErcq383gSTFcDz81DMp /d9mHfJzgU9mly1Xv02Ar6y57f+LqZEoSIP7J0crjyh1A8p+LbqHrC6udTqLYkvmd8wp S0ZZ6hCfJDQMHy6VOsrEXYcv22rxFH3pNpEPB3aNMdo5215yUa5haMCiX03+9N+NpmnI Tp6S4/+yKhbszVb6JjUvzlRBaIv6+Uuw9gioR6ReuX1vqWBfSYHezAKGS3tPlI8TgYuC v8NEM6e/1Tz9pD3FWdDSxUquNh2jNvspzPQaJNLjU7kN4eRc0d7Gj4u2tXlsmvUFcaZq gQPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740520907; x=1741125707; 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=Mn+2MaStuLfSh9Nx7QNAkBIm0USMNkH8saLu3ZiI+Vg=; b=NVb1LAAO2QEQ2qTXz1yUbXzz6tASBj4lIZpxVpxzi97UqivTI9sypZryIR0dV9LUDh WRjVUQFbhhNn1Ecx2/Nlb4J7MxxkSpPe8GDbh5PBErzgSWTUSwotu9RkDJzkphZykZat htg+bWQJ5Ap9WFq8lg4NwpnodnoYkK8sibTeb5soi/davFrQxN8U2IVJGPXxVmcQam4B zIngRfLPR8mOe5YW0/Dc39DtLmqgJ4BfWhLxpguXhGj7e3DIasGYaqE+xZf5IX/MHohw 4OZZ3voX9yxtdEst9uJP/9JCHVqMIVX8hWqGaoQa8l1XForqA5ps+mUXRBU8rQB4OJYl NAoQ== X-Gm-Message-State: AOJu0YxPqKH1XxLERjTqtciuZn7JkZqKa7n/9UxRzXJ/MfVMNaN0fCLs 7Y7hFUozW1LENpwGY/3N2cnnqzj0ZAiYy4o79L0lQGMSuKHG4G8xr21ynQRs X-Gm-Gg: ASbGncsLSDoBrcKreh6AE5jIRmTBNGxUfv+5lRlcYiarzBSfcwsT+T6bD2xUx8C3aL8 QGTBuNfmq8Ux2pjyJ58GGCe2MH16JRHzqN/zmE/nVycEYnMWzlLSsud8jLbuPKq55N3pDyG8Fgo megafPefQfZUEZlTn+rYh3+4dWFqogMfRUTp+mZnbOySw8sWCsBj1mU8IdMJ686th84TTbjXUBl /kPMaoX6QzgG+7ADzJarM7k6v44fSrQR5eru6eZuoBZEdO+RtnuU/EmuiPqzf2pPQZxq6cTxcM2 eZea4QOvZlahgWQ4qI9kVpcNvl6qqMX4rx2hsDIg7WVV5d8fdQca6QU1SPieLbn0bd0= X-Google-Smtp-Source: AGHT+IEXzn0rDpFenzDnDfxAdqkuqOkYTO1uVwv2upyB7d2RPfW3fXOUZ+40hY8/3eADfjXIGT3C9w== X-Received: by 2002:a05:690c:7203:b0:6fb:8e5b:bd16 with SMTP id 00721157ae682-6fbcc817a0bmr158810907b3.25.1740520907062; Tue, 25 Feb 2025 14:01:47 -0800 (PST) Received: from localhost.localdomain ([2607:fb90:e333:5b39:2036:1eaa:d627:4a51]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fd117dd70csm6487767b3.83.2025.02.25.14.01.46 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Feb 2025 14:01:46 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 25 Feb 2025 16:01:14 -0600 Message-Id: <20250225220121.98449-2-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250225220121.98449-1-romain.beauxis@gmail.com> References: <20250225220121.98449-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 1/8] 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. --- 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".