From patchwork Fri Jun 7 22:53:58 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13459 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 67FB74477E1 for ; Sat, 8 Jun 2019 02:02:13 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 410E968AA33; Sat, 8 Jun 2019 02:02:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f195.google.com (mail-pl1-f195.google.com [209.85.214.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D1C2768AA21 for ; Sat, 8 Jun 2019 02:02:06 +0300 (EEST) Received: by mail-pl1-f195.google.com with SMTP id d21so1360390plr.3 for ; Fri, 07 Jun 2019 16:02:06 -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=zOt+sCD/+YhrxWdcmZ0V9eb7hpX/5Ll5WH9kzFmtGRU=; b=B4sN6HPWLfiJfBwsKch5FXUH5M1MTwSVKCEQ/tiCaSB/OOXT2Zm3TfAEZnTp9pLgmQ TBgPa9mxpn/+TLyDrkMqmT55BD/XaMfxaMhzZb8jdHN0ntuAMOt/GDgLsICUHWfvpwhf 8pfPGV9rM35ffAu5ztYMdnbnzGWB3QZ0nmuh8C2VbShtMgEPUGf+kWKIjl+nym6YlhB6 YmM68rS1B19LnA/sFSsvo7IBZpMxq7L41/NWER9INheYo47o3FYUHv7nNnYdRIBwy8gR WQQqmpIJFlHVEoZwC7Pq/cuIGe1qLAQdJfWoNaeRZ6IlpvncBT6FYTXtLnu3RevirRh9 ZUag== 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=zOt+sCD/+YhrxWdcmZ0V9eb7hpX/5Ll5WH9kzFmtGRU=; b=KQHLkiH29y1L72hWio9woxBKYB0Kn7QtjUXKRL7Ix6MFtdut/1RLQuAuqLY+/XZ4zZ uKlV202x4SsMEipi6+s0nVOeTSVJAyzMBbuxlWOHxnog4SyGSrnLKyLOXnaCR3GYjv/M vHAw81rlMJ4Axr5+wIMm2kpj8mhQICSwaWJq/jwqI6lpzhiZatLwIl2l6B9mm+I+tuHa xE+58Mq//qPC+02I8S2ckuHjQVy38NukzgT5aONNxi5Ch1peh03pWvtrCuCZzU8jDCj1 b0UQXpybfwkb7qyI5s+6Wq0lMDrqS9YExcDV8+8O0aFeRhIJUPUQ0VDeb7CYL5Cjfkwk dEkg== X-Gm-Message-State: APjAAAWOR00l7HfrjUT9yd3sa7p2LXGyKckKl65SbIh8JnWVZpMOS5yC J9JePcwYRkzjTyBj8JFJk8Dvde3BjAg= X-Google-Smtp-Source: APXvYqxwb9BpugYD1cWgLqj6LaI/jyTre90eHYjdPpvPz+y//TDar3m5CE3KqKKuxaB6prHwdHpB7w== X-Received: by 2002:a17:902:968b:: with SMTP id n11mr22743927plp.120.1559948053964; Fri, 07 Jun 2019 15:54:13 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id 140sm4992662pfw.123.2019.06.07.15.54.09 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 07 Jun 2019 15:54:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Jun 2019 06:53:58 +0800 Message-Id: <1559948038-47078-1-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.6.4 In-Reply-To: <20190606055441.5691-1-lance.lmwang@gmail.com> References: <20190606055441.5691-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v3] libavfilter/vf_find_rect: convert the object image to gray8 format instead of failed directly 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/vf_find_rect.c | 40 +++++++++++++++++++++++++++------------- 1 file changed, 27 insertions(+), 13 deletions(-) diff --git a/libavfilter/vf_find_rect.c b/libavfilter/vf_find_rect.c index d7e6579..6fe12fe 100644 --- a/libavfilter/vf_find_rect.c +++ b/libavfilter/vf_find_rect.c @@ -28,6 +28,7 @@ #include "internal.h" #include "lavfutils.h" +#include "lswsutils.h" #define MAX_MIPMAPS 5 @@ -235,8 +236,6 @@ static av_cold void uninit(AVFilterContext *ctx) av_frame_free(&foc->haystack_frame[i]); } - if (foc->obj_frame) - av_freep(&foc->obj_frame->data[0]); av_frame_free(&foc->obj_frame); } @@ -244,6 +243,9 @@ static av_cold int init(AVFilterContext *ctx) { FOCContext *foc = ctx->priv; int ret, i; + uint8_t *tmp_data[4]; + int tmp_linesize[4], width, height; + enum AVPixelFormat pix_fmt; if (!foc->obj_filename) { av_log(ctx, AV_LOG_ERROR, "object filename not set\n"); @@ -254,24 +256,36 @@ static av_cold int init(AVFilterContext *ctx) if (!foc->obj_frame) return AVERROR(ENOMEM); - if ((ret = ff_load_image(foc->obj_frame->data, foc->obj_frame->linesize, - &foc->obj_frame->width, &foc->obj_frame->height, - &foc->obj_frame->format, foc->obj_filename, ctx)) < 0) - return ret; - - if (foc->obj_frame->format != AV_PIX_FMT_GRAY8) { - av_log(ctx, AV_LOG_ERROR, "object image is not a grayscale image\n"); - return AVERROR(EINVAL); - } + if ((ret = ff_load_image(&tmp_data, tmp_linesize, + &width, &height, + &pix_fmt, foc->obj_filename, ctx)) < 0) + goto error; + + /* convert object image to gray8 format with same width and height */ + foc->obj_frame->format = AV_PIX_FMT_GRAY8; + foc->obj_frame->width = width; + foc->obj_frame->height = height; + if ((ret = ff_scale_image(foc->obj_frame->data, foc->obj_frame->linesize, + foc->obj_frame->width, foc->obj_frame->height, foc->obj_frame->format, + tmp_data, tmp_linesize, width, height, pix_fmt, ctx)) < 0) + goto error; + av_freep(&tmp_data[0]); foc->needle_frame[0] = av_frame_clone(foc->obj_frame); for (i = 1; i < foc->mipmaps; i++) { foc->needle_frame[i] = downscale(foc->needle_frame[i-1]); - if (!foc->needle_frame[i]) - return AVERROR(ENOMEM); + if (!foc->needle_frame[i]) { + ret = AVERROR(ENOMEM); + goto error; + } } return 0; +error: + if (tmp_data) + av_freep(&tmp_data[0]); + av_frame_free(&foc->obj_frame); + return ret; } static const AVFilterPad foc_inputs[] = {