From patchwork Wed Dec 13 10:59:21 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: 6739 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp5264089jah; Wed, 13 Dec 2017 03:01:17 -0800 (PST) X-Google-Smtp-Source: ACJfBosoIWoTS1a6dtCL/ZZ1cPbOKkjMIgx45JKynw2IHAYZWtXq/v7FzqvXkDBLEq+ig0iGWdzZ X-Received: by 10.28.7.133 with SMTP id 127mr1504984wmh.31.1513162877370; Wed, 13 Dec 2017 03:01:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513162877; cv=none; d=google.com; s=arc-20160816; b=GAzkI2gDUT16FdmLKBcYPAU0Spx0FoVTi6TOBgw8V17m+0ernUktgMzhm11CmzRM5H 0vTzEs9pw8LE43eA/fbpZoIS3U1v83LSMOn35SDk1hb0Tat4U1Zf2l2ls54UVjLcNn4r wEmTqI092wMLOV/WUq6M/z+VADXhC0Ub/2elkP6n/cMnIavbxSVM2bJ2CKpcgtAT4gYB qThXa3hm7BnmLrY7s6NnUmZINFtUQoIP/Ni8tiZEA6s9rL9aYFN+ZepzjrYuRBKDQNRM 0fnO/Lrfl/v/N7JYEZL5hL4oCF0WbzP7aEdVSyKAdyj7xkqMciQpbMoP4MaqqibWUm9P Uxfg== 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=r5u/rEjA4odAtuZU5LzHM9uy0BulIk/4fpsvdROU49M=; b=uCdMqC0EooBpFVwap7uoXTfwYaxaOxvVOGaOINIqxI80tjSJ/imO8y+SaLAg0tktDA kS3xazxZcUQSnFFUGcAcrdPCsQ2pUk23buFvedl2wFvBTU6fnZzZnpBrvoin/4dJdU+x A/KQXks28QBYTh+vXZpRGrlOAOmu9dRoe0gGfvaAax5hSepbJYuIJlHiuxCR8QoXRD7h YDcHvjMXgYLXS2pYwo4igtTwS9NM0FeB7veP4oJN4+9zrEy6o10w/bagulb53udC8j6k 7rjLhBMuC7ANe74ZgC3qZFai3eY2sCWu7kpLA3ZuZVEpbQscq51cM8EZSToWjh8m3Fk1 NR0w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=ed9wz9zf; 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 r13si1202353wrc.91.2017.12.13.03.01.16; Wed, 13 Dec 2017 03:01:17 -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=ed9wz9zf; 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 0840A68A382; 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-f194.google.com (mail-wr0-f194.google.com [209.85.128.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B45068A097 for ; Wed, 13 Dec 2017 13:00:20 +0200 (EET) Received: by mail-wr0-f194.google.com with SMTP id l22so1700598wrc.11 for ; Wed, 13 Dec 2017 03:00:28 -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=AOfAz+SoePVodu+gjHH+V05DZoc1zPKeIYTCt3jV6io=; b=ed9wz9zfPgAwrWPHPZ1viAEfQWe2kHLrHrj1LxH6BcSY6gFZAxYsIGO3aH71+ESFRw loAC8qY3T8f9e4W4YJaeNoVRNXw5dxPvP+K/dtuVLRCissNGqh2HLSv+ZFDCZsNO8KpZ cX6u+lNU/2HWMeuZbOx0MuCnLyjCex7O1AGjVKXa8Jwd5hI4hgqG2s8vVUGKaG/qRwMq yTT1nkBEPVImPc1kABRnlFRWrOCfN1h6jF3DlhH2lgXujAIyM0O+0Npro0CNmbAEebrg Ynzgoo9CQY+4Z+dVKq9w1y3bfSprajE3KeUqvJ9KSTWvpAovqluZoYwpOVScYiSGXkfE Ct/g== 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=AOfAz+SoePVodu+gjHH+V05DZoc1zPKeIYTCt3jV6io=; b=Z4bL3KODT2dYeXfzvK13Us5qt7hAlV7/c7DoDBiAtFoOZ0TlQpS1Wpjj6OAed4/KV/ A4Cd5vqw/ErBlU0a6ld91TwOwQuM9tIgxCwNacWof7cU8pA38kHCIu/UveJEG5036K6t 2LKxHyvfKBjgErFGc7bHsTC9UKTVIA2sZuBuBIYZoY0n3IOmm9aLFNYDGXOCPcmmbQCa LE0zG5aGFjP3m+52Kb8anKLPhT/XaxBqb/V3NwfqIUxoWUVoc6/uyCFTUPRoFUvqe2s7 4BbGfoMN9V5T5alo1MjqYwLESdXtatE9XgCDp2LQi/37SiVaSMIUexkPX8tsuum366K7 C5/g== X-Gm-Message-State: AKGB3mK1Jcr8bxXuAXbxqbBufCFXpCiUTGLuayxP4V6ENN46F4TXL5xi OeFURYP9KpQMzry2trJ9X897pA== X-Received: by 10.223.179.215 with SMTP id x23mr1950117wrd.198.1513162828047; Wed, 13 Dec 2017 03:00:28 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id w21sm675961wra.30.2017.12.13.03.00.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 03:00:27 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Wed, 13 Dec 2017 11:59:21 +0100 Message-Id: <20171213105940.32103-5-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 05/24] avfilter/vf_scale: make use of color_range from filter links 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 --- libavfilter/vf_scale.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/libavfilter/vf_scale.c b/libavfilter/vf_scale.c index 9f45032e85..802f841cc3 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -303,9 +303,15 @@ static int config_props(AVFilterLink *outlink) if (scale->in_range != AVCOL_RANGE_UNSPECIFIED) av_opt_set_int(*s, "src_range", scale->in_range == AVCOL_RANGE_JPEG, 0); + else + av_opt_set_int(*s, "src_range", + inlink->color_range == AVCOL_RANGE_JPEG, 0); if (scale->out_range != AVCOL_RANGE_UNSPECIFIED) av_opt_set_int(*s, "dst_range", scale->out_range == AVCOL_RANGE_JPEG, 0); + else + av_opt_set_int(*s, "dst_range", + outlink->color_range == AVCOL_RANGE_JPEG, 0); if (scale->opts) { AVDictionaryEntry *e = NULL; @@ -416,6 +422,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) if( in->width != link->w || in->height != link->h || in->format != link->format + || in->color_range != link->color_range || in->sample_aspect_ratio.den != link->sample_aspect_ratio.den || in->sample_aspect_ratio.num != link->sample_aspect_ratio.num) { int ret; @@ -429,6 +436,7 @@ static int filter_frame(AVFilterLink *link, AVFrame *in) link->dst->inputs[0]->format = in->format; link->dst->inputs[0]->w = in->width; link->dst->inputs[0]->h = in->height; + link->dst->inputs[0]->color_range = in->color_range; link->dst->inputs[0]->sample_aspect_ratio.den = in->sample_aspect_ratio.den; link->dst->inputs[0]->sample_aspect_ratio.num = in->sample_aspect_ratio.num;