From patchwork Wed Feb 1 17:12:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40204 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp34947pzk; Wed, 1 Feb 2023 09:12:54 -0800 (PST) X-Google-Smtp-Source: AK7set9gxL92olKkuau/gym03m9NYJLT9ZWfFd9VSieviFiWWAJ6k6LjtoMQTbz2pAmpNmodBRSF X-Received: by 2002:a05:6402:2206:b0:4a2:1b97:228c with SMTP id cq6-20020a056402220600b004a21b97228cmr2266981edb.28.1675271574108; Wed, 01 Feb 2023 09:12:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675271574; cv=none; d=google.com; s=arc-20160816; b=0imbOlU0g4ZitZE1VEIIgpzLiQBk6AVGrNMsQLScWo7lZOVaiBfxG0wMsszdl4xicL mXqzrEBadjqOgzKjpL+JrD2RjbJq317Mez5AxO9bZV+L7tlnOpKR0txvaHjEXh6UtRYy i1F+cL8duRzdSLUVTxMTdEiUZ1V3uxubXOyY3B3r/oojwnRSVAOy2o/Pz6ThT+QdTpQY A6oX4UaCIOyCjz3TLd+GGhIXeZX4UYxUO1JJmhGokmqrbPwfjD0WkhPhANPt2a2Fj+S9 pN86f/dxfZ+G+7NuDzWtErhIITi4eF4QR3r0SRInUU1orqwjGoiGG26VQhRChUisogse 3ffg== 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=DrBjeRR0/xxV8EGOU6KNZmTEbpdnn4msXXvf6nrucUWsFhq8fXy4ngIToaqiSsgGol BcTj6NWqtS/zd1+Q8JbGZ4CrMEl1v0WbKkv7LvQCLN8ho8/w7T7b0hcCvQbqn6sRyzOK hpE60Lje1S1R1GTNGbylUYzZMUotNQ4SeTMzOWiT1AqtzADpIRr5GoInztTHiCp4Wstv gAHSQJ2YTPaWkJbiBQu89JaKWg0X6pNcYiwkAxRiC1ymAE/fwHjvQXHsSxK+sQtlFGmh //D/ByrrVLdz/1E6qGVMhWhee+OzW53XEPcSRPudPB/2hwOJxIQqOXnu71G3J5lMbJxw T4ug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Gfky8vPz; 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 d11-20020a056402516b00b00483a725a827si20110510ede.412.2023.02.01.09.12.53; Wed, 01 Feb 2023 09:12:54 -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=Gfky8vPz; 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 C662968BEC0; Wed, 1 Feb 2023 19:12:39 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 202A968BD6C for ; Wed, 1 Feb 2023 19:12:33 +0200 (EET) Received: by mail-io1-f43.google.com with SMTP id 65so4374126iou.3 for ; Wed, 01 Feb 2023 09:12:33 -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=Gfky8vPzdA0std85Q9YEe4DoRD+6XXq0o+k042Y7Si+MbWv1yeWTkQw0bBfaozKCCJ rfwRwGFoD6m9TsjeTXWkUqwsMBMniQqHxyJs/fEleiFx1u9jrE1A40FoTBhKOIWDHlMd hP/+JuXafDeRHggAsNvgJ3YP1c7Zx7XERjgnF+4UCDDgGvo1AoG4SyK1Twj5dmVIQfjI 8zk/twENTPymtlHNYvnQnAGaDlmYUvrth8AdPcP/2xIKg3DPB0HnMTtm8nDRnn2ZLQSX +dSYtUovXn1bBwIpvzR1sZXqKEeVxUk1kXvx43WZojEiy5yJompbdirVxOp8zlukL7Q/ 3y+g== 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=BNidOKX5d37CDx8DI/742pErUSZTmSTjeSr7ZsIeLF1pRdRAj0jzrnQh4orWZDN5AU TTDqeuFmIKLOG2H5PzyqnqmrnB7h3c3D5Oyrh/c9vFq+/E2Yluo+bRI7JjpPwVRMcZ+e QO+4CEvyfujRRuhUQpQho0dfjJB+vfyEwUckCqAhgKgm0oIbhRL2rVqL8KJEEQFoEqAJ Cr37StxJUb7cERdqtbqnTZsUQIJdB/JDIC0DlIXCsd2QFlIfe6su30Q+1ez/69FVRWPg xBz49FJfWWnv7XxJweDKpNPlkHQo70MQrOjhEi4VZ5C6O3oy/qL2AUffkhRJ20o+pesf 0Row== X-Gm-Message-State: AO0yUKWH5Xul44N+4S0lrws83HcSIny6I/T/DokR62RlVQ6+Sd29UjuH ZErIQFF+fbBPhk1SfB91/ksQjVDwVjjAHw== X-Received: by 2002:a5d:841a:0:b0:707:d0c0:1bd6 with SMTP id i26-20020a5d841a000000b00707d0c01bd6mr1890584ion.1.1675271551595; Wed, 01 Feb 2023 09:12:31 -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 l4-20020a05663814c400b003a0565a5750sm6689598jak.119.2023.02.01.09.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 09:12:31 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Feb 2023 12:12:26 -0500 Message-Id: <20230201171227.57864-2-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201171227.57864-1-leo.izen@gmail.com> References: <20230201171227.57864-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: vUO8cKKRenRl 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:12:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40205 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp35071pzk; Wed, 1 Feb 2023 09:13:02 -0800 (PST) X-Google-Smtp-Source: AK7set9TV7jUquTtPDRtYGJAbk9eikvFjmY15FXYYm+yWw4b5Z+SAoadjyDO1x4Ng7Fobju7wksm X-Received: by 2002:a05:6402:4145:b0:4a2:5f73:d3d2 with SMTP id x5-20020a056402414500b004a25f73d3d2mr3367549eda.41.1675271582744; Wed, 01 Feb 2023 09:13:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675271582; cv=none; d=google.com; s=arc-20160816; b=Q1xzE+8MYxv/ocfpJBTpdyVu7rvhcYxXLxPXWl1YEtYi0ODv9BgbNKsDmHun51R+f2 43QjNp8hD7sO05yZDF9t3vTxLPhujIBYKZsneKu48/oe0PSicXEW/x1kgZP6jJun1KQG M2+bTUcLg8Oj2+l9IwqmnVvTf0Vr34/7I/k5947OzmYpgjkuB19ng9tMYmvmN0DMUA8S wxYgT1eCt6gH+3CkcKkHxU2V1Nc3C07ocjrrC/iZ1P+8FVQvUGwBGvrR/ukVmy4n8dha nkReBT5+LdavVQk7AScGCtzI3Mp/dRf7b0+Xd8sCGU1u/cTY8OL78P/BTPiaibsljUkk 8hrw== 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=K5qVGTIyGIMt7NlYtXZL56MbkBAbH9r0bHuewYfcgHs=; b=swi0aUh8n0Ga2Pg60FlrbL0rNwwUrypBVp4lPGVaBBDM7GOaw1/wNQ0JuosI4WKvSR FwHoUTJSZYBBz75BQ2mwxxYHWgXD0UCQ7SmnpcTP+ALR/jFPIp4tSx7cqUGSZcKhpPLE h6XZ7f5qBuxdz1vw6JDx6mScM9hmDWPVTRmY6V/sm63VxBMvHBPnfwA0I+my1j8J0U0q 0iNdCtzvq8MtrrDG6PxrK7c6CUKdDkTmJUAS/idpklh2LyjbTQ5TJu5hPM4KoLCwfoK+ Sia0aKU7hvIFvhppHpSyJoAa9en51hQPZS/8dMy+OE26gTOqPDwhyoLOt9NTtGzSfkuq jVSg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="n/Ch0Q0D"; 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 h4-20020a0564020e8400b004a2224ff345si15712246eda.68.2023.02.01.09.13.02; Wed, 01 Feb 2023 09:13:02 -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="n/Ch0Q0D"; 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 DDB4368BEC8; Wed, 1 Feb 2023 19:12:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A1D2768BEA2 for ; Wed, 1 Feb 2023 19:12:33 +0200 (EET) Received: by mail-il1-f180.google.com with SMTP id i17so8010409ils.11 for ; Wed, 01 Feb 2023 09:12:33 -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=fcTY0NSLkf/ogWOdXtpor2PPnDBf2mrOhidsQ+WaeJo=; b=n/Ch0Q0DjPjfN/SZPANcAlY7mWRkFZEhdvqbsrHYLGvh4S6dYj3kYnb+FOpALBonNz 1K86I7w8QHtRTSsmndV+h7A2Drv6ruPTgLv/PUXC2Mc65rx8NkqIMVtlfnbnPYImkYYU lLTRaVGWM4RP/udbKGrVStYtanFW5glsMoZFiSqRjebMNIAMDooFwnWjXxOshBFGVRki eJ02OUunAkyfxG/iwK5veY+glgJG/3Fe/JtbRmY3StWQ3bEuT2TTnsphN4Wp4pEl2+PJ Y9trNFpH3QwMjRrVNUemzo8Yuj4mOnWR1lO7AR8szHFZvPV2j6mr/o2/yuymB5EUnAtp G8RQ== 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=fcTY0NSLkf/ogWOdXtpor2PPnDBf2mrOhidsQ+WaeJo=; b=dfF12jx6g1433e4X6GAE9zewUX9/j1xOlfFUMYmSdnnMYlE4VePYtZnL/mfGDA7llu HDUYMJGB2lXIxubvSt6YaDm9PDBKH0kA18LMETby4xs7u+P4XAFIiuZ9G97e9d2t605r JCIIbvW5wPUOyzBJV8YUBniVWoufLspBzA8AX93QgQ7VaxYZej8misqdzC9ttig5zBUw p3PhIHmuF3b9DykhymSqzreUs+UnglNG+FFYq0KI4fMoKK2nLrBwtt+Amoz5R4rxnLGn 03N97pfjMoj+DFlpnjMxxPGeaVd8DtSiDfmrKXYOEXQKxoMBOii+aEx+zfOuHN+8EoX8 ngwQ== X-Gm-Message-State: AO0yUKVD/RPXzRfx2YouO35Npo2RjfcN5urMRJ7Mc7CBZthushT44qGF NFcCX6rwtKQiegK2mnnKTuGvFahrdbFaGQ== X-Received: by 2002:a05:6e02:152:b0:310:cc70:a152 with SMTP id j18-20020a056e02015200b00310cc70a152mr2102747ilr.2.1675271552266; Wed, 01 Feb 2023 09:12:32 -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 l4-20020a05663814c400b003a0565a5750sm6689598jak.119.2023.02.01.09.12.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 09:12:32 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Wed, 1 Feb 2023 12:12:27 -0500 Message-Id: <20230201171227.57864-3-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230201171227.57864-1-leo.izen@gmail.com> References: <20230201171227.57864-1-leo.izen@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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: ubGea2eDzZvE 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 ++++++++++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 51 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) {