From patchwork Sat Dec 9 15:37:57 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: 6627 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp808537jah; Sat, 9 Dec 2017 07:39:43 -0800 (PST) X-Google-Smtp-Source: AGs4zMZlm3MFVXzPRazJM33N/gkUEqH0GSO3O9n+Ezzq238oNLGeXHuNcxSPOOZHssxmwxWHpQQt X-Received: by 10.28.178.135 with SMTP id b129mr6188291wmf.103.1512833983140; Sat, 09 Dec 2017 07:39:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512833983; cv=none; d=google.com; s=arc-20160816; b=lg15hVVCHEFOOWRfbjO7T8WhViZFzTx4TGHy7A2s86Tt2jOReF77m7piRWcoeCfkrA ydlmrJDwCU2llpwNgm/HWZG5ur54vNuT/zVjQPepSGuW9sRNCJMY/nVMHy3yyDm08vst +1hOYaWkHNVi3MV4LP2Jaj+UmhUa8Yi8Fj3EGcVBN3xsftOQErzCf5fL2MYzvY/fPeqc cxbwsgFFcFgnf4y/XSryiDcfK5sOaE4UzzQiP6SdvLIF0O5jqLIC9xwAOrvIwskshE4n d7v/z5jqmSQJ5UW1Ny0Uiwlo/sl72VmziAkzfegAUw6imH0DoWsUKpAUuYQXDr5Krx+b 6S/Q== 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=0h4jJVeBM6QLW7H2gXSuWa+sbc7VVP9/PPyuyNvUOh+H838JipWvoARfr7MPXChrpO XE6S+AuhtYK95eOTj5fP2AUgHDRQtDCfVNHVrVCOJYCcc6XKDRsoY83RCIpwPdtObboD qt9KYnYwwNWzOazpkLBLiNl3tsCEeN034AWnIDjhlbsRj36ObzudS9dTxDHjx63RXt2n VmvIH4VRRhih64zhcxUGvLkAElc5Dd6K8yzqvVTSIOmlhcoh3rTEhkm3fmqiLziAJehM MFGpBBuHllOAQSXOF1SXocYViqbXU4p+9m5QW8dCeJ5CTHOGWPVBqBZ4NY23pOy1Eui9 qwvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=p6D02f25; 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 o8si2764341wmf.50.2017.12.09.07.39.42; Sat, 09 Dec 2017 07:39:43 -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=p6D02f25; 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 D15C768A493; Sat, 9 Dec 2017 17:39:06 +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 E4A7568A454 for ; Sat, 9 Dec 2017 17:38:59 +0200 (EET) Received: by mail-wm0-f68.google.com with SMTP id 9so7549488wme.4 for ; Sat, 09 Dec 2017 07:39:06 -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=p6D02f25x4t9a3OxBrJhL/Zu7GfP/v9fNWFiVRaG8YVQAEFb8j9udbR7N85kPw5Mcc EQ+B5yt6O1+caOr62zwWEaJ1hsYM2riveloEleVSEaThemLRugq3ndttccMzQhpvPiSv XtMU9x3r5jN4CmjU1xKHHluRwVGYHgr9HSOZFmi+Stf67q3u/V0RM35vZH2eIvyL9rKq DTfAFIQ9da6Xi8oml7jqnWx95dTl0IAp5A8YxAuLmqeWIXJkXOKBWG4BJOlHGCnNIGRE XfhgDSKaGQDK6JaRThrCX9v0zZ9b1neVbX/CL02cBKLmCweyKOUNp/eZAjxALPWAvPdZ n5jA== 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=ieE6ImXI053cwNTIKqJOI4YcKeyFSDydfsorEBC7n/fgAd3bmER0PDFscF63qJAtaj pDNU97+UT4lPQBSzEllfMVkaw2VpYOSXI4tmvGl5iWZKzBGS3Pxqaakd0i5qWYyICJB4 xstmlZrIKTGdSVu5eZzlvdOAWZnllh6Q4xDrocMLEI7IAgMLJVdkIR27s88uKqkqAnyz iaG+qgbwUGYfhxTTqIImsLGHnBqf26n71O8ewKWtw4/PGDH1e647qtcUngYP7Qg6hYV3 2UPUWKC4InGYKH5Pg8yV9tERpsN6JhA4GY8zV+wsOdfgp/hdU0sWL4T3LQ9WVAbE8c69 x67g== X-Gm-Message-State: AKGB3mLHSmXnlvK92ZV4qGa9XwBDIB0s40mFnaPkc+Ly5Ja/gBialqWp 3s1SNpS0OOra3hE17iGTRdFANA== X-Received: by 10.28.120.2 with SMTP id t2mr6063548wmc.5.1512833946217; Sat, 09 Dec 2017 07:39:06 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id 52sm14654536wrv.8.2017.12.09.07.39.05 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 09 Dec 2017 07:39:05 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 9 Dec 2017 16:37:57 +0100 Message-Id: <20171209153819.19007-5-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171209153819.19007-1-onemda@gmail.com> References: <20171209153819.19007-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 05/27] 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;