From patchwork Sat Jun 8 22:42:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13469 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 4F839448857 for ; Sun, 9 Jun 2019 01:42:48 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2A05D68AA95; Sun, 9 Jun 2019 01:42:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f196.google.com (mail-pf1-f196.google.com [209.85.210.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7790168AA65 for ; Sun, 9 Jun 2019 01:42:41 +0300 (EEST) Received: by mail-pf1-f196.google.com with SMTP id a186so3147985pfa.5 for ; Sat, 08 Jun 2019 15:42:41 -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=3NpUraMj83tVlDLQQqfjQR7Gs2FyBcP1GpFwI2glpEU=; b=qSygTnZRk31EbkCpJDkpoU4P3UKotq+rYQY4iPLQ/HoemC1B9HbyEfVSSU7ZMhoP1h C45YP7tIrpFsZmt8LWvQChN/Pt2pPFcjAGinEh8wgxqJHCvsXTMb6I6XyuUAxQe9TVmn 5vBOqfyZsPbS5rzrefU0y7052XoTjV5UHTnVrd/k6P3CWItTM7lHL6Or17d/UNRVlGyE DSNT3S9ptVFXGaHw+2SEyNgr3v2itu9le4wpBOMbAOCE7jYTIhdku5AosUeP0tw8UyQq Eqmj9+VK9492k1agMvenPkLFCiDDg0tRwij6V7w0EsUBGo6zN2rtrgFX/tJkjbNKq/Ce uEDg== 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=3NpUraMj83tVlDLQQqfjQR7Gs2FyBcP1GpFwI2glpEU=; b=GNbExZRNeMbPyD3J+mdWslj+uMIrrESxe6Tu6Yd1mYlSoMWZ0BhYeAGO3id6l/fTNH u6R3gGg8Eztt9jHVSzN8U3RvVXwFijrWoksMUvzLX63R1vRGuY4jDMnFJYZy+GHbqBQ+ 3h9ztP6YyqJTvryTqEpiFXowuQcMGJ8tIaU3B5vx2dsXjvV9OzOg8kZIyBaL5ozWYm7K QV7TIC1X7X43aFodXKizKcv2OuvSA8EIxjMyvGGsqQfib7nDE4AJubKlIubAfoso23MO x2atRn7fxbqa6SfKD5bxjUSdicS7LqDEkhmshBUbI/4fZopBLiBFucvNrDkEW8XOK2Lt JWjg== X-Gm-Message-State: APjAAAWlajlzA3Fg95V/AHXd+zeKEhgq/tGYb9wWwkqDJA4he7QX4Aws Z/yaCqaVaoOFFxAqC0EdvjviGXuRrOM= X-Google-Smtp-Source: APXvYqz0JhN7spUcuTv8ys8q2kLaio/KMfMY0/zgGBYryYzdRxRrIFHKps0ILzNN6AUfX8D02L53IQ== X-Received: by 2002:a17:90a:19d:: with SMTP id 29mr13530382pjc.71.1560033759235; Sat, 08 Jun 2019 15:42:39 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id b15sm8331350pff.31.2019.06.08.15.42.37 (version=TLS1 cipher=AES128-SHA bits=128/128); Sat, 08 Jun 2019 15:42:38 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Sun, 9 Jun 2019 06:42:20 +0800 Message-Id: <1560033740-50094-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 v4] 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 | 39 ++++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_find_rect.c b/libavfilter/vf_find_rect.c index d7e6579..ee6c3f4 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 @@ -244,6 +245,9 @@ static av_cold int init(AVFilterContext *ctx) { FOCContext *foc = ctx->priv; int ret, i; + uint8_t *tmp_data[4] = { NULL }; + 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 +258,37 @@ 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: + av_freep(&tmp_data[0]); + if (foc->obj_frame) + av_freep(&foc->obj_frame->data[0]); + av_frame_free(&foc->obj_frame); + return ret; } static const AVFilterPad foc_inputs[] = {