From patchwork Tue Dec 12 13:56:03 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: 6718 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp4111561jah; Tue, 12 Dec 2017 06:03:08 -0800 (PST) X-Google-Smtp-Source: ACJfBotGvu4TrfhjYt/tyRgBYUnCN15rcPXW7t6oW6KNS6F57ABuRL/vkszSvYgGwNMmNoGybCIl X-Received: by 10.28.111.15 with SMTP id k15mr1793533wmc.139.1513087388008; Tue, 12 Dec 2017 06:03:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513087387; cv=none; d=google.com; s=arc-20160816; b=t2Z+hwKGREMjdhFtOA05ZuJu2ASylIpTVWHNU1DTIJqagOUQh7hrCq1dP254t993XT hbvCrGW5rjBqhXRFRE8r3I8DLZYN3SLrePKvxvhvGaSED+sqf0X3LvQrC48pULB5KJVo 5hKH/7gvF/2/qYEpRchoWteGH9jxZS7+bLjvghNSV5pJugj4EEiD6rBP1SEyIx/aZxvC esnlgLhH9a2P/IRwproiXIN6TSNlE/WzDlE2NjG0nF06cnZSnp/LmoIHr+1DmCMyJuHn ZFbnfM1sF52zhNLvVIVAnEfvb1W5KrPSO0YNqdm3Axcya2hC7NHkpRJi0ALX8SlQKfzE 3TQA== 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=eEsy8JLj46OwmrxEf+4c1PtqWNYY1RvLMVRUfEC8QatsXvx9dSEUm0hZf5+xMJOurD 5wgMEgpEPdLdxV9Y39G+eJkWLSbhNaaWsxjALSS7VgExFa65OncHAdZ9HbkaZ48TfOde OdxEv3NPF4eWaKa8jMmud2dfxuuzHS6dh51Tqa7f2awtWeaTWkNSGyQzYoGtle6JXp1I ch+pwXtQ1EXaPjwn14APTCc9n02PT1DKDr9ViFiDUp6HcWm7YBJV7XRh3wOHPmk1TIR1 yF2mq3gJIUCSytzW94qrj4ZcmW84qvKmOF5UkxErA+sv7Ta1dP+h+8Dryp2l+AzxcNW5 5zeg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=VWcR9Ysu; 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 w5si12760108wre.263.2017.12.12.06.03.07; Tue, 12 Dec 2017 06:03:07 -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=VWcR9Ysu; 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 AFB5868A63B; Tue, 12 Dec 2017 16:02:58 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4F7EB68A40B for ; Tue, 12 Dec 2017 16:02:52 +0200 (EET) Received: by mail-wm0-f65.google.com with SMTP id f140so20486164wmd.2 for ; Tue, 12 Dec 2017 06:03:00 -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=VWcR9YsuAnqJZIEDHYIa+C6DeZ8FjHWbl/I2VvsHkM6r9lijMUS1ebDOFqkPVL8xup Y37w2FoUtVRt2G0BXqRB3vuRWrrwwu1sn9OlbHNHaaVT7dDILkMiwasNlAWBqJRCNwxJ ISPjbYv2Ct1y93iqJDvpiS6TtQqdVfgShJaiM9e8aLg4cFvEu0uZRlw3nqTwNhXC3+l5 2RhZNFNc9unEct7izddQOnDjjiCcIFyGDtjnly/pN//LqjfLSDjtmtZ1lqlcX9zrwXN7 BzfI0xzdrriVOyT479wdHjcvgVLnyiSKbkSjdFqjYzhsoEHBZrmu7CVzyxyP+S5g1IkV 7c/Q== 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=YvqoIaZK3ur1lEz2UbAZ24GWvQmyMz3IDWNuyAiQFxyAhvVziRZDOKOKe3zU3byXTn /fmO3BVcZ1KmTJYONXWInfelMAZ28yi0MA1l6xaiWN/qN6xrdBjSyDTYdXU92bgCBiUc +TCt8+yl/fE1vJ7fE2bigvuG7CgDcUMo8lS8vO9nIQAn5JXBpoUMuscEnI8hvwZzLusD f7r43uVu6IwBILnqii3B1nwkrHRgh/KQx2KasjZYkgAAmawnOFczmE5+o74AF8Zbn81K KeHtrrx7N7+cj9AM0iHxeQ3XxKa0f28HL07ghWlA8pQBl/VxAPVWRJutUMdA6Yuw/O4D B20w== X-Gm-Message-State: AKGB3mKgFxtWV9TndXJDiUUaVdMMzJiBx90gCEuAZ5kFo4xQcRt2rFfC +a4sV8KOy/dPJs8CVj+rdElu6A== X-Received: by 10.28.68.65 with SMTP id r62mr1964854wma.42.1513087029989; Tue, 12 Dec 2017 05:57:09 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id l25sm12628397wmi.35.2017.12.12.05.57.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Dec 2017 05:57:09 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Tue, 12 Dec 2017 14:56:03 +0100 Message-Id: <20171212135621.30835-5-onemda@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171212135621.30835-1-onemda@gmail.com> References: <20171212135621.30835-1-onemda@gmail.com> Subject: [FFmpeg-devel] [PATCH 05/23] 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;