]> git.sesse.net Git - ffmpeg/commitdiff
dnn_backend_openvino.c: fix multi-thread issue for async execution
authorGuo, Yejun <yejun.guo@intel.com>
Mon, 8 Feb 2021 10:46:27 +0000 (18:46 +0800)
committerGuo, Yejun <yejun.guo@intel.com>
Thu, 18 Feb 2021 01:59:37 +0000 (09:59 +0800)
once we mark done for the task in function infer_completion_callback,
the task is possible to be release in function ff_dnn_get_async_result_ov
in another thread just after it, so we need to record request queue
first, instead of using task->ov_model->request_queue later.

Signed-off-by: Guo, Yejun <yejun.guo@intel.com>
libavfilter/dnn/dnn_backend_openvino.c

index 48f5ba50be1a1f86686fcd259e0d49f0e65de3c9..ed41b721fc54fd3be0d2d18218da695843a584ad 100644 (file)
@@ -178,6 +178,7 @@ static void infer_completion_callback(void *args)
     IEStatusCode status;
     RequestItem *request = args;
     TaskItem *task = request->tasks[0];
+    SafeQueue *requestq = task->ov_model->request_queue;
     ie_blob_t *output_blob = NULL;
     ie_blob_buffer_t blob_buffer;
     DNNData output;
@@ -243,7 +244,7 @@ static void infer_completion_callback(void *args)
     request->task_count = 0;
 
     if (task->async) {
-        if (ff_safe_queue_push_back(task->ov_model->request_queue, request) < 0) {
+        if (ff_safe_queue_push_back(requestq, request) < 0) {
             av_log(ctx, AV_LOG_ERROR, "Failed to push back request_queue.\n");
             return;
         }