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 AF67548436 for ; Thu, 2 May 2024 15:16:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 27ED668D815; Thu, 2 May 2024 18:16:18 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2034.outbound.protection.outlook.com [40.92.89.34]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4CA4868D6DC for ; Thu, 2 May 2024 18:16:12 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UkqclAg689+K0FNRPX2k2dd6abSf8oafaUDafGirNPE/G3fsSNeT2LOqH7kBZyV40Db8wGK9FpbILx8zjtSH3oVgTruIm5klFztJh0zR4R7Wq2gOD+PEf96YMi9ve2fShm1Xgx/fKfcchWRtAaHnqUiEinAYVHIBIepsyn+kPx8uUXlXDRQQ2IIxoZxyQqXPaYPcvsu4WvdLUvJW6EZW+9u2uNkieSkMW5dUljT8bzWEV69pMmb8bzhzGpEeFtcyjUo4+6YTjwdGooxbovR6W6AXu8dQl8pa+770LoTYCa8accl/omzavUU7BjQ9czkHeQbglJRSawcWv5AwUChmeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; 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=Sl9GtyDQN/DJNTRDH6ZfD72IJUPjOxwCEE5pm4az5UI=; b=RAZ4nXDb3BDXn5xR4pVN2ml230tGQmdVm91/p2p9/Zu+ikeCUclGSM5Ss5kgyrGuWK6YW80ydg/H4ivelipAjkl9HL3tZVy5NyVsOGzIgu4zM1ixvaIpDDDrvdy1NzJ8kX964/RqWlK0OVmrQK3kAKJdwNDb+lQyGWuHwrsHCnAjFHzY6FnMblFBY4i2+RkR8GbCv55Xl0kwuU5NYa/8fjx3Mv4EalYAafmi42nXXlqL0s4RN41O9uhGHxIh/pwjivOqb8Rri7nveppLUpBoT8cElFv7kkHywk27NcxCEtPDwKGnspmKWEwsrCdnIkLNPMENcwGVP8GO1uiKQpqtqg== 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=Sl9GtyDQN/DJNTRDH6ZfD72IJUPjOxwCEE5pm4az5UI=; b=R3eRMl9ss30WCQuy8VNyCbYWoxlShOwkYzGz3Isu7fk5e5k0Ax94XsIrXNQwvFzE8T/aHwZep6RkRGSXexNzAh8e1BnJNDKOHsnr7lmF7G2+ADpwwyorTg3NVNKW+sfb/r6lYKvT4VeS70ZMjv207Q5hxaZ/pvBH0C1RIjYkBTdJ33CLyvufaxGi9PGkn923ZpOBdNq4o7ofNRaYeyFBvXXh6t/ueybyrgnb3HqgmwKqKeczR/nq5fQaym53NL5O6DJSVNDi6bsHplKekUotXZfzYp4r8ORHApTWQ5VDZm8Kis0QYt+JZNkuOoVqLlcKrSDt4l+aGBSEvtvsVe/29A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PAXP250MB0565.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:289::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7519.35; Thu, 2 May 2024 15:16:10 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::1f29:8206:b8c3:45bb%3]) with mapi id 15.20.7519.031; Thu, 2 May 2024 15:16:08 +0000 Message-ID: Date: Thu, 2 May 2024 17:16:06 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240430231926.2506728-1-michael@niedermayer.cc> <20240502150549.1733-1-jamrial@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20240502150549.1733-1-jamrial@gmail.com> X-TMN: [nVxdWce7AMhQBWExuN5RI7hB58sRGZ1PZXfPgATZRME=] X-ClientProxiedBy: FR3P281CA0183.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a4::11) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <11fb2d06-513f-4821-93b7-183df309293c@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PAXP250MB0565:EE_ X-MS-Office365-Filtering-Correlation-Id: d1ef2fa7-5b71-467d-b7e6-08dc6abacb3c X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|3412199016|440099019; X-Microsoft-Antispam-Message-Info: EXbKm37C4IEGGWPSpE/EMs/605v8TEy38Y5ot6VuHK9YBlSsBCAlp11DWtuJCsVIdpPkiWUtWgpCQDk+Xlo+ifg05mp/enCqCdcwffN+STKqHjatNROVMDFEHdNfxHsiWFnM34BPBRH8GtdDctdLPmPTx78z4lQnztU4s0xjuNmuJ/N9ItIWHSdz7f84mA2fnA3VcvRYdU/jLrp4VyFBo0dLOzN83M7ad1sp6D4UeS8KFzccKzH82m/dnt4GmUdl/nyNWa6sODWLUQuH+tJXhAMO0MWXagsEogxd0ONseQ0KODseaAvEjgBdvWC2mWrVvPqhSJz/Q+0tlBkSN2dXSRMpfs2j2Pl2tF6d6gtCJ9KzIgTEkl+tJfs/MFhpg9+LNXUI5NtyIIIwjwa92hkP/6oseYTSLOHYTuC9K3GoHCN7iKdGNr+LU1Yp+4Csi5FO4tI5OdzemauxZWINi0vfFnc1dW4+EomF575QoS9i7EgobjM2MIZwLya4qa8Q86P/uWD7eXe5FBxFI32Jcykpv0aL53sZ2+ESCJCkIBQ+57Di6qqJphEIUvo+ZdWmwzjL X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Y0NUbUVhYWZoNEJqTUtjZW9BMnZLa0VQSXdQeHdNVGRFaldKR0ZYSENoR3NN?= =?utf-8?B?R0NBdVF3UnRzaGNoQ1Q4dHhSM1pUNE5GV0cyeVBPMk5LRk9hc0t0L1hhSzFz?= =?utf-8?B?Y3pwTHh6cUJMdS80aUZRR0JSWUY5YzI0K2J5d2ROa29MM29uSGxaaFlPQUdu?= =?utf-8?B?Z2lxVmdNZmUxSE85MWQ2aWtUb2grRmNBU05kQVRXTHg5Z2tYSStkcnprbjdX?= =?utf-8?B?M1pkQ2tjRTN2NGZyTGgwM0VYT1pxbjQvRFJOWGV3M2JFRTVnTmdCbDFnOVlI?= =?utf-8?B?T3pTeW9QZVhnT3RDMm5PbDE0MFhEb01vL1gwaXVQRmxkTFVnYjdsTWhaUHAz?= =?utf-8?B?dTBlZ01hcjViaHczZmRKUDAvQVRGMEJXdHg1aWM4Q0Y1c3kxclJ4OXFJeHRJ?= =?utf-8?B?MmVJTTNUYmdqYllpTkhTQUVSNnl2dnB2clhqaHpqeW1tZHZyV1lzblpPRngx?= =?utf-8?B?MnA2WGJKSDlMREk0NUxMNXlVZnRCSUNBWXlYN2xhU1JLWGQzM2greHJHeTFX?= =?utf-8?B?dmJrTE1RZW1hK3owZjdSMGhURHZLbWVxeWVzaExsMFRxdFRORVBQVHFxMkEx?= =?utf-8?B?L0RpWGIvMXl5aSt5RzhocTZJWXVWeHV5RjZUakk4NUpqWjZTcHpXdEJFT1No?= =?utf-8?B?dFY2Rm13TURUNHVGYS9ocmZXRDRJL0ljbnpwMVhYTUV3eXduZHJZVE5PdUZx?= =?utf-8?B?OWJwT2hTaUZYU05Jb3pCM1NMcWwzWEVLcnRRNGhTWDZzeVZOcUp3eE9VelVD?= =?utf-8?B?L3oxVkhGNytMdmlyUHVZQU53dlJIQWN6YmpIWFFDZnNiNkRmd0JrWGFuSTZC?= =?utf-8?B?Wm5XQk1wZHdDR3NwNUcyb0ZBMHI1SmRFNUVzTTMxL1RLRSswVDErclRzZXlT?= =?utf-8?B?d2F6OGlWcHgxaWwxc1dOcjFvRHZFOEtiaDlPVmptaXVUd0FIMTNvREhRa01w?= =?utf-8?B?L0IvZnZsOEdTN2tJMmMyNW9wMWU5Ym4ySzRFY0pzMW41NmUrMm4vbkZsc0cw?= =?utf-8?B?bExTbC9tR0xxWFFndm44YlRLbnZ3ZE03c0dodTM1QUl0NXQ5KzNOS0d4L243?= =?utf-8?B?eGEvZVZEbC80WnU1YzBNOE5Pcms3aHJENUVzYTV3cUFhamdPT3VVQXk1STZP?= =?utf-8?B?eHRYWk1HTGFhS3MzQzJ2dW9FQXpleGtubFB4aXJ6SHI3NXV2b2hKR0tDVmQw?= =?utf-8?B?S05nKzlYbU9XM1NEcnc4cVZLd2dRVzV5b24reVM5TTk4cHo3M2x1Q1pmckQy?= =?utf-8?B?Q21RRnN5WDIyQm11SDdMSkVIYXZLaWIrYnhrL3I3enV5cW1jRGgyVHR5ZlJL?= =?utf-8?B?MW10d1FBQjBsMUdCbkNpVjZLcVRQbG5LS0N3Z2VOdTVRb1Y0YWVjOWduOUVl?= =?utf-8?B?VEczTUlUTWEwYWk0eVl6dm1lb1dDUVg0UnpGUjJRQ0hqRnA5MEdmRVZRMnU4?= =?utf-8?B?bTg3WW9XTVo3bEM5RXB5WGIySlozNm9mM2NmaHdENFEya1NsZGJzSHo3ai9T?= =?utf-8?B?bGxnbXRmUjNDVDhrdXBjbnNDNG9zdWJGYWxKVEg2RDVWWmJ2UHRBWnRqMWo1?= =?utf-8?B?WDlON3RGM2tBSTVSSEZFTzZheUZxTVV5Z3pJcFBUcFkvYm82eXdDZVpuV2FD?= =?utf-8?B?QkM2eWJkdVZ3RGs3ZXdWQnhvaVluVkw1Rmx0Vm9oalFXVHNxcytQc2d0OFVw?= =?utf-8?B?MVFsZ0FaWmYweDlIUjJpc1hjbXZmUzZXZjYxdE9Cd0c1eTk0cUdxT0VnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d1ef2fa7-5b71-467d-b7e6-08dc6abacb3c X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 May 2024 15:16:08.8535 (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: PAXP250MB0565 Subject: Re: [FFmpeg-devel] [PATCH] avformat/framecrcenc: support calculating checksum of IAMF 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: James Almer: > The total allocated size for types is arch dependent, so instead calculate a > checksum of the fields only. > > Signed-off-by: James Almer > --- > Depends on "[PATCH v3] avformat/framecrcenc: compute the checksum for side data" > > libavformat/framecrcenc.c | 76 ++++++++++++++++++++++++++++++++++++--- > 1 file changed, 71 insertions(+), 5 deletions(-) > > diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c > index 8cc4a93053..6d46b51489 100644 > --- a/libavformat/framecrcenc.c > +++ b/libavformat/framecrcenc.c > @@ -24,6 +24,7 @@ > #include "config.h" > #include "libavutil/adler32.h" > #include "libavutil/avstring.h" > +#include "libavutil/iamf.h" > #include "libavutil/intreadwrite.h" > > #include "libavcodec/codec_id.h" > @@ -76,7 +77,8 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) > for (int i = 0; i < pkt->side_data_elems; i++) { > const AVPacketSideData *const sd = &pkt->side_data[i]; > const uint8_t *data = sd->data; > - int64_t side_data_crc = 0; > + size_t size = sd->size; > + uint32_t side_data_crc = 0; > > switch (sd->type) { > #if HAVE_BIGENDIAN > @@ -127,12 +129,76 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) > case AV_PKT_DATA_IAMF_MIX_GAIN_PARAM: > case AV_PKT_DATA_IAMF_DEMIXING_INFO_PARAM: > case AV_PKT_DATA_IAMF_RECON_GAIN_INFO_PARAM: > - side_data_crc = -1; > + { > + const AVIAMFParamDefinition *param = (AVIAMFParamDefinition *)sd->data; > + uint8_t buf[8]; > + ptrdiff_t offset = 0; > + size = 0; > +#define READ_UINT32(struct, parent, child) do { \ > + if ((offset + offsetof(struct, child) + sizeof(parent->child)) > sd->size) \ > + goto iamf_end; \ > + AV_WL32(buf, parent->child); \ > + side_data_crc = av_adler32_update(side_data_crc, buf, 4); \ > + size += 4; \ > +} while (0) > +#define READ_RATIONAL(struct, parent, child) do { \ > + if ((offset + offsetof(struct, child) + sizeof(parent->child)) > sd->size) \ > + goto iamf_end; \ > + AV_WL32(buf + 0, parent->child.num); \ > + AV_WL32(buf + 4, parent->child.den); \ > + side_data_crc = av_adler32_update(side_data_crc, buf, 8); \ > + size += 8; \ > +} while (0) > + READ_UINT32(AVIAMFParamDefinition, param, nb_subblocks); > + READ_UINT32(AVIAMFParamDefinition, param, type); > + READ_UINT32(AVIAMFParamDefinition, param, parameter_id); > + READ_UINT32(AVIAMFParamDefinition, param, parameter_rate); > + READ_UINT32(AVIAMFParamDefinition, param, duration); > + READ_UINT32(AVIAMFParamDefinition, param, constant_subblock_duration); > + for (unsigned int i = 0; i < param->nb_subblocks; i++) { > + void *subblock = av_iamf_param_definition_get_subblock(param, i); > + > + offset = (intptr_t)subblock - (intptr_t)sd->data; > + switch (param->type) { > + case AV_IAMF_PARAMETER_DEFINITION_MIX_GAIN: { > + const AVIAMFMixGain *mix = subblock; > + READ_UINT32(AVIAMFMixGain, mix, subblock_duration); > + READ_UINT32(AVIAMFMixGain, mix, animation_type); > + READ_RATIONAL(AVIAMFMixGain, mix, start_point_value); > + READ_RATIONAL(AVIAMFMixGain, mix, end_point_value); > + READ_RATIONAL(AVIAMFMixGain, mix, control_point_value); > + READ_RATIONAL(AVIAMFMixGain, mix, control_point_relative_time); > + break; > + } > + case AV_IAMF_PARAMETER_DEFINITION_DEMIXING: { > + const AVIAMFDemixingInfo *demix = subblock; > + READ_UINT32(AVIAMFDemixingInfo, demix, subblock_duration); > + READ_UINT32(AVIAMFDemixingInfo, demix, dmixp_mode); > + break; > + } > + case AV_IAMF_PARAMETER_DEFINITION_RECON_GAIN: { > + const AVIAMFReconGain *recon = subblock; > + READ_UINT32(AVIAMFReconGain, recon, subblock_duration); > + if ((offset + offsetof(AVIAMFReconGain, recon_gain) > + + sizeof(recon->recon_gain)) > sd->size) > + goto iamf_end; > + side_data_crc = av_adler32_update(side_data_crc, > + (uint8_t *)recon->recon_gain, > + sizeof(recon->recon_gain)); > + size += sizeof(recon->recon_gain); > + break; > + } > + default: > + break; > + } > + } > + iamf_end: > + break; > + } > } > > - av_strlcatf(buf, sizeof(buf), ", T=%2d, %8"SIZE_SPECIFIER, pkt->side_data[i].type, pkt->side_data[i].size); > - if (side_data_crc >= 0) > - av_strlcatf(buf, sizeof(buf), ", 0x%08"PRIx32, (uint32_t)side_data_crc); > + av_strlcatf(buf, sizeof(buf), ", T=%2d, %8"SIZE_SPECIFIER, pkt->side_data[i].type, size); > + av_strlcatf(buf, sizeof(buf), ", 0x%08"PRIx32, side_data_crc); > } > } > av_strlcatf(buf, sizeof(buf), "\n"); This is overkill; tests for IAMF side data should use ffprobe. - Andreas _______________________________________________ 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".