From patchwork Fri Jun 7 10:20:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 13448 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 C8ACE448BBF for ; Fri, 7 Jun 2019 13:21:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABD9B68A550; Fri, 7 Jun 2019 13:21:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C930668990B for ; Fri, 7 Jun 2019 13:21:16 +0300 (EEST) Received: by mail-pf1-f193.google.com with SMTP id u17so930073pfn.7 for ; Fri, 07 Jun 2019 03:21:16 -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=Euh+I6SGQP/vHOvd2FCPaiRChCtLuyloW0AYe0yX8iQ=; b=oNOwCQ0FgysfDpk0JSuDaMbGdnhJLxdTk8FmhD8UtSWdwXR5AjN9xDWPFvzrAuBVj1 VpmMgmVkUOuX8l31SAAm8JyDm8HvH3WbOrxgdjMMqFJES5rfJMtpTngr1RKq1lNHx9j5 Mh0nZVmFc3dlUVFGOUoAw+ksEfPsohtDQlmh2JAQSQCTS/x695NWEVcY7YTc1UfHMXWj f9d/mAOB9JU1QXox2O8PbvqH62eGyOmLx8FdDgvInIQET6Lr9p/YDEtp5DsnZE4ZDIHW 46e26LayDLnA4p7L3KJb737Nw0eGPBAFZEXynSugqhj5WyWzXBOXwzHXzopBGbTHo0Oj W3UQ== 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=Euh+I6SGQP/vHOvd2FCPaiRChCtLuyloW0AYe0yX8iQ=; b=ML2EA7SrWhZwIhlEA0/cqfGP4HF3jXENJnGiYdFsqKJloaWwvg8k3Ni2YnZjuLtuFS WUlBxEiZlQouX7qNB0JejuJh0drqgyHlgjUyb4y5gaPQUJu7bNluhELWAAY736Koh7Jo JUDQm9kk9nSkj5ye8XviNANtK7ECOzxqTGHsnGY2OFUd9kKwcI1REfnboxNUMMbOAPlr G9OorWjuCzPBP9Qr9b6RouErpgY+BHnyjOf3YoblQ513dhZoEkCL+WkBbmE5+H1WqQOV xdC0KCZMd0cE9/UGDlozsl1pqYtiGWtzHBoked5Lsxb+HRhrXcykc61vefEhPrkxit1v BHpA== X-Gm-Message-State: APjAAAXU+M/TGFPsBYuhQvj/HEAal2yqVtK/XXVs9lkcXRltgeoMDp5M FksRgEJbjJNgziZ9x81nweowaNqorsY= X-Google-Smtp-Source: APXvYqwJKPdxsyTfQuP+NetXOZsgEYVpY3IvnNjdfz2aOKQQOv+oiqopFf500ux6FX5K+Aeczvt66A== X-Received: by 2002:a62:188d:: with SMTP id 135mr54067919pfy.222.1559902874901; Fri, 07 Jun 2019 03:21:14 -0700 (PDT) Received: from localhost.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id t7sm1541992pjq.20.2019.06.07.03.21.12 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 07 Jun 2019 03:21:13 -0700 (PDT) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2019 18:20:25 +0800 Message-Id: <1559902825-35137-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 v2] 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, 29 insertions(+), 11 deletions(-) diff --git a/libavfilter/vf_find_rect.c b/libavfilter/vf_find_rect.c index d7e6579..8c6e928 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]; + 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,38 @@ 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); 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]); + if (foc->obj_frame) + av_freep(&foc->obj_frame->data[0]); + av_frame_free(&foc->obj_frame); + return ret; } static const AVFilterPad foc_inputs[] = {