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 951F74BEE4 for ; Thu, 6 Mar 2025 14:50:41 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 49DF568F1B2; Thu, 6 Mar 2025 16:50:37 +0200 (EET) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2046.outbound.protection.outlook.com [40.92.89.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9F0B68E8E9 for ; Thu, 6 Mar 2025 16:50:30 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=e0kIsyMVrU6VyZewpbC/o823QJMdJHL2L6U8AaJ2bW96GIkrXuXny4IyneuNxCpTpvnSkAGexw7jbH20pS62j4SSk4QeUcf6S9hs5FJkFpJ4N5r+lfHR0wZ/pfW+4ipA79PldGCgVb0o5htveyHCKc/h+EHzxgr4D3l3s5f9SVmv7r1r/fE15yUX+H7fBr/4RycrpBvJFMVA5pkr9sDDZWts2DvuGN+Sy83a8WjY1GDwFJkomP6u8/Fp28PsPGPV9i6W9YgyneUvPOdBcr7dsKzD/NBhIGlmkbeX8ClvPkGMc+uTuGxdpuWQ7J2FXRuoWnuIWBgut4+1YUJgjZ5XfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=zPkSikZmtDNXPy2Ew5LsJaAYdgUCF0zK9AbTAt1exPs=; b=ufVIKzJd/8h46TNi9L0nA9ECwDYJrAOxN5dCuCWGOFA7ZVeFM0S70ooFZxbZ0fGag7SJGlzc55Hm4Yg8x9ks+PkN9ubM+ZIbdzxkViH01LyIasyqxOzzTBxXhYLQ9uy/eIdceU5dCxV6Gba62mCmhuESQL/qr489bOBd54r9E5EA81liSUtK2wSRCoCNzoz6vJOLS7vdtHAVPj59gkx9qehnn8KkDwJB7hT0xrmFz4omEn/zXX7F2SUX0Y+UHZ6ln7nlBMvUdRcKcNM3ysM1IJ3jTOWa/MJTQdqyw7rpAXPyhI1sF1BSWp20jkl5kW6mq/zR5NGUSrKHcu2AtjzsyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=zPkSikZmtDNXPy2Ew5LsJaAYdgUCF0zK9AbTAt1exPs=; b=fDCIM1ZcKkBOsIxp3SOMNxoXeBqvVw3c7LzileByvqm0xpA5Q/XJXL+kHr+KJ+c73wRfsUSUbwhLVKF1BAoY7FLGr39cDBsDrpnyw5rqg45OxnDWDb1nRKyv2SoIyvkx0gKra+q2XtZz+85C2kppyenERwBmJp4kdLyySp7YDrMdKkKITOTmuZ+u4fSBZa5h7AZEuMrEIRMQmA/a1AgXYwthHx8VFqZPGQRigE63V9L1kQ7fjZdyUCUtXyMahawWjMt/n1ymc/adHVpw0AKlabVsjSzUgSaZ2fHElcCx7COZAIAAzVAErcllaYPPdHa4HoqObvqByN/btsJptv8/4Q== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS4P250MB0750.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:576::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8511.16; Thu, 6 Mar 2025 14:50:29 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%5]) with mapi id 15.20.8511.014; Thu, 6 Mar 2025 14:50:29 +0000 Message-ID: Date: Thu, 6 Mar 2025 15:50:27 +0100 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250220172454.2952-1-jamrial@gmail.com> <20250220172454.2952-4-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20250220172454.2952-4-jamrial@gmail.com> X-ClientProxiedBy: ZR0P278CA0100.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:23::15) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS4P250MB0750:EE_ X-MS-Office365-Filtering-Correlation-Id: 949e63c9-9612-46ce-a0bb-08dd5cbe3c83 X-Microsoft-Antispam: BCL:0; ARA:14566002|19110799003|15080799006|5072599009|8060799006|7092599003|12121999004|461199028|6090799003|3412199025|440099028|41001999003; X-Microsoft-Antispam-Message-Info: =?utf-8?B?Ni9tMjdPM0NkYThYRG5TbWNkd2FHdWJMbVVEaGNCNmJxc3ZpOE1FWnBBM2F3?= =?utf-8?B?TDV4b29DYnlRZmxCRXE4TksyUkNqUzJSL3ZXWmRWOFFzQWxES0MzazNjd29i?= =?utf-8?B?aXVhdlA5dlpHdFJjd0Zjak1haUkwR1BBQzhIZWVBWGpVL2UyRzdzazVHbVky?= =?utf-8?B?YisvVXQ0SG55eVNla00rcTZZRVJJKzJlN0NKbyt4THYrRWpHVmtyVjZrV1Y3?= =?utf-8?B?ZkYwUWU4b0JDWVpRQmpwK3FBWFpoOEMzSnhwVXoyM0dWNkN3emwwem9YZVh3?= =?utf-8?B?WGE1VmlNUVo5Qyt5bFJCa1NjUkdudzdNT3NHellac0l0eENCYTNzRXV2YXQ3?= =?utf-8?B?c3Q5YThTOXRyTjVicGE2NVBsdWhMeTBYY0ppMFZFcXFrVU00OThDNHl0U3N5?= =?utf-8?B?eVprNWJrek9mNVNoelhOVkw3ZU9sV3E2MWZQNGh3Y216ajRCSUNvRmZWMG5G?= =?utf-8?B?UTJOWWduMFdyTGlvczJDV3YwbW1JeENGRktleTNGMHA5QWNSTnUwSDBJbUxR?= =?utf-8?B?bXREUHJ1QUVVeWI2cElLNmdwM3pITW1yaDh3Z1FPNjhRc2I2c2dDUE5PUGR6?= =?utf-8?B?T3NucjNzR3dRZWRzRCtRQTJrUm84RFNMZ2lOUnpIQlJZcjdMeXBqWStnYlRR?= =?utf-8?B?a2tkRjRyS2lsOGFCSzA0dE5CaDVnTytaalFCZCtIVTFaM0hYRjZDajhlRHVC?= =?utf-8?B?SlVjMHJVRkx2d1A4dk9mckNuL2JGbUhsK25tR1dta3dDVkhDa0I3ZGRBc2cy?= =?utf-8?B?em9pZU9Ia0dDM2J0ejdUU3diaFYwNWpOT2Y4Z1FwRGNiRXdVMkRBMUx4cXBH?= =?utf-8?B?VWpkNGtCQ01kY1ArcUZ3TWFxbzZUOTJPWXhEd2VZK3EvMm1NZGdKRjZnVE92?= =?utf-8?B?T0lMYTk1a01xN2pETnJraEhlZUdDRXI5aUZmVzc3MytRM2hkdG4wQ3lRZnRm?= =?utf-8?B?bzFia0JkbFJETStPN3BPdi9XTWVnNEx0S2k0QWQ4VERPTUoyT2dKMnJJbUI3?= =?utf-8?B?c3RmbUFjQVV6RGNmeHhXZWNHQzliS25kMjNjenVvZVFMTEwrT1I0Q3FzU2gr?= =?utf-8?B?U2NwVzlEU3l3TlRtREVMeGRQTGFSWmhFUE5RemR5ZllaeFZpYzl1OFFqWHpW?= =?utf-8?B?emcydExuemNaNVVxa2FiSDBLT0JCK2ZWY0RoN2x6RW1JU2s3SS9ydG5LZGps?= =?utf-8?B?M216dnBDb2swbXc3VEdleGJtQS95Vys1OWUvTXZpdTZ3a1Q2WjRXMzdoZWhn?= =?utf-8?B?MnhmQ00zeC9CbzZqZEFLcUp5SHl4c0hBbUVONHppMWVqTGphZEprbVdkNjht?= =?utf-8?B?ekVycFcyQnMrSTF3NWMrZC9MYVhzODBIdTREZDlDUU1Ra0pkamNLY2YwUFQw?= =?utf-8?B?dVF2UHBjR3ByWEZwL1RSK0VDbkFralFjdDFvVTczNm5ybDJlOHE3YnhqaFNu?= =?utf-8?B?QmhnblhuSVNWOVRWZ0hCK1hrZ283ajZ1amFSdDc0VFhwWUluV3ZCK0FOa05V?= =?utf-8?B?SnFrZGh1VWs5ZWNVOEdrSTgwZ2lmcWVKN1FlN21VRU1oOEtwcHlhd1U3cXNT?= =?utf-8?Q?+y73oV8wGi7LfxQvzGW/9zl0U=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NjQ0QW9WR1Z1RTREL1JhY1NTUG5JeG9EUDlmLzVsMzZGQXhuM3pCODJSWC9T?= =?utf-8?B?dit3NlBKYndjUytIRk40aVdBRGhCZml1ZklwZVJ6cVIwczRCR3E1QkhmUnV4?= =?utf-8?B?Q3VhTE1rb21naWhmYi9yNy9heStZcFNwbWd1ODNROENuZFhjTHNkblRmYUJK?= =?utf-8?B?RVd3RGF4SGtJeVNUMjhOdWl2ek5WZVFwZFFLbDdqMDQ0ckt1c2JBUUNPSlBJ?= =?utf-8?B?dWJnNDBXUnQxaWZjVkVwSWxEcEkvVUlCY0NDVldrV2dmWWpZOEpXY3ZwM3BB?= =?utf-8?B?N1NyMjExMW1FQkZncjUxNEcyTWdUOU5taUpaeTlvL2lEWnZ6NVZ5c2oyZVBy?= =?utf-8?B?YWw2WUpJcHVwNEZDMEU5Z0t5TjBzcE9TVlgwTFlSYUk0bnE2OUpwcTlNRHlT?= =?utf-8?B?bkVUUDIrTmNIS1RKUjI4UlNMODMzRHhvampySmVzWGtFM1B2NzFxRloydGdj?= =?utf-8?B?eGZVN3RFRmZGNFh1M2VIRWVyc3ZKd1hOd2ZZQ1Rqd2lpY0tUdmVxd1VFWCtn?= =?utf-8?B?N3pnOGgzd1NLclk1OG1xY053RlFVZ0JoWUZWUmc3c3N4ZEU0bEV4NWE3eDM4?= =?utf-8?B?eng5ejN0aWRQUnVKdFNVQ0p6WVdUSmJ6WGs4Sjg3a3pMY09xRGxBMldKSGVr?= =?utf-8?B?YlgreUZIS3J3bGVZRisyNVphdVNGYzNWb1FCRjZjemU4eXJtRHYzamNGSE1S?= =?utf-8?B?OE5TUUlrbE5Zb3Rieis5RXcwL1JwWnJhcFJHRmZ1b3pPeitHZStCZVgraW1z?= =?utf-8?B?RFo4QllvMnA1d1duRGFIZkxwVjdiTVBidDErNUlUWnp1OUJSbExLQ2l3byta?= =?utf-8?B?cC9xWW9wV1ZVK0Jua254cUZVeS9ZdmtFd3l4WlE0YTE4bFNTak1GM1NDZjdL?= =?utf-8?B?MW5DYjBnOEJaUlh4RzhNTUp4b2w4VHVlUWtZdWJxRUlnYU1xTSsrY3NCMHJV?= =?utf-8?B?NXo3MjM5WjVpa0UwVmpZeUQ2TDVjOCt0aDVsaDA5dWYvcmZFWHRlY1RTSTFa?= =?utf-8?B?UVNoeEhyRzhzMVBDQVBUTUV3S2NsMjd1TUhkak5RNWJ6K2ZPbWt4V0dyUmNm?= =?utf-8?B?b0k1dzJBWUx4MGlpa0pEdmNRZkxKVm1WQmpreGdRTmFvNlErb2hQaVlQOFFC?= =?utf-8?B?UU9LVC9JemQwaEI1YnFCL0hadTd3bVM4QkxXNk5PMkdmUU5vN0ZPK29FTWUv?= =?utf-8?B?SUhQanhpaS94QkYyM2xaS2k4WlBiQk5OWGZycmVzSXBweVMyZFZpM0greUJ5?= =?utf-8?B?eVZsckh4RUFDdzdTL1pNZWVyWldoQ2NiS1EyTHNPeU5xUFlFb2hyV29SbGE2?= =?utf-8?B?ajVwd3FIbytuNGN2OHpqakk5VGV1bVZ5Z3FYSldxbnNYdForUnovRkc3dTVk?= =?utf-8?B?QTg2WVFienp5c0lCWWhWQ2dRbG1EcWhMeEozWU8zSkJuOUJCTUZBdWtwWXFz?= =?utf-8?B?N3gzaWlkcmcyNXQrazcrY3NUakRqOGErZ3BiZlNFbEEzYkMwR2EyOWdPZkl3?= =?utf-8?B?TFJQU3N5ajJ1RnYzWTJGWDNndHE0R1VkZnBlSEl5bUZ3UHpUeUxGOGxqN2Rx?= =?utf-8?B?aVR3bEx1WVZvSmZJamlWUkVIVS9ydW5rY2NwazJGWDh6TUduUUErYnZaVitM?= =?utf-8?B?UUxVeTBHelM3VFpqUWZGczBuaDBiNzZsT3RHNHptR0UyL3JDcFpvdUd3WlNF?= =?utf-8?B?KzFRQm91Z2VXZ05aRk9wTzhsK1pGSm1GYzJwTHhoNVpTRjhEWExOZUFRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 949e63c9-9612-46ce-a0bb-08dd5cbe3c83 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2025 14:50:28.9724 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS4P250MB0750 Subject: Re: [FFmpeg-devel] [PATCH 04/11] avutil/frame: av_frame_side_data_new_struct() 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: James Almer: > As well as the AV_SIDE_DATA_PROP_STRUCT prop, to define types that describe > a fixed-size C struct and not a flat byte array. > This excludes types like VIDEO_ENC_PARAMS as the struct it describes may have > extra bytes allocated past the end of the struct. > > Signed-off-by: James Almer > --- > libavutil/ambient_viewing_environment.c | 9 ++- > libavutil/frame.h | 17 ++++++ > libavutil/mastering_display_metadata.c | 9 ++- > libavutil/side_data.c | 77 +++++++++++++++++++++---- > libavutil/side_data.h | 4 ++ > libavutil/spherical.c | 10 +++- > 6 files changed, 107 insertions(+), 19 deletions(-) > > diff --git a/libavutil/ambient_viewing_environment.c b/libavutil/ambient_viewing_environment.c > index e359727776..ee2e9427cd 100644 > --- a/libavutil/ambient_viewing_environment.c > +++ b/libavutil/ambient_viewing_environment.c > @@ -20,9 +20,12 @@ > > #include "ambient_viewing_environment.h" > #include "mem.h" > +#include "side_data.h" > > -static void get_defaults(AVAmbientViewingEnvironment *env) > +void ff_ave_get_defaults(void *obj) > { > + AVAmbientViewingEnvironment *env = obj; > + > env->ambient_illuminance = > env->ambient_light_x = > env->ambient_light_y = (AVRational) { 0, 1 }; > @@ -35,7 +38,7 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_alloc(size_t *size) > if (!env) > return NULL; > > - get_defaults(env); > + ff_ave_get_defaults(env); > > if (size) > *size = sizeof(*env); > @@ -53,7 +56,7 @@ AVAmbientViewingEnvironment *av_ambient_viewing_environment_create_side_data(AVF > return NULL; > > memset(side_data->data, 0, side_data->size); > - get_defaults((AVAmbientViewingEnvironment *)side_data->data); > + ff_ave_get_defaults(side_data->data); > > return (AVAmbientViewingEnvironment *)side_data->data; > } > diff --git a/libavutil/frame.h b/libavutil/frame.h > index a707b35087..cd6b5194d1 100644 > --- a/libavutil/frame.h > +++ b/libavutil/frame.h > @@ -304,6 +304,13 @@ enum AVSideDataProps { > * or adjusted to the new layout. > */ > AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT = (1 << 4), > + > + /** > + * Side data stores a fixed-size C struct and not a flat byte array. > + * Entries of this type should be allocated with > + * @ref av_frame_side_data_new_struct(). > + */ > + AV_SIDE_DATA_PROP_STRUCT = (1 << 5), > }; > > /** > @@ -1121,6 +1128,16 @@ AVFrameSideData *av_frame_side_data_new(AVFrameSideData ***sd, int *nb_sd, > enum AVFrameSideDataType type, > size_t size, unsigned int flags); > > +/** > + * Variant of @ref av_frame_side_data_new() to add side data entires of a type s/entires/entries/ > + * with the AV_SIDE_DATA_PROP_STRUCT prop. Using AV_SIDE_DATA_PROP_STRUCT has a problem: It excludes trivial cases like AV_FRAME_DATA_AFD, AV_FRAME_DATA_SKIP_SAMPLES and AV_FRAME_DATA_VIEW_ID as well as not so trivial cases like AV_FRAME_DATA_DOVI_METADATA. Maybe simply use a flag that says "can be used with av_frame_side_data_new_struct()" instead. > + * > + * @return newly added side data on success, NULL on error. > + */ > +AVFrameSideData *av_frame_side_data_new_struct(AVFrameSideData ***sd, int *nb_sd, > + enum AVFrameSideDataType type, > + unsigned int flags); Can't you add a new parameter nb_elems to also handle all the side data that only has a single array? This would then also cover AV_FRAME_DATA_REGIONS_OF_INTEREST, AV_FRAME_DATA_VIDEO_ENC_PARAMS, AV_FRAME_DATA_DETECTION_BBOXES, AV_FRAME_DATA_VIDEO_HINT. AV_FRAME_DATA_A53_CC, AV_FRAME_DATA_ICC_PROFILE, AV_FRAME_DATA_SEI_UNREGISTERED, AV_FRAME_DATA_DOVI_RPU_BUFFER and AV_FRAME_DATA_LCEVC. If you want to, I can write the patch for this. > + > /** > * Add a new side data entry to an array from an existing AVBufferRef. > * > diff --git a/libavutil/mastering_display_metadata.c b/libavutil/mastering_display_metadata.c > index dd37ed7d0e..4948f30523 100644 > --- a/libavutil/mastering_display_metadata.c > +++ b/libavutil/mastering_display_metadata.c > @@ -24,9 +24,12 @@ > > #include "mastering_display_metadata.h" > #include "mem.h" > +#include "side_data.h" > > -static void get_defaults(AVMasteringDisplayMetadata *mastering) > +void ff_mdm_get_defaults(void *obj) > { > + AVMasteringDisplayMetadata *mastering = obj; > + > for (int i = 0; i < 3; i++) > for (int j = 0; j < 2; j++) > mastering->display_primaries[i][j] = (AVRational) { 0, 1 }; > @@ -47,7 +50,7 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_alloc_size(size_t *siz > if (!mastering) > return NULL; > > - get_defaults(mastering); > + ff_mdm_get_defaults(mastering); > > if (size) > *size = sizeof(*mastering); > @@ -64,7 +67,7 @@ AVMasteringDisplayMetadata *av_mastering_display_metadata_create_side_data(AVFra > return NULL; > > memset(side_data->data, 0, sizeof(AVMasteringDisplayMetadata)); > - get_defaults((AVMasteringDisplayMetadata *)side_data->data); > + ff_mdm_get_defaults(side_data->data); > > return (AVMasteringDisplayMetadata *)side_data->data; > } > diff --git a/libavutil/side_data.c b/libavutil/side_data.c > index beb8ea3212..49197e321d 100644 > --- a/libavutil/side_data.c > +++ b/libavutil/side_data.c > @@ -24,43 +24,78 @@ > #include "mem.h" > #include "side_data.h" > > +// headers for struct sizes > +#include "libavcodec/defs.h" > +#include "ambient_viewing_environment.h" > +#include "downmix_info.h" > +#include "hdr_dynamic_metadata.h" > +#include "hdr_dynamic_vivid_metadata.h" > +#include "mastering_display_metadata.h" > +#include "motion_vector.h" > +#include "replaygain.h" > +#include "spherical.h" > +#include "stereo3d.h" > + > typedef struct FFSideDataDescriptor { > AVSideDataDescriptor p; > + > + void (*init)(void *obj); Can't you use a switch instead to avoid the relocations? > + > + size_t size; > } FFSideDataDescriptor; > > static const FFSideDataDescriptor sd_props[] = { > - [AV_FRAME_DATA_PANSCAN] = { .p = { "AVPanScan", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, > + [AV_FRAME_DATA_PANSCAN] = { .p = { "AVPanScan", AV_SIDE_DATA_PROP_STRUCT | AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, > + .size = sizeof(AVPanScan) }, > [AV_FRAME_DATA_A53_CC] = { .p = { "ATSC A53 Part 4 Closed Captions" } }, > [AV_FRAME_DATA_MATRIXENCODING] = { .p = { "AVMatrixEncoding", AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT } }, > - [AV_FRAME_DATA_DOWNMIX_INFO] = { .p = { "Metadata relevant to a downmix procedure", AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT } }, > + [AV_FRAME_DATA_DOWNMIX_INFO] = { .p = { "Metadata relevant to a downmix procedure", AV_SIDE_DATA_PROP_STRUCT | AV_SIDE_DATA_PROP_CHANNEL_DEPENDENT }, > + .size = sizeof(AVDownmixInfo) }, > [AV_FRAME_DATA_AFD] = { .p = { "Active format description" } }, > - [AV_FRAME_DATA_MOTION_VECTORS] = { .p = { "Motion vectors", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, > + [AV_FRAME_DATA_MOTION_VECTORS] = { .p = { "Motion vectors", AV_SIDE_DATA_PROP_STRUCT | AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, > + .size = sizeof(AVMotionVector) }, > [AV_FRAME_DATA_SKIP_SAMPLES] = { .p = { "Skip samples" } }, > [AV_FRAME_DATA_GOP_TIMECODE] = { .p = { "GOP timecode" } }, > [AV_FRAME_DATA_S12M_TIMECODE] = { .p = { "SMPTE 12-1 timecode" } }, > - [AV_FRAME_DATA_DYNAMIC_HDR_PLUS] = { .p = { "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, > - [AV_FRAME_DATA_DYNAMIC_HDR_VIVID] = { .p = { "HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, > + [AV_FRAME_DATA_DYNAMIC_HDR_PLUS] = { .p = { "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)", AV_SIDE_DATA_PROP_STRUCT| AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, > + .size = sizeof(AVDynamicHDRPlus) }, > + [AV_FRAME_DATA_DYNAMIC_HDR_VIVID] = { .p = { "HDR Dynamic Metadata CUVA 005.1 2021 (Vivid)", AV_SIDE_DATA_PROP_STRUCT | AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, > + .size = sizeof(AVDynamicHDRVivid) }, > [AV_FRAME_DATA_REGIONS_OF_INTEREST] = { .p = { "Regions Of Interest", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, > [AV_FRAME_DATA_VIDEO_ENC_PARAMS] = { .p = { "Video encoding parameters" } }, > - [AV_FRAME_DATA_FILM_GRAIN_PARAMS] = { .p = { "Film grain parameters" } }, > + [AV_FRAME_DATA_FILM_GRAIN_PARAMS] = { .p = { "Film grain parameters", AV_SIDE_DATA_PROP_STRUCT } }, > [AV_FRAME_DATA_DETECTION_BBOXES] = { .p = { "Bounding boxes for object detection and classification", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, > [AV_FRAME_DATA_DOVI_RPU_BUFFER] = { .p = { "Dolby Vision RPU Data", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, > [AV_FRAME_DATA_DOVI_METADATA] = { .p = { "Dolby Vision Metadata", AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, > [AV_FRAME_DATA_LCEVC] = { .p = { "LCEVC NAL data", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, > [AV_FRAME_DATA_VIEW_ID] = { .p = { "View ID" } }, > - [AV_FRAME_DATA_STEREO3D] = { .p = { "Stereo 3D", AV_SIDE_DATA_PROP_GLOBAL } }, > - [AV_FRAME_DATA_REPLAYGAIN] = { .p = { "AVReplayGain", AV_SIDE_DATA_PROP_GLOBAL } }, > + [AV_FRAME_DATA_STEREO3D] = { .p = { "Stereo 3D", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_STRUCT }, > + .size = sizeof(AVStereo3D) }, > + [AV_FRAME_DATA_REPLAYGAIN] = { .p = { "AVReplayGain", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_STRUCT }, > + .size = sizeof(AVReplayGain) }, > [AV_FRAME_DATA_DISPLAYMATRIX] = { .p = { "3x3 displaymatrix", AV_SIDE_DATA_PROP_GLOBAL } }, > [AV_FRAME_DATA_AUDIO_SERVICE_TYPE] = { .p = { "Audio service type", AV_SIDE_DATA_PROP_GLOBAL } }, > - [AV_FRAME_DATA_MASTERING_DISPLAY_METADATA] = { .p = { "Mastering display metadata", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, > - [AV_FRAME_DATA_CONTENT_LIGHT_LEVEL] = { .p = { "Content light level metadata", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, > - [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { .p = { "Ambient viewing environment", AV_SIDE_DATA_PROP_GLOBAL } }, > - [AV_FRAME_DATA_SPHERICAL] = { .p = { "Spherical Mapping", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, > + [AV_FRAME_DATA_MASTERING_DISPLAY_METADATA] = { .p = { "Mastering display metadata", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_STRUCT | AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, > + .init = ff_mdm_get_defaults, > + .size = sizeof(AVMasteringDisplayMetadata) }, > + [AV_FRAME_DATA_CONTENT_LIGHT_LEVEL] = { .p = { "Content light level metadata", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_STRUCT | AV_SIDE_DATA_PROP_COLOR_DEPENDENT }, > + .size = sizeof(AVContentLightMetadata) }, > + [AV_FRAME_DATA_AMBIENT_VIEWING_ENVIRONMENT] = { .p = { "Ambient viewing environment", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_STRUCT }, > + .init = ff_ave_get_defaults, > + .size = sizeof(AVAmbientViewingEnvironment) }, > + [AV_FRAME_DATA_SPHERICAL] = { .p = { "Spherical Mapping", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_STRUCT | AV_SIDE_DATA_PROP_SIZE_DEPENDENT }, > + .init = ff_spherical_get_defaults, > + .size = sizeof(AVSphericalMapping) }, > [AV_FRAME_DATA_ICC_PROFILE] = { .p = { "ICC profile", AV_SIDE_DATA_PROP_GLOBAL | AV_SIDE_DATA_PROP_COLOR_DEPENDENT } }, > [AV_FRAME_DATA_SEI_UNREGISTERED] = { .p = { "H.26[45] User Data Unregistered SEI message", AV_SIDE_DATA_PROP_MULTI } }, > [AV_FRAME_DATA_VIDEO_HINT] = { .p = { "Encoding video hint", AV_SIDE_DATA_PROP_SIZE_DEPENDENT } }, > }; > > +static const FFSideDataDescriptor *dp_from_desc(const AVSideDataDescriptor *desc) > +{ > + return (const FFSideDataDescriptor *)desc; > +} > + > const AVSideDataDescriptor *av_frame_side_data_desc(enum AVFrameSideDataType type) > { > unsigned t = type; > @@ -247,6 +282,24 @@ AVFrameSideData *av_frame_side_data_add(AVFrameSideData ***sd, int *nb_sd, > return sd_dst; > } > > +AVFrameSideData *av_frame_side_data_new_struct(AVFrameSideData ***sd, int *nb_sd, > + enum AVFrameSideDataType type, > + unsigned int flags) > +{ > + const AVSideDataDescriptor *desc = av_frame_side_data_desc(type); > + const FFSideDataDescriptor *dp = dp_from_desc(desc); > + AVFrameSideData *ret; > + > + if (!desc || !(desc->props & AV_SIDE_DATA_PROP_STRUCT)) > + return NULL; > + > + av_assert0(dp->size); > + ret = av_frame_side_data_new(sd, nb_sd, type, dp->size, flags); > + if (ret && dp->init) > + dp->init(ret->data); > + return ret; > +} > + > int av_frame_side_data_clone(AVFrameSideData ***sd, int *nb_sd, > const AVFrameSideData *src, unsigned int flags) > { > diff --git a/libavutil/side_data.h b/libavutil/side_data.h > index 8275aa35a5..5d25833882 100644 > --- a/libavutil/side_data.h > +++ b/libavutil/side_data.h > @@ -27,4 +27,8 @@ AVFrameSideData *ff_frame_side_data_add_from_buf(AVFrameSideData ***sd, > enum AVFrameSideDataType type, > AVBufferRef *buf); > > +void ff_mdm_get_defaults(void *obj); > +void ff_ave_get_defaults(void *obj); > +void ff_spherical_get_defaults(void *obj); > + > #endif // AVUTIL_SIDE_DATA_H > diff --git a/libavutil/spherical.c b/libavutil/spherical.c > index 64ade1d0ec..4ef2c225c2 100644 > --- a/libavutil/spherical.c > +++ b/libavutil/spherical.c > @@ -21,15 +21,23 @@ > #include "avstring.h" > #include "macros.h" > #include "mem.h" > +#include "side_data.h" > #include "spherical.h" > > +void ff_spherical_get_defaults(void *obj) > +{ > + AVSphericalMapping *spherical = obj; > + > + spherical->projection = AV_SPHERICAL_RECTILINEAR; > +} > + Can't this be inlined? > AVSphericalMapping *av_spherical_alloc(size_t *size) > { > AVSphericalMapping *spherical = av_mallocz(sizeof(AVSphericalMapping)); > if (!spherical) > return NULL; > > - spherical->projection = AV_SPHERICAL_RECTILINEAR; > + ff_spherical_get_defaults(spherical); > > if (size) > *size = sizeof(*spherical); _______________________________________________ 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".