From patchwork Wed Jun 12 10:57:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13512 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 F1F07449AA3 for ; Wed, 12 Jun 2019 13:59:46 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DC56B68A10A; Wed, 12 Jun 2019 13:59:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E6C336807E1 for ; Wed, 12 Jun 2019 13:59:39 +0300 (EEST) Received: by mail-pg1-f195.google.com with SMTP id 83so8734388pgg.8 for ; Wed, 12 Jun 2019 03:59:39 -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 :mime-version:content-transfer-encoding; bh=nbXdwTvZ7TVN+DcdlW5hCyrVQPidkt9OnC25s788PEg=; b=t4ux/3cDifidAZFCC22MZiBMoFSVV55UaMwNyPjsSKY5wS9uZrd1tvVVe+QpDTfvlz ZigDbMv83pBW3DoRHvRQbhlegEfDfA32CRWKiqeO1uges/e9NJYcNV5nh33mP6wkDPhV 3666xR0UOEqxZvf8onPu2GJpzPIzTISCVf3Z+Kds29GmCwJCoooTZD6rMtIpeJGJqEVz pKWw3TwikQwU9mVNS1cHqhw97QFfTi8s7MQOUqPdmQn2zNSxtfND2xuwxPAjm5ob+J2p SQxlmNEAkk1CnmhvrKRbdziFuNnHENd+sDG6WkxVww9H80TSoVbDGTYm1IBIs98/YMzF MnQg== 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:mime-version:content-transfer-encoding; bh=nbXdwTvZ7TVN+DcdlW5hCyrVQPidkt9OnC25s788PEg=; b=e/0sfF4rEX9lNpEC1sJmxfW9JaX5FwCeC8agc5Hq5b+4S7bKh4fZw2Rie6SlkCnrxw KhiLj1J2Y/hnBMluOaF0VrQBney6TV76/dtj3x4MmcgCURBlUmDmUfY4bb/emOAnPEB5 tXArfo9lWlW4rt86mfnyxpCOykGI1Y8QzfIxYcL8UHGOduzjUiyZ0gSmrsNUi67yZGYL dxz9C1+on/RHWtn3DV2mpK2vdoogk5EzjnskrIxY4xCl9uovDZhOEbHUIaNOo14MVDC6 6fKZ4ne3U2FXf6Sduozu/zNNpMotcG1ZisfybFhGrUjylVQVdFEaFlHIs7mHbG9H00dG Cqkg== X-Gm-Message-State: APjAAAULs7rHn0mAWA5Zo3itHLhKKDLW7AQgw3PqsWA/cIUzaF9eoc1G 9rE4WhGVVdLxU727MDECArWNwoPXelk= X-Google-Smtp-Source: APXvYqwC2e3FUE5SP5aKI9/BHAa3wc6Pw7P4e70ZOk/kMl+TzArfrAAwlJnaps1UINcUxPhMzWVaeQ== X-Received: by 2002:aa7:8e50:: with SMTP id d16mr78370922pfr.65.1560337178217; Wed, 12 Jun 2019 03:59:38 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id e6sm15518868pfi.42.2019.06.12.03.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 12 Jun 2019 03:59:37 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jun 2019 18:57:31 +0800 Message-Id: <20190612105731.43622-3-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190612105731.43622-1-lance.lmwang@gmail.com> References: <20190611060730.21868-1-lance.lmwang@gmail.com> <20190612105731.43622-1-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 3/3] vf_find_rect.c: improve the find object detect performance 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang Test with my samples with same test command, the detect function is OK, however the benchmark result is from 16fps to 400fps Signed-off-by: Limin Wang --- libavfilter/vf_find_rect.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_find_rect.c b/libavfilter/vf_find_rect.c index ed15885bc2..d7da224c10 100644 --- a/libavfilter/vf_find_rect.c +++ b/libavfilter/vf_find_rect.c @@ -32,6 +32,7 @@ #include "lswsutils.h" #define MAX_MIPMAPS 5 +#define MIN_THRESHOLD (0.05) typedef struct FOCContext { AVClass *class; @@ -42,6 +43,7 @@ typedef struct FOCContext { int xmin, ymin, xmax, ymax; char *obj_filename; int last_x, last_y; + float last_best_score; AVFrame *obj_frame; AVFrame *needle_frame[MAX_MIPMAPS]; AVFrame *haystack_frame[MAX_MIPMAPS]; @@ -190,8 +192,14 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) FFMIN(foc->ymax, foc->last_y + 8), &best_x, &best_y, 1.0); - best_score = search(foc, 0, foc->mipmaps - 1, foc->xmin, foc->xmax, foc->ymin, foc->ymax, + if (FFABS(best_score - foc->last_best_score) > MIN_THRESHOLD && best_score > MIN_THRESHOLD) { + best_score = search(foc, 0, foc->mipmaps - 1, foc->xmin, foc->xmax, foc->ymin, foc->ymax, &best_x, &best_y, best_score); + } else { + /* prefer to use last x and y for best xy to avoid small shift of object */ + best_x = foc->last_x; + best_y = foc->last_y; + } for (i=0; ihaystack_frame[i]); @@ -204,6 +212,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) av_log(ctx, AV_LOG_DEBUG, "Found at %d %d score %f\n", best_x, best_y, best_score); foc->last_x = best_x; foc->last_y = best_y; + foc->last_best_score = best_score; av_frame_make_writable(in); @@ -271,6 +280,10 @@ static av_cold int init(AVFilterContext *ctx) } } + foc->last_x = 0; + foc->last_y = 0; + foc->last_best_score = 1; + return 0; error: av_freep(&tmp_data[0]);