From patchwork Tue Aug 13 01:37:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 14456 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3946F4418E1 for ; Tue, 13 Aug 2019 04:38:03 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 109F168A92E; Tue, 13 Aug 2019 04:38:03 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 07B8268A274 for ; Tue, 13 Aug 2019 04:37:57 +0300 (EEST) Received: by mail-pf1-f181.google.com with SMTP id o70so5286762pfg.5 for ; Mon, 12 Aug 2019 18:37:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XsgkiHK6X6xUe95dtvn590zRdkVWCUa9SF1Vlx2sMBs=; b=c/IHrih7IGDDtKucu7CPjf6fLCjLWCsSeWNhBhiG+AX84Px9tOZGvFXT5CoZWEgFTG NOrEmI6qT0YgXbE3zcvV1sZoGGRn+/0fD0ZxVI41PI6oHo2ka36aWrvclH0YrExGRXxW VEf8ne1+dpO4cCjmY/Dt/Nz0sNrZ1Wi9m6btCp8kfdRO6z3rQde1XqiJeO/f/8rnNf5M eZO/KXgSqGThvz8HD8pR31zMmDHx7feshSDAi69iwmm8RpeThdeFlQ6j/IJX6iE1M1TZ ZKte62tPqh3w+xz71gxVSwt6dl22HKSzDNvsrPlz55Evy4OWJ6UlpCabB2xgnOJQO/CZ K/Gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XsgkiHK6X6xUe95dtvn590zRdkVWCUa9SF1Vlx2sMBs=; b=WfZ4xY61taiZ7liBOLSid8OgueQaiQgIDKaZvUhXQguUlyK8vxA11YNWMSjzp0MT4l mApJBRJg5ega+mq0MkB9gHbtWK8Zrv8ojx0xgyAHUzaMvrIv3Dyocu596k4BgkeGdCj0 VN2Iz00QP4Y8QXV2X3ZkocPb+y9suV2TA2WA80hUfgrX8CSPldrtv0xkzejbHrhOODZm 3pzm453EcDDOGIC6KqJ41jDL1xi8UT7ALh83K18qDEhFtKt0B0lSXxB6z1QJH5Pm2L6k exJdLvxbciOcHcyBOkGXhdZTeIu/dg9RdergyXKKNh/QmIduoolsfK4TaKQWRcIci7Mo Emsg== X-Gm-Message-State: APjAAAX/+SVS2q+70xctHhnBlnEoP594qCKFOcv33+Vz2SE8wPF5p2aw ONoGS/4bi5HzSvysPV9B+vAicZ89 X-Google-Smtp-Source: APXvYqxp57ikWBu3LANxPnGi0m7vEeh+1UGLghqTnlO//zK2ZkJZ8XoWrTnEtqH7+s0eGKeIFkBkyw== X-Received: by 2002:a63:69c1:: with SMTP id e184mr30960994pgc.198.1565660274853; Mon, 12 Aug 2019 18:37:54 -0700 (PDT) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id f63sm11785824pfa.144.2019.08.12.18.37.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 Aug 2019 18:37:54 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2019 09:37:46 +0800 Message-Id: <20190813013746.12670-1-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20190810160203.12754-1-lance.lmwang@gmail.com> References: <20190810160203.12754-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3] avfilter/f_select: yuv will use Y plane only for scenecut detect 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 Cc: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Signed-off-by: Limin Wang --- libavfilter/f_select.c | 5 ++++- tests/ref/fate/filter-metadata-scenedetect | 16 ++++++++-------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/libavfilter/f_select.c b/libavfilter/f_select.c index 5c7372c976..c8d30dd226 100644 --- a/libavfilter/f_select.c +++ b/libavfilter/f_select.c @@ -209,9 +209,12 @@ static int config_input(AVFilterLink *inlink) { SelectContext *select = inlink->dst->priv; const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(inlink->format); + int is_yuv; select->bitdepth = desc->comp[0].depth; - select->nb_planes = av_pix_fmt_count_planes(inlink->format); + is_yuv = !(desc->flags & AV_PIX_FMT_FLAG_RGB) && desc->nb_components >= 3; + select->nb_planes = is_yuv ? 1 : av_pix_fmt_count_planes(inlink->format); + for (int plane = 0; plane < select->nb_planes; plane++) { ptrdiff_t line_size = av_image_get_linesize(inlink->format, inlink->w, plane); int vsub = desc->log2_chroma_h; diff --git a/tests/ref/fate/filter-metadata-scenedetect b/tests/ref/fate/filter-metadata-scenedetect index 7ce2d6794e..36c033bc0e 100644 --- a/tests/ref/fate/filter-metadata-scenedetect +++ b/tests/ref/fate/filter-metadata-scenedetect @@ -1,11 +1,11 @@ pkt_pts=1620|tag:lavfi.scene_score=1.000000 -pkt_pts=4140|tag:lavfi.scene_score=0.668643 -pkt_pts=5800|tag:lavfi.scene_score=0.996721 -pkt_pts=6720|tag:lavfi.scene_score=0.357390 -pkt_pts=8160|tag:lavfi.scene_score=0.886268 -pkt_pts=9760|tag:lavfi.scene_score=0.926219 -pkt_pts=14080|tag:lavfi.scene_score=0.650033 +pkt_pts=4140|tag:lavfi.scene_score=0.923403 +pkt_pts=5800|tag:lavfi.scene_score=1.000000 +pkt_pts=6720|tag:lavfi.scene_score=0.475643 +pkt_pts=8160|tag:lavfi.scene_score=1.000000 +pkt_pts=9760|tag:lavfi.scene_score=1.000000 +pkt_pts=14080|tag:lavfi.scene_score=0.874623 pkt_pts=15700|tag:lavfi.scene_score=1.000000 -pkt_pts=18500|tag:lavfi.scene_score=0.316402 -pkt_pts=20040|tag:lavfi.scene_score=0.269509 +pkt_pts=18500|tag:lavfi.scene_score=0.422509 +pkt_pts=20040|tag:lavfi.scene_score=0.352360 pkt_pts=21760|tag:lavfi.scene_score=1.000000