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 044C44A12E for ; Wed, 22 May 2024 04:19:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 26BBD68D3A1; Wed, 22 May 2024 07:19:33 +0300 (EEST) Received: from EUR04-DB3-obe.outbound.protection.outlook.com (mail-db3eur04olkn2025.outbound.protection.outlook.com [40.92.74.25]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95E4D68D353 for ; Wed, 22 May 2024 07:19:26 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Tb8b4YJVa6b16+xjgjgMhA4hKfHj+YXoCDIF5aYGZTXGEWQPQUXvF8GJt5gAxgg25mW1omn4Pj8f2Z7AHMceTOwC17qrC0Sieparar8Rn2Bo/iIA5YgWE3M4YrJUWNC58R3JbVQoPpOkAgC9/OPuof5/mVPNTDMxSeDJmgeo3hM3k3d3LGYj+sbEGK7qWCFXNr8Rx+HbQfRcZKf4G2tFxLpOWAkQ67vKJ8udOICZMScS5i3ZiaxMgQMOAcHk9gAq21nuFawn6q4Vn8wLTNCbFCA3BIml8hz3MxRQ7L636COkM5khB+UyuolN5dnDyLFkCKMDk88HXlsh76swWMe+fA== 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=8LNrSBIrLRMNoT6zSHjcaEMlOBhP41QfLJmBrEUcJ44=; b=G5QFhxw1VeT0Jels7+KroSMIsFeqHvZ4JBnycoPMcWPJVStRKi1CyGFoip0hHXDTWmkvrRR7CzB6OQ9TZ+cIy7af23IuywZWsHq02GSGhHCE1RfiJ1xsfWTydv/1bgJJa102EAFAm+nLHvcVkOnJmFIgnrhiM+UkjEP0qI3ohAe2bZhe3vXdj75dxXS1PEUoRGp8Yks2eFV0KJf5S6ELLRVi26nVgv/FPhfNKXNB6aroeVHzv3q0X0Mz0inOg7Du6aMNK/HljFxgMBxLYuHU2G1mpOyHrSOoUIbToLG82MMkbuGSt3UsEM/8vJwmp56Zvv5YqkekjDLjOtuYw2zp4A== 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=8LNrSBIrLRMNoT6zSHjcaEMlOBhP41QfLJmBrEUcJ44=; b=uh4GOR86k1o0l3izazifZUCJjnDVjA9KmdfKLSrvJxQqnAbqzIv/x5zzQqRHcpxM4HB5rQfpTPlG01MazyQicL5KB6xTpBo5doGuiYON/pRHTkl57JQB+95qoMX9X13o7wd2KLxGjGY2u9rXv+mB9yMJtjCBYRgApieRj/9b/L82K+6Wc/k1B/eny6RRl9+9qm/QvnVWFwq0dHNKHyENYa/J2c02aDPo5DaN/caauGl+4JvvwEZSnsyNHdFXSF/6wYxm14RccjUhV5s+KhykbB5LyN3HiJAbya8JtXUtlouMTfKX/iKOmve1wFrXTxIqd2KbHMbKGMMg0zVK97ThCg== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS1P250MB0584.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:48f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7587.35; Wed, 22 May 2024 04:19:25 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%3]) with mapi id 15.20.7587.030; Wed, 22 May 2024 04:19:25 +0000 Message-ID: Date: Wed, 22 May 2024 06:19:22 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240521183905.76407-1-cosmin@cosmin.at> <0101018f9c733dc5-40f2990f-582b-44f9-93d6-eb22da8e293c-000000@us-west-2.amazonses.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <0101018f9c733dc5-40f2990f-582b-44f9-93d6-eb22da8e293c-000000@us-west-2.amazonses.com> X-TMN: [beMFioq3ykN3dPUeeAOj8MVdeB4wSaDw05s8CIZUKz4=] X-ClientProxiedBy: FR5P281CA0036.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:f3::9) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <5ca773d1-439b-48e7-a3af-f2273157ce03@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS1P250MB0584:EE_ X-MS-Office365-Filtering-Correlation-Id: 07e48731-a4cd-4315-ee42-08dc7a165cfd X-Microsoft-Antispam: BCL:0;ARA:14566002|461199019|440099019|3412199016; X-Microsoft-Antispam-Message-Info: biCojqaIkTRVf6aWPlJKfm0GACOitTqBOR9QvBPaewJJYEsXf4AugFNeBszXOiX+Lc8Mmg1jkzcRdgb+LcZQviHuj5eCPiKbBTyOQgO0pyCgYgJgu1rRKwomD6V2wsiIetywVxgkjlvcz4nY6gUYKlBBfYm+85qEUtdswp6vwWhlFtrl1WPthq73pdIhFtQ40SK3/3z17NsYnxL/c4Cqnm3nyAj1npCIZhcvY01fj4xwZuBPhAb47qQQTm9OyNP3XNgRVs54NO0jH5Vvix8ewI49uOcvhBAwCzWDlc1HTqz8QRGRYWAYewTCY11Es4BLZ73l54ou+cuJ4j+Z8SyB4NisrbR6DSmkVF7hNw9E2yOrp3sOT4J+xCvfntW752HzeaeJAMvpu6thFkL0klkoDU33kvKNYHMVn7Lbl3JICGAAYSkUKLwhKtS1/j9p6tI+CiBB0h8I62FceoqfPm80FXO2icdRM7emHdSO+pjdHAFAZ/XjcFKwT69gCxOyBUaaT5HfAYAzF4wtwgtRHAZ/J4WDlAMBMOJey9L5mU6lZo1IAc/Ke/CJEz8AGHgMlGSD X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZGErWDAxQ0hwTjg2QTZxOUdGK1BzcTFSbHoxU1FNNnNoN1had3N3aTdGdTRr?= =?utf-8?B?RHVvb0J4VXlNOUdxbVBaMlQyZzRPQ1FQR01YYk9ZalZ5cEd2UWJiUUNpUDZF?= =?utf-8?B?MlZMUndVNmg1Y2Y3L3NWanQ4dW04S3lyUnR5eXg3VnNVVjY3MDlxRnBNMnpL?= =?utf-8?B?WXNYVDJ5V1d0VGFrUEtwOS9oT2lubytHQ0xjeU50Z3FMOWxwaW1EbG9MS0F2?= =?utf-8?B?dDlWU05GY3NydVJzQWw2QW5ubm1pN1l4VGJpcmdiRG5HbC9mYVVoUGhBVCt4?= =?utf-8?B?QUhtd2dHZy9RS0JlNy9QcVgyclROUHJrTUVpeFF1QlhYMXVsWmF3UEV3L0xj?= =?utf-8?B?RXNzdlZCTXE1VHNpdnJDMmNrdUtMK0Urd2lCaWNxeXJHZm16eFplaTU0SWtN?= =?utf-8?B?SDRPTXJaTVJkd3lHUEhvZy9JdjhUNG05UW9odm9aeWV4VC9lVlZCeW96NlJQ?= =?utf-8?B?WnJ2dVJteHV1MEE4dEpsbkZXcVB3VFVCS1RMRHJXaGxuekJ5OFAvQzgvczFU?= =?utf-8?B?cWVkeUxNWkFhZTE1alAvV1dUOVJobHljVmZucnFibGl6MURsQVY5RFF1dGY3?= =?utf-8?B?YlQzWkJnRUFUVTdhY0ZuZ2p1SElxTG1LQTlJdUdsdURWT0RZaFI4M2M0UUhs?= =?utf-8?B?Y3RpcDNTNkVwVG5KbmNIaElJdlU3d05Yb3F3QUIzQ1ZHaDE3dTlrWnV6eUxr?= =?utf-8?B?Um9id281NlBPNWVmOEdIYnphK01NYWZjQmUyTUhRcmtzZHRDcGFrMHBrdzBU?= =?utf-8?B?QmNSc09mREtpdm8rcDVnUkVSMlpXME80eUM1VXRSQ25Wa3JIdkNxTHZnNitF?= =?utf-8?B?UWkvcTlEL0lmNWtNVGM0SUFTeHpsaDFUYzF3WHNPYTBEbndaVmpoZm9yRHQ0?= =?utf-8?B?QjdxWnhGVFFabXlRNnprN1d4UUlpRVFLMUlEdTVvMFFZUUVRa3JIWjRWbHBE?= =?utf-8?B?MGJUK0xsR0FNNzYwVVk4NlhxaXR6amdGLzkwYkt3VzUvbTBvN3lwaDZUVHor?= =?utf-8?B?LzY0SjhtT2s3SXAwTE5EamJEdDJxS2d4NlpaaHdHS3c0R3phQWFLcDhCdURU?= =?utf-8?B?WEN2V3BhSjRKTHdadEh1Vkc4TmRSN3hEUHV4RUFqTTB1S0dMS3ppY1VHSnRk?= =?utf-8?B?NUlWNEQ5TTRYQThRUDBsbCtoR2VaYkxtY2UzSC9BK216WVpSUUsyaDU3R0hO?= =?utf-8?B?eWdpenhKMGN3amVHeHFIN0JXM2RueUJMcHRQbWFEcUxYNEo4d2I4WFRQRmxF?= =?utf-8?B?UVd2MGFxSFBYT3NOdmZxVFJneCtOUGZXL09RVURxTEVpNlZYZXBqajYybjJm?= =?utf-8?B?WXVmVVZmMnVKc2kzUi8rcyt6VE55Zm1RZ05BeWxjYnlOVUc0NzdLUm5ncWRG?= =?utf-8?B?MFFkUUdNRE5WZDA3aW9TQXRhK0hxKzI5QW5ZbDNBdWk0WHZZdVU0L0F5dlMy?= =?utf-8?B?UE1CNHVqUGgrSjNab1lpRmcrZ2IvR2NsWmNZUCtGaG5iYkh0N0NVb1dyNHM4?= =?utf-8?B?eUplakFWK2YyZGdQRHJKWlFZNWRGZHNNM296WlhSUndTYzBKV1Bkd0pYRjJJ?= =?utf-8?B?UlNPVEdHdHF6Y2lIRDcvSEtsczhYbklDVytPRkQwdFdZYXJPK2ZydFpCeTNw?= =?utf-8?B?WFJJRGVLajRFenhNUUV2RDdwalBQWW5FeHlucDBqRkk2b0taU0Ftayt5cS9Y?= =?utf-8?B?RE1aYUt4NDBWWEFOMWJudy9kNHYrTUpkU3d1QS9NK1FpZFR3cXEyR0hnPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 07e48731-a4cd-4315-ee42-08dc7a165cfd X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 May 2024 04:19:24.9785 (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: AS1P250MB0584 Subject: Re: [FFmpeg-devel] [PATCH v2] avcodec/dovi - correctly read el_bit_depth_minus8 and ext_mapping_idc 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: Cosmin Stejerean via ffmpeg-devel: > From: Cosmin Stejerean > > These two fields are coded together into a single 16 bit integer with upper 8 > bits for ext_mapping_idc and lower 8 bits for el_bit_depth_minus8. > > Furthermore ext_mapping_idc has two components, upper 3 bits and lower 5 bits. How do you know about these fields? You seem to know something that Niklas doesn't. > > --- > libavcodec/dovi_rpudec.c | 7 ++++++- > libavcodec/dovi_rpuenc.c | 4 +++- > libavutil/dovi_meta.h | 2 ++ > 3 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/libavcodec/dovi_rpudec.c b/libavcodec/dovi_rpudec.c > index 7c7eda9d09..af41ab5827 100644 > --- a/libavcodec/dovi_rpudec.c > +++ b/libavcodec/dovi_rpudec.c > @@ -411,13 +411,18 @@ int ff_dovi_rpu_parse(DOVIContext *s, const uint8_t *rpu, size_t rpu_size, > > if ((hdr->rpu_format & 0x700) == 0) { > int bl_bit_depth_minus8 = get_ue_golomb_31(gb); > - int el_bit_depth_minus8 = get_ue_golomb_31(gb); > + int el_bit_depth_minus8_and_ext_mapping_idc = get_ue_golomb_long(gb); > + int el_bit_depth_minus8 = el_bit_depth_minus8_and_ext_mapping_idc & 0xFF; // lowest 8 bits > + int ext_mapping_idc = (el_bit_depth_minus8_and_ext_mapping_idc & 0xFF00) >> 8; // upper 8 bits > + > int vdr_bit_depth_minus8 = get_ue_golomb_31(gb); > VALIDATE(bl_bit_depth_minus8, 0, 8); > VALIDATE(el_bit_depth_minus8, 0, 8); > VALIDATE(vdr_bit_depth_minus8, 0, 8); > hdr->bl_bit_depth = bl_bit_depth_minus8 + 8; > hdr->el_bit_depth = el_bit_depth_minus8 + 8; > + hdr->ext_mapping_idc_0_4 = ext_mapping_idc & 0x1F; // lowest 5 bits of ext_mapping_idc > + hdr->ext_mapping_idc_5_7 = (ext_mapping_idc & 0xE0) >> 5; // upper 3 bits of ext_mapping_idc > hdr->vdr_bit_depth = vdr_bit_depth_minus8 + 8; > hdr->spatial_resampling_filter_flag = get_bits1(gb); > skip_bits(gb, 3); /* reserved_zero_3bits */ > diff --git a/libavcodec/dovi_rpuenc.c b/libavcodec/dovi_rpuenc.c > index 3c3e0f84c0..91c0a85050 100644 > --- a/libavcodec/dovi_rpuenc.c > +++ b/libavcodec/dovi_rpuenc.c > @@ -444,6 +444,7 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, > int vdr_dm_metadata_changed, vdr_rpu_id, use_prev_vdr_rpu, profile, > buffer_size, rpu_size, pad, zero_run; > int num_ext_blocks_v1, num_ext_blocks_v2; > + uint8_t ext_mapping_idc; > uint32_t crc; > uint8_t *dst; > if (!metadata) { > @@ -551,7 +552,8 @@ int ff_dovi_rpu_generate(DOVIContext *s, const AVDOVIMetadata *metadata, > put_bits(pb, 1, hdr->bl_video_full_range_flag); > if ((hdr->rpu_format & 0x700) == 0) { > set_ue_golomb(pb, hdr->bl_bit_depth - 8); > - set_ue_golomb(pb, hdr->el_bit_depth - 8); > + ext_mapping_idc = (hdr->ext_mapping_idc_5_7 << 5) | hdr->ext_mapping_idc_0_4; > + set_ue_golomb(pb, (ext_mapping_idc << 8) | hdr->el_bit_depth - 8); > set_ue_golomb(pb, hdr->vdr_bit_depth - 8); > put_bits(pb, 1, hdr->spatial_resampling_filter_flag); > put_bits(pb, 3, 0); /* reserved_zero_3bits */ > diff --git a/libavutil/dovi_meta.h b/libavutil/dovi_meta.h > index e10332f8d7..d01bfe19fe 100644 > --- a/libavutil/dovi_meta.h > +++ b/libavutil/dovi_meta.h > @@ -87,6 +87,8 @@ typedef struct AVDOVIRpuDataHeader { > uint8_t bl_video_full_range_flag; > uint8_t bl_bit_depth; /* [8, 16] */ > uint8_t el_bit_depth; /* [8, 16] */ > + uint8_t ext_mapping_idc_0_4; /* extended base layer inverse mapping indicator */ > + uint8_t ext_mapping_idc_5_7; /* reserved */ This is an ABI break. All new additions need to be put at the end. Furthermore this needs an entry in APIChanges and a lavu minor version bump. And it should be in a patch of its own. > uint8_t vdr_bit_depth; /* [8, 16] */ > uint8_t spatial_resampling_filter_flag; > uint8_t el_spatial_resampling_filter_flag; _______________________________________________ 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".