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 7339545211 for ; Thu, 16 Mar 2023 03:16:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1C1FB68BABF; Thu, 16 Mar 2023 05:16:38 +0200 (EET) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 249F768BABF for ; Thu, 16 Mar 2023 05:16:30 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678936596; x=1710472596; h=from:to:subject:date:message-id; bh=+XdaWPPopHkn9vzLqBPzJnUTsUT9ar/jGp/HyyKRhUE=; b=TczkeyhPhlxzD2c6GVt+iUE7mUUUt19tfj3bPiJenChF60AqqrvmcLVX reWP0aeINeYCQXOEQvTdKQ7JoCvGuNFKQXaeaI1TqdEb2g7mTCZJ5pazv ez6sKc6Kb4IAXNU3wOj+JphBM6AIKJbnjHPTnav4EoN6Vv6JVXTsYZQQq 1+j83Ideu7JIeJLBoEsWXXuqzrON4gjYXkQvkXSMBZ+eLxjAAs4nMAJIV J4k82Jv0h2Zw6ICWvNFPjWJI9I73hYwE0WDyIlQMzflUnYEEbL4JyP9SM yA6OZN+vE4f1cJqF85n1TmzwdnUTstLTpOqtTizB4OnUEE3McxJ6jfwEJ A==; X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="402747596" X-IronPort-AV: E=Sophos;i="5.98,264,1673942400"; d="scan'208";a="402747596" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 20:16:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="712164935" X-IronPort-AV: E=Sophos;i="5.98,264,1673942400"; d="scan'208";a="712164935" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.83]) by orsmga001.jf.intel.com with ESMTP; 15 Mar 2023 20:16:27 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Mar 2023 11:00:14 +0800 Message-Id: <20230316030016.4096-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 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 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: Signed-off-by: Ting Fu --- libavfilter/dnn/dnn_backend_tf.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 3b5084b67b..fb1a5f1350 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -176,9 +176,6 @@ static int tf_start_inference(void *args) 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; @@ -439,7 +436,9 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) TF_DeleteBuffer(graph_def); if (TF_GetCode(tf_model->status) != TF_OK){ TF_DeleteGraph(tf_model->graph); + tf_model->graph = NULL; TF_DeleteStatus(tf_model->status); + tf_model->status = NULL; av_log(ctx, AV_LOG_ERROR, "Failed to import serialized graph to model graph\n"); av_freep(&sess_config); return DNN_GENERIC_ERROR; @@ -453,7 +452,7 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) av_freep(&sess_config); if (TF_GetCode(tf_model->status) != TF_OK) { TF_DeleteGraph(tf_model->graph); - TF_DeleteStatus(tf_model->status); + tf_model->graph = NULL; 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); @@ -466,7 +465,7 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) if (TF_GetCode(tf_model->status) != TF_OK) { TF_DeleteGraph(tf_model->graph); - TF_DeleteStatus(tf_model->status); + tf_model->graph = NULL; av_log(ctx, AV_LOG_ERROR, "Failed to create new session with model graph\n"); return DNN_GENERIC_ERROR; } @@ -480,8 +479,11 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename) if (TF_GetCode(tf_model->status) != TF_OK) { TF_DeleteSession(tf_model->session, tf_model->status); + tf_model->session = NULL; TF_DeleteGraph(tf_model->graph); + tf_model->graph = NULL; TF_DeleteStatus(tf_model->status); + tf_model->status = NULL; av_log(ctx, AV_LOG_ERROR, "Failed to run session when initializing\n"); return DNN_GENERIC_ERROR; } @@ -940,6 +942,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_ return model; err: + model->model = tf_model; ff_dnn_free_model_tf(&model); return NULL; } -- 2.25.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".