From patchwork Sat Sep 2 08:23: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: 43458 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4f16:b0:149:dfde:5c0a with SMTP id gi22csp55687pzb; Sat, 2 Sep 2023 01:25:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGQE3vRO55CG2E26TCyZMMu7ZLOmLaVPpLCTBGyOmyvtsOabnz7XgOPgPUgwHBQSVYaqo/7 X-Received: by 2002:aa7:c389:0:b0:523:38eb:395f with SMTP id k9-20020aa7c389000000b0052338eb395fmr3654761edq.2.1693643158266; Sat, 02 Sep 2023 01:25:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1693643158; cv=none; d=google.com; s=arc-20160816; b=JHmaRWbr8i/qNMMcP32eBLUZC2Je7dA3Wn+ogDGQaor8Tr3vq5LD+oUmRY71Kf3VDz SdiuCn459ro1Yn0HeaTBO7oAfz0ceV+AJZmPVzlzErLXvnE0OPXPrKiQ7rq/JKnZ1RPs r0wB6blMBJp9CcRWkrmXktPcAQaMoaIONkxKtz/Q3w8Oke7rj9gOc3lfrph6sy12603z FoJm0kfEGQxqcPO5texVp0/2t2b0CT4UKdF+5y+qUJeMLXbFg0TZUlQPIWhqTqFf2qvt FAL5Zy21kpBGRleHWK60BfZPDQxpj/cyUsoar5jh/R6FJLOsJ+L/IOQXbfLruopmTUnE OS7g== 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=LOLtBDsXfEzdRRWVXsg8vBlWUNhbCqbhGR1iTXb6syY=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=Gq6L+i7A/CK+6IPDpjsW1nVgT9Grh38VZoVHYTHDxne+QAMrXP0D2Y+QkVKV1zt8fo UNJ8zSuZzW75PR4ghp/ctzrdKYsYxZZD7KDpZ68QFkmIr6GKBwztahu6WqzScoyWP/08 CoCX1bl4xM8JnREOb02r+ureShfE+ugmMeN0/nVDTq0pW1Gn6lf0y0Xv8HwalQlIvQHo esv9DlWYiU4KMGpFWPAnfXOjNcASOfRMqa+lRNCc0ao7QHjTogFrCG6JmHIDuFvRdSYE fbMXtXEC0r1ENK0UZaj28YJwToFrQXRnw5IlekCFybYThzYWPL5SPCjQeJEcMt+n79DB Sgsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FCl0tB3c; 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 r12-20020aa7cfcc000000b0052a11cb4b23si3549964edy.688.2023.09.02.01.25.57; Sat, 02 Sep 2023 01:25:58 -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=FCl0tB3c; 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 AADF468C7BC; Sat, 2 Sep 2023 11:25:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-155.mail.qq.com (out203-205-221-155.mail.qq.com [203.205.221.155]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 65BD268C736 for ; Sat, 2 Sep 2023 11:25:11 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1693643103; bh=3azGQ8cDINqIV90Rwyfshxa7m+lx3GTesGkBj6rk9rU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FCl0tB3ct9XRj5hu3K0lZo8WyBT9CFG0ZXm8nl8sRU7Ot3PNBc7oSkV/O1teCBR1L YyhcXgmyKQijGsCBzA+3j2hKthzxnO3McYUTxfebHMjbwbCdnQX4rkvHvLF7fEUF2v IBb7dYRjvbOWrb/raWjVvedDnWjxdnmd8yDnOQbE= Received: from localhost.localdomain ([113.116.30.246]) by newxmesmtplogicsvrsza7-0.qq.com (NewEsmtp) with SMTP id 640954A0; Sat, 02 Sep 2023 16:25:00 +0800 X-QQ-mid: xmsmtpt1693643102t437csp4y Message-ID: X-QQ-XMAILINFO: NB2Y38G+/V2YwckhGIh7C/rZYNmzjww3wx5rRrG9CO8QDJUo8NwhmpJI3fHvQX z+FaH6kM+rUaADgd4H4A/yiaHFGjRTJGyfXv0sYIV6IuBCtA+YK3hJRxE0wkipdz4BkTy8/hFMjO 8q+9JX3gyS6otq9ZylZyl6q/+ctFgUGuPcLrWa/UrSb0tlXQNJGKoYJBWnK9YdHsABrUHHO0y3MX b81Lp/2k+5J5YNhGMXlo+iNaO9mspp42ia6nlYmEfaRyFlxVIeumy+b7OvJYDuS09Ph75K9qzJZB FlB0enKGms3E3v3uXnzs8PMIPVNq4k6oBaQQo/aIESEjwT8Fty7DhYzfAAcI5qnZUu0caJ8heZvy XNugnSpy5ntgOU9ge3gIlqJfih7KDVOJXdYRTlxGFrITUrwcNGp9ylWXGg4O8LidYPecH+eZDD0c gOj7x3bdqIlFWLrAlw7JMkbJjISAXQEaxvShvjdZzF6ft+Fg1fX0kzH47O7P49sqmHlcpwkqi2RH eTv2OwdGS8rZFFEVOkp3hkMk7/VGODhGF5a4k4VBKyl2KFKTSkmoEhhVCr1eNgQEo2fT4QSCXWgB a74zqc+qRicE7Dz34XTTU9sCKnYbHk9YeBDyPMlA9DywAUVnPZzB9heKaFwY2jZilfT6QwsTgLGH ao54IiQHtgUypXKPiVTHM/56edFSpwAOZ7i7n1RRee1urycj5ZhpENHdS5ONAwezBGU+d4hPIHy+ NtkG2qA53zM5x2+MSz+nLcb8Sxi3rQPXP4/i+t1Vee68AoNdqJeMinCk/SkB/kQZvLhIqgCbZ0hI G5GJW+AnS4a5KCc/sygpCIDNhsjeAH9MyjQZDaey9l+eAW5x0JWFoAxYiAS4U1heb8TBOjX69gcC 7wO8ufUWyqeaREfn3kifzhc0RfLLw3GLNCE6n8Ppw8w1aFtvTCgX2sAyqO5CrFiGBNq2DoCPR73+ WvjwWZ6U+UgNu2VfY3zclRR1xY157H X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sat, 2 Sep 2023 16:23:54 +0800 X-OQ-MSGID: <20230902082359.260925-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230902082359.260925-1-quinkblack@foxmail.com> References: <20230902082359.260925-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/8] avfilter/dnn_backend_openvino: reduce indentation in free_model_ov 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: HILxGEPSWZ4o From: Zhao Zhili No functional changes except ensures model isn't null. Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_openvino.c | 89 +++++++++++++------------- 1 file changed, 46 insertions(+), 43 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 951f179b7c..85db4ecd35 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -463,58 +463,61 @@ 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) { + OVModel *ov_model; + + if (!model || !*model) + return; + + 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) { #if HAVE_OPENVINO2 - ov_infer_request_free(item->infer_request); + ov_infer_request_free(item->infer_request); #else - ie_infer_request_free(&item->infer_request); + ie_infer_request_free(&item->infer_request); #endif - } - av_freep(&item->lltasks); - av_freep(&item); } - ff_safe_queue_destroy(ov_model->request_queue); + 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->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); + 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 HAVE_OPENVINO2 - if (ov_model->preprocess) - ov_preprocess_prepostprocessor_free(ov_model->preprocess); - if (ov_model->compiled_model) - ov_compiled_model_free(ov_model->compiled_model); - if (ov_model->ov_model) - ov_model_free(ov_model->ov_model); - if (ov_model->core) - ov_core_free(ov_model->core); + if (ov_model->preprocess) + ov_preprocess_prepostprocessor_free(ov_model->preprocess); + if (ov_model->compiled_model) + ov_compiled_model_free(ov_model->compiled_model); + if (ov_model->ov_model) + ov_model_free(ov_model->ov_model); + if (ov_model->core) + ov_core_free(ov_model->core); #else - 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_free(ov_model->all_output_names); - av_free(ov_model->all_input_names); + 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_free(ov_model->all_output_names); + av_free(ov_model->all_input_names); #endif - av_opt_free(&ov_model->ctx); - av_freep(&ov_model); - av_freep(model); - } + av_opt_free(&ov_model->ctx); + av_freep(&ov_model); + av_freep(model); }