From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 7577F48429 for ; Mon, 4 Dec 2023 05:36:56 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AC06568CE37; Mon, 4 Dec 2023 07:36:47 +0200 (EET) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DAA6068AC2D for ; Mon, 4 Dec 2023 07:36:39 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701668205; x=1733204205; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=sAO5zK+LdKAT7gYfnXZCujXZe50HbDYU1O1ccgvZi0s=; b=WuFn6sYIHDk/VeyS+vv9N7lIsssudgNzjBqLoP65W/gKnEXb8Ep+58lD MP1zd7NyLZ639Gf+XWUMG/yrICQZOIuieV2Qhc930zQGBVaP3jpxcrXE6 CpIWylErA/laMFOvf1xNQsjAaCmkGDOUJxHo9Z9R5AkjMbxfqMawa0JAz Ovf24IAXewoSs2WVoPtLe9I7KKxpXELR11uOZZSdL69IR4+G7dzC8A7y4 /5LA9gbmyHWmeGVFYqg00YPieKxBvbjNix5G5qPKWGN934nMrrbi+u/TR 4l7TJgtb4Ljdk38w9bNt95Gsj1aNcSlPE8tnyI80n/7wGsPeW7Vrq7RJc Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10913"; a="397574028" X-IronPort-AV: E=Sophos;i="6.04,248,1695711600"; d="scan'208";a="397574028" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2023 21:36:36 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10913"; a="914308725" X-IronPort-AV: E=Sophos;i="6.04,249,1695711600"; d="scan'208";a="914308725" Received: from wenbin-z390-aorus-ultra.sh.intel.com ([10.239.156.43]) by fmsmga001.fm.intel.com with ESMTP; 03 Dec 2023 21:36:35 -0800 From: wenbin.chen-at-intel.com@ffmpeg.org To: ffmpeg-devel@ffmpeg.org Date: Mon, 4 Dec 2023 13:36:31 +0800 Message-Id: <20231204053633.1743228-2-wenbin.chen@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231204053633.1743228-1-wenbin.chen@intel.com> References: <20231204053633.1743228-1-wenbin.chen@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] libavfilter/vf_dnn_detect: Add input pad X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Wenbin Chen Add input pad to get model input resolution. Detection models always have fixed input size. And the output coordinators are based on the input resolution, so we need to get input size to map coordinators to our real output frames. Signed-off-by: Wenbin Chen --- libavfilter/dnn/dnn_backend_openvino.c | 24 ++++++++++++++++------ libavfilter/vf_dnn_detect.c | 28 +++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 089e028818..671a995c70 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -1073,9 +1073,15 @@ static int get_input_ov(void *model, DNNData *input, const char *input_name) return AVERROR(ENOSYS); } - input->channels = dims[1]; - input->height = input_resizable ? -1 : dims[2]; - input->width = input_resizable ? -1 : dims[3]; + if (dims[1] <= 3) { // NCHW + input->channels = dims[1]; + input->height = input_resizable ? -1 : dims[2]; + input->width = input_resizable ? -1 : dims[3]; + } else { // NHWC + input->height = input_resizable ? -1 : dims[1]; + input->width = input_resizable ? -1 : dims[2]; + input->channels = dims[3]; + } input->dt = precision_to_datatype(precision); return 0; @@ -1105,9 +1111,15 @@ static int get_input_ov(void *model, DNNData *input, const char *input_name) return DNN_GENERIC_ERROR; } - input->channels = dims.dims[1]; - input->height = input_resizable ? -1 : dims.dims[2]; - input->width = input_resizable ? -1 : dims.dims[3]; + if (dims[1] <= 3) { // NCHW + input->channels = dims[1]; + input->height = input_resizable ? -1 : dims[2]; + input->width = input_resizable ? -1 : dims[3]; + } else { // NHWC + input->height = input_resizable ? -1 : dims[1]; + input->width = input_resizable ? -1 : dims[2]; + input->channels = dims[3]; + } input->dt = precision_to_datatype(precision); return 0; } diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 373dda58bf..86f61c9907 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -699,13 +699,39 @@ static av_cold void dnn_detect_uninit(AVFilterContext *context) free_detect_labels(ctx); } +static int config_input(AVFilterLink *inlink) +{ + AVFilterContext *context = inlink->dst; + DnnDetectContext *ctx = context->priv; + DNNData model_input; + int ret; + + ret = ff_dnn_get_input(&ctx->dnnctx, &model_input); + if (ret != 0) { + av_log(ctx, AV_LOG_ERROR, "could not get input from the model\n"); + return ret; + } + ctx->scale_width = model_input.width == -1 ? inlink->w : model_input.width; + ctx->scale_height = model_input.height == -1 ? inlink->h : model_input.height; + + return 0; +} + +static const AVFilterPad dnn_detect_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = config_input, + }, +}; + const AVFilter ff_vf_dnn_detect = { .name = "dnn_detect", .description = NULL_IF_CONFIG_SMALL("Apply DNN detect filter to the input."), .priv_size = sizeof(DnnDetectContext), .init = dnn_detect_init, .uninit = dnn_detect_uninit, - FILTER_INPUTS(ff_video_default_filterpad), + FILTER_INPUTS(dnn_detect_inputs), FILTER_OUTPUTS(ff_video_default_filterpad), FILTER_PIXFMTS_ARRAY(pix_fmts), .priv_class = &dnn_detect_class, -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".