From patchwork Tue Aug 18 15:08:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Guo, Yejun" X-Patchwork-Id: 21702 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 C899E44B57A for ; Tue, 18 Aug 2020 18:13:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A1843688078; Tue, 18 Aug 2020 18:13:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8D034687F6C for ; Tue, 18 Aug 2020 18:13:36 +0300 (EEST) IronPort-SDR: KGob3uvKy5alNEVgB/4kSCRBIYps0tNyb3aSXDWwlcM/an6gQIbrVQ/G7LKcPzDzZJteXU5k4k dUIMXTZ4NJQw== X-IronPort-AV: E=McAfee;i="6000,8403,9716"; a="219234835" X-IronPort-AV: E=Sophos;i="5.76,327,1592895600"; d="scan'208";a="219234835" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Aug 2020 08:13:33 -0700 IronPort-SDR: qCt8fWPtHrVNPetLgrRjW23VKMxLE0XgDJjhaAdKFr68UGeBQ6R3n5wocNSdG2eD+eKyuAPkC5 wYgjfH+GVpNg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.76,327,1592895600"; d="scan'208";a="471845615" Received: from yguo18-skl-u1604.sh.intel.com ([10.239.159.53]) by orsmga005.jf.intel.com with ESMTP; 18 Aug 2020 08:13:32 -0700 From: "Guo, Yejun" To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Aug 2020 23:08:19 +0800 Message-Id: <1597763299-5823-1-git-send-email-yejun.guo@intel.com> X-Mailer: git-send-email 2.7.4 Subject: [FFmpeg-devel] [PATCH V4] dnn_backend_openvino.c: parse options in openvino backend 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Guo, Yejun --- v3: use AVOption v4: don't add new file dnn_common.h/c libavfilter/dnn/dnn_backend_openvino.c | 50 +++++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index d343bf2..277c313 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -26,9 +26,37 @@ #include "dnn_backend_openvino.h" #include "libavformat/avio.h" #include "libavutil/avassert.h" +#include "libavutil/opt.h" #include +typedef struct OVOptions{ + uint32_t batch_size; + uint32_t req_num; +} OVOptions; + +typedef struct OvContext { + const AVClass *class; + OVOptions options; +} OvContext; + +#define OFFSET(x) offsetof(OvContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM +static const AVOption dnn_ov_options[] = { + { "batch", "batch size", OFFSET(options.batch_size), AV_OPT_TYPE_INT, { .i64 = 1 }, INT_MIN, INT_MAX, FLAGS }, + { "nireq", "number of request", OFFSET(options.req_num), AV_OPT_TYPE_INT, { .i64 = 1 }, INT_MIN, INT_MAX, FLAGS }, + { NULL }, +}; + +static const AVClass dnn_ov_class = { + .class_name = "dnn_ov", + .item_name = av_default_item_name, + .option = dnn_ov_options, + .version = LIBAVUTIL_VERSION_INT, + .category = AV_CLASS_CATEGORY_FILTER, +}; + typedef struct OVModel{ + OvContext ctx; ie_core_t *core; ie_network_t *network; ie_executable_network_t *exe_network; @@ -155,6 +183,22 @@ err: return DNN_ERROR; } +static int dnn_parse_options(void *ctx, const char *options) +{ + AVDictionary *dict = NULL; + int err = av_dict_parse_string(&dict, options, "=", "&", 0); + if (err < 0) { + av_dict_free(&dict); + return err; + } + + av_opt_set_defaults(ctx); + err = av_opt_set_dict(ctx, &dict); + + av_dict_free(&dict); + return err; +} + DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) { DNNModel *model = NULL; @@ -171,6 +215,11 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) if (!ov_model) goto err; + ov_model->ctx.class = &dnn_ov_class; + model->options = options; + if (dnn_parse_options(&ov_model->ctx, model->options) < 0) + goto err; + status = ie_core_create("", &ov_model->core); if (status != OK) goto err; @@ -186,7 +235,6 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, const char *options) model->model = (void *)ov_model; model->set_input_output = &set_input_output_ov; model->get_input = &get_input_ov; - model->options = options; return model;