From patchwork Sun Apr 30 15:38:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41418 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675557pzb; Sun, 30 Apr 2023 08:39:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6OWBB3iUn1Wb3wgQHBo4Bpmx/McCdmMeRxag9Pnhj5OQgY/BEKEObBu0sSlexXnvMqNc7q X-Received: by 2002:a17:907:728d:b0:95f:2046:d20d with SMTP id dt13-20020a170907728d00b0095f2046d20dmr11193335ejc.2.1682869177729; Sun, 30 Apr 2023 08:39:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869177; cv=none; d=google.com; s=arc-20160816; b=bWrK2kPSKtH6R0CLdcakidmQi9Otsr66feOYPf8+VjqUgTQ1wkPkY+Tg52hBlJLTxm UbsNontLUAja0AkzoHGDWNN8Ti3bXT8UiclCvmVZu/PKfcpmETNcbGMOqld/76hyyqPf Jmk6JHGCSKQiWTlsh3ywz/mav/xlRGxdxa5C8cUt1yqk0U7Hs2vFTPYF6YazEWBjtKhb Krer5q/gRNW4/0LcgbDZzdZMI3lmtm1ZDxzwrlWRufpHtrLexiFLK0LCJ7j9Raf8GrGX ntAtWw8TialgU/V6y6n2KlDcRFZIsNVOGLIYVla3TftFOUnUHbN/uBuul3Kx57ZTEw/o CgEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=R/pV3KpcN2bIf8SxroTqE3/qHstoXPLeJflor90PBB4=; b=Tr+Y1lA7YYkj8SRbu3rmSEV+StLPQZSOiW4KPJWvW5LIe1F2otmzcsrphjs4lKnz8i qf4GF9DRwSE9gypRASGCbvzu2Mrd4JS+z/sxrnviX5vXuuqKBnh6oSjo/wWO7hPJneHV UIBgqctAfBzfzvHb6lfL8xlcOzBSkp43PuzHXp75XtUcKT05iA+Dtul2JsL+RRi8rm9O Nt0Rf+N27rCTfRjR2OUaA8mycLMU12V+odqqXOM57BQRevE4e+GJw6WP3Q9nvJcV6lIz L/e9yPqVLPTmV9fO3zpyWBBBZiuT/WIma/EMGo0EoEg7bmh4LYGOdgmaoaZSsfPVH9uq 3R0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=L4oIdN9N; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id io12-20020a17090780cc00b0094f73fba5a1si19664673ejc.926.2023.04.30.08.39.37; Sun, 30 Apr 2023 08:39:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=L4oIdN9N; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E781668C078; Sun, 30 Apr 2023 18:39:31 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-59.mail.qq.com (out203-205-251-59.mail.qq.com [203.205.251.59]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E0DAA68BECA for ; Sun, 30 Apr 2023 18:39:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869155; bh=mH/JM2Zr9nINJxTzQKlpbjh+NMeQ6RHWL7+1YqRqwoI=; h=From:To:Cc:Subject:Date; b=L4oIdN9NctFmJmFTpsrE5H3/blWLl3m2ZSs0Tvnnv8xkw4gK8TrNh0ijiE2qNwwgG cq/T9bvs/vBnwOuoHGgci1dZdfSpnuF+ZKWQzrVzOKoVrC3mMVipB/AlD+y9VIsHK1 w2bElThcfLYS5ZILCOCdGLlQpV9u+iRVEYcqwgH0= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869144t6lkw8duo Message-ID: X-QQ-XMAILINFO: NY/MPejODIJVF8laCCgeMTi5JYUemqbXMvWsb9QoWeZHPicS+wsRmGNf7ulcB1 PDj/GE9w09R07mLojnm1QPdycMV9mBWpIWQFG9Fvl+LJ44S/cfNsQ6f5ohnoczgM4Q5Z7xtAKPxP pv8SRN2sxoI+MIZrqVlzQsvCGLzgS5otvQKPTmPfoopmW3WoR2yxM9PR86GGyo7aDB2q/D0Ir11F X/FiGP7L9lTxYjBhzsurpNUJ71VA0DF7qpptfRICIhYe8KFwiBfQTfc9W1KrlhOFfbM5Ybc++J/h 5iRUwbOrm0SSvNx6fZAaLlNXh9LO/ryVNiF2HEQCrwSqON8pqfpiJYWsN+zsoY82bofOwwycxn7h JQb/YYMzXrs+XWJRSOC/lTT+o1rkOnJxMe9CUleKTFynl8lLKYYMdcthbovKKmM1DYLHPRjZBQQC bd2QbZgUXOVdzkvg8F9EcsSZ7Xf7VGw+ZwGJhn2eTVWcCjS4HXiB4/ZNpo+ODLtUN0KvoniAytSE sQcaT2SFiHpnOEVYl+s7/qeL6m1f6XPQBfW0C0yhuiImpKqIC969dKS6O/K49MtS2sFSJ4PDT2mt U10vsyIfYoc4iWnHPdcTQV8fGqRrY6jOF1jORYJQH14INVLBQDsKM88pkKZxe9g7Sy73B2MOdzr8 Nhgh5G0PxVN4mzVR9Ghfyj4aQdyv9mlOIJo23FkbLkY7LB5smyPFhwezyraF6nqFXVeNbsuMNJgn GpgjyklFXFmgNgyLjXqb3SPoGySKZKfgdQ2SY5Q75v+66Q4LybA9JlGMhdJQzUws3W3M5WebkXdh ytjQKRwYxYb7os9WM0SuqGxjGvntwpxDfdY1uKr2sEKqLiRg+m7E7XeHKyaW5tRVi72qd5w2Pym2 yOoISFnHP34y8UGKZ8reV6X8UvNQfi3Dvi0IeAKxzQrS0K1Cgj0k2Ee3LNUCJV4Qo47KEpYm5Pym Kd/fkp7C+a8nr3UKchng== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:53 +0800 X-OQ-MSGID: <20230430153902.48405-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 01/10] avfilter/dnn: define each backend as a DNNModule 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: rwsegAn8/wR5 From: Zhao Zhili To avoid export multiple functions for each backend implementation. Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_openvino.c | 98 +++++++++++++----------- libavfilter/dnn/dnn_backend_openvino.h | 40 ---------- libavfilter/dnn/dnn_backend_tf.c | 101 +++++++++++++------------ libavfilter/dnn/dnn_backend_tf.h | 40 ---------- libavfilter/dnn/dnn_interface.c | 17 ++--- 5 files changed, 112 insertions(+), 184 deletions(-) delete mode 100644 libavfilter/dnn/dnn_backend_openvino.h delete mode 100644 libavfilter/dnn/dnn_backend_tf.h diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index b67f288336..7db2e7a10f 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -23,7 +23,6 @@ * DNN OpenVINO backend implementation. */ -#include "dnn_backend_openvino.h" #include "dnn_io_proc.h" #include "libavformat/avio.h" #include "libavutil/avassert.h" @@ -293,6 +292,46 @@ static void infer_completion_callback(void *args) } } +static void dnn_free_model_ov(DNNModel **model) +{ + if (*model){ + OVModel *ov_model = (*model)->model; + while (ff_safe_queue_size(ov_model->request_queue) != 0) { + OVRequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue); + if (item && item->infer_request) { + ie_infer_request_free(&item->infer_request); + } + av_freep(&item->lltasks); + av_freep(&item); + } + ff_safe_queue_destroy(ov_model->request_queue); + + while (ff_queue_size(ov_model->lltask_queue) != 0) { + LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue); + av_freep(&item); + } + ff_queue_destroy(ov_model->lltask_queue); + + while (ff_queue_size(ov_model->task_queue) != 0) { + TaskItem *item = ff_queue_pop_front(ov_model->task_queue); + av_frame_free(&item->in_frame); + av_frame_free(&item->out_frame); + av_freep(&item); + } + ff_queue_destroy(ov_model->task_queue); + + if (ov_model->exe_network) + ie_exec_network_free(&ov_model->exe_network); + if (ov_model->network) + ie_network_free(&ov_model->network); + if (ov_model->core) + ie_core_free(&ov_model->core); + av_freep(&ov_model); + av_freep(model); + } +} + + static int init_model_ov(OVModel *ov_model, const char *input_name, const char *output_name) { int ret = 0; @@ -438,7 +477,7 @@ static int init_model_ov(OVModel *ov_model, const char *input_name, const char * return 0; err: - ff_dnn_free_model_ov(&ov_model->model); + dnn_free_model_ov(&ov_model->model); return ret; } @@ -721,7 +760,7 @@ err: return ret; } -DNNModel *ff_dnn_load_model_ov(const char *model_filename, DNNFunctionType func_type, const char *options, AVFilterContext *filter_ctx) +static DNNModel *dnn_load_model_ov(const char *model_filename, DNNFunctionType func_type, const char *options, AVFilterContext *filter_ctx) { DNNModel *model = NULL; OVModel *ov_model = NULL; @@ -806,11 +845,11 @@ DNNModel *ff_dnn_load_model_ov(const char *model_filename, DNNFunctionType func_ return model; err: - ff_dnn_free_model_ov(&model); + dnn_free_model_ov(&model); return NULL; } -int ff_dnn_execute_model_ov(const DNNModel *model, DNNExecBaseParams *exec_params) +static int dnn_execute_model_ov(const DNNModel *model, DNNExecBaseParams *exec_params) { OVModel *ov_model = model->model; OVContext *ctx = &ov_model->ctx; @@ -893,13 +932,13 @@ int ff_dnn_execute_model_ov(const DNNModel *model, DNNExecBaseParams *exec_param } } -DNNAsyncStatusType ff_dnn_get_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out) +static DNNAsyncStatusType dnn_get_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out) { OVModel *ov_model = model->model; return ff_dnn_get_result_common(ov_model->task_queue, in, out); } -int ff_dnn_flush_ov(const DNNModel *model) +static int dnn_flush_ov(const DNNModel *model) { OVModel *ov_model = model->model; OVContext *ctx = &ov_model->ctx; @@ -937,41 +976,10 @@ int ff_dnn_flush_ov(const DNNModel *model) return 0; } -void ff_dnn_free_model_ov(DNNModel **model) -{ - if (*model){ - OVModel *ov_model = (*model)->model; - while (ff_safe_queue_size(ov_model->request_queue) != 0) { - OVRequestItem *item = ff_safe_queue_pop_front(ov_model->request_queue); - if (item && item->infer_request) { - ie_infer_request_free(&item->infer_request); - } - av_freep(&item->lltasks); - av_freep(&item); - } - ff_safe_queue_destroy(ov_model->request_queue); - - while (ff_queue_size(ov_model->lltask_queue) != 0) { - LastLevelTaskItem *item = ff_queue_pop_front(ov_model->lltask_queue); - av_freep(&item); - } - ff_queue_destroy(ov_model->lltask_queue); - - while (ff_queue_size(ov_model->task_queue) != 0) { - TaskItem *item = ff_queue_pop_front(ov_model->task_queue); - av_frame_free(&item->in_frame); - av_frame_free(&item->out_frame); - av_freep(&item); - } - ff_queue_destroy(ov_model->task_queue); - - if (ov_model->exe_network) - ie_exec_network_free(&ov_model->exe_network); - if (ov_model->network) - ie_network_free(&ov_model->network); - if (ov_model->core) - ie_core_free(&ov_model->core); - av_freep(&ov_model); - av_freep(model); - } -} +const DNNModule ff_dnn_backend_openvino = { + .load_model = dnn_load_model_ov, + .execute_model = dnn_execute_model_ov, + .get_result = dnn_get_result_ov, + .flush = dnn_flush_ov, + .free_model = dnn_free_model_ov, +}; diff --git a/libavfilter/dnn/dnn_backend_openvino.h b/libavfilter/dnn/dnn_backend_openvino.h deleted file mode 100644 index 304bc96b99..0000000000 --- a/libavfilter/dnn/dnn_backend_openvino.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2020 - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * DNN inference functions interface for OpenVINO backend. - */ - - -#ifndef AVFILTER_DNN_DNN_BACKEND_OPENVINO_H -#define AVFILTER_DNN_DNN_BACKEND_OPENVINO_H - -#include "../dnn_interface.h" - -DNNModel *ff_dnn_load_model_ov(const char *model_filename, DNNFunctionType func_type, const char *options, AVFilterContext *filter_ctx); - -int ff_dnn_execute_model_ov(const DNNModel *model, DNNExecBaseParams *exec_params); -DNNAsyncStatusType ff_dnn_get_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out); -int ff_dnn_flush_ov(const DNNModel *model); - -void ff_dnn_free_model_ov(DNNModel **model); - -#endif diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 486d2405b8..e6ebd17595 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -23,7 +23,6 @@ * DNN tensorflow backend implementation. */ -#include "dnn_backend_tf.h" #include "libavformat/avio.h" #include "libavutil/avassert.h" #include "libavutil/avstring.h" @@ -477,7 +476,48 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) #define NAME_BUFFER_SIZE 256 -DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_type, const char *options, AVFilterContext *filter_ctx) +static void dnn_free_model_tf(DNNModel **model) +{ + TFModel *tf_model; + + if (*model){ + tf_model = (*model)->model; + while (ff_safe_queue_size(tf_model->request_queue) != 0) { + TFRequestItem *item = ff_safe_queue_pop_front(tf_model->request_queue); + destroy_request_item(&item); + } + ff_safe_queue_destroy(tf_model->request_queue); + + while (ff_queue_size(tf_model->lltask_queue) != 0) { + LastLevelTaskItem *item = ff_queue_pop_front(tf_model->lltask_queue); + av_freep(&item); + } + ff_queue_destroy(tf_model->lltask_queue); + + while (ff_queue_size(tf_model->task_queue) != 0) { + TaskItem *item = ff_queue_pop_front(tf_model->task_queue); + av_frame_free(&item->in_frame); + av_frame_free(&item->out_frame); + av_freep(&item); + } + ff_queue_destroy(tf_model->task_queue); + + if (tf_model->graph){ + TF_DeleteGraph(tf_model->graph); + } + if (tf_model->session){ + TF_CloseSession(tf_model->session, tf_model->status); + TF_DeleteSession(tf_model->session, tf_model->status); + } + if (tf_model->status){ + TF_DeleteStatus(tf_model->status); + } + av_freep(&tf_model); + av_freep(model); + } +} + +static DNNModel *dnn_load_model_tf(const char *model_filename, DNNFunctionType func_type, const char *options, AVFilterContext *filter_ctx) { DNNModel *model = NULL; TFModel *tf_model = NULL; @@ -567,7 +607,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_ return model; err: - ff_dnn_free_model_tf(&model); + dnn_free_model_tf(&model); return NULL; } @@ -765,11 +805,11 @@ err: if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { destroy_request_item(&request); } - ff_dnn_free_model_tf(&tf_model->model); + dnn_free_model_tf(&tf_model->model); return ret; } -int ff_dnn_execute_model_tf(const DNNModel *model, DNNExecBaseParams *exec_params) +static int dnn_execute_model_tf(const DNNModel *model, DNNExecBaseParams *exec_params) { TFModel *tf_model = model->model; TFContext *ctx = &tf_model->ctx; @@ -817,13 +857,13 @@ int ff_dnn_execute_model_tf(const DNNModel *model, DNNExecBaseParams *exec_param return execute_model_tf(request, tf_model->lltask_queue); } -DNNAsyncStatusType ff_dnn_get_result_tf(const DNNModel *model, AVFrame **in, AVFrame **out) +static DNNAsyncStatusType dnn_get_result_tf(const DNNModel *model, AVFrame **in, AVFrame **out) { TFModel *tf_model = model->model; return ff_dnn_get_result_common(tf_model->task_queue, in, out); } -int ff_dnn_flush_tf(const DNNModel *model) +static int dnn_flush_tf(const DNNModel *model) { TFModel *tf_model = model->model; TFContext *ctx = &tf_model->ctx; @@ -853,43 +893,10 @@ int ff_dnn_flush_tf(const DNNModel *model) return ff_dnn_start_inference_async(ctx, &request->exec_module); } -void ff_dnn_free_model_tf(DNNModel **model) -{ - TFModel *tf_model; - - if (*model){ - tf_model = (*model)->model; - while (ff_safe_queue_size(tf_model->request_queue) != 0) { - TFRequestItem *item = ff_safe_queue_pop_front(tf_model->request_queue); - destroy_request_item(&item); - } - ff_safe_queue_destroy(tf_model->request_queue); - - while (ff_queue_size(tf_model->lltask_queue) != 0) { - LastLevelTaskItem *item = ff_queue_pop_front(tf_model->lltask_queue); - av_freep(&item); - } - ff_queue_destroy(tf_model->lltask_queue); - - while (ff_queue_size(tf_model->task_queue) != 0) { - TaskItem *item = ff_queue_pop_front(tf_model->task_queue); - av_frame_free(&item->in_frame); - av_frame_free(&item->out_frame); - av_freep(&item); - } - ff_queue_destroy(tf_model->task_queue); - - if (tf_model->graph){ - TF_DeleteGraph(tf_model->graph); - } - if (tf_model->session){ - TF_CloseSession(tf_model->session, tf_model->status); - TF_DeleteSession(tf_model->session, tf_model->status); - } - if (tf_model->status){ - TF_DeleteStatus(tf_model->status); - } - av_freep(&tf_model); - av_freep(model); - } -} +const DNNModule ff_dnn_backend_tf = { + .load_model = dnn_load_model_tf, + .execute_model = dnn_execute_model_tf, + .get_result = dnn_get_result_tf, + .flush = dnn_flush_tf, + .free_model = dnn_free_model_tf, +}; diff --git a/libavfilter/dnn/dnn_backend_tf.h b/libavfilter/dnn/dnn_backend_tf.h deleted file mode 100644 index 0b63a4b6d2..0000000000 --- a/libavfilter/dnn/dnn_backend_tf.h +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (c) 2018 Sergey Lavrushkin - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -/** - * @file - * DNN inference functions interface for TensorFlow backend. - */ - - -#ifndef AVFILTER_DNN_DNN_BACKEND_TF_H -#define AVFILTER_DNN_DNN_BACKEND_TF_H - -#include "../dnn_interface.h" - -DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_type, const char *options, AVFilterContext *filter_ctx); - -int ff_dnn_execute_model_tf(const DNNModel *model, DNNExecBaseParams *exec_params); -DNNAsyncStatusType ff_dnn_get_result_tf(const DNNModel *model, AVFrame **in, AVFrame **out); -int ff_dnn_flush_tf(const DNNModel *model); - -void ff_dnn_free_model_tf(DNNModel **model); - -#endif diff --git a/libavfilter/dnn/dnn_interface.c b/libavfilter/dnn/dnn_interface.c index 5b1695a1dd..4f78f35474 100644 --- a/libavfilter/dnn/dnn_interface.c +++ b/libavfilter/dnn/dnn_interface.c @@ -24,10 +24,11 @@ */ #include "../dnn_interface.h" -#include "dnn_backend_tf.h" -#include "dnn_backend_openvino.h" #include "libavutil/mem.h" +extern const DNNModule ff_dnn_backend_openvino; +extern const DNNModule ff_dnn_backend_tf; + DNNModule *ff_get_dnn_module(DNNBackendType backend_type) { DNNModule *dnn_module; @@ -40,11 +41,7 @@ DNNModule *ff_get_dnn_module(DNNBackendType backend_type) switch(backend_type){ case DNN_TF: #if (CONFIG_LIBTENSORFLOW == 1) - dnn_module->load_model = &ff_dnn_load_model_tf; - dnn_module->execute_model = &ff_dnn_execute_model_tf; - dnn_module->get_result = &ff_dnn_get_result_tf; - dnn_module->flush = &ff_dnn_flush_tf; - dnn_module->free_model = &ff_dnn_free_model_tf; + *dnn_module = ff_dnn_backend_tf; #else av_freep(&dnn_module); return NULL; @@ -52,11 +49,7 @@ DNNModule *ff_get_dnn_module(DNNBackendType backend_type) break; case DNN_OV: #if (CONFIG_LIBOPENVINO == 1) - dnn_module->load_model = &ff_dnn_load_model_ov; - dnn_module->execute_model = &ff_dnn_execute_model_ov; - dnn_module->get_result = &ff_dnn_get_result_ov; - dnn_module->flush = &ff_dnn_flush_ov; - dnn_module->free_model = &ff_dnn_free_model_ov; + *dnn_module = ff_dnn_backend_openvino; #else av_freep(&dnn_module); return NULL; From patchwork Sun Apr 30 15:38:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41419 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675638pzb; Sun, 30 Apr 2023 08:39:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ40TuExRhuM+rZkXN07LLt/lPdvcLK5Yy6fGB7gxxvTGcX59FqM0BhJGW9rg2Td1/GyBYVv X-Received: by 2002:a17:907:7250:b0:959:6fb2:1c3b with SMTP id ds16-20020a170907725000b009596fb21c3bmr12714068ejc.39.1682869189283; Sun, 30 Apr 2023 08:39:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869189; cv=none; d=google.com; s=arc-20160816; b=odFuShAjKNC5O0SwyAgtWFu4U69pwSagRWAxM7AAB4fwKfaQn+L9A+9o8vFK/aK7Ny 5b9B2iSatmkmC7SZV6rVDPf+AsmzUkPkHviQXKvGqjxdRMX1KOqIHcB+9uH8CCrOZlWH rXOb2dnijbqlKuUvG0OxoL1QSMBVTLUgS2SqoFNMinJZ24nIKbXUPdLz6Le9YtMm/dlz Zm7TNrf3uj5BghGd9Y4h7fPw+zn/rqqL+Dwxl8PYPK+Ctb2/ZPKd/APPsd2ZgLMGGOj2 FldGdxfWeQwSpa++dPaWbObqMbSf2O4PqTlKMP/m8ClwAHlIKdhB4aOiKlEcizPrADcn sAzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=zf1sLQw78DG/56a6Dg7MglP6t35erfjMwl4ZUpR7FHc=; b=E+ozEApNU5MFNlCAGaqJaVRZjg4Ru6JQWsYgobqZddG20nH0OMhMjHT4e5JEtmikgN QJ8NGnmzHHOrvkyHg1tSZ9PxUkV5kzeJF5pMstNsLRVb+8WwcWHYqdHkYD3hATkyxScC fOzrz5yyDVnL4RfL7wOQjB4PYyLGEbENM9ZolGhkfZuX7jun1647ppnYetWsp12fuvn9 S58mAoDO8ptGWaIT3pKGjcqMBVGOyo17t9s2fa0HYov3qcPjaD1Ery6ypyHOykiSDrgx NF+kSlKgBb+uvunZF8kmytIFLIETgZYKI4sK/dFdeH8ydW8V0KnAqzgMRqqqqdK1HJBv zVrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=YNIk5OiT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds16-20020a170907725000b0094f5777ef96si22475529ejc.1000.2023.04.30.08.39.49; Sun, 30 Apr 2023 08:39:49 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=YNIk5OiT; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 940C568C07A; Sun, 30 Apr 2023 18:39:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22F2A68BF1D for ; Sun, 30 Apr 2023 18:39:24 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869156; bh=S22XX+YZ73TL5eEP0nZd6RcFLc46tjbdxhZW4Wi1JNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=YNIk5OiTVjpLXsfMk36SGyc5W4CeNQtDV+4zXGwSzKvwsN3ZdZRp22gShz/0Vgrsq fNCK/vRHO8+Q6Ox3wiHZElZwNWsyUrJ3Yykx/GGqDiRCPDxb6p12GUHv6XivlJthfW PahovVR6sPa9i6jHbqgaa+WKmsNPq6XT/pj4pNpw= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869155t96wius33 Message-ID: X-QQ-XMAILINFO: NDz66ktblfzJhp+flP9SGW5XdZabzTboYsO5R5geqI67+pBZKe3fRYsRYBjKMY Xdack8uzwPv1u6rQlvisk/vvXj2a0zHjQeOXWZZaSbFg0t8Cy2wGKr1DxwGCnC6ib6RvieqPqT4x D19VRnVTyGh0hWr2s1m7Ey3uKvg2y4N2Lj4jmnMVF810/b7+kmA6fWP2+cOj60Xw77M0rWt6ToSE 5+DR2oFixLCyyzlf77deEIJYMTsMIHuz/gdgEqquR47zgQZOe10neRblvgZQYSkN0dQ2e2LCzYOh e4qZA4jmAEaUmLMm6JoZB8w3TwXumK9MCxAHTsI+BpR85/Wx7egkFOqdSHZ+Ce6D+HK0ag1ArP9Q TTsI8hU2CXXda4w23FjJBru/oxYKn8qOQA2PHA/ktJKm5HSCwQv9ts66P8umrgNyxoETD//XYLNm ddQ7dRCwQxjWeLGBoeiQAwKlSrQuwH4ZA9UZP2ivI/G2xPrsvAcbRZSvomSwb/YGoP3LxjvymRRz +hQGGYoHJBWMYt5qTvRzZvG257h2hHDAasAC4Xmqsm4btWik3NXpyjtc1s65Nsc8ZzgUVCT1g/PK UcVPWdyqhafJ4neCUEK/dwX+qXqIHnvh5noEy/a5FgP0LamhtqcBMu3ZI+8YmxCrPDQKT63LNezA Bt3OmKMoqaaOxc0UakJgMzs5wQDW6F6vo3oEw2llv/u2QRv5uW++3zxbjTTKRd3Rr4tVUAceqCAK DPKCUyzuDEilpMetRG9CRI2SkdPfNMil9v5JoKkW3925zBL2BRw7qDLLnProrx0N4LG8/xj93nSB bxzmxz+yGdKYJAYmbfSBzR+bOKl1sjEA5X1cmk00tVYseNhX8Z6eJP/jVda+QLkCjC83aHHghK3o 6oMpBOpo29tCitgafgJGL0iWr7tjLu08oDU/pF4cTJo907FwOzmxTkvUZObH3QcSqlW0328qt9qT yHZDzjw8GXSPk+NQoUlQfVUGYdgVJD From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:54 +0800 X-OQ-MSGID: <20230430153902.48405-2-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 02/10] avfilter/dnn: refactor ff_get_dnn_module to remove allocation 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 4PyGfw269laX From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_interface.c | 28 +++++----------------------- libavfilter/dnn_filter_common.c | 1 - libavfilter/dnn_filter_common.h | 2 +- libavfilter/dnn_interface.h | 2 +- 4 files changed, 7 insertions(+), 26 deletions(-) diff --git a/libavfilter/dnn/dnn_interface.c b/libavfilter/dnn/dnn_interface.c index 4f78f35474..a60dcb091b 100644 --- a/libavfilter/dnn/dnn_interface.c +++ b/libavfilter/dnn/dnn_interface.c @@ -29,37 +29,19 @@ extern const DNNModule ff_dnn_backend_openvino; extern const DNNModule ff_dnn_backend_tf; -DNNModule *ff_get_dnn_module(DNNBackendType backend_type) +const DNNModule *ff_get_dnn_module(DNNBackendType backend_type) { - DNNModule *dnn_module; - - dnn_module = av_mallocz(sizeof(DNNModule)); - if(!dnn_module){ - return NULL; - } - switch(backend_type){ - case DNN_TF: #if (CONFIG_LIBTENSORFLOW == 1) - *dnn_module = ff_dnn_backend_tf; - #else - av_freep(&dnn_module); - return NULL; + case DNN_TF: + return &ff_dnn_backend_tf; #endif - break; - case DNN_OV: #if (CONFIG_LIBOPENVINO == 1) - *dnn_module = ff_dnn_backend_openvino; - #else - av_freep(&dnn_module); - return NULL; + case DNN_OV: + return &ff_dnn_backend_openvino; #endif - break; default: av_log(NULL, AV_LOG_ERROR, "Module backend_type is not supported or enabled.\n"); - av_freep(&dnn_module); return NULL; } - - return dnn_module; } diff --git a/libavfilter/dnn_filter_common.c b/libavfilter/dnn_filter_common.c index 5083e3de19..7b34fd0c0a 100644 --- a/libavfilter/dnn_filter_common.c +++ b/libavfilter/dnn_filter_common.c @@ -158,6 +158,5 @@ void ff_dnn_uninit(DnnContext *ctx) { if (ctx->dnn_module) { (ctx->dnn_module->free_model)(&ctx->model); - av_freep(&ctx->dnn_module); } } diff --git a/libavfilter/dnn_filter_common.h b/libavfilter/dnn_filter_common.h index bcdf37c815..30871ee381 100644 --- a/libavfilter/dnn_filter_common.h +++ b/libavfilter/dnn_filter_common.h @@ -36,7 +36,7 @@ typedef struct DnnContext { char **model_outputnames; uint32_t nb_outputs; - DNNModule *dnn_module; + const DNNModule *dnn_module; DNNModel *model; } DnnContext; diff --git a/libavfilter/dnn_interface.h b/libavfilter/dnn_interface.h index 6b64a2b55a..b2bfdd38e7 100644 --- a/libavfilter/dnn_interface.h +++ b/libavfilter/dnn_interface.h @@ -123,6 +123,6 @@ typedef struct DNNModule{ } DNNModule; // Initializes DNNModule depending on chosen backend. -DNNModule *ff_get_dnn_module(DNNBackendType backend_type); +const DNNModule *ff_get_dnn_module(DNNBackendType backend_type); #endif From patchwork Sun Apr 30 15:38:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41427 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2679086pzb; Sun, 30 Apr 2023 08:47:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4fdYeeNmI6JyRsVpOj8YTlmFO0y9AjPr0TJv45adkYpyFOMlFVxn26mri9No1jwdYfT2nW X-Received: by 2002:aa7:c38a:0:b0:506:71c9:4bb4 with SMTP id k10-20020aa7c38a000000b0050671c94bb4mr3943819edq.40.1682869661006; Sun, 30 Apr 2023 08:47:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869660; cv=none; d=google.com; s=arc-20160816; b=EMaewoljUm/lEM8sSA6jLURAVXV8rI48P2zbl0JUHRceKdrGPbqaD9O3acMD4nP6np 5VF3r9eXZ3ZgIFYylFVvbo5eFsealom3u+yJ+KXM8m7IDMkjyc9Dj1BEP5E/8ZkXcVQB E8txkCpNXVN3cln2f2x5Be+Rtl8SDFFTUvKgk1+qqVZX/uRRk7N+bhvVri+UpUYPyahw /7UZxZEfPrVP8AacZOldbWR0RTSMwbrFGcsYpnJt8/NMYUBZoVFrV3t2guZJN51Kp77z cppn3dsE6GZoKQDc4l61X+9pi3s8HcVUMlZ79C4glxT9kPSFbJ4hLk1wwz0b8qGRksY7 8Y6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=3m3cjzinDfQUwx9kuCpMna+wKq6L24YU5pfuDTE4/Sw=; b=uGq6yqtLc49+Taght0sNrs+IKxj0WDE3engc5Ds/mTct3t6tdimgqz7NIR1+hl4hR/ kX2p5m9Woj5RMRH+J8jUWPDmmxgA4JkaZWQoq1w9plQrbEy6Gzb8/RffwCwWXU/xHbS3 us6lMMh5DcGX6wwPoin/I4OroX1WEb/VTw1Xnmx1Hs5AFSwV1cULfFIyzLYytRIW2+Vg rsiyQFyztRR1/HKeCbZUCaoFc0kd3jaKkDIrccI9Q5G1qSPiYK/oK2Rswu/QolRFLElY YzpQA6G4erELVixznuWN95Nd4ampA8ZtEe4N+mHT6PBVhLSOVUq7m+9a2xbDKzOYU8YC bjUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=rfzb9BLB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m26-20020aa7c2da000000b0050514519405si7792506edp.111.2023.04.30.08.47.40; Sun, 30 Apr 2023 08:47:40 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=rfzb9BLB; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8A3EF68C079; Sun, 30 Apr 2023 18:47:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-210.mail.qq.com (out162-62-57-210.mail.qq.com [162.62.57.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 813CB68BF1D for ; Sun, 30 Apr 2023 18:47:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869647; bh=X9k6pTVvqT2IDxE+SNcFMDfdfmgah36xblnbE2qSHOI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rfzb9BLBx8qDk3EvQrM2FQgPFgFfTC2zSmHUD6ld79KXCLPtW4Hlhy5FYDeZb0xsS vKfYNZ1oYrwoS0BHWKKsBknHnsJrbaHFv2pK3UhtL+78Hs/6cv8sbvPkyX3CMzBCLQ so7ahJkC8TBXpodK4egpp9xrVXx8ywhaankiL7go= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869156t7iy6rx60 Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uTgalkk4BtdDMkRJIQmIfy+zat9Td4IclbraQftWHivJpNCo4X9U Z/8OgDi1B/vVQG/zMGVuZ5pmg8XzlVdEowYoWYUIan2u5RllMtRb/Vjkm7UCMfCdsTdYQATeD4gy criYpY/FdgHSm/M+5rbGmlDExhzr3rcl7N/AYuUBLfHLYWp5cBCiuZuDuPIZYCBb6OCwsJMOEKY2 5kCS4PDjIRe8udxd1GlibsbuifSpbRCGFB2lUUdbfm54g5gUt5zV5YkujPEH/54m8+Du5l3Aq+mV QVLyzfQrxIir9f1jf6y0xWBrjhK6DNOScNsePL63IZF3s0UNaFvxGP6IPEyUbmXvJTnjQ9JZSx40 rfwJvoPaieRbqHyI0ewdaACK3Davo9TCRih9+j21LRqAtesXgXn8avBvfFS15Ux/zZyODeGpcBFV gbEU0OpHBSF4NYoffsdPhDbYXfacieg+ckbZ+XHl7s3a4y9PU872AWgIeg5pEePdGbxHdYARkKZJ kk+lcR9E26fJ1Dg2WDeUmy78rAopJ1wxxLXg3VcsEkByL5s8Ne1879BU9T5RF3UNOxnZXPCZx9Uj YD2C7/fAt6T2k6IJmRHoIdKZHbpJMq1nQ/yh6mvvkoekfN1ZvOQYFOopVChe7KgZlaMZjDzyKNPx srOfugmmNKhtUrjzoTQPrvxFu0hwZg1lDmb4NdMHuFaeexeA1hnPmYVPlVSWCTNsF7YlSO2hwMMF Hio/4efPckir2YaeYuQtTAUbo9WuEcp4vUiNCBtWp98S4PaWcU5BjHpgY9uPpPZw4f6YK16skWrj gHabIe4Gr3I1OQBV0hCJZ1is4TbpU1AK8WhLVE6QXkF8OypP0LVcp9H3iqOhM2WpzItPVwgZzPLS hnqqO2imh4ZxSjmxp1e5gYEEvjyhBdR8vvlb8L0S0TDhsUyaHXGKLRl5NAk9Y5lEij0qKYQhYJAj 7zxat/0ZhJ3vOKHTP0E2yX2/fRaWTb From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:55 +0800 X-OQ-MSGID: <20230430153902.48405-3-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] avfilter/dnn: add log context to ff_get_dnn_module 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7b8iyMcNTH+C From: Zhao Zhili Print backend type when failed. Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_interface.c | 6 ++++-- libavfilter/dnn_filter_common.c | 2 +- libavfilter/dnn_interface.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libavfilter/dnn/dnn_interface.c b/libavfilter/dnn/dnn_interface.c index a60dcb091b..e843826aa6 100644 --- a/libavfilter/dnn/dnn_interface.c +++ b/libavfilter/dnn/dnn_interface.c @@ -29,7 +29,7 @@ extern const DNNModule ff_dnn_backend_openvino; extern const DNNModule ff_dnn_backend_tf; -const DNNModule *ff_get_dnn_module(DNNBackendType backend_type) +const DNNModule *ff_get_dnn_module(DNNBackendType backend_type, void *log_ctx) { switch(backend_type){ #if (CONFIG_LIBTENSORFLOW == 1) @@ -41,7 +41,9 @@ const DNNModule *ff_get_dnn_module(DNNBackendType backend_type) return &ff_dnn_backend_openvino; #endif default: - av_log(NULL, AV_LOG_ERROR, "Module backend_type is not supported or enabled.\n"); + av_log(log_ctx, AV_LOG_ERROR, + "Module backend_type %d is not supported or enabled.\n", + backend_type); return NULL; } } diff --git a/libavfilter/dnn_filter_common.c b/libavfilter/dnn_filter_common.c index 7b34fd0c0a..d175c91914 100644 --- a/libavfilter/dnn_filter_common.c +++ b/libavfilter/dnn_filter_common.c @@ -68,7 +68,7 @@ int ff_dnn_init(DnnContext *ctx, DNNFunctionType func_type, AVFilterContext *fil return AVERROR(EINVAL); } - ctx->dnn_module = ff_get_dnn_module(ctx->backend_type); + ctx->dnn_module = ff_get_dnn_module(ctx->backend_type, filter_ctx); if (!ctx->dnn_module) { av_log(filter_ctx, AV_LOG_ERROR, "could not create DNN module for requested backend\n"); return AVERROR(ENOMEM); diff --git a/libavfilter/dnn_interface.h b/libavfilter/dnn_interface.h index b2bfdd38e7..20c6a0a896 100644 --- a/libavfilter/dnn_interface.h +++ b/libavfilter/dnn_interface.h @@ -123,6 +123,6 @@ typedef struct DNNModule{ } DNNModule; // Initializes DNNModule depending on chosen backend. -const DNNModule *ff_get_dnn_module(DNNBackendType backend_type); +const DNNModule *ff_get_dnn_module(DNNBackendType backend_type, void *log_ctx); #endif From patchwork Sun Apr 30 15:38:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41426 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2678177pzb; Sun, 30 Apr 2023 08:45:31 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ44IJXmP7MPpKhMv+8lbmm936wmfNRXHzb65Sg4Lw7TptJubxfpCVvNQLObDp4qeGeZ4mJL X-Received: by 2002:a17:907:3e97:b0:94d:cebe:691 with SMTP id hs23-20020a1709073e9700b0094dcebe0691mr12761095ejc.69.1682869530826; Sun, 30 Apr 2023 08:45:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869530; cv=none; d=google.com; s=arc-20160816; b=EVLiDpFuTlT4e05xsgNpFWDWnVS6FVspquu152Ci9Lu3SfaYXxKNIkQ5XfSS7XT0T0 0FE+SjQOlT224YBtbpvgJDtKsskMNyKfAniGd4NxFPoy0Zh/50TCDrxqpN7anyfn/hB8 2bpvVwho1vAHV0EcNf//D6jJKl1yEBl1ylTsh13o534ypHdXCzsVBRavd+NpOHz5hL+p XI3SbBA3RUNNaqevQUPUB5U78rxtEHYhUWmtgAqwcZWffYQNOQJCVLZ15+ADYTGGBuJP FY4P+sJDOXtKLCJcFKrad1X4D88HUZpgB0FGPP08BSH9l8UuZpBhAz3QfcKOpnE/W7JO ZtOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=/g3hofZ/w1hKNaHoxAFJ6qNL3PCbHPKLt545fWOgffo=; b=Z1kg8rjdmT6g+DztZMtcyjumJzv5KRBWEUyrv0sGTNbu7u/Iz6q9OZGhhhYIKjqkPj c4H5GDz3ykBaa/EOol5AfSKqZNogg+fJq+23XKthWoht5wjTcT/WEvSF+zhWD9RQND0G BXgs/a37M54BEvMIdqEwLTHgeN5ixq9d1W3ptMI7ckSXpS47Gv8w/UHVXbj+N1app44d 2zy9McXtn2LBNSqpoeFwNVOiVqyRduvR8I9CMdvcZFmOQikHWJeEDji2awzdoZZxq86r Z8ryKmYiYoZFC+GdY38I/FGVSbQZPnnJGPAFqVBJ74HjicWvCzrTU55ypK4teS/SrXP2 tjZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=mXEoImai; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id cw18-20020a170906c79200b0094eeaa360c2si16972711ejb.648.2023.04.30.08.45.30; Sun, 30 Apr 2023 08:45:30 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=mXEoImai; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9D5968BED4; Sun, 30 Apr 2023 18:45:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-64.mail.qq.com (out162-62-57-64.mail.qq.com [162.62.57.64]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43BC868BED4 for ; Sun, 30 Apr 2023 18:45:20 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869518; bh=wX3v0NmI65h5vqRkHeAaWySAePgEVyP7K0FvXlA3ljE=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=mXEoImaiO9bjBQpBY8xZwyPKRQuZiCiIj0J+SxudM5gV1y0kY8lAKxPGv0xX9XFD1 vckSyT5mqc+hANxD5nwncFU5b9FAohfVed3c9XzmhIsfabpdS28zPB53a2onSgDxEM 0yNYjL4TXuMrokyANIspT/GqUz9aCq7Z91HZUafE= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869157t9rp2b3kg Message-ID: X-QQ-XMAILINFO: OdIVOfqOaVcrxZmC6EvpFIwO2yX3Bbz4GKm/hg0w7EkmQzm9Asi6k5xWu8+ISC hhqsKhb43F3bbWclUitF64cyc8VnpXh3leGOOG1GUMad4ys8sjtFrX1yVR7WfPrV381QRCQ2/lBv PyTZIBzPbIxaliFCCmYl6YN46sH71BpW7JDDJDjQH8IXMAWhyM9OjUCtAmPL1wYiVnx0VrM9lU5b iDZ5iFL1HYDmNvk3VL0NmRMUdwVVDsQQtuYEbsmYZVJ3XUUijvuXYd8p3RS/EUq5jBzYSag6WG1C zVky5nAZpI8TQg+pa3qR68D5hWflvqs/wdRIv2GA1cftaoOoRdDZo93S4kxZBF803Hhn6K64CAzX qyXUjodtzArS6msdEbBXhRWSWZojbLVWj/KHkgGFJ+Vd5jZW9uWKAFlSFFe75EPmmDNbpK/DSm4/ FrHBOW3yMajw7h95yTDRx8Eoyg8jyOk3+8o89hoCzPs1a/g+gFbFoQhGaocIdpAmNW3HR80UfGa5 hiuYtgk3uqYTQ7tV7Tt3Fe/jaS/TcDExzu6AtWwwcuYsrhZl6gO9pyKyU6zVeeGYWhvGWJZQW5gN DEA90avoGOv24vW1d0rfWxFo5Uj1LmXQnUG9gxoPkmyYmV6UVIPuBc+1FmA9yi3MZq6L7TgUNnoE KR7HnQnmBzXivplnBLhd75DpN4rk49S25F1mF+bThhyQYAgj42IRfP4cenik1pSfoMDDfuOsxZKS btikya17CvVXnIfWt78jOZTNZPNKwVxMJmt/2lL1QplAmjHqSkvdA0nTZpTckbgSW1D+kxIJKYxB 69+YCB0lPtIQGKeR0bScyD32M40H5ao7zsrYpccywPRYCvvF9Ezh1wzjh6A0mpfflcRyLQt66Uhb nlmOxv4bxtlZLYv/t8RjYIMSXh63MVXegATbd320XQxqXbnQ/lzv9loe8Ng3WGQh+t++114Oo8Lf JGXn1GvbgRy1aVE9dD4PLR98T9nAr+5bDkUEcqmZz93576sBWbIkex38ssM3Pn From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:56 +0800 X-OQ-MSGID: <20230430153902.48405-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/10] avfilter/vf_dnn_classify: replace magic number by enum value 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: LXPrTKCL+hma From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/vf_dnn_classify.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c index d242aebcfb..c3f2762cf9 100644 --- a/libavfilter/vf_dnn_classify.c +++ b/libavfilter/vf_dnn_classify.c @@ -44,9 +44,9 @@ typedef struct DnnClassifyContext { #define OFFSET2(x) offsetof(DnnClassifyContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM static const AVOption dnn_classify_options[] = { - { "dnn_backend", "DNN backend", OFFSET(backend_type), AV_OPT_TYPE_INT, { .i64 = 2 }, INT_MIN, INT_MAX, FLAGS, "backend" }, + { "dnn_backend", "DNN backend", OFFSET(backend_type), AV_OPT_TYPE_INT, { .i64 = DNN_OV }, INT_MIN, INT_MAX, FLAGS, "backend" }, #if (CONFIG_LIBOPENVINO == 1) - { "openvino", "openvino backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, FLAGS, "backend" }, + { "openvino", "openvino backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = DNN_OV }, 0, 0, FLAGS, "backend" }, #endif DNN_COMMON_OPTIONS { "confidence", "threshold of confidence", OFFSET2(confidence), AV_OPT_TYPE_FLOAT, { .dbl = 0.5 }, 0, 1, FLAGS}, From patchwork Sun Apr 30 15:38:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41420 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675710pzb; Sun, 30 Apr 2023 08:39:59 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4lScFIT2GQYZLHh7GcL3ZGm9vpHBnLl05d/MV7Ktx3D1yDzogjNIXy+XPbXuuv5NGBO4tc X-Received: by 2002:a05:6402:18d:b0:509:d476:3a15 with SMTP id r13-20020a056402018d00b00509d4763a15mr3891050edv.12.1682869199264; Sun, 30 Apr 2023 08:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869199; cv=none; d=google.com; s=arc-20160816; b=MHEA5dHdnczSJNQ9QhNyFnESaFXWTmH+PS9f9URAgm9XdHqGFJlBJwq//xx13yuiFa wK+TizhIsUEtldK9VgZBCvwpXmnwpmGviDTGZ3Y1IHwiqZ85C8s/4WtXN4ecRwVF0Jcu krj7L0o8nYqVZbzbJqs99KiknROdVetabXMbM/4BwfQW6Q92belyKJiGk2MTCeGWPkLs Cwd+nlfZEyUZgnGIbITTS1ixfDuV8DdTJNHEGv1EFvR7g1G+3wEjL8Lk1zhVU+nPXO9C D85bwcepC/oeqmyhEuZuueQhawDtguhQ1B2WjZiozP21cnKks9CKSlbXhe2RPj7hTY/P pr5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=2fznmN1XfqqxFLLKeRixcmLLqsNNpqUUmX/4GEMVnww=; b=VLg47EaMwTxHTtMghKV+WF1ew08+pF1LJyrmz6kLLBYvVgjRTci5bdV64odj86AVTW /pvVYZEFpeB6cv6IEKGZBZ2CZ8xKrW8qYjhJwPb4zCPMNku1nuysguaLH0rQFWww4GpD NwSuxS5khEsVxKU1zBR2vo4wXOCMGKMRYElrG+WGHN40kI/BxX+h0EKYTSJOjy/mrTS3 UblXE6uTyxsH/AaSDVPOZ5cf7NuI/TjYA0kgWIuJC1urHyox6jERqanPkZvhCWw/FUgt 2Neoat730QhCmk0DKVvuFV1WjDkq9ivhJKcvTwj3eDrW+96riyjkRm607DVW3L/seABY S5fg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=rXMtGbc1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bo7-20020a0564020b2700b0050bc479a849si873774edb.672.2023.04.30.08.39.58; Sun, 30 Apr 2023 08:39:59 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=rXMtGbc1; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BE92C68C08D; Sun, 30 Apr 2023 18:39:34 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BBA7F68C074 for ; Sun, 30 Apr 2023 18:39:26 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869159; bh=PbRxbzhM0G3xh90jaTtz8oXjQHaZzlJVy7uOQ029UcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rXMtGbc1q0oso10pxhn3PYAznv8mU1dOR5ecYNeu41/zV3oQtK1mBddVFzR39rKpo EGW71EaTIJeoev13vPFHoWTpOolS9hsJt28NkqlIUFPQwOxShwvz39fnvt3ug4vp/m TzFeFcoIp4rx5kpFn0iQf9AGpyWVo+9yGVHXWCfs= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869158tdex58r38 Message-ID: X-QQ-XMAILINFO: NMGzQWUSIfvTjsXOlARvB1cjDgmxUOpVFVEFrE40218o7o5R3x8qFXXIBB5363 gV9g6k0RioHlCdrBaPeMIHQkUDY70KKwesCS6RvBveVG0Rfv4NmSlIkV6p4cE6bkz7fQVUcmMa98 2cRuDd7YUNdWFvhx5njil6Kg7daIE8FY7IPKYz6pwMGwDymLdWWZWNXTlmVHn091nlqLIb8jk89W f5xT8IrKUyA8zR7WVWmA61K/kamOni/TU0a9Awm4iHArmm0xg4By0OUKLhoKx8fE6dzx5SWL6W6f 3YGk4ly1aYTWqDyQrKltTzkamJ6Myurv7Jm+oeosFoy91PEcnku2k/LJZJUUdj9Rfb57CLOgPr0z ZEXnZWjZPyEkXLog4g4V4bGh84u/YF7rR6HJYdFQZsbEMIk95Ki8lkK9KAEvtx/wq5HHuYwQQUoF VKSrvsH+K389PZY8d9nnjOEYHl3elxAFbGaswt1HLOmP6mjgOvnLqmf6u1l115bIMNAWUSIhh31M SNy0qHtdeA4WXN+MP6bONK+oHVyPSlc93gwaLJexvRf8B4wOEkF9N1UfVRJf6WTgWJLMqE5mhUAE 6Of6c+NybF5FJxrV2/m+moEM/ucGo4ifcD4zCD1yBYiTWrVITzswTvLGbdrP7K1RsKlcuuzhQ7ps wWom2hc6IabzIxDh5G/PBU5NCGuRLE39qo+b2NVGkEWPHoaUu539w30H5U1b/HM2TLso5iT103Ls N+/os/lVwUGYh5rats4KNQ+3BMvube4va30wnLxriia5eULYHW/q933v+6P2F1F3Nw3q0v+hibGF AZ8yxvC7QbtABCnREdijgDlBiT2Fm2XQGO4Bjl4fFaxjckWu9zASk/u4JpQrSu8JbdC1vgcTejrz dpJrvAlcGGWTyLNWMePuIlRYqtyxro8KNyZU891cc+MGZjmIkKzfjM2g2hi6gy33wiHrH8IkR9An 6t4pfIzQJUYT7sanOyt3rhdBaTIkCbAQoRLvQy/kbA3Ebg4EOGhKei6f03q7le From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:57 +0800 X-OQ-MSGID: <20230430153902.48405-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/10] avfilter/vf_dnn_detect: replace magic number by enum value 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DSYKctnmNqkW From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/vf_dnn_detect.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index 7e133f6af5..06efce02a6 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -43,12 +43,12 @@ typedef struct DnnDetectContext { #define OFFSET2(x) offsetof(DnnDetectContext, x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM static const AVOption dnn_detect_options[] = { - { "dnn_backend", "DNN backend", OFFSET(backend_type), AV_OPT_TYPE_INT, { .i64 = 2 }, INT_MIN, INT_MAX, FLAGS, "backend" }, + { "dnn_backend", "DNN backend", OFFSET(backend_type), AV_OPT_TYPE_INT, { .i64 = DNN_OV }, INT_MIN, INT_MAX, FLAGS, "backend" }, #if (CONFIG_LIBTENSORFLOW == 1) - { "tensorflow", "tensorflow backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, "backend" }, + { "tensorflow", "tensorflow backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = DNN_TF }, 0, 0, FLAGS, "backend" }, #endif #if (CONFIG_LIBOPENVINO == 1) - { "openvino", "openvino backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, FLAGS, "backend" }, + { "openvino", "openvino backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = DNN_OV }, 0, 0, FLAGS, "backend" }, #endif DNN_COMMON_OPTIONS { "confidence", "threshold of confidence", OFFSET2(confidence), AV_OPT_TYPE_FLOAT, { .dbl = 0.5 }, 0, 1, FLAGS}, From patchwork Sun Apr 30 15:38:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41422 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675862pzb; Sun, 30 Apr 2023 08:40:19 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ62rQSPvo+F/lL07ijnskw6DC6Ga5UI634OO6kqV1V20NZUYipjrxFLBHkat1bgXaCKju9o X-Received: by 2002:a17:906:eec8:b0:956:fdb6:bc77 with SMTP id wu8-20020a170906eec800b00956fdb6bc77mr11214097ejb.30.1682869219220; Sun, 30 Apr 2023 08:40:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869219; cv=none; d=google.com; s=arc-20160816; b=ZOvNh2J8W8/yYBZmN+NZxC6bBKFOKZvg6AHSojaxIri4cVJY+XB4HoBnc5mZqzHS8X xKlEDIKJCT/QUAqvJpQZeqCEeyV1Tdjyc6xxcCL/LhpFcv04e48oBW61tCxH7PvhI/BI dO8t5kGgCCEn8/bwgiaqe1eQLnBhUZXPDrR04TFKwJf+oHdAZ1zKKZjrAJun+iSlWx8i Zk+Ly537TRnqA/acvj3b+S+foX+PFtj4GwbEfs+BP+YruIEd9kTjUR3RuST0wARBgoA3 KS3DevBkTD40Wx8HlKsx0qODJcIhdnV2ncN8C9xGf/DGzqkgP2QJD42cWZMnCRYjNAHK oAPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=sPukyy+jjUK25X2d8vVtNz7qc1ctEoDfyz4YFlexE1M=; b=VDNF9twkQ2w6WufctZdnX72Z5E3Az1kBFZUSFDmRsJ1gWqNB3HEE8R+P6iLRxiJHQG YFjPanjQRmtmZ5yB1ZqSTMzl43dJDviBg59/8WQgLRGl0HDJZX7evszBGaaXv9df58l/ ie9D18Ug4oECU/pQwYjbHxCSpU3rbvK4j5iIT4GCucOmSb7bBTmu426TP1VB7LYjY4Bf lAJ4F1M0T2SP/rcAXqM1AvbM9WVT8PmxqWBXl1VAgB3M8IsNTfsIFAoNvQfdsdHmC8vV Y7vrrJiUJdI4W4ysen2toEQHHBoA0uGRREGInF0dRTa1TrVb9mFkxxgUWvecuoNAP15C AjkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XMDmv3Rk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds16-20020a170907725000b0094f5777ef96si22476152ejc.1000.2023.04.30.08.40.18; Sun, 30 Apr 2023 08:40:19 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=XMDmv3Rk; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3D39A68C0A1; Sun, 30 Apr 2023 18:39:37 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-202.mail.qq.com (out203-205-221-202.mail.qq.com [203.205.221.202]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CD38168C085 for ; Sun, 30 Apr 2023 18:39:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869160; bh=ZccS5aWPgTJ40Iq4cagEru01+V4c0pzjKE/nDcpwbUo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XMDmv3RkhoNgNbBk3FZ+SxpECymV32w9Bi4spMpJssw+VwWQZScZuPoVh6a4XW1w2 fXyj45dPmOYXNeLMVxrmWdvhhxtoVO4vjoP1NxGhxa5kyqoMspIlV+MAiLoKx4nCmZ JitsCShbl7AMIwcG6oCHtz65lbPY7/X+17c8SBhQ= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869159t32lq83s1 Message-ID: X-QQ-XMAILINFO: OZZSS56D9fAjP6VYKisArUqIVXkDzw7AR38ePzknXzUzCYtgX+8f0QEGZ4Nbjx wSv/g2JEbcIyZQ6H/qXNw9ln/sLtvVj8MJ8h72sYzokmm2FKNr/MyCJ33USlFmK0RrNwNgjerUmm iQqYn80Pn9DBaEAyA4AZlUvjLw0Ye5sg0eQMCr5EIAjtkeCfUHSMmhTVcd3D+K6WyuK5fijylFAO QGcb31x99Zf1tiGLETY/X1XLo+ULBGmVtBP4t6ee5WgBa58aP21/DiutXlYCIOSxXAFE1SJTbGNW 0pgLQYzI5PrvSEK2/zC67HvhGTRrkkp2Di/Go1DDGLccs9NVY3TqDj2w+0TV4U9SAC+BH5Q+qYa1 Xly5EwPjoK6Wzl32beV3NZUHiXHUhQXZRdkjHGgoSEmxzDwGby2ORTa/anEblDds+Om1zGz2YuE1 3U3j+JPK6FMX2ePS4XQa8Bb+/SqJgmo128SaMaP2lMk7tAqAsEOgFQFefrO+mjD6+lOtn7qHn++l NiTfqO5Px++q4tsMZ6o2DRrzSZWJ37NTV6ulB8PSBOhXnWYtoBcZWjXgcwUFJ0ygFh8piMGt/nmO YcLtP5n1+M31NzsOukLfqNgeK8m6zfcn7kFoiVFVAgIYFt48plqsVCJH0ZntIlEdCezgNB+KxhU0 qw3CrPJOogpSxtk8niZPRnaG0Sr1jjTRJp2Yq3KBdTR0ZC5vSvtfuOgnNzeX5B99bzZjR8URHGCL Frq5iuZbtXh/huhkdn+YxYL1LWMDmtOHwnmVwi7iCsIwA/1+C82UnJCdWYNKnr7xTM/BBtxQEJWH cWYdaWqvjX/j8zZ+yvQXOTbf3vqDV5+gJsh+5Wem7fh+N3/Zs89TrncgBx62qXNvpkSZUdsVeOGR AIGHLsJqEmnro5NwWpLsQlf5KzyvGOfxQzRsp1nR4jyoH8vAHbvmuA5ykcB63OYtDrNY+CVVz+Bh aWP4VMsMpD2iuMHsouF/2hvD/27V5L/Ui9kqm6LhxE+RdZhGO7YVH7s9lSa3LE3TZiAS+LF0Y= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:58 +0800 X-OQ-MSGID: <20230430153902.48405-6-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/10] avfilter/vf_dnn_processing: replace magic number by enum value 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: DaUMfhki0QNC From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/vf_dnn_processing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavfilter/vf_dnn_processing.c b/libavfilter/vf_dnn_processing.c index 18ecf111fe..95c3e0b99b 100644 --- a/libavfilter/vf_dnn_processing.c +++ b/libavfilter/vf_dnn_processing.c @@ -45,12 +45,12 @@ typedef struct DnnProcessingContext { #define OFFSET(x) offsetof(DnnProcessingContext, dnnctx.x) #define FLAGS AV_OPT_FLAG_FILTERING_PARAM | AV_OPT_FLAG_VIDEO_PARAM static const AVOption dnn_processing_options[] = { - { "dnn_backend", "DNN backend", OFFSET(backend_type), AV_OPT_TYPE_INT, { .i64 = 1 }, INT_MIN, INT_MAX, FLAGS, "backend" }, + { "dnn_backend", "DNN backend", OFFSET(backend_type), AV_OPT_TYPE_INT, { .i64 = DNN_TF }, INT_MIN, INT_MAX, FLAGS, "backend" }, #if (CONFIG_LIBTENSORFLOW == 1) - { "tensorflow", "tensorflow backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, 0, 0, FLAGS, "backend" }, + { "tensorflow", "tensorflow backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = DNN_TF }, 0, 0, FLAGS, "backend" }, #endif #if (CONFIG_LIBOPENVINO == 1) - { "openvino", "openvino backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = 2 }, 0, 0, FLAGS, "backend" }, + { "openvino", "openvino backend flag", 0, AV_OPT_TYPE_CONST, { .i64 = DNN_OV }, 0, 0, FLAGS, "backend" }, #endif DNN_COMMON_OPTIONS { NULL } From patchwork Sun Apr 30 15:38:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41421 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675778pzb; Sun, 30 Apr 2023 08:40:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5fWAsPxv1CX6k3RUSVDhlmgkFGwv0KtFfkM2Rqwx7gEaZaMy2xG45VdmnLn1miz4ZxhX0W X-Received: by 2002:aa7:df84:0:b0:506:bd01:114d with SMTP id b4-20020aa7df84000000b00506bd01114dmr3589127edy.34.1682869209207; Sun, 30 Apr 2023 08:40:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869209; cv=none; d=google.com; s=arc-20160816; b=RsEIrxOf+dF8iL69VQ43RVPFMZujDxVuYvFcqKAwf0CCzlLfp7cGDgzC0b4SooaSWj D9zPwBZ/24nDZeUzarL43BhtjRsmHXoZ73O859eGVorJJVzPVzeTXl6SIqJBNEhyr7B0 7eSLBe+1qaEhGbZ8Yqe6QgDn5kHekjgp64BGFn5Malai+wlyXflE/Ya9fMncrnDo2soq iOjmPocCTee9mFTWHCMvOEn1BP0KMbNDs4CSeqOwf5DFrdfIz0Mlt0BbJ+ydNld4tdlU F+3p3cUKJGKF376Ags5P4eIFk7OhkjpVw6ag67hBiTP5hK/CKAS+euC8onepjFho/xTH 846w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=9LJNTGFRB1wrYr+Ixj7Yp75pHT5Hs98Ez1kPxvbXzTo=; b=h71f/0Esk+h16nxMoSEuxk1GqaWBCslB0WiH9mrJghyJnnYyn4XkEKXAvJeYS3GAhy rQc+uLaXjvC8ER2ErHq0ygBhLTjrqWkf1tONllg1NdzPm41RT2lumpRHs5CIwJghphAS S7/1pux83OS5scHUB8B40yn2gcnYrashb4U7RQWVAIjqDRPThTTFT+5JHyMWZNFpUH/Q RuyaAbZfrFrZ2GFGqIywkys4sCCB46+EZz0U9x5GNhaseJ9pcHLzBKoZL5FgEG/lJ4SL ziI6cl15o1U8HVlBlo7uGsgma2ZnJMV2xfY+3hAeKTVkjAm2y4KFcs6ENNxOpGrB2qxI ohfQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="Bgem/Oqr"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p24-20020a056402075800b00506a8071d27si20792140edy.554.2023.04.30.08.40.08; Sun, 30 Apr 2023 08:40:09 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="Bgem/Oqr"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C82E268C074; Sun, 30 Apr 2023 18:39:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5349468C082 for ; Sun, 30 Apr 2023 18:39:28 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869161; bh=kCkqJ377X8lSqTUXgxPIz7K0a8sjLkvpySgDgmYphSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Bgem/Oqr4maRuk0tULR+eL3L4jtkoCrroG6e+2a1oQxj4adTYjVvwvvUSMURi8mpz /Sb72MsJytvWkHaSNBlxHrWRf/lfaXclKAJhX+Sw1ITDZzyvRoi+xCN3mMvN0Ginpm InB0zEWyC3EjjA8d/3sArgETo6Wopary4FICK33Q= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869160tbv3zeb36 Message-ID: X-QQ-XMAILINFO: OKkKo7I1HxIeOSnbYJQ9ANoRiBa66+zNNZsjlS2o0IMiKz9OzaEcujIlxQ0+NR PeOAz3/NuAktQwyToW0CNsWFXSow5NlbN9qvO+lvsI51uf5CyHL8hLNDMVHXgp8tggcDV1poU2il VVh3xWy4Aj6RJhJdYnAAyUy4K8x6cSW7zPZxLOf4Sn5MRjp76UvSl6OQVx6R+DlCYmkUXSXLrWGL ztYT4Ax//YO9fr8yh6MUrnr7iK+rNHVr0br1UrbljVJiFRttny/IXUuiQIG3mDi/pwjIiK775HoL zIdcjKbUU5lehTvkVpwj63KBXb/egPY26eLAEqohYzBfameHXnTGy5Q3/DgsI7DpxmdOfAKIIoXZ 9wQb0QiyD5i+14nL+LGBB20htrZY5rXNyvZ95YaUB4a6w+2mtC8FcWknvx8gPhPFoavExgSeh6/I krRLxrCZKeT4Q2kb4KFltmpI56Ojb755oHZ7bUIF4PWlfov4V1pIRCzIq9nnfKRSxS6ulxloD9VR XDVJX5e3pwQDLigyEgFCvt/d80DmPGv87C4XmtTCJJ8LCsG2UzrUVbH5ZrmuMOA2/idNmgxpJCeE rALajFbjc6oCY6nWDVxJenPLZAWIrdhNsd5P2szJgORvU2Zv592fDvDUzjx+uPeBwtW+L1EdnCTj NSCiDNnRk5az/hEhSOEt5CClq7QOMBPZ0IC9D75PghOyhVCeHth0We1WgfvoTtOa/C8BTDymwfv+ 41YaDR/oK1SBtv899r82+ELs3y2SWDy7KaNuVNXuQnn/HPslzLJdgzsX1CINZFnwvjgeTll9oNTG M7kUo4qBrSS9vklNuQiF6VdF/on5Pn6KRRuLr86HH3y9T0gzNATsk9qV2eKwI1aHMRztrMVJZaBA CyUm1mDazEzzvBF9eDMeIN9PYAlv7WmJimHVrlFp2SybyN7lbUoQXSFEJ8+apvdwoc78jKFm2Nwp ktYK0FrFBOU5ruGCB8TqLmBO+t2EPv2WEMLo+KGzQ= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:38:59 +0800 X-OQ-MSGID: <20230430153902.48405-7-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 07/10] avfilter/dnn_backend_tf: remove unused define 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /83QdBcbDUck From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_tf.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index e6ebd17595..74fe06d6fb 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -474,8 +474,6 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) return 0; } -#define NAME_BUFFER_SIZE 256 - static void dnn_free_model_tf(DNNModel **model) { TFModel *tf_model; From patchwork Sun Apr 30 15:39:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675975pzb; Sun, 30 Apr 2023 08:40:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4oQVMgUgbsYS3b67ETUVH9QXxmoPO0Rx7/OGyQwkNVS+k7ndUuk1FazcqqG2hXBmEgDCLy X-Received: by 2002:a05:6402:456:b0:4fc:725:e670 with SMTP id p22-20020a056402045600b004fc0725e670mr4277105edw.11.1682869237542; Sun, 30 Apr 2023 08:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869237; cv=none; d=google.com; s=arc-20160816; b=nzhyqgs6xtImUsGrK69Y69ICCQqCFlZtwr2u8sAWuTkjxCj8kG2FsuGEa7UKwzOs2M PH7c3GU04A7iUzqSGLJqmwpLr/64hg7MgMHgEYkNRGc+vRp+uZZ8P6y5ND5oqQn7//aK 6tIEj/ZMzKA8pAmL5X1bDR8qpAd1XcB9GWCs6pWGsWoVOQG2n+D2zoNSavNZmOYWGcIX VvAYxPsqFMb/9damy5+xalPQGowQNKPAJnBhd0E+OSLjZDXGBDX42jHviMgpk/btCS2F JWN5WBhHSbpnUTf3ESfNtfapDlRPvUl4QJpcPVmOimeuZTX+ZAcb3C4kv8T2TeaC8uxl vETA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=sjP09PpmdpLIk05H9+jbHd29JZRd78KZUORSUiHqL/0=; b=IC/AGBK/qg00ute1mPVdqZHEzWFpLwT1lCxvd0VTds3MUvdXLIH9C0AHXrXMz4NvxH InE7g1t+T4nKBZiWVJY9bm26vK9V5eeSqC5Wp/nk3ontv4Qh5gJFbcG/cVaVUElx39nl dduXgJnf3isPXy1QW09BmLH4e/oo+36kFW326sruxSJcRN3QJlIPWfXOkF1rliDPe47I 2nDcYvH/wuffh2ElKLFvzyDy7AKcjKuv4QiKbeCttM4mcse9tuurEqA88/MKUhRq3uDX 4jj6j4bvQmNGjJWFWp1QBQ2bOUl/yCyQ1UEEkQYOohZbNRhxFj5v1yIx55b5HUHCDK9O wqDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="pN7aL4/I"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d26-20020a50fb1a000000b0050281b75a38si18428447edq.386.2023.04.30.08.40.37; Sun, 30 Apr 2023 08:40:37 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="pN7aL4/I"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F48F68C0AC; Sun, 30 Apr 2023 18:39:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-87.mail.qq.com (out162-62-57-87.mail.qq.com [162.62.57.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1121768C086 for ; Sun, 30 Apr 2023 18:39:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869162; bh=kjEox5FCXrdbi6lBIcgorjAwZjuSsOeNjlQ4GP+5j5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pN7aL4/I2iJnB/J8/wVvgLFuehDRiy1A4L1NA2KFOfNi2IOjzwSpn5YH/Mwygg/M3 n9yUcJO5HL0nK5MgX4Lp3lDvUMIiZOOpzuASwbbR46S5C+Aybo/Ad8mQJHsnqsfj1R iuVI96QgO89VmTVqrS4FkhTC9KI8Dex/CMBrk/10= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869161tsh0bkhb0 Message-ID: X-QQ-XMAILINFO: OKkKo7I1HxIeOSnbYJQ9ANoDceZtZtC7YdDvC379WT67tudAz+DFbFszhMdxxj LIvDvPxbJ+HIEXzLiJWS6ynCdeE35ZlolWsEGywbzC7kY1lyWB/zHHITyz/g5H4NPShqnZL1vJ28 +VTaU33U9++MSOpuAifeeZdBRx7wVgOxhfxBvCbD9RvgWZjJPSVl5p7fBijLlHOOJ9HqQFQyc9xq GJqYvpPboAzUKNx2gjYMIFELcEabnL73N2crbGKqP5xGXBT+lKtSNBbkBNoPvDX/U1iTioHq70P9 k6tCcC0l5uFERO0lINRlZOK89uYkn9m5Y06NInDd1hZHsaFBW9S+zLET8pWNcePlN4dg6xeJBdLb V3gHhfO9gCux6R1sdidCvqkckJ9vLzM4OQQieCqcTxYYEJfyNTPpcvlARYcYdplwnotQJAu8RSjV EMDi5ZJt0WZTw6kJFas+yQfzuW146CTxNg/oS/df9i4fwcRzDnoTCfV4l8+thSMmfHjeAu5McPwu SHhXnhI1/EmNDGq7z0rjRkimjOxtp/aDqne3JZXPvGaEiXs6BzUSguyIa67fYC92yUjsnP1j8ttl MnyUXInRHZLsA8D7ibsrQ1vmNmtqNXJ497j1g7CXD0NeBTiJc0an3xIO3ga4eRTRqS3/kiH3l7MQ zHsxr3Sguztu61yiHJf/NxDwyx8oTKr4yh7Z7yofUv5pClD11cc9AfTgb9qNua9VlRCD6EXoYJb2 C/p/SC5D/2vqGdIWareo9Oq+WLDDf195AUIYloDQ/KOT1iXgLxJBNBmpoelhNAnCnUfj8WFHokJ7 4SksT50TYxJxYLNEMuMMhvjy1riNVHfNSznW/nYzLnf2bYwx0DWsUz0i/O+ZtILZs1bcfo6nnmpn KcbPFDsVh31uBXvGk9fPdeT/2mhvZSZgu4Q9Nvt67nAHapPDWth/vD8oQ1YemBXR5sj3titqeKfg QHOHFflkCx305eJhsNjKVPprR6rmG0PvAyJpw8ngOpEdEt6sKKTLpdn7uaWyOY From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:39:00 +0800 X-OQ-MSGID: <20230430153902.48405-8-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] avfilter/dnn_backend_tf: check TF_OperationOutputType return value 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7OkMZ30rmbai From: Zhao Zhili This also fixed a warning: implicit conversion from enumeration type 'TF_DataType' (aka 'enum TF_DataType') to different enumeration type 'DNNDataType'. Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_tf.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 74fe06d6fb..552a9f2fa1 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -274,6 +274,7 @@ static int get_input_tf(void *model, DNNData *input, const char *input_name) TFModel *tf_model = model; TFContext *ctx = &tf_model->ctx; TF_Status *status; + TF_DataType dt; int64_t dims[4]; TF_Output tf_output; @@ -284,7 +285,18 @@ static int get_input_tf(void *model, DNNData *input, const char *input_name) } tf_output.index = 0; - input->dt = TF_OperationOutputType(tf_output); + dt = TF_OperationOutputType(tf_output); + switch (dt) { + case TF_FLOAT: + input->dt = DNN_FLOAT; + break; + case TF_UINT8: + input->dt = DNN_UINT8; + break; + default: + av_log(ctx, AV_LOG_ERROR, "Unsupported output type %d in model\n", dt); + return AVERROR(EINVAL); + } input->order = DCO_RGB; status = TF_NewStatus(); From patchwork Sun Apr 30 15:39:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2676031pzb; Sun, 30 Apr 2023 08:40:46 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6gCb16QAr99HzktgrQWIYqmz7zr8QN+F48T+ImXVFNXTac6gRsoFBMeKmV5gRT7Dhryups X-Received: by 2002:a17:907:2d8f:b0:94e:e039:98cc with SMTP id gt15-20020a1709072d8f00b0094ee03998ccmr12823583ejc.42.1682869246702; Sun, 30 Apr 2023 08:40:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869246; cv=none; d=google.com; s=arc-20160816; b=HTMO1nOwIDICtmwhBEp1p27UsRdgavXejJCWSnYz0WjPtfmw5m7oYcXEob42XIrHib zJVCdYOyoGBpiY8ndTCVNGeNGKv53weA080t51afioUE1y15B7IHZgje62ayKuNVwq1Q 01ucd6OSAnFCmeGUGiU4lI+XGYtCp05vu24ciUxnAO3zE/6Es5flF5CTKZ373y6iHKBL 4TI6FUeQk3ZLo9oGh7AiywEO6XeQ1gP+p/uUZbLprM7TK2BVmJJZkaIjpC4PClYlcbnh JxedwfNRheAwc2dQY8ltLaucxp3Y0U8RAdQWsjA0O5rd/sNnHIuNWQ9u8smzZFQPFr/Y wZbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=WP88cjzMfZvC0Zki5YhQlHBnWnYrb63cxFmob1Xnu4U=; b=kp7SjRC+FabICYoXEArOqyO4XF+dY1JGGsNvl6uilFtYipjc9eTmm5PEHFukDj/Qvj nJm/eJ5+Em7DPMhofPf7h7Kpwy4e60JabfjS2oIs50nNjJkK4mTKy8LoJtHQnvQaV8T3 AyzTRe58vTdxDIoLR8eA/0pgyXNReO0QkvcgeOGjYQmhs/iudBobxEQfa+v0Bu53Ewlt 10T+7fJ97Ajhxppvn0Ird3JuIbf6pksDLovXw6qv36i2MPwaAb6w09/oMCSNIS3cJ7Jr HkIJ9EyO//mgB/uppFgVSsluV32G4Nsl1roP2XH9w8PKBg6mkIPgsQL8MPOiNFPx+lJQ aJ1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=HgUiz3vN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id v19-20020aa7d813000000b0050bc68c8f68si68462edq.61.2023.04.30.08.40.46; Sun, 30 Apr 2023 08:40:46 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=HgUiz3vN; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4247268C0B5; Sun, 30 Apr 2023 18:39:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-211.mail.qq.com (out162-62-58-211.mail.qq.com [162.62.58.211]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B92C968C096 for ; Sun, 30 Apr 2023 18:39:30 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869163; bh=qyfwoNZp8fzOcbaJH+Yqs1qYM9XDoxZ0r6hNmYXXBzU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=HgUiz3vNttURzMA8yO5JvLZVBT2Xy8mXx9yvtGmoXqEs+Ny94Zntvy00IdID1j5oy OrxsMZOtD5M2DtjAtjtWzwsJNMOiBcUzNOjfEjeWIlNAHaB4x/urqnTS7/GNMEGr6T LR/koiWdWO6QLkhjlGfdi6nZHLf5QCzfL7ZOzx9E= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869161txcy85o6s Message-ID: X-QQ-XMAILINFO: OQhZ3T0tjf0a4rQe3c9aSHDjkx8wIKP5HH+W4F4LaFn035DVAEjg/RDwpyor9S y6Qq1nh3ed5QAu8dK6N0WkXBGRije8dM3PZO28R3q7RxHA/e4hg+uydqj8Ndo1EDuI4hCnJ669zF 5tQSiMbuHW+xFwUqHBKIbKJ3qmn57AiGGZ5vPhvOSnaCi91pRQOsnjuPv+1D9zQTeoq0qUe+Gq+0 X4dfIBeyKtX7DzqpAsGVQOAEdBaz3O9IXL7dJLd8CKXLpZmDGTVxIiVQwQbnHsDTtMGIYT+GquB8 rK2Jsq8FUZpHy6fOYAiP6dX8RpJGqQ5WfSgacAf8r0e/AAf3JahvZh/7ddvibi34GklVpE6Ok5RE s2OCq4ks+upsjgZ8tUXPxdAxVBbtuA+5y6rTVKm8/HXrsthC5TkcFRxqiTfjrs8k7BpUrK+AFGC6 K4JLFC8E+idVmrSCynbE4zGXUEIpC2MJKQ7hRabuRLiVhIUH557CAQDEiupqw8UxOMcUpEzCCwEo iLwOhO+R5mNBTw9oAyzNkV4l0PtUk1m2yYChsmm91HZUfDSylaxI9DmrIOBN8J68G+EgvIsgSnNG ixXE0TkcCtkZVMcnGrRhEnAK2jfQFVw4d0LbruYVIB/XCiJU4259HjdxFuT3QvYOdn4ID8Tiu8J0 k2EsOVpASwGJnS/qU1d+7FDYMFICHSQLs2/FRwaqs5Y8M+UTZ85wCDdFQpKdNZ3nm/ghWefCzRNS OV+AzNLnzgcnKgmlRODC+4Y+bx2Hd8LvdUiPhQEBpI72N7OanxK1ppVxWObusd+XIoqBEqCFkqjR vpcCOK0DoPwRzq4715t49AMNFa/0f1LscIIrS7FOTLGu+GxD/Grw2Xr7KdvWq2sY5sRl3kFghrgA sgpbSxzxo8riO+9tm22FqGbyZjb4KobY8/6ZGt/R1DnzQkg+QhBrbeH+TG0dZZn+CLuiBSWt3zjo k7dDGDZGHUMe1pv4c5uacFt/zmej/+TyunK6otz663BNpeGXc6F4lZsGDDeiDzdA13BFKBt4s= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:39:01 +0800 X-OQ-MSGID: <20230430153902.48405-9-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 09/10] avfilter/dnn_backend_tf: fix use of uninitialized value 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: t9sQEuhkCjSq From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_tf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 552a9f2fa1..c15f1a7d3b 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -625,7 +625,7 @@ static int fill_model_input_tf(TFModel *tf_model, TFRequestItem *request) { DNNData input; LastLevelTaskItem *lltask; TaskItem *task; - TFInferRequest *infer_request; + TFInferRequest *infer_request = NULL; TFContext *ctx = &tf_model->ctx; int ret = 0; From patchwork Sun Apr 30 15:39:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41423 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675905pzb; Sun, 30 Apr 2023 08:40:28 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5QPPQED60F1poywHJ0lgtm7A5z2RHixDiBA/0qy08s8uW2Np4PjTago1zGtshSoioW1C3s X-Received: by 2002:a05:6402:1ac6:b0:4fe:ddf:8d8c with SMTP id ba6-20020a0564021ac600b004fe0ddf8d8cmr3205070edb.13.1682869228455; Sun, 30 Apr 2023 08:40:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869228; cv=none; d=google.com; s=arc-20160816; b=gYmXdLWBf1xAzUbrtn7sy3kZVyJC2DD4uqVi12pVlfdRymPYYuyqfRb0U/caxBxDsI dDLkOggYoaFCOeQzL9xODRIez7n6bBrOG5D9ied7zeh7cyvAN7VH2jx9oxiEMn25e39j SMLttcX4DtICZsW4YUtFlfU/T6Nn7/sH1l3A/FPhrbWsTCrx/Zso1cSRsM4wbPqhkFmW gQNkkuFLI17cTCpL5CT/yX9Xh0mTEYNY1VJGkL6+I3u2dTohPw7dLR672JLnYAenWv2p jFmtoqvjSND4b3FNfDlGghnpcxM8pHpJEoHQsxN0QTB1UV4aVDumOXvr3d24xaPLTp4Y PFaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=oTKm29+Mo6ngMw101JEZ0f7/IVZMjvMCnH/oJFEwQys=; b=pH3JNHB1ASE5+4opgQ/z5mTPWQmHWhi26n93o8VjBHmF12MbSHBuJpJ/W5S7+1DqGT vOQROEGbQKWrVU4+rjijam6cGWUdSTPpu+CgnXWpdJ65iCs36ZW7p+z0SmyaCBTB5OQO XRFAajwRajKES0rsU54AzvdkFsioCoQdKo/7iup616o2p7t+WSXRqbxBrTdD5y9KOGKO BTprzCyUvVv2tCg0NRWjsGMebh1sn2xL/UsOOKp0GRwjHTV7e0hIXz1RmhnfHr5pl1LI Rp5j2nTpIVBi6BMil+loQCq928YONbhu/Rqmg8p8xlgYw7PXd7SCX/OBufUAtf7FoMw6 BTBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=vIIA0PDi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id n24-20020a05640206d800b00504bad84433si19464303edy.203.2023.04.30.08.40.28; Sun, 30 Apr 2023 08:40:28 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=vIIA0PDi; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2806368C0A7; Sun, 30 Apr 2023 18:39:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-251-53.mail.qq.com (out203-205-251-53.mail.qq.com [203.205.251.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D17D568C086 for ; Sun, 30 Apr 2023 18:39:33 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869164; bh=3Jazqf1K7txBOK4u/VusD2oVwEct9ZYyYQUw1S4nOGc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=vIIA0PDijNJa1cjNnMcJldeJy85dSTrElZ6RUECFGYJT84pb1zKspNyE2F0k6J0KQ wObipyuKohO/XfJvQVlvAP+YeVZkfN7Zeqvk9qoV+FNuVqulz7jYDF/icMc+HfwKtJ bnQ+DjhK1cweceRzR/kY8dy5HhQZK+pUJuDG6Pwg= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869162twefk37em Message-ID: X-QQ-XMAILINFO: MBhxx2BUoWsxz9QhFTdbyCEVOz7MSOwUWa5rtsjNLtsSc/LtQGwsmAtyqmAABe yQC77I8ze8vTIt5eNUYYAkzsm2n+/bG4OhcB3Ar/reADATfz+Cq5x5+FBDdh5/xyJE4Du/hYpwXm Oo5VYHLB6492161rMgAvoucliUSpbMVahwMik377PK35bIUyhaiT3VVLfd3rDHqiOyIRMb2b39Ve tDXMbW/nYWn5rB/Wv7Dgz8Li8YIaROLk+38aDUqbPPNQMtc/w6uMZYax61WJkILzHiH1oIPvc9qc onHHfwryrWhzdTlQrAm+v9u9BMW3hyeMqt3owNUjx+rj5FxzYmBT5F4zw21IbCtceinPuRnpQnHN eUx8xRnGN3vE1Z8gdr6JWqqprx88kEkIEiJlPQYaSswgh1Ft/IuXWPWog6LvKlToH4GP8njIeeiQ /ts4NrvBYr72+aCKuldXEC09dNoquxjlXViLNckKsye4ZK2wDFiNay758g7SFMLkMVTDNUEp7UQL BlxkM2i1Iim43cpRifyS1NAgC7W1h+/i6JHXrdz6Iij4SHRW1sllJyJZCDy4HIBoc53vBeMtl8xe 7YUw4ctwBZACi/z7So5+irsWw00EtsiuH9SmK9UaOIVtA8lRYZnVYow14XkKhL3FHalYpKE8817x mKE/lPhBUdNgM9ZrvgjQNL+vEL/cxVTixYGLvVzOkLoO/0O+3l6iMm5XgA5iCjuKMa4fcWlCUpBj Zb+BRwGh/mu3KTESyNRds2AgsGON+HnJ/JKp/WJVf7hr98cdZQ/gA0d6dUHn28pvlkem5J4N1oVq AIrR2KVFywau/nT8TzSPwdyrGslF8snyt4P+0d5xzejGMmA6FhAbECa2X9T4eleVD7lTOk2Y5FqK rQ1+nVHFzHwoGadcLf6uI6xyhIk6hgmiMaqS2Th3fO1caWo8V6ZTM9V9qe8cbMBcbiZpoCMMXD6v Q1UIdPdSlBes9qJw1tY6WFug8OI+H+GZnpnl58oCfdvTMeLB8077gk4bJ80BRmW54E2YlulHQZqa ppsEEdhQ== From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:39:02 +0800 X-OQ-MSGID: <20230430153902.48405-10-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/10] avfilter/dnn_backend_tf: silence implicit cast warning 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 Cc: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 5of4ZtjPxW4q From: Zhao Zhili Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_tf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index c15f1a7d3b..b521de7fbe 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -735,7 +735,7 @@ static void infer_completion_callback(void *args) { outputs[i].width = TF_Dim(infer_request->output_tensors[i], 2); outputs[i].channels = TF_Dim(infer_request->output_tensors[i], 3); outputs[i].data = TF_TensorData(infer_request->output_tensors[i]); - outputs[i].dt = TF_TensorType(infer_request->output_tensors[i]); + outputs[i].dt = (DNNDataType)TF_TensorType(infer_request->output_tensors[i]); } switch (tf_model->model->func_type) { case DFT_PROCESS_FRAME: