From patchwork Wed Dec 13 10:59:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 6741 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5264511jah; Wed, 13 Dec 2017 03:01:35 -0800 (PST) X-Google-Smtp-Source: ACJfBovKOsEffi+rqN5GRjD7Fsx1XhqEWrkYSIrXI2Xntp7Ye1c7d/ZGDbpEiSEzhq3xgW5upMpE X-Received: by 10.223.157.138 with SMTP id p10mr2184018wre.28.1513162895270; Wed, 13 Dec 2017 03:01:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513162895; cv=none; d=google.com; s=arc-20160816; b=IYlanW6G7dKyaqYCHpbCx1amv5aeitwdxxI1TCuhbiOk5IcF0yJO3G2KNhHO7u0+Mi GrD7BHpI8l4Ew+tlUgMtgue1++35DJRUP3dYvvfr0vHpQJFWmZj/VNLOtS11uW/li5cz 8e7QAwEj/Xhjpx0DHzbWirMU+jxPOGhGN2WbiMM6EmQmPZKnJXx+Tv9mmEkydYNY7y4z lzOoXonc3qfjXSKCk/86lKqZrc0dc4hEizLLzu7uw1iyGbFhq4iEVNUhVbLOtpz8EkEN Uiu+zC6CvVbIrsWocvmxpAikS5ofEKhMVCQCEgOhQmKrOgKJT+sAMV98CLDVuunkEydc lFjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=dKDwgq3BSOr1V7OGKkNwa4cSOOvaAILoRpA8oDnNfO0=; b=E60m3/o1QyGjXkW4rK6bWUdwFJF1BJ+6LNd+0Rn1HegGQQjN5xzCemqT5QTQ99y6nk zY+cDHVE1UhruHZhQUMjEpPhQZ5npkiqFu5WzWFBdjcrz9pQOR99sQgo4OGUhwKCHq2e bUJ48rknh2n07SReQFi+YY+2vrP5VZlNcCNg0SWWix9ZRWG4qzPbKWOQ7gnL+zbe2K/P j1xUUzPv4oO6sifK4AEsre+b9uxebyR8YpAXzlSf16/5UN60QxHU9OHysvYo3zKHeP6I g4SXzhmPIyHgZzk2b/4x1yzfpPO73DdmT8klO/hylP6/HfCT12585ZaUUqxd0cVRrNTj SPiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=l9x+Mz5w; 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=NONE 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 133si1231360wms.136.2017.12.13.03.01.34; Wed, 13 Dec 2017 03:01: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=20161025 header.b=l9x+Mz5w; 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=NONE 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 D1F0D68A3E6; Wed, 13 Dec 2017 13:00:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4A0EF689B97 for ; Wed, 13 Dec 2017 13:00:21 +0200 (EET) Received: by mail-wr0-f195.google.com with SMTP id x49so1696795wrb.13 for ; Wed, 13 Dec 2017 03:00:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=L4PovPO2QbQfL86OvG74iN4j1u2VIgvy1T+XQMbfCfw=; b=l9x+Mz5wK7nI7F3oMhu6Q9q9z6G4Wiu+I2Qvu+3NvSievYZ702qt4k3NwrQP1l+qtJ 7p65qJmkyCOQuxwgbgvJB5SUtIevoh/lf6KPyaBPkEWjB0kbJrpVKZMtT5rADuacz1ev YCeiMKTo1JO30Jxww6qSoJ0XBgR4x12h2e9M9p29GsyDbZ1KzaglN5PFe2saU10U0IgG 4GcTtQvixWn8bFM2ycAPwtGDg61nPra0vxk3EiMREPAT/4SgLVlhxXZ9DEpS7EcWwU2J MiyyaevzmryhrLE4jWwUGGc2IY8j4YirNiB8gdAGdH8IGlgGRFYym6Y82/rcg8ZDatMa uGUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=L4PovPO2QbQfL86OvG74iN4j1u2VIgvy1T+XQMbfCfw=; b=tceyPLVhrJ8xLl7U/l78hHjVlg82to6evy4LzCLZzvImHOx6TModqb+fl5uAb24A73 Qv2bOIZJrsGCDc2tu4P8IXWXiecLnimH6CTBh8sBIHb3EOPqmtgw7+Mxv/RINGxgbZjE cwFyEhgP+Afi4OlWXB8IOwvkGjbyQCnLNrR6GlkpaouM2uXEclTZ1HUhgyGDm0qOlqXR Nqyd1QsLltJSj/LspFHceOss6iJtecMZ3kOItvrjqN62bFqioPUUDUvnevehmEAA9iOo cO2aCEqsZTU85UTSwmeOtZltuTwdpOOKTr+MpVbalrn3aql33vmHVfwJti4VHLl45j6q qbhg== X-Gm-Message-State: AKGB3mK1GvTTvWeff4THLad0nJFMN7VC1gqN/H6NZIwBivTHQlRb9Bne gW+0hOYFhgRyEgE1b7KzKdGMRA== X-Received: by 10.223.190.134 with SMTP id i6mr1930376wrh.177.1513162829098; Wed, 13 Dec 2017 03:00:29 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id w21sm675961wra.30.2017.12.13.03.00.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 03:00:28 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 11:59:22 +0100 Message-Id: <20171213105940.32103-6-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171213105940.32103-1-onemda@gmail.com> References: <20171213105940.32103-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 06/24] avcodec/pngdec: set full color range only for gray formats X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Paul B Mahol --- libavcodec/pngdec.c | 8 ++++++-- tests/ref/fate/api-png-codec-param | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index f93f200bb1..dbf986de50 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -641,9 +641,11 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, } else if ((s->bit_depth == 2 || s->bit_depth == 4 || s->bit_depth == 8) && s->color_type == PNG_COLOR_TYPE_GRAY) { avctx->pix_fmt = AV_PIX_FMT_GRAY8; + avctx->color_range = AVCOL_RANGE_JPEG; } else if (s->bit_depth == 16 && s->color_type == PNG_COLOR_TYPE_GRAY) { avctx->pix_fmt = AV_PIX_FMT_GRAY16BE; + avctx->color_range = AVCOL_RANGE_JPEG; } else if (s->bit_depth == 16 && s->color_type == PNG_COLOR_TYPE_RGB) { avctx->pix_fmt = AV_PIX_FMT_RGB48BE; @@ -658,9 +660,11 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, } else if (s->bit_depth == 8 && s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { avctx->pix_fmt = AV_PIX_FMT_YA8; + avctx->color_range = AVCOL_RANGE_JPEG; } else if (s->bit_depth == 16 && s->color_type == PNG_COLOR_TYPE_GRAY_ALPHA) { avctx->pix_fmt = AV_PIX_FMT_YA16BE; + avctx->color_range = AVCOL_RANGE_JPEG; } else { avpriv_report_missing_feature(avctx, "Bit depth %d color type %d", @@ -680,10 +684,12 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, case AV_PIX_FMT_GRAY8: avctx->pix_fmt = AV_PIX_FMT_YA8; + avctx->color_range = AVCOL_RANGE_JPEG; break; case AV_PIX_FMT_GRAY16BE: avctx->pix_fmt = AV_PIX_FMT_YA16BE; + avctx->color_range = AVCOL_RANGE_JPEG; break; default: @@ -1575,8 +1581,6 @@ static av_cold int png_dec_init(AVCodecContext *avctx) { PNGDecContext *s = avctx->priv_data; - avctx->color_range = AVCOL_RANGE_JPEG; - s->avctx = avctx; s->previous_picture.f = av_frame_alloc(); s->last_picture.f = av_frame_alloc(); diff --git a/tests/ref/fate/api-png-codec-param b/tests/ref/fate/api-png-codec-param index c6ea7c6296..a04b77fa43 100644 --- a/tests/ref/fate/api-png-codec-param +++ b/tests/ref/fate/api-png-codec-param @@ -115,7 +115,7 @@ stream=0, decode=0 color_primaries=2 color_trc=2 colorspace=2 - color_range=2 + color_range=0 chroma_sample_location=0 log_level_offset=0 slices=0 @@ -254,7 +254,7 @@ stream=0, decode=1 color_primaries=2 color_trc=2 colorspace=2 - color_range=2 + color_range=0 chroma_sample_location=0 log_level_offset=0 slices=0