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 6D15A4B984 for ; Tue, 2 Jul 2024 15:54:36 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8AF2E68D91F; Tue, 2 Jul 2024 18:54:34 +0300 (EEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2057.outbound.protection.outlook.com [40.92.91.57]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D7CC368D6C1 for ; Tue, 2 Jul 2024 18:54:28 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I2Lz87dJea959y6C/SHJS/IiVCaNV1ZOZSh1IsecLA8mMqaBFn3aTxjchSiSwQH5x+ZfdSdeypO2pDvkc2FaLuiwBLwrvwxn+F9l879zuf6PuzDI5zxR+aRUp0OeX96QEsa1qpNq6kKdHLzN1DWJ5m2lvGnmH3mxqpA5oYNMKMyWI4BsVPYaqh3sBchcugmvO63KO0YzgporU5TLSJg0KpAkBOoH77KiQjDwesZvLb9u98HZ6mGESF6FQzHcb/iZ2zJg4ywEZLgZb0HNHgEiTDmMd+75MYXF8Ehky2womUWIZ3jY7vOU096k7YkfFfYnmKTImmaAAdTPqBtQN2xXAA== 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=XR/O0VP6c7IvAK7pMi9ywGW5f5umMOAwISiXC2Jv6h4=; b=KWGKW0DZi/1ZRenmF1w7EuSKZCcd0IKu4TRFWiFP2vsBejnPKapDQluAYw8nflmH/GHI2dQhSrgOqhuTSveTd/tek0wzajoPl0FnjnHk672Y2bHBAmiYyCEBES8ULezdx0UhoDEQbiHd1LSkFLJc9bvUjksA09LNoDyJQ1qyYO0TdFyLUsWzDi7BcXCe5DlOuQPECkNV542zEdLlI3P5DVkF+1VuNBIgdLb8COLzBCm4TLoMQmy2DtIqufnnmSzuoYA1N1c3oP3U2sOjm3joWJ2MxfD+iIy5nUxPdPPDkTsHyfzRlF20D8cKvpwIix8ekkKnFoOrnUe4nJ+MwlR4NA== 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=XR/O0VP6c7IvAK7pMi9ywGW5f5umMOAwISiXC2Jv6h4=; b=MZ1i0zRRPxnz4kZJZp/i2nhJrwztRENKiGVVr+inEAj4O9pbAEdXu21BDhXFAiAMTnFSpZ+j54dYHsi9k7ngVLJIOSCAEZO/M9oAptf4v9FKJrxIScPvGGiNIdGRl9x6RYHc7o0IsLqW8ebQ/TJv+OlQEcp3eN+Vd6WD4P6/m7ED4P3PQ2obyngfhase3qgv7Eg1887TEZV5LyF82NAmT9uqGhxmfsm7s5y+C4iOkGQilixSBm9R4r/fpkqFppy+H0QvJkH7XXMcjc+jE4fWmB1V3OWjzv1T5IlRZbsx6jqNYqg3aayi2YFzLTA5ZCx2xn2aUEAWfVFzLrJ9AiercA== Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) by AM8P250MB0200.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:327::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7741.23; Tue, 2 Jul 2024 15:54:27 +0000 Received: from GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614]) by GV1P250MB0737.EURP250.PROD.OUTLOOK.COM ([fe80::d6a1:e3af:a5f1:b614%5]) with mapi id 15.20.7719.029; Tue, 2 Jul 2024 15:54:27 +0000 Message-ID: Date: Tue, 2 Jul 2024 17:54:24 +0200 User-Agent: Mozilla Thunderbird To: ffmpeg-devel@ffmpeg.org References: <20240702134424.133688-1-leo.izen@gmail.com> <20240702134424.133688-2-leo.izen@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: X-TMN: [nFEoeh0JiAaffOEOMEjySVXd+4MaCa9X4bTAJfYeGPs=] X-ClientProxiedBy: ZR0P278CA0053.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:1d::22) To GV1P250MB0737.EURP250.PROD.OUTLOOK.COM (2603:10a6:150:8e::17) X-Microsoft-Original-Message-ID: MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV1P250MB0737:EE_|AM8P250MB0200:EE_ X-MS-Office365-Filtering-Correlation-Id: b698b5ba-8f0a-4c4b-8342-08dc9aaf404d X-Microsoft-Antispam: BCL:0; ARA:14566002|461199028|8060799006|440099028|3412199025|4302099013|1602099012|56899033; X-Microsoft-Antispam-Message-Info: XcrF6Gd8by/AReU1WPIj5MQIXdbOd05igLso4BaQER30sRz9+Z4GGZfitecQnL+LZZjfsm2H+xHEuGuujGPtXAsF1DqmBncpJ0p+UnLHpejdlXPZKIhkpyw4/tJDWjhiYvdcbcz44VQT7vPuTFD6k/z/+XE3jfouqkAiOrY63z2SOOnEnhhLxSRUfciR1YS6XBF/pOV9IJSSJG8sN9S6qta/8w2ZM6JJyxc33dBbTSpoSuSJO7gB+qSURApa7EHJzqefFXZ23BEyRIO76h4nT6/HAbIi0J5IiHcIf+9N6FjJWiVProBlD265NWAzPMsUc/HNEmTyxpHtrpO3wki8R5HtiURLHduLIR7EAB1GUegRVizdpkdJfsKViYCHExgsuyghZkiMUaYfnBdOPAHaD1YJHkA8yWuH65DF8v0XkbG/DyoO3NRKjO6RGQHrFWqVmtDPP34oPKfXDbRJD914lxGf/oqD9POKesTGprqf7DQhvB9HkwboYofzVCn92qneSuuEHHkbC/8dHbrXqv3ITAxa1ECoFlR0fSEsU9eHSq9NltzmqfdLXcS+Gbvm6ApL9xGWU8BqUAzMjKxgNQfufuv/mXBQiPI4rgc0ns8Yg0X+T86z1lSWTgCejrL1aX90YF/839e9r77eDQXqkTHaO4ftNvHwRhA6HKO+3w02iCKTg9F9vr879mvNQ1Q9P2z2CPm4ZdIlLwjyymVxL4Fu6F7nfozvDnV1+P27qCGBwks= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dWdub2ZHUjA4Q053MHRJUWlreUJiWDlMUG4rZFkxNitVZHhUdExzNzhoU0E1?= =?utf-8?B?TmZXMzZJd2tGa1pRdGZSTk94aWFub0F4c0NyaFEzcEJOK3cyMWx3Q21TM09I?= =?utf-8?B?YWZQQ20zejljYTN6bHFzTEdSVnpibEhGd1RncTFZMjBqdlhiSnhudkw0d1ov?= =?utf-8?B?Z1FPMlFOMzdyVUV2YnFnYjN0Z2tZM2h1eFVmYmxZVlZEZnRKTGM2VHlFTmdz?= =?utf-8?B?Nkd0SDhNNlNGQWMxUk1UL2twQ3F6eTloWE1CUHUzRWMySm5rajJla081b1o5?= =?utf-8?B?Sk1rUHBOSDhmT3pvK1NVUTNaSUFmV3cwR2NvUTNuQ3gwb0pWazZBWEthMVE5?= =?utf-8?B?RkJVTkJwU1hqendhMkhrNEc3aWRTSXJtRUpqblJCU21kcGhpUVk0bkMwMVFu?= =?utf-8?B?OHdVUlk0M1pBek1oVWp3MzF5cTc5S01Jb0JpVE5iQlhYS05RWGhaRGFyUjRV?= =?utf-8?B?RjRMMXdRSjhhb2dkS0FTSlNhSEJkeExJLzJBNEdGSDdGYTVBeHpXRmRCeXMx?= =?utf-8?B?SmZkWlpWQW8yeEJxbkxZL0c5bGFEUTVqYkF3OGh1bWx0ME85MU9hU1pmZDZm?= =?utf-8?B?dlc0MG9VQzJZNlVRZWlwcmFPaVpidUMxWkJmcHp4U2g3aFRxRDZhSjkwaXVj?= =?utf-8?B?a1dvSCtSUjdXRm5CT1JiRXlnMXBMd24xM0kybDhrY2RQQyt0ZDNxWmd1em01?= =?utf-8?B?WEJOenRRUVhlRnBLRFRSdENVTEdxU291YzU4aEt1STJrWVg2aHNBUVo4VFZw?= =?utf-8?B?TldCQ0NUaFBIQ0tPSE5WSGJFOEoxWFIxL0tnaUR3bFZpVmdJa1NFT2d2NHAv?= =?utf-8?B?L0xwaEZlRis3MjBlMGdjcFNacmhKRjcyNHJaQmdKQWt5R1IrRGx5cTB3ejVH?= =?utf-8?B?UWhIWkpZUU43V1dHUGlzS2hXOVVEaTMyRWIrL1o3TmZBVTNOc1RmN2VMa2JZ?= =?utf-8?B?TlJtMDAyaFNkaC9ZRE5xWnY2ZXR1VXI5NFozQ1dxN3h6aVI2ODg0TmFPZW9r?= =?utf-8?B?VjkzWGhYbFl3aE9uVEp4Y3lWR08yKytvSGVVaTJJM0d3OU9Rb3N6bEdXOWJq?= =?utf-8?B?aEVLeFNldkRiOHRRTU5mVzcraERMazlWTUdVTkZYdkE1dnR3eHJPaGtjYWh2?= =?utf-8?B?cCtKL2xaK2JZRkFReWlxcFBJWXJXNFRRVXVzTWc5T1lOUnZtRnZwc3UrQ09Z?= =?utf-8?B?bEs2RDhmcnJpUzcrY05SeGxNSmZPbE9xQWtHMmNhdlh6UElpZzlITGN2TWFt?= =?utf-8?B?YldQYVBJSGMrY0dsQUZRTmNLMThEUVVQRGRJNzlBbjhZQnVvVmtPZ2t6akVG?= =?utf-8?B?K2c5NllJN0NnS1U0M3NmWXlSbkpreGZHYTg0NkhjaEhrdE41UW5ieHpXejZT?= =?utf-8?B?VVFMK3pMV0tDd3hqczg2SVNYY2FPNEZqbDlPZmhObHgyblJwalZBOTV5SG1F?= =?utf-8?B?MHRNR0ZQWndkTHJjWGVQbGgxb25wbWJYNGh2a3JwSUx5RXNmaDlaNjR5WXQr?= =?utf-8?B?VytIeERNdE1Wd084RFVjYWNxQWpnSTErUGFxU2JPS2dxeFhDK2lKSGpqM01G?= =?utf-8?B?Nk93TjZ4dGQ4Ui9CT21BZ3A2UlRHMG8zTURKM3RpRk5PRkNzWkpmTDQrUC91?= =?utf-8?B?N2Z0cU43Um53aWd3dzFUMXhKN3owc2lsTHhvR1Q4MkoyeTJuUnI2a3BmSGE0?= =?utf-8?B?SDJUTWNCK2NueG40dytFT2NVWUZtZUlnWmdycFJicjdSN3JOWkNRK1RBPT0=?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b698b5ba-8f0a-4c4b-8342-08dc9aaf404d X-MS-Exchange-CrossTenant-AuthSource: GV1P250MB0737.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2024 15:54:27.0635 (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: AM8P250MB0200 Subject: Re: [FFmpeg-devel] [PATCH 2/2] avcodec/pngenc: fix mDCv typo 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: Sean McGovern: > Hi Andreas, > > > On Tue, Jul 2, 2024, 11:48 Andreas Rheinhardt < > andreas.rheinhardt@outlook.com> wrote: > >> Sean McGovern: >>> Hi Leo, >>> >>> >>> On Tue, Jul 2, 2024, 09:44 Leo Izen wrote: >>> >>>> When mDCv support was added, there was a typo in both variable names >>>> and also the MKTAG itself, incorrectly listing it as mDVc. The tag name >>>> stands for Mastering Display Color Volume so mDCv is correct. >>>> >>>> Typo originally introduced in 78949041417caaef0c82b2b23d7defdd88aa2378. >>>> >>>> Signed-off-by: Leo Izen >>>> Reported-by: Ramiro Polla >>>> --- >>>> libavcodec/pngenc.c | 18 +++++++++--------- >>>> 1 file changed, 9 insertions(+), 9 deletions(-) >>>> >>>> diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c >>>> index 89c3d5b83e..7ae16fa2c5 100644 >>>> --- a/libavcodec/pngenc.c >>>> +++ b/libavcodec/pngenc.c >>>> @@ -450,17 +450,17 @@ static int encode_headers(AVCodecContext *avctx, >>>> const AVFrame *pict) >>>> >>>> side_data = av_frame_get_side_data(pict, >>>> AV_FRAME_DATA_MASTERING_DISPLAY_METADATA); >>>> if (side_data) { >>>> - AVMasteringDisplayMetadata *mdvc = (AVMasteringDisplayMetadata >> *) >>>> side_data->data; >>>> - if (mdvc->has_luminance && mdvc->has_primaries) { >>>> + AVMasteringDisplayMetadata *mdcv = (AVMasteringDisplayMetadata >> *) >>>> side_data->data; >>>> + if (mdcv->has_luminance && mdcv->has_primaries) { >>>> for (int i = 0; i < 3; i++) { >>>> - AV_WB16(s->buf + 2*i, >>>> PNG_Q2D(mdvc->display_primaries[i][0], 50000)); >>>> - AV_WB16(s->buf + 2*i + 2, >>>> PNG_Q2D(mdvc->display_primaries[i][1], 50000)); >>>> + AV_WB16(s->buf + 2*i, >>>> PNG_Q2D(mdcv->display_primaries[i][0], 50000)); >>>> + AV_WB16(s->buf + 2*i + 2, >>>> PNG_Q2D(mdcv->display_primaries[i][1], 50000)); >>>> } >>>> - AV_WB16(s->buf + 12, PNG_Q2D(mdvc->white_point[0], 50000)); >>>> - AV_WB16(s->buf + 14, PNG_Q2D(mdvc->white_point[1], 50000)); >>>> - AV_WB32(s->buf + 16, PNG_Q2D(mdvc->max_luminance, 10000)); >>>> - AV_WB32(s->buf + 20, PNG_Q2D(mdvc->min_luminance, 10000)); >>>> - png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'V', 'c'), >>>> s->buf, 24); >>>> + AV_WB16(s->buf + 12, PNG_Q2D(mdcv->white_point[0], 50000)); >>>> + AV_WB16(s->buf + 14, PNG_Q2D(mdcv->white_point[1], 50000)); >>>> + AV_WB32(s->buf + 16, PNG_Q2D(mdcv->max_luminance, 10000)); >>>> + AV_WB32(s->buf + 20, PNG_Q2D(mdcv->min_luminance, 10000)); >>>> + png_write_chunk(&s->bytestream, MKTAG('m', 'D', 'C', 'v'), >>>> s->buf, 24); >>>> } >>>> } >>>> >>>> -- >>>> 2.45.2 >>>> >>>> _______________________________________________ >>>> 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". >>>> >>> >>> This did also land on the 7.0 branch so I assume it will get a backport >> if >>> approved? >>> >> >> Why should it be backported? This patch has no user-facing consequences. >> >> - 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". >> > > Even though it fixes the written tag in the call to png_write_chunk()? > Ok, I overlooked that tags. Ignore my above post. - 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".