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 ESMTP id C2021471EB for ; Tue, 29 Aug 2023 21:14:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4763968C6B5; Wed, 30 Aug 2023 00:14:10 +0300 (EEST) Received: from mail-ot1-f42.google.com (mail-ot1-f42.google.com [209.85.210.42]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7430F68BE34 for ; Wed, 30 Aug 2023 00:14:03 +0300 (EEST) Received: by mail-ot1-f42.google.com with SMTP id 46e09a7af769-6bd0425ad4fso3549138a34.2 for ; Tue, 29 Aug 2023 14:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693343641; x=1693948441; darn=ffmpeg.org; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=+EFNfl+GdAcmq8k/qdN2Mq4Wr+wavNvv0aP3UvUjymQ=; b=f6hou5H9W6VlUBRqsh9P00imf3GLDcnxkf5Y8sBqV6b3KnuGAgLDDfNIga9g4UDwmV 1kG/bQo3RWl5Z5mFlLxPoCVXjg7OG9QjZWaUsvBrSzPBxwVHhGBGsV6tMrX513ZKV07r GhCIiHN4taJp4c/IZHwT9AD+iNynD0oG4piD5pW6ES9MFO87dZlE8/rCCOwPrnZ0Qy1P txagDsMh+zS0KF5RFKZGP89PBe3hhbW0GISBOvV6QIi399gP/af4M6kAUDA/RpYnysr2 21FbxCAgLGD96VmA2DYfMT6bGes83tnFsY5Y88QGcCHJJgXsys3toe/wGm8SNFM7kdfx nX8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693343641; x=1693948441; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=+EFNfl+GdAcmq8k/qdN2Mq4Wr+wavNvv0aP3UvUjymQ=; b=IXsgSOpr17V2mrVk74LdYqw4bt1dPHTR8OnsNXCCxGuyQjA7NBLPgkVVTcrpeBIsRv bAblbHPUhpCLo/mB3lD6YhSn6S6noiHIWkE6BX78VjzX5tjngbuJLsNuSuoF16yWnj/V zHzuME6RtgISwKDOgI4oMZVPZTiHP9U2XFWU6ETAU6Cx/Y0Uuk6xM/XKAzmtGuCScL28 ifJMsuJCFe9g6rdVLUck8H3tSId7AZ7AzjUXeMvkv11r26ybVjB8rfx8C5TDOsnlbtWv tIplZQ3xYZ4hAQneUfIB52m7gsL5FeCkdQUcDzh4Dc4pzZ1JPT7NQHu2SithF/lfsjCI ZB4Q== X-Gm-Message-State: AOJu0YxxVEykl+518XXgjwSX8wq9SSDYMWdYXvV83z5lyFtgOKsM3MbQ Z/I2e852IrMVeDhDXZ7sroTHxqMCNtg= X-Google-Smtp-Source: AGHT+IFHXFv68jWa4FjLcDn/fwYbNDelX6EUOZAaDDX4Mgxh33caZTHPB6EvZz+xN/6wxvb3CHT4vw== X-Received: by 2002:a9d:63cd:0:b0:6bd:bba9:2d6a with SMTP id e13-20020a9d63cd000000b006bdbba92d6amr337103otl.24.1693343641419; Tue, 29 Aug 2023 14:14:01 -0700 (PDT) Received: from [192.168.0.10] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id h24-20020a056830165800b006b9d237ea0bsm4860914otr.34.2023.08.29.14.14.00 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 29 Aug 2023 14:14:00 -0700 (PDT) Message-ID: <12d7ea34-738f-e380-d7c7-5017ddc19699@gmail.com> Date: Tue, 29 Aug 2023 18:13:58 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20230828123617.57535-1-jamrial@gmail.com> <20230828123617.57535-9-jamrial@gmail.com> From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH 08/12] avcodec/decode: check for global side data in AVCodecContext side data 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 8/29/2023 3:24 AM, Pavel Koshevoy wrote: > On Mon, Aug 28, 2023, 06:38 James Almer wrote: > >> Signed-off-by: James Almer >> --- >> libavcodec/decode.c | 56 +++++++++++++++++++++++++++++++++++++-------- >> libavcodec/decode.h | 2 +- >> 2 files changed, 47 insertions(+), 11 deletions(-) >> >> diff --git a/libavcodec/decode.c b/libavcodec/decode.c >> index 7eada8e9ab..4b8c1bc74d 100644 >> --- a/libavcodec/decode.c >> +++ b/libavcodec/decode.c >> @@ -1408,25 +1408,30 @@ static int add_metadata_from_side_data(const >> AVPacket *avpkt, AVFrame *frame) >> return av_packet_unpack_dictionary(side_metadata, size, frame_md); >> } >> >> -int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, >> +static const struct { >> + enum AVPacketSideDataType packet; >> + enum AVFrameSideDataType frame; >> +} sd_global_map[] = { >> + { AV_PKT_DATA_REPLAYGAIN , AV_FRAME_DATA_REPLAYGAIN }, >> + { AV_PKT_DATA_SPHERICAL, AV_FRAME_DATA_SPHERICAL }, >> + { AV_PKT_DATA_STEREO3D, AV_FRAME_DATA_STEREO3D }, >> + { AV_PKT_DATA_AUDIO_SERVICE_TYPE, >> AV_FRAME_DATA_AUDIO_SERVICE_TYPE }, >> + { AV_PKT_DATA_MASTERING_DISPLAY_METADATA, >> AV_FRAME_DATA_MASTERING_DISPLAY_METADATA }, >> + { AV_PKT_DATA_CONTENT_LIGHT_LEVEL, >> AV_FRAME_DATA_CONTENT_LIGHT_LEVEL }, >> + { AV_PKT_DATA_ICC_PROFILE, AV_FRAME_DATA_ICC_PROFILE }, >> + { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, >> AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, >> +}; >> + >> +int ff_decode_frame_props_from_pkt(AVCodecContext *avctx, >> AVFrame *frame, const AVPacket *pkt) >> { >> static const struct { >> enum AVPacketSideDataType packet; >> enum AVFrameSideDataType frame; >> } sd[] = { >> - { AV_PKT_DATA_REPLAYGAIN , >> AV_FRAME_DATA_REPLAYGAIN }, >> - { AV_PKT_DATA_DISPLAYMATRIX, >> AV_FRAME_DATA_DISPLAYMATRIX }, >> > > AV_PKT_DATA_DISPLAYMATRIX is just removed, not moved? > Just curious why this one is not like the others. Unintended, and fixed locally. Thanks for noticing. _______________________________________________ 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".