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 BD7B340D70 for ; Sun, 5 Feb 2023 03:46:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 69F1068BEAA; Sun, 5 Feb 2023 05:46:42 +0200 (EET) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-vi1eur04olkn2060.outbound.protection.outlook.com [40.92.75.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F49868B88C for ; Sun, 5 Feb 2023 05:46:35 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KyDmlmk+so2CUbl4TszIcSXUc0kKlFycK7fs/6RJQRoYXkpGbr7N3mfGIO4MOaNGclr0RyA+E9xsXw1jH1N7JsYon902CzrNLEq0sUIru53oxdCboJJPjK3oImbLBEFg3qDZARpuXGQz4TJ8eUlqH6HqiZt4lGoLKSD+IrsIJVLLQIXRgkpgWiY0JPiVzHfgn4fzkb9jL9/Q62dXh303bVniA8eptU0JkQlwBrWSVIwJcJc4fHwFSawiwGr22R6pvaL+ozWaMhqPQ4AuRt7Csrd57S6uYLPlHjo0jm+6vfmKs2cqvalsc0gmOvLuehsgJb+Ns8w5rHBju2KR9X8Ulg== 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=DQ4RXfdTCFaoMxnTfhuRGl1RIPdd8QXYA59zD3RxdVg=; b=Xb/KvCoQNMZ/wADj3Y33ISrM0ALe4zrmy1QCFCfT5yikHQCK5Jy8/9xb0TqRAOi58FuQwMXPbxMKoQWIsLbRErGI01T7SWeUH8iFhv6ng7wRO1mLYVITQ6S8KFjAkYRzfJXN7vrcxsv+P2P2+wRQDhpL7nrbs08NLxWLPR1tVfoalWX0GxRgmNDpowVvE2absHt6wVtvNGAUUtwe/bJ5FomzXjq1EH5VO+HL9CTRiNFVRLL3B9MyhGcPnTvl1aog1jjOlhgPWcQwrWPvdfnbd36UWmvf1+6oY0Uo/xpowQ97ezOhLejIN11MvIdTWz5S72WzngIH7pSbf+nTE+j/aA== 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=DQ4RXfdTCFaoMxnTfhuRGl1RIPdd8QXYA59zD3RxdVg=; b=jZv7h75YUMdTeEZZIzCdF3n1zwhNLbAgWASbEyLAKbkWPt/V64swOFbvZL+ozJ6ztTAOkKr9IZiOl+gv2ksUnClbZBRuhmYDIKbL9kPxKYwBPShTV3mUitr449lttV6n+GoVq08uYR7Ax9WGXdw9QGzWe9wEBD0FC+8896mliSPtm5xB2u7Do6ArpQmyBDe6g+KcLtcE4eQFV6Eeg4dd0l8Hsw9OfGW6Sw2bCxX8Cq+lNwJLNS4y26wDvreUR0IF5KxnJa1fO4I6RmF78phEWzCSh8YQVruCExnAVqcm4suN8OnWDjDCtCD9AsK2w9k++mcnuO/l9s03PCjSRjMgrA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by DU2P250MB0336.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:27d::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6064.34; Sun, 5 Feb 2023 03:46:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::ee20:26b8:7242:6ac3]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::ee20:26b8:7242:6ac3%7]) with mapi id 15.20.6043.017; Sun, 5 Feb 2023 03:46:31 +0000 Message-ID: Date: Sun, 5 Feb 2023 04:47:00 +0100 To: ffmpeg-devel@ffmpeg.org References: <20230202150938.22297-1-leo.izen@gmail.com> <20230202150938.22297-3-leo.izen@gmail.com> Content-Language: en-US From: Andreas Rheinhardt In-Reply-To: <20230202150938.22297-3-leo.izen@gmail.com> X-TMN: [kY7G7h8KVRpX89IpKyiHvBlyEl1VqSG5] X-ClientProxiedBy: ZR2P278CA0005.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:50::10) 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_|DU2P250MB0336:EE_ X-MS-Office365-Filtering-Correlation-Id: e430941b-7c5c-43f7-f77b-08db072b9194 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: zk2cutblcE+oeRP/TpadkM/3q726y2QRno8I+MoMl0YUa/FqXaIOzs7+EqDVHgxxyWPNE3QxGk5PzYC50SvPYhaatcHw9uHR6+gwX05bZXzTs4pFqkZMxfX6GCRHX4rIaluf27qkygJ/2u9r26A9Y5gXDyT7qkQNoQqkYu4SdRcGmiurAHvR2lZxELBLSQThsz7Uwi10i4bZ/sdBg1ms5ifc1grI+Ejq24PBQ8wEXhT4niElfH+FG/s39aygZ90qWwDI9JYFHLAUW/4AJd7QlgTAbTciEcI/kNvsmeUGzLl/korR5Ey8AEHO4Z2dfp8SU6ZAcSaWN1YlqkoVXPnL6BGaLNXyzlkhZdplZsMOVPquCG/4zu4ENDRjc5nawu570ZeFXd7MNmlN6c3Ty3nVIbEvBJUsMg1XL8P92k/hepn9aFGrMrWWK9lQV01X8OH2TkwcbJFJum+CkngA/TXq2Y4HRdbqSbojn5uEJAp1GpQMo+72vepsuNBKYsHDFIDFIVtI3GyRAzVCnXJDIGtXG2B+zmkDan+RJiINxXmuSSxsA4PMYbaALJDBUXvBvrFZdC2J+j1MjFcnCOQOfUwknDLR5EUPFkn6+ueu3XbrcQ6iRB0erWHWb9VwY56k5608hKrobqc+sYB/pl8RejGhjQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?RTNMUkF1aU1IdDl5UnNWYUZLaGExWVFpWGo4cVVkQ1NJZ0xXMkxCTkZFUzMw?= =?utf-8?B?Wko4cjJSZmJ0WTBLcmVkMFU3NmVZeXMvakdOV1JpN21DT05XWE1LQkRGUitr?= =?utf-8?B?Wml3UExTZUR3ZVNTZXdaYzFHSzZHUG5xS2NQUHcwWUVPRFhVaFlJdHhOL1pP?= =?utf-8?B?QzB0R3huaU9UK2l0Q3diQTBrZDlPSHVVQXBpUlJEdkVhNkJIRit0S0srUmV2?= =?utf-8?B?YWhFbkd1VUliM1FidGpRZ2RQZXVMWTEwLzBZa0FpTDdJU2JmODExNVY3aEFt?= =?utf-8?B?YU9RWUZjWlNBZzFjVWVKbVZJZnFJMDRNS2w0dmxhK2ZWV2EwUXhUSlZNV3Jj?= =?utf-8?B?ME9NcThnQzAzdWFnb3gyNjFWcnZHWkltOHdBc2NHZjVTNkl3VnBKMENDMFRE?= =?utf-8?B?eU1sVzRZelE1Ulo1MlJRcXNUOTNBSzE1Y1o3clNXY3lqVWRaYm4reHk5aktl?= =?utf-8?B?Rmc5a2R2c0JiMkJJUThTTmRhWVBwVHdibnJySXFVWm0wS3Nyd1ZlRkIwNFhw?= =?utf-8?B?QkRuNHNVQjdUaTcrbEt1aldoTVNhZWRqQjJVUlAyaWplZWlmOGoxY090MGpT?= =?utf-8?B?RjcyeSt5ZVNhVEpoNEt3Y1l2Y0I5N3lQazIyVXh4UDVjajNuN1lVM3dHZC9j?= =?utf-8?B?QlN1UDNqWkF3WmZPK2NURmUxTlVlMzM0U3R1NjgzVHZmaDhVUDVMNENGRmR2?= =?utf-8?B?VzJrZXpjS0VFYWk1eGZxRWZ4M2o2Qkh2dnZHcWFsWkhTUmJqRWx1K1M2M3Rz?= =?utf-8?B?TjdiUUF5LzlyVXdWcEJ1MWx1RHBRTHIyRGhsRk5GTUlEakZ0TWZkbTcxY0RH?= =?utf-8?B?NUVTRVEvZnR6VzdIRGJuVFlSQ2xlRGc5RFBPZmh3djkwTCtiVjJxM05vdVBI?= =?utf-8?B?TFZ4ZlJFWnQ2MWFzN0dRc1gySmk4NWlRbkI1QTFCa3N5b0Q5K0VOWDMxRTFl?= =?utf-8?B?OFJQdm43MzZvUURtYVExZkxJQ3h2a28vSmdFY3FRZ3ZubDBsZDMxV0JjTGFx?= =?utf-8?B?dlhyTFBPb0ZuMnhld2JJQXNFcXYvN054WkFCRHNadXJveitOQU8zaWNCalJM?= =?utf-8?B?cGFBa2UvNnZWdzNIU2ZrVTZ4NXlXOFNiWi9zcmFmb01EVkZXMG5qU0lrWWdH?= =?utf-8?B?czRBNXUrMm11Zk9uRFVUWnRZNzBuNHdMOTFTRDRmVmROUGlETVdGSGRrRVJi?= =?utf-8?B?eUVMRHBrdHQ3TEZHVGIrRW9UQnIxUmpYZW1UNS9tbFhNOVFKaGN3ZkI3SEVl?= =?utf-8?B?OUhSMmRwSWRaQkViaDJmMUh6Mnd2d3BmQkh5NDl0N1M5UkxLOEJzTmZucTVW?= =?utf-8?B?bEdNZHRMY2pEdEVtNXMwb25DZ1I2Wk54VHMwbHArNHpyWXJnS3pVTzhiZGRW?= =?utf-8?B?djQ2RnAwUHYwQ2dXS1Mzc0hLNE5TbGJUZFlybzlMaWtqaktCSjFpL0ZGcita?= =?utf-8?B?SmRCMkZkamNlb05LSHE3NW5XUDFnT29oVnVYdmJSSTNoNnArbFR1NHRtV2ZK?= =?utf-8?B?VjJQaU51a0hGdTZTSWlkallOV204WkZ0M3ZPeDF5QitZN1JxYkp5R09hVExI?= =?utf-8?B?SVZsNExWQzM5clRyaUtpeGtGWEJ1OWk5Qi9TQkFoendOcTBvNWp3ZDQ4dHU1?= =?utf-8?B?VWxlMkswcm9nQWdKR3IwazZxbFBTM2ducTl4TER0MzFmMS9mcG14VGZDdjhL?= =?utf-8?B?dnVZdUFuM0hIVGRQUGdkMFJlQ045RWQycDNHVWI0OStCbGViVVFOYk9oR0p1?= =?utf-8?Q?NIMK/wOeorlxNXwREw=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e430941b-7c5c-43f7-f77b-08db072b9194 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Feb 2023 03:46:31.2513 (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: DU2P250MB0336 Subject: Re: [FFmpeg-devel] [PATCH v3 2/3] avcodec/pngdec: read colorspace info when decoding with AVDISCARD_ALL 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: Leo Izen: > These chunks are lightweight and it's useful information to have when > running ffmpeg -i or ffprobe, for example. > --- > libavcodec/pngdec.c | 103 ++++++++++++++++++----------------- > tests/ref/fate/png-icc | 8 +-- > tests/ref/fate/png-side-data | 2 +- > 3 files changed, 59 insertions(+), 54 deletions(-) > > diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c > index 0d969decf2..a80e0d15bb 100644 > --- a/libavcodec/pngdec.c > +++ b/libavcodec/pngdec.c > @@ -1203,7 +1203,7 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, > > if (avctx->codec_id == AV_CODEC_ID_PNG && > avctx->skip_frame == AVDISCARD_ALL) { > - return 0; > + goto exit_loop; > } > > if (CONFIG_APNG_DECODER && avctx->codec_id == AV_CODEC_ID_APNG && length == 0) { > @@ -1256,6 +1256,9 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, > case MKTAG('t', 'E', 'X', 't'): > case MKTAG('I', 'D', 'A', 'T'): > case MKTAG('t', 'R', 'N', 'S'): > + case MKTAG('s', 'R', 'G', 'B'): > + case MKTAG('c', 'I', 'C', 'P'): > + case MKTAG('c', 'H', 'R', 'M'): > break; > default: > continue; > @@ -1382,6 +1385,56 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, > } > exit_loop: > > + if (s->have_cicp) { > + if (s->cicp_primaries >= AVCOL_PRI_NB) > + av_log(avctx, AV_LOG_WARNING, "unrecognized cICP primaries\n"); > + else > + avctx->color_primaries = p->color_primaries = s->cicp_primaries; > + if (s->cicp_trc >= AVCOL_TRC_NB) > + av_log(avctx, AV_LOG_WARNING, "unrecognized cICP transfer\n"); > + else > + avctx->color_trc = p->color_trc = s->cicp_trc; This code (both the new code as well as the old code in output_frame() added in 6f79f0971e8 and f7bab37c8e6 and 2548c32cc10) modify avctx fields after ff_thread_finish_setup() and are racy with respect to the generic copying of AVCodecContext fields in update_context_from_thread() in pthread_frame.c. > + /* we don't support tv-range RGB */ > + avctx->color_range = p->color_range = AVCOL_RANGE_JPEG; You set this unconditionally below, too. > + if (s->cicp_range == 0) > + av_log(avctx, AV_LOG_WARNING, "unsupported tv-range cICP chunk\n"); > + } else if (s->iccp_data) { > + AVFrameSideData *sd = av_frame_new_side_data(p, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len); > + if (!sd) { > + ret = AVERROR(ENOMEM); > + goto fail; > + } > + memcpy(sd->data, s->iccp_data, s->iccp_data_len); > + > + av_dict_set(&sd->metadata, "name", s->iccp_name, 0); > + } else if (s->have_srgb) { > + avctx->color_primaries = p->color_primaries = AVCOL_PRI_BT709; > + avctx->color_trc = p->color_trc = AVCOL_TRC_IEC61966_2_1; > + } else if (s->have_chrm) { > + AVColorPrimariesDesc desc; > + enum AVColorPrimaries prim; > + desc.wp.x = av_make_q(s->white_point[0], 100000); > + desc.wp.y = av_make_q(s->white_point[1], 100000); > + desc.prim.r.x = av_make_q(s->display_primaries[0][0], 100000); > + desc.prim.r.y = av_make_q(s->display_primaries[0][1], 100000); > + desc.prim.g.x = av_make_q(s->display_primaries[1][0], 100000); > + desc.prim.g.y = av_make_q(s->display_primaries[1][1], 100000); > + desc.prim.b.x = av_make_q(s->display_primaries[2][0], 100000); > + desc.prim.b.y = av_make_q(s->display_primaries[2][1], 100000); > + prim = av_csp_primaries_id_from_desc(&desc); > + if (prim != AVCOL_PRI_UNSPECIFIED) > + avctx->color_primaries = p->color_primaries = prim; > + else > + av_log(avctx, AV_LOG_WARNING, "unknown cHRM primaries\n"); > + } > + > + /* these chunks override gAMA */ > + if (s->iccp_data || s->have_srgb || s->have_cicp) > + av_dict_set(&s->frame_metadata, "gamma", NULL, 0); > + > + avctx->colorspace = p->colorspace = AVCOL_SPC_RGB; > + avctx->color_range = p->color_range = AVCOL_RANGE_JPEG; This is new in this patch; it changes behaviour even when nothing is discarded. Is this intended? > + > if (avctx->codec_id == AV_CODEC_ID_PNG && > avctx->skip_frame == AVDISCARD_ALL) { > return 0; > @@ -1499,56 +1552,8 @@ static void clear_frame_metadata(PNGDecContext *s) > > static int output_frame(PNGDecContext *s, AVFrame *f) > { > - AVCodecContext *avctx = s->avctx; > int ret; > > - if (s->have_cicp) { > - if (s->cicp_primaries >= AVCOL_PRI_NB) > - av_log(avctx, AV_LOG_WARNING, "unrecognized cICP primaries\n"); > - else > - avctx->color_primaries = f->color_primaries = s->cicp_primaries; > - if (s->cicp_trc >= AVCOL_TRC_NB) > - av_log(avctx, AV_LOG_WARNING, "unrecognized cICP transfer\n"); > - else > - avctx->color_trc = f->color_trc = s->cicp_trc; > - avctx->color_range = f->color_range = > - s->cicp_range == 0 ? AVCOL_RANGE_MPEG : AVCOL_RANGE_JPEG; > - } else if (s->iccp_data) { > - AVFrameSideData *sd = av_frame_new_side_data(f, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len); > - if (!sd) { > - ret = AVERROR(ENOMEM); > - goto fail; > - } > - memcpy(sd->data, s->iccp_data, s->iccp_data_len); > - > - av_dict_set(&sd->metadata, "name", s->iccp_name, 0); > - } else if (s->have_srgb) { > - avctx->color_primaries = f->color_primaries = AVCOL_PRI_BT709; > - avctx->color_trc = f->color_trc = AVCOL_TRC_IEC61966_2_1; > - } else if (s->have_chrm) { > - AVColorPrimariesDesc desc; > - enum AVColorPrimaries prim; > - desc.wp.x = av_make_q(s->white_point[0], 100000); > - desc.wp.y = av_make_q(s->white_point[1], 100000); > - desc.prim.r.x = av_make_q(s->display_primaries[0][0], 100000); > - desc.prim.r.y = av_make_q(s->display_primaries[0][1], 100000); > - desc.prim.g.x = av_make_q(s->display_primaries[1][0], 100000); > - desc.prim.g.y = av_make_q(s->display_primaries[1][1], 100000); > - desc.prim.b.x = av_make_q(s->display_primaries[2][0], 100000); > - desc.prim.b.y = av_make_q(s->display_primaries[2][1], 100000); > - prim = av_csp_primaries_id_from_desc(&desc); > - if (prim != AVCOL_PRI_UNSPECIFIED) > - avctx->color_primaries = f->color_primaries = prim; > - else > - av_log(avctx, AV_LOG_WARNING, "unknown cHRM primaries\n"); > - } > - > - /* these chunks override gAMA */ > - if (s->iccp_data || s->have_srgb || s->have_cicp) > - av_dict_set(&s->frame_metadata, "gamma", NULL, 0); > - > - avctx->colorspace = f->colorspace = AVCOL_SPC_RGB; > - > if (s->stereo_mode >= 0) { > AVStereo3D *stereo3d = av_stereo3d_create_side_data(f); > if (!stereo3d) { > diff --git a/tests/ref/fate/png-icc b/tests/ref/fate/png-icc > index 14de544639..1f4eab1fb0 100644 > --- a/tests/ref/fate/png-icc > +++ b/tests/ref/fate/png-icc > @@ -1,5 +1,5 @@ > -a50d37a0e72bddea2fcbba6fb773e2a0 *tests/data/fate/png-icc.image2 > -49397 tests/data/fate/png-icc.image2 > +c460cd06a88ace94d7c76a6309aa8fb8 *tests/data/fate/png-icc.image2 > +49441 tests/data/fate/png-icc.image2 > #tb 0: 1/25 > #media_type 0: video > #codec_id 0: rawvideo > @@ -21,7 +21,7 @@ pkt_duration_time=0.040000 > duration=1 > duration_time=0.040000 > pkt_pos=0 > -pkt_size=49397 > +pkt_size=49441 > width=128 > height=128 > pix_fmt=rgb24 > @@ -34,7 +34,7 @@ top_field_first=0 > repeat_pict=0 > color_range=pc > color_space=gbr > -color_primaries=unknown > +color_primaries=bt709 > color_transfer=unknown > chroma_location=unspecified > [SIDE_DATA] > diff --git a/tests/ref/fate/png-side-data b/tests/ref/fate/png-side-data > index a4c16eb395..8f955f76bc 100644 > --- a/tests/ref/fate/png-side-data > +++ b/tests/ref/fate/png-side-data > @@ -26,7 +26,7 @@ top_field_first=0 > repeat_pict=0 > color_range=pc > color_space=gbr > -color_primaries=unknown > +color_primaries=bt709 > color_transfer=unknown > chroma_location=unspecified > [SIDE_DATA] _______________________________________________ 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".