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 DECC34A1C3 for ; Sat, 23 Mar 2024 18:01:11 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E77FC68D390; Sat, 23 Mar 2024 20:01:08 +0200 (EET) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2025.outbound.protection.outlook.com [40.92.91.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 018B668D380 for ; Sat, 23 Mar 2024 20:01:02 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gbka3Zpn0Cqj6ziEm6uYjGAOTi0iKqoT1OR5zpDpMsw49WvoB4+dlzaFZQnHnwmarFIWXPfm3w5/PFRlcEcfxijgri1V3eJmYYGVCdrYl9f9TQy3MwMU6TL5aXy1c7EeuU5aZCL5Y/gaCnVFKVwCignWXi++d2OPnIkxuCfucu9SnprB8AmK0PUpeATkB/we53+pJkIV2PXoUbVisEySFHmfqUT3Szfb71Avjys6pKIxTHHAXdxPfPkjIL7WPqKMSaREF1q6cnQKEEMJiNZW70pG8+fxnjYPsDu3ItLUDce43N0SmA4dxeEY5+TpCbvOrH0jSV3sOAC62kw7T4GGyw== 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=rvgolwT/Qcdd7Bqvg1f6ydYtEQfeJL6SAFSqIOfk40I=; b=kAtPJgB8B/AJ77N+9YxUBXNdln4rcXo82MaVa9TspeBph3SM8oOfZ6eGU6zqts6oRqyJgKcUM7W+9KT/3jY4JLqzPmCGxsssGK1dwOe7Wew+N5FZlrLhHyaZvVk++9R3NC9TggeCN72pz0nx9wMy5qkMfJPExFv1Yl54czjkckpE+FwN2iX9XqyFoLs5Ex4Mzdp3ZDqpVgFcbMQuXWruy2AT0C+uQzX8jrH5hR6184uaK9i6CbPV6l/btjxOffMcWxiVZ9x/Th7yYjSRgwASF31+Kazr8cC9Px2W7Y4gyW8hEn3OHQrKnlR/O9RsiU0gs5I+SiJAkV+y7C/k8aomRg== 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=rvgolwT/Qcdd7Bqvg1f6ydYtEQfeJL6SAFSqIOfk40I=; b=p7e/eVxlXIN9GMNeHK4eBAGbmn/mljq8rkWfQMEW5CILuuff0kSwOwSO/WfC18wPOKxoKiX9xsi8oKMLqQ2ecC8/iw0awSov/K5GhOjWorwbbH7Xat4Syh60+jFcKJO1gld8Eq/62otzLyHiNppt0Td8vcyuZbS+pQTNaAol2giLciztZtfRL3WRRafDgQBtHLMRjbA5CCtZOuK1169Vsg/6ByqcqvfHrYpTCx0wMXmKdorACZG6PNNAFAn2piAEcscoeuSDkr5PndGHelSZDZBnC5qGwHMhpudOCXcnQMHwMkmKqQZ5wolKMeBhRVhTyyACjKGCRdcKRpIt2uSuWw== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by DU0P250MB0532.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:328::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.26; Sat, 23 Mar 2024 18:01:01 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::4a3b:cf76:cddc:c68d%4]) with mapi id 15.20.7409.026; Sat, 23 Mar 2024 18:01:01 +0000 Message-ID: Date: Sat, 23 Mar 2024 19:00:59 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240323173735.26224-1-ffmpeg@haasn.xyz> <20240323173735.26224-6-ffmpeg@haasn.xyz> From: Andreas Rheinhardt In-Reply-To: <20240323173735.26224-6-ffmpeg@haasn.xyz> X-TMN: [rv0BtFZXN/a4ks/SyZI69lfR2jclmPXEfZ/M23SX9tk=] X-ClientProxiedBy: ZR0P278CA0059.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:21::10) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <562c122b-9ea4-47c7-8bce-61934d18ed9d@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|DU0P250MB0532:EE_ X-MS-Office365-Filtering-Correlation-Id: 7895985d-1fd7-438b-fe66-08dc4b63331a X-MS-Exchange-SLBlob-MailProps: Cq7lScuPrnqkjmXb1vlddM5aSa/Epk3A/hCz3BIh+CT1FEsXj75s+NyqrUJvJD15jCcZj5FsW6RDdkeDy8S5Y8lpZtAsqig5dJGMh0xb6tuv1fkTdTn2woyDKvbGsiuaFJpHMy+E5NJvR2zG/BYatloO8Qr7AZu5qZFEzsB7ayl3jqycsgBDkw/EBLKe0Aum4KtIeqzHM+5n8uKmfWT9LyAJVzasEobn1I+xQzpI6U8/xhhVeCLP7yEdCmT7XMCoIyhY0E/T+MA49RcdF7FffIrZGSOrGcIPty2tNKD3FIsLsAVhrfz2txQmK6/Uw9Aj6EiJQQwmSKu1VCaMMu7QzHkW/PuZS1Kw/QQlGCMXA2YUdz+C6P5AoakplrZIF1pDN53LicdqgfPsZGjg8rQbRI2/TCC3WG/chN080v/HvdewqmZWBBbC/kdJWEhmipiYwgc008Hp5RD2pu//lqiX++Eu2EsXHjStpEnvTcUU8Mk7r6EsKNGGW392dDUG07OM71jvJA7tgE5AhGkPTWnIpanQ/C+wbpYWUDS+wsHxwlGLV1nxyAIl3nKtzHcblFZq5/xM+R16kbJYuSFvTtEH1c+Ie1hc4j/QfCbQM4PI3WmMSUc7YV6xqbhxPBHtypqRPepCytAKjCAj6Ae1cWZER3lWGeXrJ3Tp57TxkJpf5eTA02tQ1TpXuZK9KKUzjG7yha7cGp9JduEjeAKEqTqa5G5MbO0wYkT0/ilMPKMvFLdCUt86W5ARz7AEPdk5wrX/iW3iG9i2hIQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: JKJZg0Uh5CsKM4xGbqLjOkSsHbJjdcKtiHaVvRkr5vsO2q0YFmDP2OTU1Bk3Bzm8iPM9rz4MZd1bIsjIPF/fWw6CkSJ/knok4Loas+FHOx8jcrRPpAyXjEe4XGuiezf88/CjyYBJFLE3O/lfwFWh66VcaGsLXOjWG2/BjRAkRh01Pg0UEdWBWv9Hyq5Rz2Z1oiiSBKWFva3aEHuDMt98mkk6W5p6kZ/j8tD6Y1/REGZ8xwhel1ikTHnxX9p4FERoFNfg5pvpnCh2ajm3t90St6zYNVtKNwI+6ZmlGyVD/SDgPzAGAVwqi1OINcyz012tzmWouoo2iuF26vw3Xt+8+dlkqHoYy1zq1OMg8Y5l78bWcQ0a0KeARrKpNEZ9wpxwbe6GcHCS2tIEU5xoVFgIaqZO5GFLQLs3kqCbddu4D44tbg6zltSIGBI8frbJjYsZsgNA2r/a8Qi+2tEazRQDkxFNjmxH1YJkUZpwWo7itpm4Fqwvi9i0YO+2D1alo+MGAxMziznt32D77PH9WIL6K8OhrwWPquN5V0hboIzgErLd6CtiWi5h8gMdm0nfq1b6 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?WUh4NXg1VWthK3NwSjNLU0tqTHRVaDl4Yi9DaW5QOFl2MXpySXpaS1NmenZY?= =?utf-8?B?T2hoS21LcVl1WGkvSlAyZ21aN1RyVHlpeUQ5ZTFMOURKcDJaNXpiQ2pkNG9M?= =?utf-8?B?bm05QktzNTlSQkVLNllQbS9iUW1zNU9LZkh0STBUY0lrbWo2YWYxbmE1c1Va?= =?utf-8?B?Tll4djV2YmUycFNPbGdZNXhZUVBleVJGeEkyS2R2aCs2dXlHRnhxMDYzaTZp?= =?utf-8?B?RVhqMFRoRG1ZNDZ1MDdINUJPNFVmQTZMbGVoR2VhY3l5bG40Z0VGL0NaQmJE?= =?utf-8?B?enREZFBWWE1ud2oraDZlUXlVL2tMbURGTnkybld1UnN0dzd6QlVvN0hBNG1V?= =?utf-8?B?dmVHRlZUTGo2L0w2SXBWdGNhcmZTNjNIeEhtb2gxNGY1eVVBMmlaN0ZhODlB?= =?utf-8?B?RkN3TFAvL0dESi9lcmY3L2VvN3BjbmdQZmdQZ0NCajVMelJYRWQ5NFNQZkFY?= =?utf-8?B?MmZZNDFmQitEZ1A4aW1uUmNWQmVUZU1OcVUwNHVVZ3l2dVpENTl4SW5qNnBY?= =?utf-8?B?Q2o5YU11eWlZRjRUai84YnBQRlVndzJ3eEM1Z2pPZ2xBR2dFU1RNTmczSSt1?= =?utf-8?B?ZkF5WXgvcXhzWnIzdlNJMGh1NHoyWHhWL3RMenpyeXcrZE1XeG5nOVduNzZV?= =?utf-8?B?UVpLNjMzVkpRQkcrMlFHbWo3WUFySWRML2Q0aVorZWd6Y1FTcDNRUG1TQkVh?= =?utf-8?B?OHVrSVBFcUEzY1M2cTZsOU81VDlKTXpuTVB1VGdYd0kzcC9DNkRmdDB4SEZK?= =?utf-8?B?bmhYWWZLdjRGaUtlZXBBT2FuQUljeUxvR2EyUDVscG1DWHRyckVMVEJLZC93?= =?utf-8?B?TUdBdVdkN1ZvM0ZzU2FDQ21rcHpySjBwYlVtSzVXUDNqU1E2ODhoSjNqUExQ?= =?utf-8?B?cWFWV1hVaS9vWFl1Slh2VGRIdTMxTzE2VlQ5YkpEM0xOdjVqL1ZrSXNNc3pH?= =?utf-8?B?MWx1OHdWUFlpUXo1aHcxMWFQV0lQZGR0VTRoM1NaS01sU1R3RkJYbVNsbGo5?= =?utf-8?B?Z2JoOGVnTmV1dUM1NnNnenJRQzNqbVNFTU11MzV5L1poejZKRjFOckMxV3VC?= =?utf-8?B?Ym00dUN6TzdrdEVFMWxxV21BbXRQckZxRmRiaXN5V1pzQjI2dy9IZVFERWVw?= =?utf-8?B?TkgxVG9EMElLZmJWQ3J1VXBmUk92MU5FSXdrenh5a3VkZWpka085N2E1QUtP?= =?utf-8?B?MXhzVnpxQ1JNVXRYc3VveDUxYjNhSXZIWFZ4TGQwczNCb3BTdXpUWXRLRHdR?= =?utf-8?B?azZsMStYRnh0RWI1dlBQRXFsWmxrdWx2cFFjNHM4TUsvOXB0dk0rZWF0cGxt?= =?utf-8?B?ZytoZWZUbFJmbG4rZlIrenJkYmhSYjJEME0wVDFSUUdtaFp5YytSci9VT3h3?= =?utf-8?B?dTNBTG5VMm1Wd0lIRjIxbjRGZVBDYTJVcHN0OVMzbUpLbFp2R1hwME5jYWt3?= =?utf-8?B?L1hLV0Nlb0gvb2doRTgyQStsMWxDRUFPQ1R0RS95YmlJS3pzdFl4SzFhNkZY?= =?utf-8?B?QUptNjBvS1ZiaEU4cUdnbnNUdkVQR2RMYVdLZmJKbHZRS0RSMkxSL21BdFJK?= =?utf-8?B?aTFVSVpuMFM4L0pnOE5mTFVMR01WNy9tcTlML2ZKYmR0Z2w1N3NSd2hjaDVN?= =?utf-8?B?eTA3alpXTW1nQXA1dE9XVmhBS3VBbGUxK2VNazdTd1g2MVV4eUVNS2pEbUhY?= =?utf-8?B?cXhHQ0ptMTAzUnBnb3JoYjBWbmZxdlB6NTJTZko5QWZzRi9sK2dpYmhRPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7895985d-1fd7-438b-fe66-08dc4b63331a X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Mar 2024 18:01:01.2730 (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: DU0P250MB0532 Subject: Re: [FFmpeg-devel] [PATCH 6/6] avcodec/dovi_rpu: parse extension blocks 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: Niklas Haas: > From: Niklas Haas > > We split the inner loop between v1 and v2 extension blocks to print > a warning where an extension block was encountered in an unexpected > context. > > Co-authored-by: quietvoid > --- > libavcodec/dovi_rpu.c | 178 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 178 insertions(+) > > diff --git a/libavcodec/dovi_rpu.c b/libavcodec/dovi_rpu.c > index 21cb1850e3e..99a983f65dd 100644 > --- a/libavcodec/dovi_rpu.c > +++ b/libavcodec/dovi_rpu.c > @@ -199,6 +199,174 @@ static inline unsigned get_variable_bits(GetBitContext *gb, int n) > } \ > } while (0) > > +static void parse_ext_v1(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm) > +{ > + switch (dm->level) { > + case 1: > + dm->l1.min_pq = get_bits(gb, 12); > + dm->l1.max_pq = get_bits(gb, 12); > + dm->l1.avg_pq = get_bits(gb, 12); > + break; > + case 2: > + dm->l2.target_max_pq = get_bits(gb, 12); > + dm->l2.trim_slope = get_bits(gb, 12); > + dm->l2.trim_offset = get_bits(gb, 12); > + dm->l2.trim_power = get_bits(gb, 12); > + dm->l2.trim_chroma_weight = get_bits(gb, 12); > + dm->l2.trim_saturation_gain = get_bits(gb, 12); > + dm->l2.ms_weight = get_bits(gb, 13) - 8192; > + break; > + case 4: > + dm->l4.anchor_pq = get_bits(gb, 12); > + dm->l4.anchor_power = get_bits(gb, 12); > + break; > + case 5: > + dm->l5.left_offset = get_bits(gb, 13); > + dm->l5.right_offset = get_bits(gb, 13); > + dm->l5.top_offset = get_bits(gb, 13); > + dm->l5.bottom_offset = get_bits(gb, 13); > + break; > + case 6: > + dm->l6.max_luminance = get_bits(gb, 16); > + dm->l6.min_luminance = get_bits(gb, 16); > + dm->l6.max_cll = get_bits(gb, 16); > + dm->l6.max_fall = get_bits(gb, 16); > + break; > + case 255: > + dm->l255.dm_run_mode = get_bits(gb, 8); > + dm->l255.dm_run_version = get_bits(gb, 8); > + for (int i = 0; i < 4; i++) > + dm->l255.dm_debug[i] = get_bits(gb, 8); > + break; > + default: > + av_log(s->logctx, AV_LOG_WARNING, > + "Unknown Dolby Vision DM v1 level: %u\n", dm->level); > + } > +} > + > +static inline AVCIExy get_cie_xy(GetBitContext *gb) > +{ > + const int denom = 32767; > + return (AVCIExy) { > + .x = { get_sbits(gb, 16), denom }, > + .y = { get_sbits(gb, 16), denom }, > + }; The order of initializations is undefined. > +} > + > +static void parse_ext_v2(DOVIContext *s, GetBitContext *gb, AVDOVIDmData *dm, > + int ext_block_length) > +{ > + switch (dm->level) { > + case 3: > + dm->l3.min_pq_offset = get_bits(gb, 12); > + dm->l3.max_pq_offset = get_bits(gb, 12); > + dm->l3.avg_pq_offset = get_bits(gb, 12); > + break; > + case 8: > + dm->l8.target_display_index = get_bits(gb, 8); > + dm->l8.trim_slope = get_bits(gb, 12); > + dm->l8.trim_offset = get_bits(gb, 12); > + dm->l8.trim_power = get_bits(gb, 12); > + dm->l8.trim_chroma_weight = get_bits(gb, 12); > + dm->l8.trim_saturation_gain = get_bits(gb, 12); > + dm->l8.ms_weight = get_bits(gb, 12) - 8192; > + if (ext_block_length < 12) > + break; > + dm->l8.target_mid_contrast = get_bits(gb, 12); > + if (ext_block_length < 13) > + break; > + dm->l8.clip_trim = get_bits(gb, 12); > + if (ext_block_length < 19) > + break; > + for (int i = 0; i < 6; i++) > + dm->l8.saturation_vector_field[i] = get_bits(gb, 8); > + if (ext_block_length < 25) > + break; > + for (int i = 0; i < 6; i++) > + dm->l8.hue_vector_field[i] = get_bits(gb, 8); > + break; > + case 9: > + dm->l9.source_primary_index = get_bits(gb, 8); > + if (ext_block_length < 17) > + break; > + dm->l9.source_display_primaries.prim.r = get_cie_xy(gb); > + dm->l9.source_display_primaries.prim.g = get_cie_xy(gb); > + dm->l9.source_display_primaries.prim.b = get_cie_xy(gb); > + dm->l9.source_display_primaries.wp = get_cie_xy(gb); > + break; > + case 10: > + dm->l10.target_display_index = get_bits(gb, 8); > + dm->l10.target_max_pq = get_bits(gb, 12); > + dm->l10.target_min_pq = get_bits(gb, 12); > + dm->l10.target_primary_index = get_bits(gb, 8); > + if (ext_block_length < 21) > + break; > + dm->l10.target_display_primaries.prim.r = get_cie_xy(gb); > + dm->l10.target_display_primaries.prim.g = get_cie_xy(gb); > + dm->l10.target_display_primaries.prim.b = get_cie_xy(gb); > + dm->l10.target_display_primaries.wp = get_cie_xy(gb); > + break; > + case 11: > + dm->l11.content_type = get_bits(gb, 8); > + dm->l11.whitepoint = get_bits(gb, 4); > + dm->l11.reference_mode_flag = get_bits(gb, 1); > + skip_bits(gb, 3); /* reserved */ > + dm->l11.sharpness = get_bits(gb, 2); > + dm->l11.noise_reduction = get_bits(gb, 2); > + dm->l11.mpeg_noise_reduction = get_bits(gb, 2); > + dm->l11.frame_rate_conversion = get_bits(gb, 2); > + dm->l11.brightness = get_bits(gb, 2); > + dm->l11.color = get_bits(gb, 2); > + break; > + case 254: > + dm->l254.dm_mode = get_bits(gb, 8); > + dm->l254.dm_version_index = get_bits(gb, 8); > + break; > + default: > + av_log(s->logctx, AV_LOG_WARNING, > + "Unknown Dolby Vision DM v2 level: %u\n", dm->level); > + } > +} > + > +static int parse_ext_blocks(DOVIContext *s, GetBitContext *gb, int ver) > +{ > + int num_ext_blocks, ext_block_length, start_pos, parsed_bits; > + AVDOVIDmData *ext_blocks; > + size_t alloc_sz; > + > + num_ext_blocks = get_ue_golomb_31(gb); get_ue_golomb_31() currently returns small values when encountering golomb values outside of the 0-31 range; but this is not guaranteed to be so. > + align_get_bits(gb); > + > + alloc_sz = (s->num_ext_blocks + num_ext_blocks) * sizeof(AVDOVIDmData); > + ext_blocks = av_fast_realloc(s->ext_blocks, &s->ext_blocks_sz, alloc_sz); > + if (!ext_blocks) { > + ff_dovi_ctx_unref(s); > + return AVERROR(ENOMEM); > + } > + s->ext_blocks = ext_blocks; > + > + while (num_ext_blocks--) { > + AVDOVIDmData *dm = &s->ext_blocks[s->num_ext_blocks++]; > + ext_block_length = get_ue_golomb_31(gb); > + dm->level = get_bits(gb, 8); > + start_pos = get_bits_count(gb); > + > + switch (ver) { > + case 1: parse_ext_v1(s, gb, dm); break; > + case 2: parse_ext_v2(s, gb, dm, ext_block_length); break; > + } > + > + parsed_bits = get_bits_count(gb) - start_pos; > + if (parsed_bits > ext_block_length * 8) { > + ff_dovi_ctx_unref(s); > + return AVERROR_INVALIDDATA; > + } > + skip_bits(gb, ext_block_length * 8 - parsed_bits); > + } > + > + return 0; > +} > + > int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, > int err_recognition) > { > @@ -524,6 +692,16 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, > color->source_diagonal = get_bits(gb, 10); > } > > + /* Parse extension blocks */ > + s->num_ext_blocks = 0; > + if ((ret = parse_ext_blocks(s, gb, 1)) < 0) > + return ret; > + > + if (get_bits_left(gb) > 48 /* padding + CRC32 + terminator */) { > + if ((ret = parse_ext_blocks(s, gb, 2)) < 0) > + return ret; > + } > + > return 0; > > fail: Why do you implement parsing for something that does not get used at all? _______________________________________________ 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".