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 E13264D260 for ; Wed, 19 Feb 2025 05:25:17 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1993A68C054; Wed, 19 Feb 2025 07:25:05 +0200 (EET) Received: from mail-yw1-f179.google.com (mail-yw1-f179.google.com [209.85.128.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7B10868BDB0 for ; Wed, 19 Feb 2025 07:24:58 +0200 (EET) Received: by mail-yw1-f179.google.com with SMTP id 00721157ae682-6fb3a611afdso43455947b3.0 for ; Tue, 18 Feb 2025 21:24:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1739942696; x=1740547496; 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=fJXVUceUeUdPqCWET0CDgOPRfzE5yD3ablmVrypg6qk=; b=XgDWIBj2oW9ap2Xt0Kz4fPUaqHr+IB1+hJQRWiYB2BI91e5U+fhonbTgQCpfR1ZD3u LGeMKJFuWkL2+lV0+4ra51369Kk0llYa+OjUIIhz6pvx9G6tgt53K+bZ1OQrxYrn9twI yNtfk5s1wSVpxwlk6pAEMJcT98VPIYvtyqFDNbgSeNp6ZS/f//t/1KbK12O3YjXKfBNV YhVCHz10go1QRxQjrjm4n1t5HNuiNolGCvJpL+CRyBuAegd2Nmh7jRLVe4BWGKbXnp8a 7MRKcmgsX/hc4inK4IjLphjj33wxi0qWiMy2vRxuGBJngKQLnk57m/IQGe20j/NKoOic RqQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739942696; x=1740547496; 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=fJXVUceUeUdPqCWET0CDgOPRfzE5yD3ablmVrypg6qk=; b=pKSm/zpUesKvAleVIp/ibIIWJZnURoA5Hzopd8QEfcCRxhhTlVg1FGtSiEPQ1jpUUb P4fXZzx56Px1rf8ET9ucDdbIHcgZ1vMVd081eyFuFKriBPApuqwizEjkf8ISClIhfCng PKSG+cpcDyx8UohN4N3CHe6hPTEECGQrLLFuBQ7IdbI/76diWzbPHjkVD+Xo4+sErqmJ UyV1/FjDieCgA6VFW3iQF4Z1qGz5a3hNKgTmLklhQ1YQOfH11soAOK8t3RkbT818o0Np NZk1I/gKCHhxsx4MvzCFX3ik8NYc6qusD4Uvp6RAYECVYkbgzyQqexyM4ToQICri0hv8 niHA== X-Gm-Message-State: AOJu0Yz2JdrrpcDbxIsLeOHQRDz2TTS2ASj3kRNsuYNRLTSMrd015d7y k7cxXB1wKIa+xyr6wGku46xctJVA0lTJjo68iTmQyvJl6+q12tns5SPu6Q== X-Gm-Gg: ASbGncsywfjktkhH7klx3Ro8qQtzTOIAIBywN1Tm0z4poLW88T2OrukPl/2YG7kTSPH Df+pjHMGW8WSd4+I6prGXNiKEnc/lmxKVWHUWfmyoY82gP7Pl9o+9Wf0j2Pd3orFtZY97bDQFpO LNYB7OBlethnu1ANGvkVax94XjpZu1pDqmYnji1FrjN95EgviaXnh9JadbO4vIbzkdkt7PTvQ7q A8P9sdboCj1G6ZKBro30gJnZiBjt2ooHii0roK5hiJBSr3fyL/EnbbsrHvNQS54NC0CLCXPCXaI VvS97zOUq1UQHtNhIZl7LRTTRnY56yTt0PHJ4H2v+DPvmzV6cpEk X-Google-Smtp-Source: AGHT+IGNvZjQE+iyim2gSq0jBgWmRblcR76RlT/or93cxsgyYpePofSJOCVF99JWlVhsT+QN0b1MIg== X-Received: by 2002:a05:690c:4d89:b0:6f2:9533:8fba with SMTP id 00721157ae682-6fb5827084bmr154222867b3.1.1739942696510; Tue, 18 Feb 2025 21:24:56 -0800 (PST) Received: from localhost.localdomain ([2607:fb91:fe2:71a6:2854:c007:54e:fca]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6fb5a15f082sm20783537b3.54.2025.02.18.21.24.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 18 Feb 2025 21:24:55 -0800 (PST) From: Romain Beauxis To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Feb 2025 23:24:37 -0600 Message-Id: <20250219052445.86383-2-romain.beauxis@gmail.com> X-Mailer: git-send-email 2.39.5 (Apple Git-154) In-Reply-To: <20250219052445.86383-1-romain.beauxis@gmail.com> References: <20250219052445.86383-1-romain.beauxis@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 1/9] libavcodec/decode.c: 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 | 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".