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 75EAC48933 for ; Mon, 22 Jul 2024 00:02:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5721768D5BA; Mon, 22 Jul 2024 03:02:18 +0300 (EEST) Received: from vidala.lynne.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E99D68D4B6 for ; Mon, 22 Jul 2024 03:02:11 +0300 (EEST) Message-ID: <45c6995e-ad9a-4832-b5ac-10fcc01a653f@lynne.ee> Date: Mon, 22 Jul 2024 02:02:09 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240721225350.298-1-jamrial@gmail.com> <20240721225350.298-2-jamrial@gmail.com> Content-Language: en-US Autocrypt: addr=dev@lynne.ee; keydata= xjMEXnFG3BYJKwYBBAHaRw8BAQdA3FyJpqEdfQj4GA7OUWVrNheT9dUsIs+yUx6Hljr9mYvN FEx5bm5lIDxkZXZAbHlubmUuZWU+wpAEExYIADgWIQT+UBOcaAVyyv1SH42i/qXwPwNEZAUC XnFG3AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCi/qXwPwNEZOTWAQCSNEA+kZLI NZ2dsR5Qg988c0HXpOXThZEjg+h1TL7KGgEA3Gff0c28efI02S6iMxazrpdWGHqHk7JN7pCj nt397wzOOARecUbcEgorBgEEAZdVAQUBAQdAjDdFQ5H+AJ9vwXrOb7val460g45EsheIaL5S 7/zSaX8DAQgHwngEGBYIACAWIQT+UBOcaAVyyv1SH42i/qXwPwNEZAUCXnFG3AIbDAAKCRCi /qXwPwNEZKaxAQCHLV4gAk/B9JvRG27MYm22X3+5QRCLBtEILP29aDh+MQD/V8JFHATDXRY3 0LsmqR3sPQ0BJ1UFVZA5BUoIJPJZWwg= In-Reply-To: <20240721225350.298-2-jamrial@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH 2/4 v2] libavcodec/h2645_sei: export raw LCEVC metadata 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: , From: Lynne via ffmpeg-devel Reply-To: FFmpeg development discussions and patches Cc: Lynne Content-Type: multipart/mixed; boundary="===============4042163587285412049==" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --===============4042163587285412049== Content-Language: en-US Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="------------Hfw2CUiFLMmaY9Vpsm4f0uoC" This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --------------Hfw2CUiFLMmaY9Vpsm4f0uoC Content-Type: multipart/mixed; boundary="------------Kdf4om7hE3kyWDWft9UPzHNd"; protected-headers="v1" From: Lynne To: ffmpeg-devel@ffmpeg.org Message-ID: <45c6995e-ad9a-4832-b5ac-10fcc01a653f@lynne.ee> Subject: Re: [FFmpeg-devel] [PATCH 2/4 v2] libavcodec/h2645_sei: export raw LCEVC metadata References: <20240721225350.298-1-jamrial@gmail.com> <20240721225350.298-2-jamrial@gmail.com> In-Reply-To: <20240721225350.298-2-jamrial@gmail.com> --------------Kdf4om7hE3kyWDWft9UPzHNd Content-Type: multipart/mixed; boundary="------------0iRXxu2YlsnEG80Jjnvc5nZm" --------------0iRXxu2YlsnEG80Jjnvc5nZm Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 22/07/2024 00:53, James Almer wrote: > Signed-off-by: James Almer > --- > libavcodec/h2645_sei.c | 37 +++++++++++++++++++++++++++++++++++++ > libavcodec/h2645_sei.h | 5 +++++ > libavcodec/itut35.h | 2 ++ > 3 files changed, 44 insertions(+) > > diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c > index 7c83747cd0..61d18e14b3 100644 > --- a/libavcodec/h2645_sei.c > +++ b/libavcodec/h2645_sei.c > @@ -99,6 +99,20 @@ static int decode_registered_user_data_dynamic_hdr_vivid(HEVCSEIDynamicHDRVivid > } > #endif > > +static int decode_registered_user_data_lcevc(HEVCSEILCEVC *s, > + GetByteContext *gb) > +{ > + int size = bytestream2_get_bytes_left(gb); > + > + av_buffer_unref(&s->info); > + s->info = av_buffer_alloc(size); > + if (!s->info) > + return AVERROR(ENOMEM); > + > + bytestream2_get_bufferu(gb, s->info->data, size); > + return 0; > +} > + > static int decode_registered_user_data_afd(H2645SEIAFD *h, GetByteContext *gb) > { > int flag; > @@ -142,6 +156,7 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, > } > > if (country_code != ITU_T_T35_COUNTRY_CODE_US && > + country_code != ITU_T_T35_COUNTRY_CODE_UK && > country_code != ITU_T_T35_COUNTRY_CODE_CN) { Unrelated change? > av_log(logctx, AV_LOG_VERBOSE, > "Unsupported User Data Registered ITU-T T35 SEI message (country_code = %d)\n", > @@ -173,6 +188,13 @@ static int decode_registered_user_data(H2645SEI *h, GetByteContext *gb, > } > break; > } > + case ITU_T_T35_PROVIDER_CODE_LCEVC: { > + if (bytestream2_get_bytes_left(gb) < 2) > + return AVERROR_INVALIDDATA; > + > + bytestream2_skipu(gb, 1); // user_data_type_code > + return decode_registered_user_data_lcevc(&h->lcevc, gb); > + } > #if CONFIG_HEVC_SEI > case ITU_T_T35_PROVIDER_CODE_CUVA: { > const uint16_t cuva_provider_oriented_code = 0x0005; > @@ -501,6 +523,11 @@ int ff_h2645_sei_ctx_replace(H2645SEI *dst, const H2645SEI *src) > av_buffer_unref(&dst->unregistered.buf_ref[i]); > dst->unregistered.nb_buf_ref = 0; > > + ret = av_buffer_replace(&dst->lcevc.info, > + src->lcevc.info); > + if (ret < 0) > + return ret; > + > if (src->unregistered.nb_buf_ref) { > ret = av_reallocp_array(&dst->unregistered.buf_ref, > src->unregistered.nb_buf_ref, > @@ -666,6 +693,15 @@ static int h2645_sei_to_side_data(AVCodecContext *avctx, H2645SEI *sei, > } > } > > + if (sei->lcevc.info) { > + HEVCSEILCEVC *lcevc = &sei->lcevc; > + AVFrameSideData *entry = av_frame_side_data_add(sd, nb_sd, AV_FRAME_DATA_LCEVC, > + &lcevc->info, 0); > + if (!entry) > + av_buffer_unref(&lcevc->info); > + lcevc->info = NULL; > + } > + > return 0; > } > > @@ -875,6 +911,7 @@ void ff_h2645_sei_reset(H2645SEI *s) > av_freep(&s->unregistered.buf_ref); > av_buffer_unref(&s->dynamic_hdr_plus.info); > av_buffer_unref(&s->dynamic_hdr_vivid.info); > + av_buffer_unref(&s->lcevc.info); > > s->ambient_viewing_environment.present = 0; > s->mastering_display.present = 0; > diff --git a/libavcodec/h2645_sei.h b/libavcodec/h2645_sei.h > index 488dbcad7e..598f78b585 100644 > --- a/libavcodec/h2645_sei.h > +++ b/libavcodec/h2645_sei.h > @@ -50,6 +50,10 @@ typedef struct HEVCSEIDynamicHDRVivid { > AVBufferRef *info; > } HEVCSEIDynamicHDRVivid; > > +typedef struct HEVCSEILCEVC { > + AVBufferRef *info; > +} HEVCSEILCEVC; > + > typedef struct H2645SEIUnregistered { > AVBufferRef **buf_ref; > unsigned nb_buf_ref; > @@ -126,6 +130,7 @@ typedef struct H2645SEI { > H2645SEIAFD afd; > HEVCSEIDynamicHDRPlus dynamic_hdr_plus; //< HEVC only > HEVCSEIDynamicHDRVivid dynamic_hdr_vivid; //< HEVC only > + HEVCSEILCEVC lcevc; > H2645SEIUnregistered unregistered; > H2645SEIFramePacking frame_packing; > H2645SEIDisplayOrientation display_orientation; > diff --git a/libavcodec/itut35.h b/libavcodec/itut35.h > index ffa7024981..a75ef37929 100644 > --- a/libavcodec/itut35.h > +++ b/libavcodec/itut35.h > @@ -20,11 +20,13 @@ > #define AVCODEC_ITUT35_H > > #define ITU_T_T35_COUNTRY_CODE_CN 0x26 > +#define ITU_T_T35_COUNTRY_CODE_UK 0xB4 > #define ITU_T_T35_COUNTRY_CODE_US 0xB5 > > #define ITU_T_T35_PROVIDER_CODE_ATSC 0x31 > #define ITU_T_T35_PROVIDER_CODE_CUVA 0x04 > #define ITU_T_T35_PROVIDER_CODE_DOLBY 0x3B > +#define ITU_T_T35_PROVIDER_CODE_LCEVC 0x50 > #define ITU_T_T35_PROVIDER_CODE_SMTPE 0x3C > > #endif /* AVCODEC_ITUT35_H */ --------------0iRXxu2YlsnEG80Jjnvc5nZm Content-Type: application/pgp-keys; name="OpenPGP_0xA2FEA5F03F034464.asc" Content-Disposition: attachment; filename="OpenPGP_0xA2FEA5F03F034464.asc" Content-Description: OpenPGP public key Content-Transfer-Encoding: 7bit -----BEGIN PGP PUBLIC KEY BLOCK----- xjMEXnFG3BYJKwYBBAHaRw8BAQdA3FyJpqEdfQj4GA7OUWVrNheT9dUsIs+yUx6H ljr9mYvNFEx5bm5lIDxkZXZAbHlubmUuZWU+wpAEExYIADgWIQT+UBOcaAVyyv1S H42i/qXwPwNEZAUCXnFG3AIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRCi /qXwPwNEZOTWAQCSNEA+kZLINZ2dsR5Qg988c0HXpOXThZEjg+h1TL7KGgEA3Gff 0c28efI02S6iMxazrpdWGHqHk7JN7pCjnt397wzOOARecUbcEgorBgEEAZdVAQUB AQdAjDdFQ5H+AJ9vwXrOb7val460g45EsheIaL5S7/zSaX8DAQgHwngEGBYIACAW IQT+UBOcaAVyyv1SH42i/qXwPwNEZAUCXnFG3AIbDAAKCRCi/qXwPwNEZKaxAQCH LV4gAk/B9JvRG27MYm22X3+5QRCLBtEILP29aDh+MQD/V8JFHATDXRY30LsmqR3s PQ0BJ1UFVZA5BUoIJPJZWwg= =ylY5 -----END PGP PUBLIC KEY BLOCK----- --------------0iRXxu2YlsnEG80Jjnvc5nZm-- --------------Kdf4om7hE3kyWDWft9UPzHNd-- --------------Hfw2CUiFLMmaY9Vpsm4f0uoC Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature.asc" -----BEGIN PGP SIGNATURE----- wnsEABYIACMWIQT+UBOcaAVyyv1SH42i/qXwPwNEZAUCZp2hgQUDAAAAAAAKCRCi/qXwPwNEZOjm APwM3k2qmPaVNZOsfwSHpyKpg7nRH+fs3XWmbQuWUziDVgEAkEi7n2TfD06iM5ckF9bmrAWpvEv3 OkaUWZl7YXIKMAM= =v1YD -----END PGP SIGNATURE----- --------------Hfw2CUiFLMmaY9Vpsm4f0uoC-- --===============4042163587285412049== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ 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". --===============4042163587285412049==--