virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/dnn: fix corruption when TF backend infer failed

Browse Source 
Signed-off-by: Ting Fu <ting.fu@intel.com>
This commit is contained in:
Ting Fu
2023-03-24 15:30:38 +08:00
committed by Guo Yejun
parent 06b451d276
commit 5c216d081d
1 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libavfilter/dnn/dnn_backend_tf.c
View File

@@ -175,10 +175,6 @@ static int tf_start_inference(void *args)
request->status); request->status);
if (TF_GetCode(request->status) != TF_OK) { if (TF_GetCode(request->status) != TF_OK) {
av_log(&tf_model->ctx, AV_LOG_ERROR, "%s", TF_Message(request->status)); 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 DNN_GENERIC_ERROR;
} }
return 0; return 0;
@@ -438,8 +434,6 @@ static int load_tf_model(TFModel *tf_model, const char *model_filename)
TF_DeleteImportGraphDefOptions(graph_opts); TF_DeleteImportGraphDefOptions(graph_opts);
TF_DeleteBuffer(graph_def); TF_DeleteBuffer(graph_def);
if (TF_GetCode(tf_model->status) != TF_OK){ 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_log(ctx, AV_LOG_ERROR, "Failed to import serialized graph to model graph\n");
av_freep(&sess_config); av_freep(&sess_config);
return DNN_GENERIC_ERROR; 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); TF_SetConfig(sess_opts, sess_config, sess_config_length,tf_model->status);
av_freep(&sess_config); av_freep(&sess_config);
if (TF_GetCode(tf_model->status) != TF_OK) { if (TF_GetCode(tf_model->status) != TF_OK) {
TF_DeleteGraph(tf_model->graph);
TF_DeleteStatus(tf_model->status);
TF_DeleteSessionOptions(sess_opts); TF_DeleteSessionOptions(sess_opts);
av_log(ctx, AV_LOG_ERROR, "Failed to set config for sess options with %s\n", av_log(ctx, AV_LOG_ERROR, "Failed to set config for sess options with %s\n",
tf_model->ctx.options.sess_config); 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); TF_DeleteSessionOptions(sess_opts);
if (TF_GetCode(tf_model->status) != TF_OK) 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"); av_log(ctx, AV_LOG_ERROR, "Failed to create new session with model graph\n");
return DNN_GENERIC_ERROR; 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); &init_op, 1, NULL, tf_model->status);
if (TF_GetCode(tf_model->status) != TF_OK) 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"); av_log(ctx, AV_LOG_ERROR, "Failed to run session when initializing\n");
return DNN_GENERIC_ERROR; return DNN_GENERIC_ERROR;
} }
@@ -865,6 +852,7 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_
av_freep(&model); av_freep(&model);
return NULL; return NULL;
} }
model->model = tf_model;
tf_model->model = model; tf_model->model = model;
ctx = &tf_model->ctx; ctx = &tf_model->ctx;
ctx->class = &dnn_tensorflow_class; ctx->class = &dnn_tensorflow_class;
@@ -931,7 +919,6 @@ DNNModel *ff_dnn_load_model_tf(const char *model_filename, DNNFunctionType func_
goto err; goto err;
} }
model->model = tf_model;
model->get_input = &get_input_tf; model->get_input = &get_input_tf;
model->get_output = &get_output_tf; model->get_output = &get_output_tf;
model->options = options; model->options = options;