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 787624541F for ; Sun, 30 Apr 2023 15:39:46 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6117768C079; Sun, 30 Apr 2023 18:39:33 +0300 (EEST) 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 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: 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 -- 2.40.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".