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 1086E471BF for ; Tue, 29 Aug 2023 06:24:26 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 12FC668C662; Tue, 29 Aug 2023 09:24:24 +0300 (EEST) Received: from mail-ej1-f51.google.com (mail-ej1-f51.google.com [209.85.218.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EC20568C602 for ; Tue, 29 Aug 2023 09:24:16 +0300 (EEST) Received: by mail-ej1-f51.google.com with SMTP id a640c23a62f3a-99bcc0adab4so521218666b.2 for ; Mon, 28 Aug 2023 23:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693290256; x=1693895056; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :from:to:cc:subject:date:message-id:reply-to; bh=a6s9FABEJKFLKftM/rt05SH58Wpouy5G1tjPD6RHPqE=; b=JyozekNFPTd8hbJBqeOsRaydK8PH4vuLGevXWOsnkgK0HSkc2mAorFAEfE9dpb8uqJ avmo5VWc9Hc5b6Nu63TdAfCGN9HgEKAKDLQvuf6kyt65cp77eELnLbCsSrthW+nMN+h4 OLGmT4aDb/FKl7o42KNJhbMX2+3CU6nCTFDKQ5LujqNlaSx9y+EQxts3/3O0rm9gaA8Q VouNyi0YF7SjARA+giocYiuizmsGlpyLu8+cVCCvFLUYn7Ynqufl0ipT2iWMH2upPpGo Mn21SLRW2EwgxzjBurGvd4H5jXWGZ9RS0eZebeByZ7864i5nXc1EkAwA8q2H4JabYNP3 pE/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693290256; x=1693895056; h=to:subject:message-id:date:from:in-reply-to:references:mime-version :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=a6s9FABEJKFLKftM/rt05SH58Wpouy5G1tjPD6RHPqE=; b=ZqvAf0WFXoDkyDBsTIKYlljY2cKYdw41eCnhYOJrh9LntTd/nXKjI2KjJQAa35gu3N Q/2DOHZCndGXqm7ZHtBuvRCPcKfySm2Pb52asAB/19N23UK7K/QQJcM4e+bUpJolvdid FQEDx4TWK/19t/hvb0MlBHAWMfklBPJ8eQuVy271z8u7m+QGjsjKjNU3TE0GGtKO2bOP dppOaeO0mjuqfXWNHfIZSQ/F/f+4+T+EYkxCmDJ/fHLr/ChoaARMra16VmaA/JNPqopT /L0+9CcwvspYp+1SPYmTLOmlz/3Tym/3XahMY7uq6Z6wO+PWOJpEHqDxJzqwjw1lgx// A3BA== X-Gm-Message-State: AOJu0YwNWh/ULMQYk87oWCvKsMd4zKf4i5pj681uwRzD6vmeOR4nB9Lc Z818NVQuGeyBXIcIp16iwda7/ysY+0NLi2AjQN4yUyK7NNg= X-Google-Smtp-Source: AGHT+IGf4vQ73d/1VPwOYpGG4ETw9ZIREDgng00GM5+8xWAMZr/8+e3820tSuGd0ivxa35gwauwCdxP9am9waB/O9pI= X-Received: by 2002:a17:906:51:b0:9a1:e293:9882 with SMTP id 17-20020a170906005100b009a1e2939882mr12353438ejg.63.1693290255526; Mon, 28 Aug 2023 23:24:15 -0700 (PDT) MIME-Version: 1.0 References: <20230828123617.57535-1-jamrial@gmail.com> <20230828123617.57535-9-jamrial@gmail.com> In-Reply-To: <20230828123617.57535-9-jamrial@gmail.com> From: Pavel Koshevoy Date: Tue, 29 Aug 2023 00:24:04 -0600 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 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-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: 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. - { 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_A53_CC, AV_FRAME_DATA_A53_CC }, > { AV_PKT_DATA_AFD, AV_FRAME_DATA_AFD }, > - { AV_PKT_DATA_ICC_PROFILE, > AV_FRAME_DATA_ICC_PROFILE }, > { AV_PKT_DATA_S12M_TIMECODE, > AV_FRAME_DATA_S12M_TIMECODE }, > - { AV_PKT_DATA_DYNAMIC_HDR10_PLUS, > AV_FRAME_DATA_DYNAMIC_HDR_PLUS }, > { AV_PKT_DATA_SKIP_SAMPLES, > AV_FRAME_DATA_SKIP_SAMPLES }, > }; > > @@ -1439,6 +1444,23 @@ FF_DISABLE_DEPRECATION_WARNINGS > FF_ENABLE_DEPRECATION_WARNINGS > #endif > > + for (int i = 0; i < FF_ARRAY_ELEMS(sd_global_map); i++) { > + size_t size; > + uint8_t *packet_sd = av_packet_get_side_data(pkt, > sd_global_map[i].packet, &size); > + if (packet_sd) { > + AVFrameSideData *frame_sd; > + > + av_log(avctx, AV_LOG_DEBUG, > + "Overwriting global side data of type \"%s\" in output > frame with side data " > + "from input packet.\n", > av_packet_side_data_name(sd_global_map[i].packet)); > + > + av_frame_remove_side_data(frame, sd_global_map[i].frame); > + frame_sd = av_frame_new_side_data(frame, > sd_global_map[i].frame, size); > + if (!frame_sd) > + return AVERROR(ENOMEM); > + memcpy(frame_sd->data, packet_sd, size); > + } > + } > for (int i = 0; i < FF_ARRAY_ELEMS(sd); i++) { > size_t size; > uint8_t *packet_sd = av_packet_get_side_data(pkt, sd[i].packet, > &size); > @@ -1475,6 +1497,20 @@ int ff_decode_frame_props(AVCodecContext *avctx, > AVFrame *frame) > const AVPacket *pkt = avctx->internal->last_pkt_props; > int ret; > > + for (int i = 0; i < FF_ARRAY_ELEMS(sd_global_map); i++) { > + AVPacketSideData *packet_sd = > av_packet_side_data_set_get(&avctx->packet_side_data, > + > sd_global_map[i].packet); > + if (packet_sd) { > + AVFrameSideData *frame_sd = av_frame_new_side_data(frame, > + > sd_global_map[i].frame, > + > packet_sd->size); > + if (!frame_sd) > + return AVERROR(ENOMEM); > + > + memcpy(frame_sd->data, packet_sd->data, packet_sd->size); > + } > + } > + > if (!(ffcodec(avctx->codec)->caps_internal & > FF_CODEC_CAP_SETS_FRAME_PROPS)) { > ret = ff_decode_frame_props_from_pkt(avctx, frame, pkt); > if (ret < 0) > diff --git a/libavcodec/decode.h b/libavcodec/decode.h > index a52152e4a7..52e5aafc34 100644 > --- a/libavcodec/decode.h > +++ b/libavcodec/decode.h > @@ -67,7 +67,7 @@ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket > *pkt); > /** > * Set various frame properties from the provided packet. > */ > -int ff_decode_frame_props_from_pkt(const AVCodecContext *avctx, > +int ff_decode_frame_props_from_pkt(AVCodecContext *avctx, > AVFrame *frame, const AVPacket *pkt); > > /** > -- > 2.41.0 > > _______________________________________________ > 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". > _______________________________________________ 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".