From patchwork Sat Dec 16 10:12:25 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: 6825 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp472757jah; Sat, 16 Dec 2017 02:21:45 -0800 (PST) X-Google-Smtp-Source: ACJfBotl9X0FO4BHuxcIQ9pZ9SzeUicPH6eRdQA900TfGf3xjKmMr4pTXInoJ5qSUunvAS1JBRYh X-Received: by 10.28.224.137 with SMTP id x131mr6759479wmg.49.1513419705778; Sat, 16 Dec 2017 02:21:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513419705; cv=none; d=google.com; s=arc-20160816; b=Nvz6bM4ofPbN3ZRLg+xifbi/c9U9OEfzYNOJnJI4Ds93h3AzFGoQ9V/2teD6FQUUPD pX9ciczD3TVjtJOLMSEKir1LBBM0LgQRK4fA2+eVs/ajZO4A2QY+Qp64MMc92LIO83iy mPHDOfR4bNAgLMtQ4/j/oVUjDFiri0TFq755tuXaZ8itRN3Rzpw2MBx0Ik9r2Og7qBaB d4Fmt0RaObTfkCusCFCrMMqub5YXXMNaitFnk+WU8/PP8fPphrylqENV2VFq1kNYpsXR 5BwJOoF/Gz8mYIyESg7E8WvJwykPOvCywP54M6P27LUiJtgOKulkvqYSY91BwPm3KJbj VUxQ== 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=OoLzf6kSlOo6MKwev6jKE1LMA/e9x3Hq7jKBQ/41oM1oE+SBDwSwBV03pNALKxHbwZ tkTW/fV8p6iajyM0BU6gX6HiylSIzAgLaYP8qFzqWjn/4bQ7W37vmM/5LY6BL+ihcYUq 3GQ1TLzIkoTA2n2fhBn3+T4E06vnx82sa2PQt96LnVCycNHnJoLRMybbXr7W5rF8NtWS nY6lfQWglwh1nym+p9sjhQpJYVzYvGVawnJiJPZyWKUcgwuj1o13YlKiBwJXBVgERcSU c8QBwwrvoCRDJLh3WvC34by+yrDr2v2UpsLacYms57/LPtdlI0PMpp1weA5DFtsXxRfK TMVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=sSjbr0ki; 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 v5si1862279wmg.198.2017.12.16.02.21.45; Sat, 16 Dec 2017 02:21:45 -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=sSjbr0ki; 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 69CFF68993B; Sat, 16 Dec 2017 12:21:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f66.google.com (mail-wm0-f66.google.com [74.125.82.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9CD69680354 for ; Sat, 16 Dec 2017 12:21:28 +0200 (EET) Received: by mail-wm0-f66.google.com with SMTP id y82so1165326wmg.1 for ; Sat, 16 Dec 2017 02:21:38 -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=sSjbr0kiej/waatFlAIkdSDHFecJW4/cyy455ds5lGuCieEcG8oEYYq6bxIBYyv1lt QvsPdDgnJa2E9pm1ubkQBgukilvtlJTOnSk8DVDegs2Df0IsQ9GLAg4ceSR37t+sxCOl 8+oyBgJv5X7x+/W2zcTYkouhDC2nUkB7XLN0FB7QLOB3fUEVSx3PADBgUGQSTKsDs9gy sGUty3r5hug7+fSrMmvBUY8g5yMtJSBzJuQKvQYGpolJlegxNcbiNHzX092maaaXcLPV w3vOZp7Zn07H48z6LZ049UwTsSr6Wae8VSvsj6x/5IG7FNRUdCsAhWVglYQPYCilNt+5 3TaA== 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=Z06XoCCazarPKYPCGAqy1zXRGwkyzVA2CnDX6WhZmwcFcwAjo0Q9Wzr5QM9LilelHU NunSAIIaDWQvuN12X4CTagR2qO38FkcDnV0P0qHb4bgI8+3uFT2Z/dCytMroNxD+6Xgq newSee0V9O6OZ7mNA8oYRoAwVNC9RS3SDfQTFlwhdZnAR+wNuwmSq/jppxFYX5CptiFz aXkfEe10vkKAXVwDIqXgAbZI3ureKVmrbjASmTFQ6DFqpsaaBjDp0DPGOOkT1w3I8MVD h04/9Fu5kkOHYwjAVXwbrQkkNCPUO9wxJX5iG+yMs4pwSyQ6KmuF3vy833OnDFqFBF9J F4+Q== X-Gm-Message-State: AKGB3mK0zdTFkxqxqu+Cqq8yWLcgsoEpGk9LDt+wMIC+nTZRDdjH9j9A 3lP3/CXFgwkq5OMOP7QNlq91TA== X-Received: by 10.80.230.143 with SMTP id z15mr21780426edm.106.1513419214458; Sat, 16 Dec 2017 02:13:34 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id i6sm7100034eda.6.2017.12.16.02.13.33 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 16 Dec 2017 02:13:34 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sat, 16 Dec 2017 11:12:25 +0100 Message-Id: <20171216101245.26977-5-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171216101245.26977-1-onemda@gmail.com> References: <20171216101245.26977-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 05/25] 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;