From patchwork Sat Apr 27 16:41:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 48302 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:1509:b0:1a9:af23:56c1 with SMTP id nq9csp1070173pzb; Sat, 27 Apr 2024 09:43:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWnMNRrwPy95T/YjJegVHcEgrO6wkeNdeinzqlo2J9tQNWXzZB5tBO+ynH8wTr0fanJD1AiY203PDd8WxYrQlvcfLX8H1g8pNDqtg== X-Google-Smtp-Source: AGHT+IEtcR4SnWCcdB2XazM5StvntXd5ybkjrvYBb5w3uut5ncgN/yo0IXlisIdhpHSdGPyHaW1F X-Received: by 2002:a50:f69e:0:b0:572:7b2b:d96a with SMTP id d30-20020a50f69e000000b005727b2bd96amr76954edn.16.1714236206331; Sat, 27 Apr 2024 09:43:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1714236206; cv=none; d=google.com; s=arc-20160816; b=fQZIaL7Z2kXrfFbdmmDjc8I/X7d8BQeKifYcZA9FmjExP/Oh4DnZt7d6o/wOnyMcfI 9SXkkh7CfY8TnyCEA9IsfS234+Iv3acsJZWeb2Rwvc+y4UUUgixbG1GDl+j5zBw/s8yR +lYfIYw7dUZcam4w2ugAx+oBTA+ZFD6X2/BiU3x8N/UHPhMT6oAVnlxKfmI+SIy0sK9I w/gbw8VyJ1Sx/zY5X7ERiOA4y5ijLG4D7Zip/kWllPsXfw4T5jEKzAOG1M96STV6bzS6 rnTTPnGuxOrBkamb2viNBTLjq76KPsb7e4edPketyZvS40BPDma1qPiBlmFsRGllUErF QKAw== 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=NcKvnJKy5P1JY93GJJGukbJqA5i2KQRq3fnAHueqrIo=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=maWaYsDG4lK+msTr3FX4rSzfhOrUuoh91OloE3D0P6XEOhheLLQvSSQmSDUNoJ3V5Q dooezrOw6AdqcZYiIH/H2qftJRLcRVAYEqvlcd8EgRNAWtVeRyWz9LP3OE/VsZRfdSSk i/ZCpyzlTZ9rMbbHfHkmFhxseMBZErWPAbUbHosa9JHOdiXCNlwUouGoVtGmc/ubTor/ RzbR5yj/eiSauF7hqjHtyPgHDsk6NrtuZGnR+g7JnBfydSq92lCdEZBWtytO8jlY8EC1 erlu9zuTSWMt5YkcFtXdIhB5ZecNriajlMG5bSb0hhsD0L6bMoCLOfuxWItVanintHks jClA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=LfQH5xNy; 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 a15-20020a05640213cf00b005726b196fb9si1067454edx.510.2024.04.27.09.43.26; Sat, 27 Apr 2024 09:43:26 -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=LfQH5xNy; 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 E0A8968D405; Sat, 27 Apr 2024 19:42:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-210.mail.qq.com (out203-205-221-210.mail.qq.com [203.205.221.210]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 012E668D2AB for ; Sat, 27 Apr 2024 19:42:14 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1714236125; bh=ij3BuPB+1SDO4TrQLufpRme6GURUZXSvBIfypWPgQBQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LfQH5xNyw/Fu9XHG7thLHFNCJnDhNdpz6ycLOPHYG4mSWJ+uAD+Eg/uKTIVtnUtHt C9gL8N9VF6Z3iy3YyII8wXjXEOb5BWToY/D6YHyMwkPdbsaykheKW/EdkZfSkqaTf2 pbcmonFWDJRnUbOtucAzCVwLhJI98jrizqdPgqU8= Received: from localhost.localdomain ([113.118.107.199]) by newxmesmtplogicsvrszc19-0.qq.com (NewEsmtp) with SMTP id A8200E2A; Sun, 28 Apr 2024 00:42:02 +0800 X-QQ-mid: xmsmtpt1714236124tv0wjsslv Message-ID: X-QQ-XMAILINFO: MK5U7QanZrCwSEL0746FVDmNNenX6OzdoJquzX76WyhSRMPmoBYA3ZYzkdc9Vl A1kVEWV/dTY86wlbCYaM/UDNaN7vpmLbCfBSSTDAHoAZy3XH5gbh7zvcnYTeVJPiVpyIAwnToS3B J6e+ius09cxxuQu8d0V5u4WlubiSK3MjVpewxrcBKliwl5HjuhoZevKcZfHTcUcqQ/UfxwG3r9JX bz0dC98C5FD1zkpGBUhZqIMF3SNew6DU29XBHUa8W62tL5FCiur7Vl6smI64y9H/22CAslbhHgpz RVWELCeDee1nn5O/jhx1vSLiag6MO7XijEo5FgZeFh8hVtseFINPlbytHvDJ5urkvA0jnBX/uy2J YG4nONK0uFLPoj+xnjbmrcZKHFk2P1xjZSoGPca6auoUdmE2jxcbeHHj0FGFK18Pnz4F+xNN8LE7 c7RMACo1Yl7JM9ZwYprQvSqoanEbjexLsKnhYweDjOvyOVz5ghwbrZznk27mtKN6tUp6k1HGF9Al 91hxaDpW7c/0cC/JJ5b9fvkj0Iu6OlmdUoAvPx1y8Y3Bi0zbOstztfxKKdneb0L/Scu9Ho6hq6WT 876oX/D7p2nHv17Sg1oM+/++BT54IkwYM1ZO05a2hErKrVBWEyePl/kLyNQ9EMoRNR7v0XgqWOlf TK4JEneugJPp+NHun8yg3703s3OdRUMMF5csdiHf2AcKvjRqwOmsAVCIH6LcsVR9NJ4PxUIHkMQ7 d2YCmcrAASvZVJQMa1SBRjswKTWNlNvPhg6dqyZ4fS/5uoGD5v4q1OBmNKP3iQwWrMyRnfdIJNVt bxXV0tu89yzvj0hw5obB3+Tvvohc81NCqSScVtivhAIMVjTc/Xp7HeTjPAdMbjtCipP6Gfpu+x1d jfHYQqLaQiSjsrly9gBOj1F5VJ5Sz8Sxsm2A3r6jrVWna7tV2dV3kFG/SsAwf6iayen28iacqYGT Zciszu896TB6Aj8iYM/LD1EZdoT4jCYWWEq4xptVg= X-QQ-XMRINFO: OWPUhxQsoeAVDbp3OJHYyFg= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 28 Apr 2024 00:41:54 +0800 X-OQ-MSGID: <20240427164159.82771-5-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240427164159.82771-1-quinkblack@foxmail.com> References: <20240427164159.82771-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH WIP 4/9] avfilter/dnn_backend_tf: Remove one level of indentation 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: nUmJ7bo4n1cT From: Zhao Zhili --- 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)