From patchwork Tue May 1 19:39:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 8726 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp4904238jad; Tue, 1 May 2018 12:42:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoQLP836B5DbUEwCF05G6VKjR93h3rMTGOR8qy9ZYXTJhP7xbatbhsBXUgpqE+zF9O7nyW2 X-Received: by 10.28.192.19 with SMTP id q19mr10276075wmf.49.1525203739121; Tue, 01 May 2018 12:42:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525203739; cv=none; d=google.com; s=arc-20160816; b=MUmbaThWVOAGI4nNdOkkkWDt3oiRvODWZSVGk2z8CF4rSCrQCgw7P1nyG4PJ3qGs4T ti1eXBV+lr5/CAlPhMLCHZvJo8dwx81g59dJ5YxszeKLgTLvxzm/39kT24IiVT1r+Yot v94ejyJnKzSwY41W4Joho3yxA1lqV5e+o24c/ThxjTl4+CRuJFQ9YqRVIo4VCTfM9+Xx nDPfOGQXLasRck1ghZ4OLlOxUQsIaBYpvfE3aG/lOtCHA3hkbtvx+B7KOIB2vnSfkvSp bu5kH5aPWb44Vy9OFistR08GM4+tGObHzMbfyNnG9+bljAY0wL9pLj3mFbwrTEznVgHK YUyg== 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=UbIIZlJNN6azY5HVzgBCNE3xX3U3xbADgBENrFWnkR4=; b=DaCLge9PfpCZIrw8wvUZafojS7fW293TozMveHTb6M7wSdQ41C1+8wKpaaps76ScvE x1kWm/38tDCCrpjmI8bnZWlht+NJAmZSmTiH0oHKsKLN/k9b7+E6s/ruGBXcqCDHaAuu QMjtaIinDJXHwxVhZDMxwXB0w/VlC9HooeOwHTxwl+GQsizM+9kokg9IDLwi6IaHCrSj ocFGoRDqVAEN+w63Dm7DJdlS2eMfBPQEwnhX198MgUOX/CT8sunzL+zqsnFwj6Nylr+K qGKxzvAehpt2xBiGWofj50/4GBjGPwRcq4P9fYLS2WdRgpQhoCevjZIVPSPxOKY82XtU H0PQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RVpOKiNW; 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=QUARANTINE 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 x1-v6si138806wrd.120.2018.05.01.12.42.18; Tue, 01 May 2018 12:42:19 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=RVpOKiNW; 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=QUARANTINE 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 9354E68A3FC; Tue, 1 May 2018 22:40:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DE43F68A3B0 for ; Tue, 1 May 2018 22:40:28 +0300 (EEST) Received: by mail-wr0-f196.google.com with SMTP id v60-v6so11704380wrc.7 for ; Tue, 01 May 2018 12:41:01 -0700 (PDT) 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=5urxCg9/EPB7raXGO9JMT6J2SglTUsCccVMFaMqrkrs=; b=RVpOKiNW1j7CFZo/1uKv9SuKb575vL2FcgLWuUhQaajXxYWqKoml3cB6j+KoyggKk2 e5m4SSlO+CBQEHm9Dl5+gB+hx9jCYuW/K9P3RBOhl0F1KgoFe2LtR+/K/k5bGDCNQ7He 6RAzdklwgASGcNwNFIUNALeqej/hoMsAPEYyi4MQTHIadqXCRXX9WiESdCTPX1yjtELJ Wv4D5gz1r2qmNSJV5mR8/nANwGRv7bHwddX4KVW49jPA0wsPgmuZr8s1TNYYsw8mJ/L+ /HznwbOc/kJaa/5t1UfSxxd9qAKdum61qbd/zeHkA1soi6pvoBnnLnrxH4faYeJBZ3Ej wrHw== 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=5urxCg9/EPB7raXGO9JMT6J2SglTUsCccVMFaMqrkrs=; b=U8okh0bGlh+VD0FPSJVJsEzOZ/Ll3NBpD5RQxJ6/nw2+g+xu3otBrTQbdJH4QrUcbt 3PenlnBnsYaatuz5EqtkPH8q/AeJjmsUR2VSFZeQYdth2Y3tmsMZlFhUpt7XLNHqMscN r1PQmt7Cf8e4RNBEFEkZDQlI6wGBpcM3eRiiiFKc85OQazS+0uyJUMGjoyhtytfL159L XDCgRQIlmLf1O0yT6Nk8ILNDu5eXmoj73FBZwpYcGKugUet5o6rDsLmAyHVn6Am/B7Nt 6yNA1nFg12VUZq00JsIlZpEVtdgKtv3c6JnWYp9eFYPBp8pN3/BAPcJea/ZZwfRzLstr YYjg== X-Gm-Message-State: ALQs6tAbYAELklixrljBmQfOb+mgcoiA+rLCmJXUve/A6TsdKfbEhhd1 IoktPqVMaUZfDkwGPzqpwbutIQ== X-Received: by 2002:adf:8672:: with SMTP id 47-v6mr12233385wrw.102.1525203661111; Tue, 01 May 2018 12:41:01 -0700 (PDT) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id h12sm11839115wmc.7.2018.05.01.12.41.00 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 May 2018 12:41:00 -0700 (PDT) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 1 May 2018 21:39:54 +0200 Message-Id: <20180501194013.9552-5-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180501194013.9552-1-onemda@gmail.com> References: <20180501194013.9552-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 f741419e7e..c7f2b07f0b 100644 --- a/libavfilter/vf_scale.c +++ b/libavfilter/vf_scale.c @@ -302,9 +302,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; @@ -415,6 +421,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; @@ -428,6 +435,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;