From: Zhao Zhili <quinkblack@foxmail.com>
To: ffmpeg-devel@ffmpeg.org
Cc: Zhao Zhili <zhilizhao@tencent.com>
Subject: [FFmpeg-devel] [PATCH WIP 4/9] avfilter/dnn_backend_tf: Remove one level of indentation
Date: Sun, 28 Apr 2024 00:41:54 +0800
Message-ID: <tencent_85D51EA70838AC16584D2A200ECDD24FBB07@qq.com> (raw)
In-Reply-To: <20240427164159.82771-1-quinkblack@foxmail.com>
From: Zhao Zhili <zhilizhao@tencent.com>
---
libavfilter/dnn/dnn_backend_tf.c | 63 ++++++++++++++++----------------
1 file changed, 32 insertions(+), 31 deletions(-)
diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c
index d24591b90b..60f9e57fb7 100644
--- a/libavfilter/dnn/dnn_backend_tf.c
+++ b/libavfilter/dnn/dnn_backend_tf.c
@@ -483,41 +483,42 @@ 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);
+ if (!model || !*model)
+ return;
- 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);
+ 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->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);
+ 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);
- 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);
+ 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(DnnContext *ctx, DNNFunctionType func_type, AVFilterContext *filter_ctx)
--
2.34.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
next prev parent reply other threads:[~2024-04-27 16:43 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20240427164159.82771-1-quinkblack@foxmail.com>
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 1/9] avfilter/dnn: Refactor DNN parameter configuration system Zhao Zhili
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 2/9] avfilter/dnn_backend_openvino: Fix free context at random place Zhao Zhili
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 3/9] avfilter/dnn_backend_openvino: simplify memory allocation Zhao Zhili
2024-04-27 16:41 ` Zhao Zhili [this message]
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 5/9] avfilter/dnn_backend_tf: Fix free context at random place Zhao Zhili
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 6/9] avfilter/dnn_backend_tf: Simplify memory allocation Zhao Zhili
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 7/9] avfilter/dnn_backend_torch: " Zhao Zhili
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 8/9] avfilter/dnn: Remove a level of dereference Zhao Zhili
2024-04-27 16:41 ` [FFmpeg-devel] [PATCH WIP 9/9] avfilter/dnn: Use dnn_backend_info_list to search for dnn module Zhao Zhili
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_85D51EA70838AC16584D2A200ECDD24FBB07@qq.com \
--to=quinkblack@foxmail.com \
--cc=ffmpeg-devel@ffmpeg.org \
--cc=zhilizhao@tencent.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git