From patchwork Fri Mar 24 07:30:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ting Fu X-Patchwork-Id: 40788 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp378979pzb; Fri, 24 Mar 2023 00:47:02 -0700 (PDT) X-Google-Smtp-Source: AKy350a4dpZRlfwPeqPkSPceKRVFY7+RbM34+NJmpZBKzTaiFZJt/KraQuudcwrZOJEqQ+L9/uey X-Received: by 2002:a17:906:eb16:b0:939:c411:f784 with SMTP id mb22-20020a170906eb1600b00939c411f784mr1798478ejb.56.1679644022313; Fri, 24 Mar 2023 00:47:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679644022; cv=none; d=google.com; s=arc-20160816; b=H2GKCFraddaXrRA2PHON8m2Ht3Gs/fyfSPhyMueOM1NpHsxo8xvGnN6Fa6gIFAY4qj aBGe75piZP+zWLNks5xTDLedM3lYeFtCnAtfO5iFc1EGK6cmEIWfz90y7nj4Tp8awaJP 2vWqITfwMM0h0UnMarx+dMzD+CricydKBwzNm5f+mKtdcgAdAglP4YPgWYcM6vSGZOaa RRID0/0TRwOdeXxTAoXe6URpIrbwTETvYBi3vCoaxh/IXSZzwYntRd+1NAmEktyM1czJ Sg9QMQ1RDhdbW6L+Gb/UpFEoQv2Dt20RPGF+2MQSfjyWZ2WSWrKeS4No5YbOWQJiCPMa RqrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=PPIzd2z3wtDzxvZk6RaFHaOKvASAhrIFNsgziLmemqM=; b=PDS/nH4HxCNb2fuAlAVmafeIRr10bA4+CRrmXsbKFSL4tLaWkT3NWP3sGoVNPNejHV GqGhnwkGdk8+x0a9adNplhN5ksVHhei+j9yoqjAhT++BWDMNT3SmwZFgXFBLD49TwlBX APHMo/Lxq20PPHZWlIc217njC06boNu6/TOO0N1nanJfc1WlFQ/pyV40ufPfbewCf52g I63lvPFRfnN+RDPbqPXJ7r8QaRcx5UMNKaLhlC9kaU4MYZPQd4AQl0vUrhpKBiUu24XS aECWb09yyrNrihcFxTQbzVMgXqR1JhTmt0FNNR8Bz+dtZynHfe1elB1cwDRj6d0eXTkt MTqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=AKWtfhIa; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d8-20020a17090694c800b008b194cb9af5si18156066ejy.629.2023.03.24.00.47.01; Fri, 24 Mar 2023 00:47:02 -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=@intel.com header.s=Intel header.b=AKWtfhIa; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4CC8368C535; Fri, 24 Mar 2023 09:46:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04C8668C0CC for ; Fri, 24 Mar 2023 09:46:50 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679644016; x=1711180016; h=from:to:subject:date:message-id; bh=TywQqqqtholcbN5sRmTglct/slNzHSIwgKTHOpf/azA=; b=AKWtfhIaa+xroI98F8vmgXhDTOMvffk5b1JI+Cvpmy70Hc27IJv8k/aN IeUMiYqRC10g4a0oJxuO8mRoa/MKZqqliPIS1k5iwworWEtm7LdEkeOE2 kLoZUpi/MiZb7ItVimLr5Cn9uVLmcqhxM/2e9nLdV8+go590aurankHTI REhQGTut2OsFj4Fkcerw4Xx6nG176brnu8ALpdXobnVNcRXBs6R0i7Ufr amKRWK+tffUan772W4HRwUV+M+OXxz1nzwtxRQ3naLYhv92c0qbNyXVBY 0HVlKu1Cy34q7Td8K11yAeBhAuvVN4OGV/2U5OLBXzIOzJNwb1cIbKHdJ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="320109980" X-IronPort-AV: E=Sophos;i="5.98,287,1673942400"; d="scan'208";a="320109980" Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Mar 2023 00:46:48 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10658"; a="682590190" X-IronPort-AV: E=Sophos;i="5.98,287,1673942400"; d="scan'208";a="682590190" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.83]) by orsmga002.jf.intel.com with ESMTP; 24 Mar 2023 00:46:47 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Mar 2023 15:30:38 +0800 Message-Id: <20230324073040.16310-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH V2 1/3] lavfi/dnn: fix corruption when TF backend infer failed 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: ea1QYYd8rxRP Signed-off-by: Ting Fu --- libavfilter/dnn/dnn_backend_tf.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 3b5084b67b..9570f188d2 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -175,10 +175,6 @@ static int tf_start_inference(void *args) request->status); if (TF_GetCode(request->status) != TF_OK) { av_log(&tf_model->ctx, AV_LOG_ERROR, "%s", TF_Message(request->status)); - tf_free_request(infer_request); - if (ff_safe_queue_push_back(tf_model->request_queue, request) < 0) { - destroy_request_item(&request); - } return DNN_GENERIC_ERROR; } return 0; @@ -438,8 +434,6 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) TF_DeleteImportGraphDefOptions(graph_opts); TF_DeleteBuffer(graph_def); if (TF_GetCode(tf_model->status) != TF_OK){ - TF_DeleteGraph(tf_model->graph); - TF_DeleteStatus(tf_model->status); av_log(ctx, AV_LOG_ERROR, "Failed to import serialized graph to model graph\n"); av_freep(&sess_config); return DNN_GENERIC_ERROR; @@ -452,8 +446,6 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) TF_SetConfig(sess_opts, sess_config, sess_config_length,tf_model->status); av_freep(&sess_config); if (TF_GetCode(tf_model->status) != TF_OK) { - TF_DeleteGraph(tf_model->graph); - TF_DeleteStatus(tf_model->status); TF_DeleteSessionOptions(sess_opts); av_log(ctx, AV_LOG_ERROR, "Failed to set config for sess options with %s\n", tf_model->ctx.options.sess_config); @@ -465,8 +457,6 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) TF_DeleteSessionOptions(sess_opts); if (TF_GetCode(tf_model->status) != TF_OK) { - TF_DeleteGraph(tf_model->graph); - TF_DeleteStatus(tf_model->status); av_log(ctx, AV_LOG_ERROR, "Failed to create new session with model graph\n"); return DNN_GENERIC_ERROR; } @@ -479,9 +469,6 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) &init_op, 1, NULL, tf_model->status); if (TF_GetCode(tf_model->status) != TF_OK) { - TF_DeleteSession(tf_model->session, tf_model->status); - TF_DeleteGraph(tf_model->graph); - TF_DeleteStatus(tf_model->status); av_log(ctx, AV_LOG_ERROR, "Failed to run session when initializing\n"); return DNN_GENERIC_ERROR; } @@ -865,6 +852,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_ av_freep(&model); return NULL; } + model->model = tf_model; tf_model->model = model; ctx = &tf_model->ctx; ctx->class = &dnn_tensorflow_class; @@ -931,7 +919,6 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_ goto err; } - model->model = tf_model; model->get_input = &get_input_tf; model->get_output = &get_output_tf; model->options = options;