From patchwork Sun Dec 10 13:14:12 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: 6661 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1676630jah; Sun, 10 Dec 2017 05:16:26 -0800 (PST) X-Google-Smtp-Source: ACJfBosXAbQW245EtJ06cS3ataoa7msB2z6czsxZvPVaZ9XuLI1YzKtwPXEzCQRBdbW3Q7OciZTF X-Received: by 10.28.19.195 with SMTP id 186mr869524wmt.20.1512911786920; Sun, 10 Dec 2017 05:16:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911786; cv=none; d=google.com; s=arc-20160816; b=O1JCbJ+Z72AI8OfvPYQvXQEFZix+mHJbyRRWRpFC7mpfut/sKakBjQgBLIZll88Hls 1ljvmtkPocEQnAl451je7KDRxcfPJykFwux2O0gekLSYHo81dutQNPvd83MnLBK1mhN5 VdPb3wiL90RgbA+j6lGs1fYbWoGiySn7Dv5wpsCiTQe3fHHchEFCgkQvyvBtbu92V/u/ 68RB+UxhyFz62E0/+qjlyWe0IlzxK+kBpLidcruXPpB+tPJpUFvJngN7iq5Bxo/VS5tT dJvULWg8Y7K6RDhl9FOuy6mp1gUUoXvN586omUVUAKaDn+bD1GwxqC0ANJFHYOdJF9Hj dhXw== 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=LSGBwtPQnMXdbwToJC5uXdEm5mQFl5cIK8CguQC4ShLxca9bzf98G6XzDbMf2JQZPd 7T8S1RsAorr2LSAAOfOy6+fTo0AsqD2WuYn82fMacB4x3aYam0AhO/ga8340R9AdJKQW md7cu01uU7eI8NOrwFW7EmNYE8l7PV477ijCATn5E9vVHI0cP1pMzEXEvpz14XAqNqj5 v7M5HgjMmcHo9EsaI4vKd3v+Z6fNuHQgpQC1Ir8u929Sb49IoJROFUJcFoYoRW0wQdEi OQTr5Lz7zwnw2yrYE03rCl5QNqqWFcoXCVwjbdVkuI2wC1n3FuQxHqLOq+f6qzfVXXAi lWXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=YkE6e4hi; 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 o189si3963392wmo.244.2017.12.10.05.16.26; Sun, 10 Dec 2017 05:16:26 -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=YkE6e4hi; 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 C022268A620; Sun, 10 Dec 2017 15:15:28 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 89FD76883E8 for ; Sun, 10 Dec 2017 15:15:21 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id b76so9791222wmg.1 for ; Sun, 10 Dec 2017 05:15: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=YkE6e4hitABYndrqxULIChDzrs0XbFHymQwSOtkCI0Sx+ak+fLNAfc7+t3BUl65AUW X7PYx/8rwMWUdttAZAKxs3EgGwBbjdWrUb3fN7nt7XJ+fxzCCx/o64aZqZ6TE1GqeK42 OfJdUfDmpx1xCrePm6oc2P0wC6JfS2E2E3GCS2CKaQKNe83Qv7/Zl9jEAI207BptYZSk CU2+P3xq1+oPKdOl3Qkt93uRJqLHROPDB4rxLpwAbARiJPPqVAl4g1mR7CN9bBx36qBi angRW7QCGHNWqoAIm9p3Q1wIthTmsKiVo+Uf51+FOIEpBx+0z8d8wm6iQmmOV9Cj6CJz LI5g== 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=inohH7LlvzEJ0gVtZQYaoeXYbRwKYmmGRLLqnaSgH2PzaZc8Fa1Lhg+qQtKcyWMBpd K0hqVu7c6vzKvlHv/Qp2URXlBrRk8xrHSWQ+WO0k5TzcKP28148cfvQ/FQKISOu1LZgA tg6ddEvpCU5F/37GKtaXeZ6GNwl6Ks6fQJWMTnofaX87nykugIohcW2OD7FQJCmVUlwO Si1u0EjTHuw4bhdCIFxfkLKH2w0al8NdZjSOvOk6J39ge4pAYZHD2MsRX2SdqkLVXYWH B5pPu5lcIEuYUXvtD4dMmAWnTOjYNLUGH9134v0yNSmxVk5qxjkEfq0M/tGoPkpdKA1A BuaQ== X-Gm-Message-State: AKGB3mJ5KsoDw7E2jUOg+/u3hE/suVUOh8kWvSM3q7qfooV+5Bm7YldW E/d4vaOyEoGmCqMQ3HZ5MpmyVg== X-Received: by 10.28.19.195 with SMTP id 186mr868015wmt.20.1512911728138; Sun, 10 Dec 2017 05:15:28 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.27 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:27 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:12 +0100 Message-Id: <20171210131436.15791-5-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171210131436.15791-1-onemda@gmail.com> References: <20171210131436.15791-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 05/29] 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;