From patchwork Tue Mar 20 22:59:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 8063 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4457876jad; Tue, 20 Mar 2018 16:00:22 -0700 (PDT) X-Google-Smtp-Source: AG47ELt7nvz52KNiWH6qHBUsw8nEkAbiy51DaRvvsJ/zjsJbhyWSLue1SJR6QZZUgX9ZsM91CCw2 X-Received: by 10.223.157.132 with SMTP id p4mr3599578wre.245.1521586822238; Tue, 20 Mar 2018 16:00:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521586822; cv=none; d=google.com; s=arc-20160816; b=VqTVJehO1iyniRwIGZFPTd6p+ifDJX9iHdBIrm1gkTfZ22I8Ba6ggUOZBGSlSvDnew SmbBh6zT7lBU63DLq5a6OL2opcieq3WAeXJ7jiwZ9gS/hJB4Xug3tEw1HIukNpse0cCs wgwGjH5yYeo6wqJ6++7rqJ3ADZXuNxmisdUZZx+RD3IBqAMMbO4jK5COPSHEEykapG3Y 8u0HeuWigpMgljvPUGtY7J8xv3HLSc/huTHPjM1CdFvu5iSKpTI+L8m9Krferw26H6R2 kcKsM+xLSemRR9dj6YA5PzqNr4YYsiVVQxUsH/Pirqf/zT1X6KBLPxY36EW5eOOL2nm2 GxNg== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=5/p97MDf4K4L01+6KAYbCEmsES3HUf7kYzoy4eym/mY=; b=VUN6m02cHRS0ugAFE1aQJu2ya1A/cIXQWCRpcF6jkATN/Pq+psBO+tuVWsCnh1+rUC NT4ZvflTmMxM2SVb6c40aWBBatMbknt4aM6X1/qRHgUJROG4bT18d1bWcVUgsjf3GgaK QoIqd8EUWE2aUpLDgn/uqoWQGTbZRTvKdlNOnUVz4q2Z5OlynauK2pwSuW7p9BAkdu53 U4n1zG3smbwq0JpEA7+grcW+KwJ0EhjLhi+UtlKQm7M/3padgmiEpn+XNj4gXqydt6tj //whWEVvyC+ggXGqwwepI5NSlQLj7li5DpBm/bQWAmCeMBOTuAr1D5xuYqLD4pAhhJXC cNsA== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id i8si1901226wmc.129.2018.03.20.16.00.21; Tue, 20 Mar 2018 16:00:22 -0700 (PDT) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D4C5E68A363; Wed, 21 Mar 2018 01:00:05 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-dmta-pe07-2.mx.upcmail.net (vie01a-dmta-pe07-2.mx.upcmail.net [84.116.36.18]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A9CBA68A097 for ; Wed, 21 Mar 2018 00:59:59 +0200 (EET) Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe07.mx.upcmail.net with esmtp (Exim 4.88) (envelope-from ) id 1eyQEm-0005Mg-S8 for ffmpeg-devel@ffmpeg.org; Wed, 21 Mar 2018 00:00:12 +0100 Received: from localhost ([213.47.41.20]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id QP081x01f0S5wYM01P09Nb; Wed, 21 Mar 2018 00:00:09 +0100 X-SourceIP: 213.47.41.20 From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Tue, 20 Mar 2018 23:59:46 +0100 Message-Id: <20180320225946.12956-1-michael@niedermayer.cc> X-Mailer: git-send-email 2.16.2 Subject: [FFmpeg-devel] [PATCH] avfilter/vf_scale: Do not set YUV color range for RGB 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: Michael Niedermayer --- libavfilter/vf_scale.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 9f45032e85..2f6fa4791d 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -407,6 +407,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) AVFilterLink *outlink = link->dst->outputs[0]; AVFrame *out; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format); + const AVPixFmtDescriptor *out_desc = av_pix_fmt_desc_get(outlink->format); char buf[32]; int in_range; @@ -497,7 +498,11 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) table, out_full, brightness, contrast, saturation); - out->color_range = out_full ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; + // color_range describes YUV, it is undefined for RGB + if ((out_desc->flags & AV_PIX_FMT_FLAG_RGB) && out_desc->nb_components != 1) { + out->color_range = AVCOL_RANGE_UNSPECIFIED; + } else + out->color_range = out_full ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; } av_reduce(&out->sample_aspect_ratio.num, &out->sample_aspect_ratio.den,