From patchwork Tue Jan 31 23:12:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 40199 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp444464pzj; Tue, 31 Jan 2023 15:13:10 -0800 (PST) X-Google-Smtp-Source: AK7set9ZFSuhbP2U5QMrESm17lAu8d+O+jE8CEBdtehVh5FOTcTH4njiXAHA1NRxmgeOj+1NVNP6 X-Received: by 2002:a17:906:3ed6:b0:878:762b:d8fc with SMTP id d22-20020a1709063ed600b00878762bd8fcmr113129ejj.28.1675206790746; Tue, 31 Jan 2023 15:13:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675206790; cv=none; d=google.com; s=arc-20160816; b=bM+Q2w6qrjeeFMt5AvwiVtIV9CFkuGTatYxZWHWs+wsp+hGcgG/Qs4gU/zA5o3Oo3G pDEiqTTjlmhsZKponIAo9oCyCMEB3k2Dx0Gao022HwvlVHwjo/OOeC9pcaV8TmbFkSyL UYlDGXhP0LMevlI/T4ueeOe59Z/ddGJrob/u4Hs45M9z+9CllmhIwhSoEPY0yfJ8bWNt kg3UjxELhH6gZzoJyDsPGSH9tKYNK/927oxNtAxrsXMk7JdL57ZXjYQQ9nXDR3ihzKpd DhdjQ6Mp3q2XFzslX++oJmKyVdeU/mU6kWdsVIHacS/2/p8nP4jBpmx9RZJl9hJUzXLD svqQ== 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:message-id:date:to:from :dkim-signature:delivered-to; bh=jSPaJk3eAMpD58COTWtXifFF+6i6iRH9x09KCFMZOt4=; b=qkERisOaoTirilj5Llbw5VQeyVlN4A9Zi4pmTrFUduPVzC5iBvh6J0pETjdFepQsOl KSw/JrO26b1cIAURn6qY/LhVxtKPl5JNhy5ZYqJ9Wq2bN30SOTrTZjTetgIGBEAqK69x WxLeOxNsSKBwKgnGm7AQhHkdsxVI8FW9UyymcI0F5aS1AEIYa5j03gJP0CaxIFah+g1v v/qiOXxfjPh/kUZfpmaFGivLjJTfOvstG3RineOWfoFQPROlIglS6cmQk4toGFN00XI7 d1EkqY8+9KSqYcxgHvZpB2QRVKJVlvjCNzlhG8fIUljZViHAIis+qnXldOWFIABTBztS ehUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PpUuMtzD; 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 p9-20020a170907910900b0088d91fe6b17si533892ejq.584.2023.01.31.15.13.09; Tue, 31 Jan 2023 15:13:10 -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=PpUuMtzD; 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 4EB0468BE95; Wed, 1 Feb 2023 01:13:06 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 95D6F68BE04 for ; Wed, 1 Feb 2023 01:12:59 +0200 (EET) Received: by mail-io1-f49.google.com with SMTP id r6so3763976ioj.5 for ; Tue, 31 Jan 2023 15:12:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=M+y6Lj4nUoeGwqD5BcjUa4+aG5Y8abadejFsKr/3ta0=; b=PpUuMtzDJG41rUuULwKxvkU92fUQzFewUtwuJ8uDhHblqzq3zREDF5un2QtUflVKcr 3ymemmQNlHexrOtRd1D6Zxg13G6DDrrCwEbxn0aIyEUTPu4hOo2tF4p/YGQKQKstcxw9 O2jszk2CW60nC3sEsAZfJoGbJ1Weoge2XVEbyhEUulSEj2axbhIBYO86oWYHaudjCPzC AxyrvZDkRazvcmHfIK9DPOasjJBQJiSE8gAhKunZXEcB2osgxw2e/HCGw3P8R1mh0c5h uONpY90SQw4FAu2S7XzU3CR3aWdOz6CEwARPQtXjz+dbFP7Jp+34tynTsnS9ZYdE0lly aY2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=M+y6Lj4nUoeGwqD5BcjUa4+aG5Y8abadejFsKr/3ta0=; b=h2L/Zkd9tHn+IvMyb13GPknhD6QBUjgruwh+OlyV3sDAKhFYlH/paY+3xH5m/zQ3Se 9PbSiOXO4n4laWvyqf4b4q8KllhTszt34L20Xz8nag4/9QgvtSCIFDAuwbgWYsYI3xQv YUoJG2ncHF4NcgDuNI9qmQboYiXb5le2KfigC5pWzKlUDOCbjjQeX7EE8TgX4WYhmjxS vq5yxkAAHfsoaEX4AGRsczEnTaWQEiwH7G5IA2XVbiJPr2MOmk9IjoJDhwMaddVaS+Hc Jp97/iPXuBdzVe8iBx1KWoRFObZuZx2DMf4dL1pYPRZLWhD6O04sRnk5uQruydDd3jgP Lnew== X-Gm-Message-State: AO0yUKUQZvUNzXJlSBISA0VDee1FuitbpGDrxc7ngBVj+GH2hZdJBJqy LB2c2NvyClp4uj99b8DBuBV3lYdQVfPYqQ== X-Received: by 2002:a6b:5112:0:b0:719:6a2:99d8 with SMTP id f18-20020a6b5112000000b0071906a299d8mr202466iob.0.1675206777999; Tue, 31 Jan 2023 15:12:57 -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 b21-20020a05660214d500b006f6623df63asm5412644iow.14.2023.01.31.15.12.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 31 Jan 2023 15:12:57 -0800 (PST) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Tue, 31 Jan 2023 18:12:54 -0500 Message-Id: <20230131231254.277086-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/pngdec: warn when reading tv-range cICP chunks 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: QAGsdn5YltmI FFmpeg doesn't support tv-range RGB pixel data, so if we see a cICP chunk that marks its RGB data as tv-range, we should print a warning instead of setting it to AVCOL_RANGE_MPEG and having things possibly mess up later down the line. Signed-off-by: Leo Izen --- libavcodec/pngdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index 0d969decf2..384ae97177 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -1511,8 +1511,10 @@ static int output_frame(PNGDecContext *s, AVFrame *f) 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; + /* we don't support tv-range RGB */ + avctx->color_range = f->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(f, AV_FRAME_DATA_ICC_PROFILE, s->iccp_data_len); if (!sd) {