From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id B8EF44011A for ; Sun, 18 May 2025 14:43:15 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id DF2B168D841; Sun, 18 May 2025 17:43:11 +0300 (EEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2096.outbound.protection.outlook.com [40.92.89.96]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id 9B2B168CB6F for ; Sun, 18 May 2025 17:43:04 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AEkNmFS8h1I9D5WMK5A5vUvWP33yZl0KtAKFXEV8SxblbsAviL+Aa6FexUoL81eUF297l//16BGJ2ZbtJAyuxYgtBH5xu7INd+pJwjH9UTLu7aZjbTGG+sXQxZzJ345qZCUu2zGxoiK+2iwg5srVB4Se02i21olm+MSTYzK2fvL/lHOfU/taLVs5JPdnxIbGBqE6WkvhiAff6b8ivmC0EGyDTmL4zELDMy01bGcLJbWkoDZeYeQZmTayhObvzSjNsNifLXUatLcM7+DDevl6tyAbCmgYIeV9KXm4mqFvtBlwcii34PaLclx2ZNCmb8WsDTRraDUL20tPqkDAnDt+uQ== 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=PwoqvNcIFHfDlKlu2FmsYGQB5cnnQy/ME83Odw49BKU=; b=ypTjJ/KDEvdoraBZ5j1BbvlfVVisRuw26D/RW3n8S+JgmptXcFuqdtaB2Pb+FEq6muEtqovcu4tH932PivCB0ytidY5C6XjPLUvOg5vVlKX5FK30R5GNkV8uFfYifSYDOYhEexlz54wYymXwtry9/4c1pZmPvccK9/WVuijZCQZ/l8cGN76b+zkOtjEjdXOcWz9oI+LqwyDcd9bq+cd20aU95CWIXD1aFMv+l3DtMd3YjMtpDCdP/obE/swnEClRJvvZ3DXJdHXCYIfMy3gEcCf0ZfWdtszefEEGaEw5JsAMJ5J7Eez8UhY3BqXtTftkCwGwVUkDsFvWc0kuU9nAnQ== 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=PwoqvNcIFHfDlKlu2FmsYGQB5cnnQy/ME83Odw49BKU=; b=TX8Mbkm3qVm3bqnZmUI3oEHWlMlSOPpQsfqL44gNFUdhZeJu7CDHKzD3aXM5KhVaEc2+28YcmvcPBs4tdHGmo20ScTzsyqLLRDRlEd36gYBYqGuVwL+Zv42k9XA3A3C2KNz1KCxtKmDhAp1bOd3lyL9TKbaryp7V4NLbB5zn+ucGl9KB4qEnP7p1TMnV5qg8u2JcSgJzeriZXkEkktncJzq9WjtGaW0W1Kr9bSapNvAhTvMG9+FB/xDvXXLFQiVu+flp0Py8z4vwKpqkFFPKQWHNimFyi1HnBZlIdCHpOrPbN02rGhZAgk2UNEPrgE2/qz9s6/OeIWQ0a0zEsMdaaw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0147.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:274::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.30; Sun, 18 May 2025 14:43:03 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::384d:40d4:ecb7:1c9%4]) with mapi id 15.20.8722.027; Sun, 18 May 2025 14:43:03 +0000 Message-ID: Date: Sun, 18 May 2025 16:43:01 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20250518122639.2958966-1-michael@niedermayer.cc> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20250518122639.2958966-1-michael@niedermayer.cc> X-ClientProxiedBy: FR4P281CA0449.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:c6::9) 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_|DU2P250MB0147:EE_ X-MS-Office365-Filtering-Correlation-Id: 3d0217e6-34e8-4024-44a8-08dd961a4b00 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoaApi1aWVt9ILKZbGoHsd6xa2Q8+cFQ9vnjbzenUAhgl8ouNwt6mXSVnODJV0oGPNIHzIXOGjpTsFL/ZKAcGnsy0/MSvvneIrGn+oxCpMIJ6WhbnBO2wyPE++MZ/mCfn2BrLTHpyTYLcpA5oa6baSsX+Qez03moVFs1TPDvqah33atSy6uSz0LRTxOudg6VTeScvFFwHZkIbWpwlmgZ8ZRu4/ur4Nl30mkwZkDaK2OFSF8skd5wpWCcu/yLKVwDQEOka3WJmzrGQJBn5w8C7ZPf5dqLy4VU4V+SEIpxzKlfmR5CFA2UgmyCWJdVPLFd4itxv0BhjQw8lBroMvBOI/+/MERQ3+xvdG4GODNgp0zO5SeUfS/990iLEWkYFglNjDK465SI69K6SpkzVI0evNTePKVlsHFAPiECe9XDmFc/vlg8UTfnKbKp6hssC+DgL8l6BRsYJ8rRtulFagw2javSKnbNjrlbnm+NQ9Eo1+sCLy2lZ6+m1x9Pxl7im3bAl32jMiPkWVHsSPk+ONNyvHt5Xc8djIK0rLYWFdN417bVMwlV1uvtnVDsFezlbex9OQ1DMgXT8sWHSMrTZJdN7ocLVBC06aQk8ZD8BuWl9znua+KNVpYZZcngmGYONh3ZJlFAZgivFOhF3Fr9ZRm0kweKz44pdd1Lhn08kkIwhSt2VjoRtlPKqgG7U2UVZqfl7qq/S7eYq1Jmi53Mqc4qrqXF/I2ItOxZmXeO3efqKzeQJxj1dh4gZ9k5p+SwTEV/rw= X-Microsoft-Antispam: BCL:0; ARA:14566002|6090799003|7092599006|461199028|41001999006|19110799006|8060799009|5072599009|15080799009|3412199025|440099028; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZFdFT2RESGtaZGtYSURKWUNrZk1BbTlkRERIdWd0d21rMTRkMzQ2R0tQZm5H?= =?utf-8?B?K2J3bHdlZk5RbDkvZExiQnM0d0NhaEs1VERoUnhWUzNBQXBLN0tuZm5qUk9M?= =?utf-8?B?RUE2V3FFb25zS1NsTm1ZM3k1SS90QUpWRTh0U2dRSnMxcE50UDIyQnY1bEJQ?= =?utf-8?B?MWlzZERDaHBYZzlnSXlCMCtBTGRSZnBPbzVnT0RMNkxwc1JCcWtmSW5Ld2NW?= =?utf-8?B?Z2pFSGNMMGlxN2Z5VzdMSjBkYndPcHpBU3ArSXVEZ1JpR0hML3pTNjVtM0dX?= =?utf-8?B?Y0dTZnBLN2wyV0JMb0VKUVVrcTYvanBlNXdicHQwb1M2a21xQVgrMC8xYU13?= =?utf-8?B?NTVUV05tanEvVFJiU2dDNS8va0w5OEZLVzc4VExITjU4R0M2MDhqeDk5THVz?= =?utf-8?B?TVBkTmZ1bkYvZk5idDJzT3hqY2g5VDFkQWN3S3AvZFExb2laK201NmlXTE1N?= =?utf-8?B?b2ozNFZOY2VkUGNFaDBQOHp0cjZuRENmeUVaQ2dVdG5Mekh3aHJQUzZMZm5O?= =?utf-8?B?by9IdUJtQkFTN2VjdWFvcjZlV0dIcWlyVEpPOUcvWWpSQyttbzlXMzdUL3Ry?= =?utf-8?B?dm5BMjJwNE80MzdpQkZmYTBYSlZxRDNJM1h3NTJ4SjhVMVJLa2k4U0x3ZDlV?= =?utf-8?B?aFhLdzUzbWZiWTRaYlp5VmVqN0pFUG1sSVdTbTJ3TC9zeVlXRzZkRGhlWjE4?= =?utf-8?B?VHZGSDNjbmxZK05GQ2I0ZCt5dW90YmFjRWtCeVp3SHBxeTd2dHlrL2Zsdklj?= =?utf-8?B?YlFEc2JjOUNTNjlmVklHWXl6eWRMZzNua3FhamZSNk9qLzU0RmRaYmhzUnEx?= =?utf-8?B?WU9WTUFmUkd5Qm5IQ2M1YzVnTmJQWVdKN1pYUXlOZ2lwVUFLY0dnYlFRNUZM?= =?utf-8?B?bzdkc0h5K04wQWxWNi9vVkhPbzBNQ0ZHMUJROWt6dmR6a1BUZXBUYVBWcGpM?= =?utf-8?B?U0Fsb1pWV29JSEM5UFhiNTJMQm9vTEJoL3VnMkxzdEZQNzlsQWJsNiszU2JJ?= =?utf-8?B?UFlHZnJ4QlpOaE03TEk5WUtRVEptVEpXbXhOc2FqVEt5VVRFVmxoMGxmZnJQ?= =?utf-8?B?MFJEK2dURXdhZDlDZWNjSENCOWdYb0dNWDZ1bkpRN291dW9UYkZQYlhGWmp5?= =?utf-8?B?M25ZQ0JCaXA1VDE4VlRoM1M5bHlrMWR0UXR6RTdXMG9LTTRrblNZTUVUWDlB?= =?utf-8?B?V28xTHQ5c1c3VkNSUVlXdWZOaGs2dENWUFhqb29DWU9WM3MvV3dLZ0NtdHEr?= =?utf-8?B?VFBsRFBuS3MwdGFSQ3o0ZSs3NkFmcngyb0ExS2h4d0N5amNsOXFQbDBNL2VQ?= =?utf-8?B?UVM5SEFPNFJHczJHQ0Q0dDRaUzRBRE5GejlpZWNHYS9Db0VvOWhhdUVXVHhW?= =?utf-8?B?Y2FMZjUvMjI5ak5kUWZheHlRWFI5b3FXQzZPdTJQajJHSGk1WW1uQVdjWWV2?= =?utf-8?B?emsxcFFJNVNCWFRxZmdwdCtBMG15amFpNk1UZVlnNVJCUGZvWDZLTkE5NjlR?= =?utf-8?B?aitMOXBlZjN4VjJzODduS1lQdnVydEYwMEFoNXFQMVpic2dVVm81WkVrRTA5?= =?utf-8?Q?aVb+Go695LG6ZzLu36G0K2vuY=3D?= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WDB4UTZOeDVEcFNWYW9lVksrY2Q1R1RsQ2NJMkZCcHJsZ0M3ZFl5TkVYTmlM?= =?utf-8?B?ek91eVd5VTB4Yi9TV1ZhTE9nTitZR0w1WU5hcmswcVdWRjBZTWlCdnMyZWRW?= =?utf-8?B?Y3oyb2p5WXZ4REZlYmxQckgrTDFUL21XSlhUTzlXMmFiVVNMSStCbytGYXVT?= =?utf-8?B?Ymd3YzVlWTlhaGV1RjRUdUNDajU5ZzZScDlUTFdwWmkvaXpaQ0JUMHhGd01X?= =?utf-8?B?bnNFdVRQd2Y2ZE1wY1ZYUVRXWURQQ00zRzAwWHZ0ZXQyVCtXVlNLTEl6Z1p0?= =?utf-8?B?SnlKQVdwWlUwTE53TkR2MW5UTG00bDZYMkQreUt3VWhkYk5QMnpveU5JMG4r?= =?utf-8?B?MCt1M1ZXNGFWdWhicjZGSzNDeFhPL1lpL1UvMnJadDhzTEYrN24yREg2aWpY?= =?utf-8?B?WmlIRmVkM2xzbEhLOFVua3YwS0wxWmFFY21nbGhzUHp4VkJNRktiaXREZUFw?= =?utf-8?B?R0F5SkVZeGI5RkRjRVA5dkNvamFheGMrOEpnQmRDM1NGR25BSXVoU3h5ZHNm?= =?utf-8?B?a2p1NWE2K1RJazFyOGp3bGt1OGVuMGMyVUJkdHU5RFoyaTUwY0xtRHE5LzNo?= =?utf-8?B?aDJkU29YVCtBQlJ5Qjhza1RISU4xTjVPZzFtTjgrMENYVjE4WkYrSHdhWFUx?= =?utf-8?B?cDlmTEVCL1NSZU1hMjdjblJic013SmtrdWFTemhkdWhaNzc5Y2ZwKzR4QkFN?= =?utf-8?B?ai9YVzlIcHVwYURvRm1Tc282SmNaUk91Szd1YlAxZjFMaDZCU3FNdjdKa3RO?= =?utf-8?B?d1c3b3RzVU1yMkFtR1NFNzNRVnZTMkZ1Q3QwSlNudkhBN0QrSHJIZWF5YXJN?= =?utf-8?B?ZFZJMGg3MHp1TnRoN25GWXlZbDN6RCtyV0Z6K3ljUEZaWW1iempzZlBSek1t?= =?utf-8?B?T3VCbXg4WWZwaUthUEdHOW5LS2ZiTzdXZnpFY0VUQ2U5eGgzU1c4K1VLcDcw?= =?utf-8?B?ai9FT1hmQ1doalg3aThsTnoyRkZ0d2dEMDdIRDVwQ1psbk16QXdxT2RiU2U1?= =?utf-8?B?QytYbi9sbm1tUENQT0R0N3VMbDFLYjByVi9ERU1ab1dpSG9LUXNRN0lnbEc3?= =?utf-8?B?V0Y3Tk9mUVFLL2tpOUIrVjhLWFlVa2ZaZXYwVkw3Y1hoN2tqeC92a0FUZHhw?= =?utf-8?B?eENETEdtdGhLcmk3S1p5VkJHUFlONXFNdlBjLys3ZitoeE1mRXhDbXBuMGdx?= =?utf-8?B?Y0hKUlZFSE9TZ0QzNk1mekhZSk4xc0VXZnozeG5BMm5TRzZveXdTajRsSkVi?= =?utf-8?B?VEdnU1ZNNmM0VlFPY0NSUXNLVER2NEdacXlCYW56ZmcxYnV2THd4V2hpYkJV?= =?utf-8?B?SWJDZ2RmRFJ5NmRQczZjS2Z1WTFrR2tzbDlnODl0dzdPSHNqcjlQTlhTN0Nz?= =?utf-8?B?aFdOaFNHRjJyVE16M2xCeTRjU3RmQzhmTE94eWs5YzFoc3U0MXhKczNkTTJk?= =?utf-8?B?ZTNtN0czNjVrc1JWTXM5MVdMK1NTeTVab3pUVUtuMUVIODRjY0MyaTcyM3NJ?= =?utf-8?B?azNDSHJwWU8wejN1TTBGQWRMeHRvdHVDbTRJOE51aTBGUXJ6TGoxdEpEbm9y?= =?utf-8?B?M0JXcUJiVmFSR1BaekVTcm54TStubkI0bVc4SVFSRE5CMEI2YjZWb3pxMGJv?= =?utf-8?B?SUhLVmpJa2tVUHd2aVAxdWFscDExMUhUT25zUXR0ZFJzMko0OEdZSmxsdXpm?= =?utf-8?B?aStBM1NxRFFieXRDYmdZWEhGeElzK2lLbUtOYVNKcDcvRkxFazdSbW9aaXVw?= =?utf-8?B?cDJSZ3NwVDJGU1FrYTYwdmY1RG01L3g3aHRJTVNqQ1dsL2pWbHF4bmdkOWo0?= =?utf-8?B?SUJqOVBPYU9pdzR6elZkUT09?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3d0217e6-34e8-4024-44a8-08dd961a4b00 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2025 14:43:03.0931 (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: DU2P250MB0147 Subject: Re: [FFmpeg-devel] [PATCH] avformat/framecrcenc: List types and checksums for for 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: Michael Niedermayer: > This allows detecting changes and regressions in side data related code, same as what > framecrc does for before already for packet data itself. > > Signed-off-by: Michael Niedermayer > --- > libavformat/framecrcenc.c | 116 +- > tests/ref/fate/autorotate | 2 +- > tests/ref/fate/cover-art-mp3-id3v2-remux | 2 +- > tests/ref/fate/ffmpeg-bsf-input | 10 +- > tests/ref/fate/ffmpeg-spec-disposition | 2 +- > tests/ref/fate/force_key_frames-source | 784 ++++++------ > tests/ref/fate/force_key_frames-source-drop | 34 +- > tests/ref/fate/force_key_frames-source-dup | 1224 +++++++++---------- > tests/ref/fate/gapless-mp3 | 6 +- > tests/ref/fate/h264_redundant_pps-side_data | 2 +- > tests/ref/fate/id3v2-priv-remux | 2 +- > tests/ref/fate/matroska-hdr10-plus-remux | 2 +- > tests/ref/fate/matroska-ogg-opus-remux | 2 +- > tests/ref/fate/matroska-opus-remux | 2 +- > tests/ref/fate/matroska-vp8-alpha-remux | 14 +- > tests/ref/fate/mov-cover-image | 2 +- > tests/ref/fate/segment-mp4-to-ts | 250 ++-- > tests/ref/fate/shortest | 100 +- > tests/ref/fate/webm-hdr10-plus-remux | 2 +- > tests/ref/fate/webm-webvtt-remux | 24 +- > 20 files changed, 1346 insertions(+), 1236 deletions(-) > > diff --git a/libavformat/framecrcenc.c b/libavformat/framecrcenc.c > index 2ba20f3aab4..96c2a82eb2a 100644 > --- a/libavformat/framecrcenc.c > +++ b/libavformat/framecrcenc.c > @@ -21,8 +21,11 @@ > > #include > > +#include "config.h" > #include "libavutil/adler32.h" > #include "libavutil/avstring.h" > +#include "libavutil/intreadwrite.h" > +#include "libavutil/hdr_dynamic_metadata.h" Use proper alphabetical ordering > > #include "libavcodec/codec_id.h" > #include "libavcodec/codec_par.h" > @@ -48,6 +51,20 @@ static int framecrc_write_header(struct AVFormatContext *s) > return ff_framehash_write_header(s); > } > > +static av_unused void inline bswap(char *buf, int offset, int size) > +{ > + if (size == 8) { > + uint64_t val = AV_RN64(buf + offset); > + AV_WN64(buf + offset, av_bswap64(val)); > + } else if (size == 4) { > + uint32_t val = AV_RN32(buf + offset); > + AV_WN32(buf + offset, av_bswap32(val)); > + } else if (size == 2) { > + uint16_t val = AV_RN16(buf + offset); > + AV_WN16(buf + offset, av_bswap16(val)); > + } > +} > + > static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) > { > uint32_t crc = av_adler32_update(0, pkt->data, pkt->size); > @@ -58,11 +75,104 @@ static int framecrc_write_packet(struct AVFormatContext *s, AVPacket *pkt) > if (pkt->flags != AV_PKT_FLAG_KEY) > av_strlcatf(buf, sizeof(buf), ", F=0x%0X", pkt->flags); > if (pkt->side_data_elems) { > + int i; > av_strlcatf(buf, sizeof(buf), ", S=%d", pkt->side_data_elems); > > - for (int i = 0; i < pkt->side_data_elems; i++) { > - av_strlcatf(buf, sizeof(buf), ", %8"SIZE_SPECIFIER, > - pkt->side_data[i].size); > + for (i=0; iside_data_elems; i++) { This change is wrong. > + const AVPacketSideData *const sd = &pkt->side_data[i]; > + const uint8_t *data = sd->data; > + uint32_t side_data_crc = 0; > + > + switch (sd->type) { > +#if HAVE_BIGENDIAN > + uint8_t bswap_buf[FFMAX3(sizeof(AVCPBProperties), > + sizeof(AVProducerReferenceTime), > + sizeof(AVDynamicHDRPlus))]; > + case AV_PKT_DATA_PALETTE: > + case AV_PKT_DATA_REPLAYGAIN: > + case AV_PKT_DATA_DISPLAYMATRIX: > + case AV_PKT_DATA_STEREO3D: > + case AV_PKT_DATA_AUDIO_SERVICE_TYPE: > + case AV_PKT_DATA_FALLBACK_TRACK: > + case AV_PKT_DATA_MASTERING_DISPLAY_METADATA: > + case AV_PKT_DATA_SPHERICAL: > + case AV_PKT_DATA_CONTENT_LIGHT_LEVEL: > + case AV_PKT_DATA_S12M_TIMECODE: > + for (size_t j = 0; j < sd->size / 4; j++) { > + uint8_t buf[4]; > + AV_WL32(buf, AV_RB32(sd->data + 4 * j)); > + side_data_crc = av_adler32_update(side_data_crc, buf, 4); > + } > + break; > + case AV_PKT_DATA_CPB_PROPERTIES: > +#define BSWAP(struct, field) bswap(bswap_buf, offsetof(struct, field), sizeof(((struct){0}).field)) > +#define BSWAP_RAT(struct, field) do{BSWAP(struct, field.num); BSWAP(struct, field.den);}while(0) Missing spaces. > + if (sd->size == sizeof(AVCPBProperties)) { > + memcpy(bswap_buf, sd->data, sizeof(AVCPBProperties)); > + data = bswap_buf; > + BSWAP(AVCPBProperties, max_bitrate); > + BSWAP(AVCPBProperties, min_bitrate); > + BSWAP(AVCPBProperties, avg_bitrate); > + BSWAP(AVCPBProperties, buffer_size); > + BSWAP(AVCPBProperties, vbv_delay); > + } > + goto pod; > + case AV_PKT_DATA_PRFT: > + if (sd->size == sizeof(AVProducerReferenceTime)) { > + memcpy(bswap_buf, sd->data, sizeof(AVProducerReferenceTime)); > + data = bswap_buf; > + BSWAP(AVProducerReferenceTime, wallclock); > + BSWAP(AVProducerReferenceTime, flags); > + } > + goto pod; > + case AV_PKT_DATA_DYNAMIC_HDR10_PLUS: > + if (sd->size == sizeof(AVDynamicHDRPlus)) { > + memcpy(bswap_buf, sd->data, sizeof(AVDynamicHDRPlus)); > + data = bswap_buf; > + for(int i = 0; i<3; i++) { Missing space after for and around "<". Also, why not use FF_ARRAY_ELEMS? Same below. > + BSWAP_RAT(AVDynamicHDRPlus, params[i].window_upper_left_corner_x); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].window_upper_left_corner_y); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].window_lower_right_corner_x); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].window_lower_right_corner_y); > + BSWAP(AVDynamicHDRPlus, params[i].center_of_ellipse_x); > + BSWAP(AVDynamicHDRPlus, params[i].center_of_ellipse_y); > + BSWAP(AVDynamicHDRPlus, params[i].semimajor_axis_internal_ellipse); > + BSWAP(AVDynamicHDRPlus, params[i].semimajor_axis_external_ellipse); > + BSWAP(AVDynamicHDRPlus, params[i].semiminor_axis_external_ellipse); > + //!!! overlap_process_option > + for(int j=0; j<3; j++) > + BSWAP_RAT(AVDynamicHDRPlus, params[i].maxscl[j]); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].average_maxrgb); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].fraction_bright_pixels); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].knee_point_x); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].knee_point_y); > + for(int j=0; j<15; j++) { > + BSWAP_RAT(AVDynamicHDRPlus, params[i].distribution_maxrgb[j].percentile); > + BSWAP_RAT(AVDynamicHDRPlus, params[i].bezier_curve_anchors[j]); > + } > + BSWAP_RAT(AVDynamicHDRPlus, params[i].color_saturation_weight); > + } > + BSWAP_RAT(AVDynamicHDRPlus, targeted_system_display_maximum_luminance); > + for(int i = 0; i<25; i++) > + for(int j = 0; j<25; j++) { > + BSWAP_RAT(AVDynamicHDRPlus, targeted_system_display_actual_peak_luminance[i][j]); > + BSWAP_RAT(AVDynamicHDRPlus, mastering_display_actual_peak_luminance[i][j]); > + } > + } > + pod: > +#endif > + > + default: > + side_data_crc = av_adler32_update(0, data, sd->size); > + break; > + 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 = 0; > + } > + > + av_strlcatf(buf, sizeof(buf), ", %s, %8"SIZE_SPECIFIER", 0x%08"PRIx32, > + av_packet_side_data_name(sd->type), sd->size, side_data_crc); > } > } > av_strlcatf(buf, sizeof(buf), "\n"); _______________________________________________ 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".