From patchwork Wed Feb 1 17:44:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40206 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp58141pzk; Wed, 1 Feb 2023 09:44:36 -0800 (PST) X-Google-Smtp-Source: AK7set+K2Wh/8IvrP1qs4T1L9Bgy5K5m4/IOoomIYsQd5XpxKFXroFOcyxwWK3YiPsomNCLg1fBR X-Received: by 2002:a50:d0cc:0:b0:49d:6ebe:e9dc with SMTP id g12-20020a50d0cc000000b0049d6ebee9dcmr3138116edf.25.1675273475832; Wed, 01 Feb 2023 09:44:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675273475; cv=none; d=google.com; s=arc-20160816; b=yUPz2LXpqfW0UYWF1+dAlzzkzCuqWTVCJrcDC/2s7+B9Bwrg1fXWrn9tv57P1/JCPI fsJCVu1DD1sGSJsG7wxUKcq641J4QhqoRYAsslJ7UEh8etQpfDgKImlAkyGze97KqapE diuWzfG4TKNOT4RG7owG6nrOwXaDMGjv5+FXMw7ZXyng7zNu9tG7lL55BrXYJOCrXGt6 s/sF8OcXetraLf97na9jxUV4STdlybZPnklZaeKUfkNos0umVCtCBbsKMHHqPwGMdt6L U1mC1MUBgw5fuI9W6o2Kc3XXR2v0luvjGyv7L0wAmrsGWEq3yQlQvVqqHNVxMO+R0FZU nuLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=rZ7V2NXTpFDjuMeFm7izX5pd1zzmcpkuPp4kVH+1r30=; b=CMcr0PR7eVntWT1m1a6DTZ4Il7J2gi0WNBSi90ZzZN4HqB3epr9l0GvpKPwv20UFyI i5IuEsHi1z7GJzQ0saDyVgTEg4bXfmixVtrz1Qy+IfULC7BFyVzsbeRWI0919AeQOoct PBWukuLVH4bQMsAhE81AzYUFW2sovV8oFQAJ87s+DJ65rTSQQ30ydhlTh8Ma7gzYj3fP seD3CLHUEvt5yTCnOjI9KQcPqmmV2LFkeWEEp8De1g7yTwwuv0Kg5NDUHuDqyFWy6l7r rc8r7j4GnM5avsuRo9RecEw4UsYI+uLDVJf1uGQ0WxEOfIqFFkaM8c9cw+uHkk6zRFf9 kAZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lRdU0IlK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t21-20020a056402525500b004a21d3b00a9si5730842edd.69.2023.02.01.09.44.35; Wed, 01 Feb 2023 09:44:35 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=lRdU0IlK; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E016068BEAB; Wed, 1 Feb 2023 19:44:23 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f47.google.com (mail-io1-f47.google.com [209.85.166.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 24CCB68BD85 for ; Wed, 1 Feb 2023 19:44:17 +0200 (EET) Received: by mail-io1-f47.google.com with SMTP id j4so4261638iog.8 for ; Wed, 01 Feb 2023 09:44:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=wLdi06ovCU2E7TKA0MS9qUhKm7S9jlZOnFQJ/cM2lyg=; b=lRdU0IlKuyBP0J47RztuZof7cHcsrZcFzvfLETGFx/mIMYOxWQrfFBq/Z5dhBOZTa6 +NpE+8OoyhPoCsEyj2raSwFIwIhWMOiiIRFGaJfLF/gXGr8IzLMzTF+WyVe47UMSCDCl xeoQljr0Io1Lrd3V/0LomQkBAGNo4qOPAb2jpTuO/J353ClCal2nkB4h8dafTOBoHTg6 jAdCBGaQFZ9wdjAKcl2UPX1yZEAMgjnv+St00+q3+0n+fX0UpS9OcYZaJ0M2f8MnY0Er QgrYFBlkav+G7v/FrEGoOBVg3GL82tzRaC4CcH/IqhtHwJfz4pn1hrr/cwDM9TN14yXa GwbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wLdi06ovCU2E7TKA0MS9qUhKm7S9jlZOnFQJ/cM2lyg=; b=XUyE2NpvktSiYLQrEPAJpTlNl8EQg2yYouEi1hyrobEKQpJ6m9hD4b2bVppRot+R/+ TI2WnEn9SYv1ppoYJnAzTArQ/Yvq5t3sAjw2mdGI5LQL46XXWwmt0PBmoyNKkpareexi UeP7QusSntflZ5YHB9/92EDwuYb1oSb2kEst+i/YEwKn9OzpoHBHYl84xGQL7Pd7dn0D BCFZl+G6sbY9prnHGuTvc7ptRYldHYyI5RVHsVn2qjhuzruNnjIAMEFfbQgMxQac6RDe E53c0bjgkqkoCEbUB3VKKEwfp+1ppD7QRSYal0y/7rsu9hXpPJ1rsmIlPTQEBj9QBYt6 NIKA== X-Gm-Message-State: AO0yUKXrqRdF1Fb+TD3kFfD1RS3DUMNa8/NSwjbOxJYcbmtPCeZjDFVJ NDBE5naYSzzCEau2F0fKz9mILQUK9xPPPw== X-Received: by 2002:a5e:de07:0:b0:716:8f6a:f480 with SMTP id e7-20020a5ede07000000b007168f6af480mr1776672iok.0.1675273455799; Wed, 01 Feb 2023 09:44:15 -0800 (PST) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id c13-20020a6b4e0d000000b00704a77b7b28sm5925685iob.54.2023.02.01.09.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 09:44:15 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Feb 2023 12:44:11 -0500 Message-Id: <20230201174412.78042-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201174412.78042-1-leo.izen@gmail.com> References: <20230201174412.78042-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avcodec/pngenc.c: avoid writing cICP when inappropriate 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 Cc: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 42rp0KL7R3vZ We parse the fallback cHRM on decode and correctly determine that we have BT.709 primaries, but unknown TRC. This causes us to write cICP where we shouldn't. Primaries without transfer can be handled entirely by cHRM, so we should only write cICP if we actually know the transfer function. Additionally, we should avoid writing cICP if there's an ICC profile because the spec says decoders must prioritize cICP over the ICC profile. Signed-off-by: Leo Izen --- libavcodec/pngenc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/libavcodec/pngenc.c b/libavcodec/pngenc.c index 2393161c3b..81b95c143d 100644 --- a/libavcodec/pngenc.c +++ b/libavcodec/pngenc.c @@ -412,14 +412,25 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict) } } + side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_ICC_PROFILE); + if ((ret = png_write_iccp(s, side_data))) + return ret; + /* write colorspace information */ if (pict->color_primaries == AVCOL_PRI_BT709 && pict->color_trc == AVCOL_TRC_IEC61966_2_1) { s->buf[0] = 1; /* rendering intent, relative colorimetric by default */ png_write_chunk(&s->bytestream, MKTAG('s', 'R', 'G', 'B'), s->buf, 1); - } else if (pict->color_primaries != AVCOL_PRI_UNSPECIFIED || - pict->color_trc != AVCOL_TRC_UNSPECIFIED) { - /* these values match H.273 so no translation is needed */ + } else if (pict->color_trc != AVCOL_TRC_UNSPECIFIED && !side_data) { + /* + * Avoid writing cICP if the transfer is unknown. Known primaries + * with unknown transfer can be handled by cHRM. + * + * We also avoid writing cICP if an ICC Profile is present, because + * the standard requires that cICP overrides iCCP. + * + * These values match H.273 so no translation is needed. + */ s->buf[0] = pict->color_primaries; s->buf[1] = pict->color_trc; s->buf[2] = 0; /* colorspace = RGB */ @@ -432,10 +443,6 @@ static int encode_headers(AVCodecContext *avctx, const AVFrame *pict) if (png_get_gama(pict->color_trc, s->buf)) png_write_chunk(&s->bytestream, MKTAG('g', 'A', 'M', 'A'), s->buf, 4); - side_data = av_frame_get_side_data(pict, AV_FRAME_DATA_ICC_PROFILE); - if ((ret = png_write_iccp(s, side_data))) - return ret; - /* put the palette if needed, must be after colorspace information */ if (s->color_type == PNG_COLOR_TYPE_PALETTE) { int has_alpha, alpha, i; From patchwork Wed Feb 1 17:44:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40207 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp58244pzk; Wed, 1 Feb 2023 09:44:44 -0800 (PST) X-Google-Smtp-Source: AK7set9WWpKjMgqjMGyjojNDem0/Xg/NLL+muTgSUYJ5UnUo6VcTvvCP0pT/qoykGTjUdZ0fES0y X-Received: by 2002:a17:907:1308:b0:88a:bb13:7329 with SMTP id vj8-20020a170907130800b0088abb137329mr3082098ejb.53.1675273484146; Wed, 01 Feb 2023 09:44:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675273484; cv=none; d=google.com; s=arc-20160816; b=G6EudG/j6CiQWWwX/LNNR6vpC0V6+4sXM4YUDvOu8eK+4ZjI+nbRMh+mqv8rS0uIjJ l3g2NrYUab8RLo3+HIb2q8nfIPYbKx1zePRXEAyP/bMrHZNWGVD7Lxa51HxWpchtxjb8 AvtZqVBbtah8aYArf1rvWDDYxqTRxNIbQLwZzV7FGg+AaNIPSoSAs2KGklxiH6TT4EFy tdywH8YIASq3+6L849NUwA3Z3Ik+A3uBQI46Ak+QbH7b38AzO5JOyaY+C+tb/LcND5YJ pxPC4PQi3pwcV8+I8Mu7txI1USZNZblay7VKmZcJtNz8uFSf6h09wqi+xU7XY9NS62Nn qKzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=AX1bLc2FTB/7zaTO2L6SAjZRtwvgJhd0fcBxT8Nfg9k=; b=0LpUvZkWkOQVzxMnh1zM85yl+xYI6d7rD+TzZ9FjHoyzR4yrpnlzVplBQmCJtAYGED PAkokUVwd9VPM9vfNv2CODsbnjjL6RWKKum/NuzfYGkYeSGEm1WCG+3r6gXIbVoeVGZH Z0rdqv2Oaw3Kvuag1lflC885kQwXlWDhfYU7/tsto+qI8qfaEoq3dCz5cmFhiz4XoqVi heF4ganleKJrRK/1cAjbRY7vvSk73gtElXugtcyeeXrDgWEdC2D0rtQU8QAYkMJoIAav Iq5G6cYVuHizIlHvztLV36uENeufiBQMhEHoR9UDWiS8nqkp7OMd/Uces0q+BDAt/4py eXnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GbpaVqb3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id eh17-20020a0564020f9100b0049e6678d9d8si21865849edb.618.2023.02.01.09.44.43; Wed, 01 Feb 2023 09:44:44 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=GbpaVqb3; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DF00B68BEB4; Wed, 1 Feb 2023 19:44:24 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f46.google.com (mail-io1-f46.google.com [209.85.166.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 280B368BDE9 for ; Wed, 1 Feb 2023 19:44:18 +0200 (EET) Received: by mail-io1-f46.google.com with SMTP id l7so4768406ioa.7 for ; Wed, 01 Feb 2023 09:44:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=J4ycIa3kNd+QU4UrjM6M8vuNePkcpopIn+9GSOL68PU=; b=GbpaVqb3TdRo54yxJsxf3GvFwpbmdmm9NGcCqtqCvzCy7Xgvo0Elp6202gV+t02/lr CUeb3pxLG3iAWph/UkAf2bB0PhUxv3teN5EWHlTFvGWE8T3Y9VHQdnWIZzJOIFmm2xQw lqE9yzZYTX0fcSfoUSdzWdAKYpFutirsFypZgIfFZgk1LN3fPt7Q6WsuUqceeKHDFE+j C7o+crPwj0H9sOeuw86EjFqpsdKZqzExFRjkpFBuik7+M3fgIfFhDtNAf5tPpYs8REs4 1mPxyBsPqw+AYHD96ZOcngVGhl8kUuwJYK18+TsAWyYduYQJyIip1gqp0DZPh9wjJuXE a33w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=J4ycIa3kNd+QU4UrjM6M8vuNePkcpopIn+9GSOL68PU=; b=NIPgRnRnBUK8A/2FmhXwdsrFJIyTnJNrvO88Bvj4K3aTIXexZYBoTnprE2OTSeyzcz IJORWh3NGLIN2LfElokzkpps68x3Q/bVjKkgRHvkKeZ7LGZDRca5KZxJ3ubHT6A7EXui F3wWS1/Ot+JBYof1QBl9+ofjmBYEHZQuqBe/5o+5bNJv+3X7DWDVv/8IurPCHAWrU9+L 4q17krs+A0TA7bFMe89zSQRPljFi/TbaMlkgmZ+KZxDuqQubEG8f6suGYqytiKnfjAF0 8Oa4ZqgszCGEmD7adb+Mf4U/AdMkCO93ohoyev270OsEfT9zlhumDLrsESONHs/LUWgb Mwdw== X-Gm-Message-State: AO0yUKWGAcT60tUOje799fqErEZdL6e6iBE1+l+UU7R9ItOOrnE8mF15 EYwoJsTuBK1n+9ErDpU+RJZIpFGgXZvdqg== X-Received: by 2002:a6b:3b14:0:b0:715:f031:a7f5 with SMTP id i20-20020a6b3b14000000b00715f031a7f5mr1752254ioa.1.1675273456430; Wed, 01 Feb 2023 09:44:16 -0800 (PST) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id c13-20020a6b4e0d000000b00704a77b7b28sm5925685iob.54.2023.02.01.09.44.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 09:44:16 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Feb 2023 12:44:12 -0500 Message-Id: <20230201174412.78042-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201174412.78042-1-leo.izen@gmail.com> References: <20230201174412.78042-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 2/2] 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 Cc: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4AsuJLO10MvL These chunks are lightweight and it's useful information to have when running ffmpeg -i or ffprobe, for example. Signed-off-by: Leo Izen --- libavcodec/pngdec.c | 126 +++++++++++++++++++++-------------- tests/ref/fate/png-icc | 8 +-- tests/ref/fate/png-side-data | 2 +- 3 files changed, 80 insertions(+), 56 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d969decf2..c83da08eb9 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -75,6 +75,7 @@ typedef struct PNGDecContext { int have_chrm; uint32_t white_point[2]; uint32_t display_primaries[3][2]; + int gamma; int have_srgb; int have_cicp; enum AVColorPrimaries cicp_primaries; @@ -1203,7 +1204,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 +1257,10 @@ 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'): + case MKTAG('g', 'A', 'M', 'A'): break; default: continue; @@ -1358,10 +1363,10 @@ static int decode_frame_common(AVCodecContext *avctx, PNGDecContext *s, case MKTAG('g', 'A', 'M', 'A'): { AVBPrint bp; char *gamma_str; - int num = bytestream2_get_be32(&gb_chunk); + s->gamma = bytestream2_get_be32(&gb_chunk); av_bprint_init(&bp, 0, AV_BPRINT_SIZE_UNLIMITED); - av_bprintf(&bp, "%i/%i", num, 100000); + av_bprintf(&bp, "%i/%i", s->gamma, 100000); ret = av_bprint_finalize(&bp, &gamma_str); if (ret < 0) return ret; @@ -1382,6 +1387,73 @@ 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; + /* we don't support tv-range RGB */ + avctx->color_range = p->color_range = AVCOL_RANGE_JPEG; + 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); + } else if (s->gamma) { + /* + * these values are 100000/2.2, 100000/2.8, and 100000/2.6 + * respectively. 45455, 35714, and 38462. There's a 0.001 + * gamma tolerance here in case of floating point issues + * when the PNG was written. + * + * None of the other enums have a pure gamma curve so it makes + * sense to leave those to sRGB and cICP. + */ + if (s->gamma > 45355 && s->gamma < 45555) + avctx->color_trc = p->color_trc = AVCOL_TRC_GAMMA22; + else if (s->gamma > 35614 && s->gamma < 35814) + avctx->color_trc = p->color_trc = AVCOL_TRC_GAMMA28; + else if (s->gamma > 38362 && s->gamma < 38562) + avctx->color_trc = p->color_trc = AVCOL_TRC_SMPTE428; + } + + avctx->colorspace = p->colorspace = AVCOL_SPC_RGB; + avctx->color_range = p->color_range = AVCOL_RANGE_JPEG; + if (avctx->codec_id == AV_CODEC_ID_PNG && avctx->skip_frame == AVDISCARD_ALL) { return 0; @@ -1499,56 +1571,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]