From patchwork Wed Aug 4 11:51:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhanshu Saxena X-Patchwork-Id: 29242 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6c0f:0:0:0:0:0 with SMTP id a15csp3356414ioh; Wed, 4 Aug 2021 06:04:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwKsS7XwRnVnWZkEsYW3xlH0xvYP5smEOuZZpNCwdOeDjNlmY9fGSGL6BOurCJh5ybpZFwx X-Received: by 2002:aa7:d748:: with SMTP id a8mr31670763eds.169.1628082241967; Wed, 04 Aug 2021 06:04:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1628082241; cv=none; d=google.com; s=arc-20160816; b=T5lXz+PAUJNDNcsOeH3oAvRspfgYds26sLts518hwvVj/GhuMMK39tOntG0wta15LP ++ACBATphzs5wv6BiXLhwIHehjVjpdzjHYUDZEbEx4tJAaaFfPm3byloJIPbi97dgdEx r70HpU0V+Alsyne+rHed77OQUsQNK9WXpRbnkajcWFAJuiJdZNgchI47eXrD+fxKHyD1 cj3RI6BmwonZyowXnfLyB8hMgFk2f5/8qH5oP/bhyP+23ZXhgy8DSyHobhAvjsxbvTdA EKrwZYZYk46rf66LZeakjMHusdjd0ra1ZrgJY/2aXpYitgBy0tmki+IDuFxi3JmCajFC G5lQ== 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 :message-id:date:to:from:dkim-signature:delivered-to; bh=2BaZt/nZ8tYkB2dMxu8/Sj+l4fN6MVIaca0p0tqv2lg=; b=ixqbyMydhAyhJhiHLCI3rL13RLuGsGJngD9GfGZwBfPdJxDVonlQYpnbG4XDHVnaG6 +wKwSlxv+Cq+EfOtoLrakeaIB0X0+zYBjPPrJyXOKNCI9Eu0aJGBnWnlj3AjY2sCHPou b75A7/2gLzfb/6JVcVwSPBswWvKi5OZpLH3ci3mwLjXU4XGrQNqWzaUZITCHXYaoWSLa bv3Cf7TBNvpAXI8ejAuyW3HZXvJKoQqG5bul6UhGKKCG6u1taZoNHuKTn2douPl9oQrB aY9J5ZmNT4oJHdhWMv7BPLZj9hBWM14vb5IkXM8roLFG4OtGJi/H8xR4LlU3elJPo0Js 4qKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=WNnz6LCf; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y8si2059112edu.495.2021.08.04.06.03.53; Wed, 04 Aug 2021 06:04:01 -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=@gmail.com header.s=20161025 header.b=WNnz6LCf; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CFCF068A073; Wed, 4 Aug 2021 16:03:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D0E1F688178 for ; Wed, 4 Aug 2021 16:03:43 +0300 (EEST) Received: by mail-pj1-f44.google.com with SMTP id j1so2835343pjv.3 for ; Wed, 04 Aug 2021 06:03:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=9+fJlnI+zvoCClE87bRDOXCrcDAq6TMyrQhV785zezY=; b=WNnz6LCfTcZT9zCL39EwYRK4lXpfzX7rL4Nxs2aMj3EW6psHSJ774477rbLF4BtZkE L3pQQJvjV7z1gwI5/vjCfE42yPvb/+vMOauUIvrG2uEYWLb8ClgysdobLVnaDPx7tizi fA+vBf18wRkdRcBz5Ovs3eEi37G5Woq6RcF7JGCT9RoAzi9wx/5R7lvJVV7fvf+FGQkN yvNcQshtz7ePMgocs/mO7GqRO2VGsakVn5TfLvgeSlEnxf+wX/9edXqMMfNWiXYNXr2c yKMDu213cTy8pkB+7v3fZPdJzBIn9JCGAk6WICmpnZDnrZDKjsUu59v61UCAsSr8nzKc nBkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9+fJlnI+zvoCClE87bRDOXCrcDAq6TMyrQhV785zezY=; b=oBP4LtaOg0uMEqj9CUEvN+LTeIKme4LnMjixo668EJZgllgugBp1NBqqWPYwzxv4Qz dQBuz7uDYml+4FDbJnpjhjdUT/z7wf9GDXzQkPLb+lwqYBl4Ux0Lhh/0Vvr00TahcUsU uFPRCQEK0k/fGMDMmsNtSwJETqYaARBdH0w7v3Yw9qd5a563HpXgldLMSE0iKG16l4U+ MC/YrinKUawutLsoQUVLnKwriCJlcq+jGjZt3tNl87DHOSA8eTwOYgG0GOqfOZS8dOqB EBCXYq4RVEWPU6nQhLxUR8b6Jv0Ar604stB6W9DOj9mDeVHibl7eT6p72CJC3QnR3F38 4+2w== X-Gm-Message-State: AOAM530gfAnDfowO0yK8LVy6fsLS+VrBDkoXbJSDACxVAl44aVjZLu7M g+kimnbITMaBhoDnUMkZ46eG3QKn1bDRXQ== X-Received: by 2002:a05:6a00:26e5:b029:330:be3:cacd with SMTP id p37-20020a056a0026e5b02903300be3cacdmr27165820pfw.78.1628077921903; Wed, 04 Aug 2021 04:52:01 -0700 (PDT) Received: from Pavilion-x360.bbrouter ([103.133.121.9]) by smtp.googlemail.com with ESMTPSA id ms8sm6040305pjb.36.2021.08.04.04.52.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Aug 2021 04:52:01 -0700 (PDT) From: Shubhanshu Saxena To: ffmpeg-devel@ffmpeg.org Date: Wed, 4 Aug 2021 17:21:32 +0530 Message-Id: <20210804115138.64475-2-shubhanshu.e01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210804115138.64475-1-shubhanshu.e01@gmail.com> References: <20210804115138.64475-1-shubhanshu.e01@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 2/8] [GSoC] lavfi/dnn: Common Function to Get Async Result in DNN Backends 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: Shubhanshu Saxena Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: BnaAoHViIW4E This commits refactors the get async result function for common use in all three backends. Signed-off-by: Shubhanshu Saxena --- libavfilter/dnn/dnn_backend_common.c | 20 ++++++++++++++++++++ libavfilter/dnn/dnn_backend_common.h | 15 +++++++++++++++ libavfilter/dnn/dnn_backend_openvino.c | 18 +----------------- libavfilter/dnn/queue.h | 1 + 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_common.c b/libavfilter/dnn/dnn_backend_common.c index 4c9045501f..df4bab85e0 100644 --- a/libavfilter/dnn/dnn_backend_common.c +++ b/libavfilter/dnn/dnn_backend_common.c @@ -122,3 +122,23 @@ DNNReturnType ff_dnn_start_inference_async(void *ctx, DNNAsyncExecModule *async_ #endif return DNN_SUCCESS; } + +DNNAsyncStatusType ff_dnn_get_async_result_common(Queue *task_queue, AVFrame **in, AVFrame **out) +{ + TaskItem *task = ff_queue_peek_front(task_queue); + + if (!task) { + return DAST_EMPTY_QUEUE; + } + + if (task->inference_done != task->inference_todo) { + return DAST_NOT_READY; + } + + *in = task->in_frame; + *out = task->out_frame; + ff_queue_pop_front(task_queue); + av_freep(&task); + + return DAST_SUCCESS; +} diff --git a/libavfilter/dnn/dnn_backend_common.h b/libavfilter/dnn/dnn_backend_common.h index 96e4df9676..e1d678b230 100644 --- a/libavfilter/dnn/dnn_backend_common.h +++ b/libavfilter/dnn/dnn_backend_common.h @@ -24,6 +24,7 @@ #ifndef AVFILTER_DNN_DNN_BACKEND_COMMON_H #define AVFILTER_DNN_DNN_BACKEND_COMMON_H +#include "queue.h" #include "../dnn_interface.h" #include "libavutil/thread.h" @@ -122,4 +123,18 @@ DNNReturnType ff_dnn_async_module_cleanup(DNNAsyncExecModule *async_module); */ DNNReturnType ff_dnn_start_inference_async(void *ctx, DNNAsyncExecModule *async_module); +/** + * Extract input and output frame from the Task Queue after + * asynchronous inference. + * + * @param task_queue pointer to the task queue of the backend + * @param in double pointer to the input frame + * @param out double pointer to the output frame + * + * @retval DAST_EMPTY_QUEUE if task queue is empty + * @retval DAST_NOT_READY if inference not completed yet. + * @retval DAST_SUCCESS if result successfully extracted + */ +DNNAsyncStatusType ff_dnn_get_async_result_common(Queue *task_queue, AVFrame **in, AVFrame **out); + #endif diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 8d23446296..47cbd48ba2 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -32,7 +32,6 @@ #include "libavutil/avstring.h" #include "libavutil/detection_bbox.h" #include "../internal.h" -#include "queue.h" #include "safe_queue.h" #include #include "dnn_backend_common.h" @@ -883,22 +882,7 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, DNNExecBasePa DNNAsyncStatusType ff_dnn_get_async_result_ov(const DNNModel *model, AVFrame **in, AVFrame **out) { OVModel *ov_model = model->model; - TaskItem *task = ff_queue_peek_front(ov_model->task_queue); - - if (!task) { - return DAST_EMPTY_QUEUE; - } - - if (task->inference_done != task->inference_todo) { - return DAST_NOT_READY; - } - - *in = task->in_frame; - *out = task->out_frame; - ff_queue_pop_front(ov_model->task_queue); - av_freep(&task); - - return DAST_SUCCESS; + return ff_dnn_get_async_result_common(ov_model->task_queue, in, out); } DNNReturnType ff_dnn_flush_ov(const DNNModel *model) diff --git a/libavfilter/dnn/queue.h b/libavfilter/dnn/queue.h index 2524d5fa59..9ab5c89f65 100644 --- a/libavfilter/dnn/queue.h +++ b/libavfilter/dnn/queue.h @@ -18,6 +18,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include #ifndef AVFILTER_DNN_QUEUE_H #define AVFILTER_DNN_QUEUE_H