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 3D30D499E1 for ; Wed, 27 Mar 2024 00:14:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 36B7468D6AB; Wed, 27 Mar 2024 02:13:59 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2037.outbound.protection.outlook.com [40.92.90.37]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F3DE268D4D2 for ; Wed, 27 Mar 2024 02:13:52 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=il0Ku412kpsfEjK8T/LslicTp94TMI0dcN1n7bIK/P1IbsAbQjNEixf6n8VtZyICHYNoWFps+BQhGqnqK09ekeVQdt6OpujIZduZQJ2T7Xvf1vsAi/hRpezIPA0CHtlNR/8pxRnWS+dco3s0jdPyrRjMGyGCbNMD4yThvoBs1Y2gSeFTRboi/+TDZhRpb8uz/1MDLA0vcWBa8KaR0uFkJCqf6qdYvZTNCQ7/POYxI900w5rh0xYfsXuo9Yh2/TUY4sCn0Hxq2xkJiKzcaiP44PuevlbGFrcwGXLM3NKFK3+LGMXtb2aw5bAhUGeVKn+HQhjebpcl28ZxLcV8bdFYQg== 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=3oP7XmwPNAbBPhxe7pu8m1jK92iQQ1qXuZFhcqqiTS8=; b=HBDnKP06tjE5AkU18Tj+DY3FABK3kWv7hiEIE1hVeDmGIE7dAocDc3qSlL8j95gYxAOqAVZNw0B1p/Xg2iCA/xhjtYYlOIB5v3b1by7y6xUpmtGCLYYQBL8iWCAggz6cwbxOJKyS2Bv7c2B0ZLkFCOD+yFdzbK+yMlNkd0bS0i+HNzvZ3LlOnDRzyI95Tq/LAhdePSd2mv8WTP6Ct7rcVV5nTwlNSlpD6FO/P4cPabkB4C6xTl4Aj1tdrT28/H4t/M126qPg9MStQzbNQ38FpW0q29/L5VUCGg2+sBtl9I6ShuQHwQHyDAQJFPv5NjjqeKqS9jxNFRWBxSNLr78zsQ== 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=3oP7XmwPNAbBPhxe7pu8m1jK92iQQ1qXuZFhcqqiTS8=; b=NSfJBCCu9PUDlVR9+nBGda5AUlDditXfnUQeYd7iag8z+UHyv/HGMiZtA9pT7og4QHuCIFNA06XQj/NciWUD7JclJNS/Dqf8gpAk3ZuElJas4XpMqrja6m/wkezAKzQQy+6mY9YYkeNuaAPIaTN77m50jiuE1mHk69n0rOyKt0JF82quRfMH1FMJmA/yJhleiOEA/xxf6xacn3bmzpu+EjO3aJPfQE+IRDtLqYTf5sUAMoqKeAEST2NYuHSNQDYJsU5p+/3Laoxk3PfbqJF+ljmwQ05jhb+710YeWy7FLoYGHwdRDledZYlt3LyDel9PTQBlbicRD7HiRWsD7d9U4w== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AS8P250MB0088.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:373::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.32; Wed, 27 Mar 2024 00:13:51 +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.028; Wed, 27 Mar 2024 00:13:51 +0000 Message-ID: Date: Wed, 27 Mar 2024 01:13:49 +0100 User-Agent: Mozilla Thunderbird Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20240327001154.2239-1-jamrial@gmail.com> From: Andreas Rheinhardt In-Reply-To: <20240327001154.2239-1-jamrial@gmail.com> X-TMN: [6HlTyZ6xhYd+HjljRFPHyMRnlWwUUotjf0G/8aKSiZ8=] X-ClientProxiedBy: ZR2P278CA0004.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::8) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: <1d2b5ea4-80e9-4217-800d-e72b87b495e6@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AS8P250MB0088:EE_ X-MS-Office365-Filtering-Correlation-Id: 66b33ae4-13f2-428d-22a8-08dc4df2c840 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: fr6JG8MEENMZoR8uft2FeGM7Agq11LXMBomjxeN9UxPqExMWXdfcssQVt/Abm7L90yY5UHDddqDVAmqeYTw3UHoXnKmto9+c1pVgvVapNo2fmjwkaGS/8Zx+B0Nl1j2emlWAuRjMv94flmXIwjqYp34EEkwiU+4xMAxdeiHxpm1GC6qHI+3dTYDF1iYvk+mu7Jp9IcD6WHtU99FtqWDpERpxtAwM2HOqjlgnSUQRzrA4w38IHolcg0UxBdMu04rty/GfmXzH13/LnTLXWEZRMEQ4VntHDjRhByoY4u/vj2ew4wEt0sBQMrVBH7TSYgrNglYmEUqb98vWjf3R1P3GmCOmJoiR1CcMpO2NDwjDCo+0+YejhdOTVaJ4gqTZnSK0cxUOnclNZGG7AopOFRNIl7f3J9bpZW28T++fW0+YGT5GMGWHiEE8EJNvoN94i0xjaX5gK1g/QN3z+Bw4ZzfevYbCPaqNyJijRQO26s4L3JyABpoFt4Z5CBdtzfVfO+LylgTsGoB4Degp0EEhRc8mRiq9Q2ASOIHkRjOeDSRegOWUwkN1rjFr5ULAZFNH8x7k X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NDdiSnBJOEMzeGg1UmxQTGVuTTMwYjRWWHBxRW5LNEVEdUxjMkRzYk9MeCtY?= =?utf-8?B?MWxSamFGNk81eGJCcUV1ZFI2TVJCOTJJMG83V0J6Yk42M0g3ZnFibG9mcHJZ?= =?utf-8?B?SHphUHFXWVhFb1dkNGNBRmdnK1kwSmJnZUdRYkdZSEI0RHF0alc3SWx2Y2JU?= =?utf-8?B?Q2JlNXpPajN1RndtbS8zNjVMMDZlTllpK2dIZm5ITElDb24zaVFZQ2RIOUtE?= =?utf-8?B?TnQ5ckNMQTBNN3FBcTV4THZKYktIUmI0S3JtRllqMGNvMnI1QTIrdysrZmto?= =?utf-8?B?QVp5VXhKcWpXQnNCMjhIUXdvNC83b3RyU3QzMVRGSms0clREVkVXT2pRZlla?= =?utf-8?B?Mi92ZXNJOXZjUHI2aUxLdzdIeCtWaldsYU8rekJyY2x0MWtvT0E2UGhNSE5O?= =?utf-8?B?aWgxS2FzOE1vR1RDNU8rNlhvTCtVeWtXZ3QvVS9WQTVpVmErN2V0UW1WK3Bw?= =?utf-8?B?Rjd1ZHhYSUlVczBJQTlGOEk5Z0grdG9vZ3JnNEZTb3o4ZmVHS0NGcHUrNXYy?= =?utf-8?B?UzhBS2dYQkpJcGdCSFBoakM4L0FjTzhoa1h6UFh5VHdueFZVUHQxamd3NmVV?= =?utf-8?B?eFBLQjdKLzVrRDJ4amlwbGp2VnZ0UG1Jb1B1MURSdnJaaExzWFIwdkJCYjg4?= =?utf-8?B?dkJJQzA4a0F2WFh1VHNYVGp0YnhzMDVhejRXL3BHVlRVeWVNUGFqLzh1SWVp?= =?utf-8?B?blpiWlowUDUzL0c0dmVDWFVQaCt5ZWRYRDRyMTVIUGdBWTFVODJ1ZGwzR2gz?= =?utf-8?B?bCt4ZFJ6Z3hnRHB2VTArL2FmUTBqWXJLdCtqTStRN3ZrYjJPa0gyL3UzK1NZ?= =?utf-8?B?cVRIbXcrWElIVUtNbnhQSmdhQXNXL0hHT1V6YmE5TDZRZEVBQ0daelNJLzgv?= =?utf-8?B?UHR1N0JmeUw2MFB6T3hrelVnSXFMOXN3NVVySGppcGlqcU81alBzSytQQUI2?= =?utf-8?B?VnlJSmIzTW8rOVBTL2hQd2hLbzZTSVdEejlzNENRNmkvREUrYnBSWURVQjNn?= =?utf-8?B?UHA3MHNuU2R6SFJ0NVU2MG9yQTVEU2d5MzMxVnRiMnF1NlpCN2xjR1laZXpJ?= =?utf-8?B?YjZoNGx4L3FWa1dIYkdvckRvT1o0RWlBSkUxTjdwNmZhU0xTaEl4VmhHa0JU?= =?utf-8?B?VTFFZ0Z4UXQxdy9DS0VXcXIxSGJMSUJXRS9WRmlTTnYwWWVvdGttRml0UVBI?= =?utf-8?B?M2RwUk4xS0dhQUZFNHRNOFZRT0gzeWNXUXZsTnJrOTBrVmlvS1BWanFPZXdQ?= =?utf-8?B?bmw3TmhsVDNSK3BKTVZnMGxZZW05TjBvZW5nTE1IMUhQNmRBVDNjZDhMQlNT?= =?utf-8?B?ZVRnZzZlWGJua09SbXJRZXArR1dyd0ZySitGMEtrMXJ5VFNQdE5CLzFscDZC?= =?utf-8?B?a0ZYeGowaHhBaEVJV25FTksyL0pHbFRqN3VzTm53ZjFJQjh5b3JQQ2dxSm5P?= =?utf-8?B?anp2K0lLQ2VZMnZtUGlqUm9rUTBheHRmdThWRTdlK0pUOTFuRzNzZnI4eGFK?= =?utf-8?B?alZtVUtFRVFhSTc4SWdxRlhGSGFWeHB4ZEV4NTBRL0JKejJGcDJPWjhReWxL?= =?utf-8?B?M0tpUURXY1FSckx1S21JNW5FcWh5YkI1aG5qRkIrMUF4MWU1aG50ZU12a2t0?= =?utf-8?B?dUhPWjBwVTYxN3ZFNmMrdUtESmxmNy9lY1M5d2RVbXFqYmNwamZqVkFJbXp4?= =?utf-8?B?K09CbHpZZXlldGNlditNMHJVWFJhV3JDMEJhUkVpdTFzcHZya0tHQlVBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 66b33ae4-13f2-428d-22a8-08dc4df2c840 X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Mar 2024 00:13:51.8405 (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: AS8P250MB0088 Subject: Re: [FFmpeg-devel] [PATCH] avformat/mov: don't abort on duplicate Mastering Display Metadata boxes 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 VP9 spec defines a SmDm box for this information, and the ISOBMFF spec defines a > mdvc one. If both are present, just ignore one of them. > This is in line with clli and CoLL boxes. > > Fixes ticket #10711. > > Signed-off-by: James Almer > --- > libavformat/mov.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) > > diff --git a/libavformat/mov.c b/libavformat/mov.c > index e7aa8d1833..5463f36770 100644 > --- a/libavformat/mov.c > +++ b/libavformat/mov.c > @@ -6140,8 +6140,10 @@ static int mov_read_smdm(MOVContext *c, AVIOContext *pb, MOVAtom atom) > av_log(c->fc, AV_LOG_WARNING, "Unsupported Mastering Display Metadata box version %d\n", version); > return 0; > } > - if (sc->mastering) > - return AVERROR_INVALIDDATA; > + if (sc->mastering) { > + av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate Mastering Display Metadata\n"); If this is expected (and maybe even encouraged/required by some spec), then why is this a warning? > + return 0; > + } > > avio_skip(pb, 3); /* flags */ > > @@ -6178,11 +6180,16 @@ static int mov_read_mdcv(MOVContext *c, AVIOContext *pb, MOVAtom atom) > > sc = c->fc->streams[c->fc->nb_streams - 1]->priv_data; > > - if (atom.size < 24 || sc->mastering) { > + if (atom.size < 24) { > av_log(c->fc, AV_LOG_ERROR, "Invalid Mastering Display Color Volume box\n"); > return AVERROR_INVALIDDATA; > } > > + if (sc->mastering) { > + av_log(c->fc, AV_LOG_WARNING, "Ignoring duplicate Mastering Display Color Volume\n"); > + return 0; > + } > + > sc->mastering = av_mastering_display_metadata_alloc(); > if (!sc->mastering) > return AVERROR(ENOMEM); _______________________________________________ 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".