From patchwork Sun Dec 10 13:14:32 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: 6672 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1678852jah; Sun, 10 Dec 2017 05:18:57 -0800 (PST) X-Google-Smtp-Source: AGs4zMa6tODGurwHqORg6FwEg981u58UA6xz3+pu2LqAD7+dyQfwoFwNzugKKdBaBF36QDC1rJf2 X-Received: by 10.28.54.23 with SMTP id d23mr9070767wma.160.1512911937014; Sun, 10 Dec 2017 05:18:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512911936; cv=none; d=google.com; s=arc-20160816; b=kTgm8l9bB0Xmx0IWrOnCgSHNbjdKli19IYx2gHWzzM5keGlRIRyMxWvgqtZUWPWNK7 U11e/qkYz1W752ho07zJMFr7nqQSgZMS8PLN6phKuVdf6O90Qg/BIzBFO2nZMNBAPfGl D5rDlG2OYR0Ip9SgMRF7eTUgZ6rdFSgH5SyoTXqQJ13bMs+2RQy5oFQCEYyr0//BZqeK 6bZoe6IeHTfNxi2oDJhHh3UmeaUexG47+rcEqhcNhxv9jxKGVX7LsfPYxhvBJQYKbEwJ rY9rcs/FhUjqCfpKw4zS3YC3bX3WzLYAq655m4uMqE36dfNlNyO/MlFV/y1kAX3c09a6 nPEQ== 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=wiKfpzHNSgXPwLTDyjFUCBArWT/NldlEarDOPNRCMUQ=; b=FY43QIQDnxSVpom6mY4kLvc9fC5hu77PQz8VSstUniCTvlbKKxpRCOFv5ZvDO2IAcl JyRzbJWRGEM3yOWlgmp+e0vFQTgBj8jy2DWMGFjMEcmoHtopE9PmWI1xQeH0qjzY+jXi 2ibo5lu92MeF39lkrZJelaEdMT1rd7KmhmizC3tj26wn0ZmWI9hsqidONubf32iHbwYQ pjFARlTtmmLTbZZGAzL2UfETpqEcmTgXyht1vwhDu0nAgNtEAReAcqFcwPJl2PXsBw0v mp4EGgRAE0I9vD1NF0NmtsNDU5nPEmS28PrLabJrh7HIe95xbwfQTjmVwwcI3+hSeIEP mRmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=PexJ37bg; 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 j5si8144976wrd.218.2017.12.10.05.18.56; Sun, 10 Dec 2017 05:18:56 -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=PexJ37bg; 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 BCFAB68A6DF; Sun, 10 Dec 2017 15:15:41 +0200 (EET) 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 9A0E868A6CC for ; Sun, 10 Dec 2017 15:15:40 +0200 (EET) Received: by mail-wr0-f196.google.com with SMTP id k61so14897372wrc.4 for ; Sun, 10 Dec 2017 05:15:47 -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=1kcSIfcvauatOaOxIWsZNWi2SAc47E1DLkB92Efz9dI=; b=PexJ37bgxFfAVx2DqX6W2JkQaP+PMEis96igW5w1BiXBY0G6SMrTZ5K9L0bwG7o+5+ wHQePQYjkNMTX3ZPI8UEufcdCiVRVC/vg8ZA5/IoKNgngIJqzrlYP40OpRW55VJp+VzU RL7QMbzskfoMQx2qQkUOdA3m2CZ+vYcnr6ZkWCKPzGC4HEhhLqthQTiPf3SJQWFmOPeX OWtjt1IWpVa1ZAFPIVBmX2Rs9BD3mTOKwDz28yTeK8OkiHd11gWDPNT5mIHhGf/tJ/4T 1s2wtqO9BmeJ1sijulw4qlXwe4l7W+rVWPvU5yqXzLleQ5nK7d7qJTN+ircOEWG3c9hc v1lQ== 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=1kcSIfcvauatOaOxIWsZNWi2SAc47E1DLkB92Efz9dI=; b=F+Ndyd0r1MmtsW2rUEkp2e2zHzUKBP3hc6KN81WvNV8uZTdMz2Hwp+O5EDI/J7E55z kH+IFb5ALbBwIEkXgFgCCnTnPVlo137DQLVTm9G7pGVB0Ne8wnzm+8JDm6f977byOUAb HmEmxhW9AQqt+fI0MVeBpxS79ouo7ujI3v9YWLLXemiZSA2uS8Ie9Mj88Fv6cdo66FAP UxiqP12z4caiRMpflKPA66hi4CwftsXjS3WnXem5Rnwa3DgqyGm/2vtifbPeljRpFKg4 TMn6HL+6i/ln86KifpeP2vNYaCUpPsKmsDhwdUM8PaCpezexyZRSMu9RImJGOJ1Td7Tw R2gw== X-Gm-Message-State: AJaThX4xrKROiNgE6Qozqe67Th1937r1mH+fVYVPimwMqGz8hPcVBxRi PPBoo2ZwXueUwp6ecMtD3UmPrA== X-Received: by 10.223.190.9 with SMTP id n9mr33700221wrh.46.1512911747262; Sun, 10 Dec 2017 05:15:47 -0800 (PST) Received: from localhost.localdomain ([94.250.174.60]) by smtp.gmail.com with ESMTPSA id g78sm1129877wmc.30.2017.12.10.05.15.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Dec 2017 05:15:46 -0800 (PST) From: Paul B Mahol To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Dec 2017 14:14:32 +0100 Message-Id: <20171210131436.15791-25-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 25/29] avfilter/vf_blackdetect: use color_range from inlink 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" Remove YUVJ pixel format usage. Signed-off-by: Paul B Mahol --- libavfilter/vf_blackdetect.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libavfilter/vf_blackdetect.c b/libavfilter/vf_blackdetect.c index 06ef9988d1..ff4b9eebb9 100644 --- a/libavfilter/vf_blackdetect.c +++ b/libavfilter/vf_blackdetect.c @@ -61,13 +61,6 @@ static const AVOption blackdetect_options[] = { AVFILTER_DEFINE_CLASS(blackdetect); -#define YUVJ_FORMATS \ - AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, AV_PIX_FMT_YUVJ440P - -static const enum AVPixelFormat yuvj_formats[] = { - YUVJ_FORMATS, AV_PIX_FMT_NONE -}; - static int query_formats(AVFilterContext *ctx) { static const enum AVPixelFormat pix_fmts[] = { @@ -76,7 +69,6 @@ static int query_formats(AVFilterContext *ctx) AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV440P, AV_PIX_FMT_YUV444P, AV_PIX_FMT_NV12, AV_PIX_FMT_NV21, - YUVJ_FORMATS, AV_PIX_FMT_NONE }; @@ -94,7 +86,7 @@ static int config_input(AVFilterLink *inlink) blackdetect->black_min_duration = blackdetect->black_min_duration_time / av_q2d(inlink->time_base); - blackdetect->pixel_black_th_i = ff_fmt_is_in(inlink->format, yuvj_formats) ? + blackdetect->pixel_black_th_i = inlink->color_range == AVCOL_RANGE_JPEG ? // luminance_minimum_value + pixel_black_th * luminance_range_size blackdetect->pixel_black_th * 255 : 16 + blackdetect->pixel_black_th * (235 - 16);