From patchwork Sat Jul 31 05:35:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhanshu Saxena X-Patchwork-Id: 29146 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp136224ios; Fri, 30 Jul 2021 22:44:17 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyE8bz69y2krlyhLiDVBCrYtUJcIZH4Ud7LpX9M8/hfIelnPNiKrst0mjdgb8vUFZGsjA4l X-Received: by 2002:a50:9e82:: with SMTP id a2mr2941240edf.115.1627710257579; Fri, 30 Jul 2021 22:44:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1627710257; cv=none; d=google.com; s=arc-20160816; b=LtEuchBGg7cMaWiz2NgF8v4w1CnRl2wiuF25SQVTIMQ8YJyo+xvQduv4EVaDt6vReZ BfNpjOKj9mGK0cyQn5L+6spMDo1z0eEItigf1ESSfSPbiKQ3DpUZRDrZY70jTY8O4S0h 9S943jWZm3/QNgvGI3GHCd6Nq3jjGb5k9xDpqmKUsVdW3S1X8FL5FKA9DCCgvOFBj3+5 LzlcQS7Ftf/kWVZyq6YyT9gnNDEZaLRzezYPkTvwcfOhAgQzjErwLNtTXLK7hdDV1jdh 6C7lpzkpE9/TJknF+Nf636IjFcY/szPAR+9SnIAI3Ny6b9SwtNvHit7wzdC1HmfY/y0E 7k/A== 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=I65SZxOG9O4981kh42yPiPL7zuk8MPZNgN1FtMG1UD6+I31Lf1KODXXVIC6j89U/hu Z4qUDf0UvSHdwEea2l0S3Z+U02enTa+X+BmSgwZnDKstAPTHzcoQwyhqkxDpN49Dqbzr 38Z6oOS41ayxJn1YzcVfMZd9YCcA37ggp3LOfIoq+OwrBfifRhkYbyQbCODMhnY1q5KY p7Feyjb3nGa/YSOSVxOLBmxWXHIVvahtUKWQNtzW33NfO07AhOiV0buN7rHNdPziWxJa cjs7FxFglPKPBKxlOB8oFO+dAaxK6HXZnS3DAm5kFAKHnIbVk1Efv3Is494s8lY/1z33 WIww== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=nwdG79GO; 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 j25si3773269ejy.93.2021.07.30.22.44.17; Fri, 30 Jul 2021 22:44:17 -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=nwdG79GO; 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 DF4E168A3D3; Sat, 31 Jul 2021 08:44:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 326E6680210 for ; Sat, 31 Jul 2021 08:44:12 +0300 (EEST) Received: by mail-pl1-f175.google.com with SMTP id i10so13580055pla.3 for ; Fri, 30 Jul 2021 22:44:12 -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=nwdG79GOtGIyLM/UK4mmD/cQRG7WNuj3TkbYMyvjNHGenNhAitl3dISzQpwupWmdxy 1zuNoHml48Sn2Q1Va0/V2bOGCiGhKsJl+vrOXVhV8UOUNri+TinsYZ9A9Q09JvEQ3MOX opI2tfp8G3JyaJ2SH61p6trso2OX/xSNgDdJoxMDwKUeLR6cRZ2jVgZ/rhY0SaGCpVTR Wrt0WQDJs6of7oCSAfQWVTzR4VHoTh5hRXIDWMfNgFgSiA7SANVKUpkCAa0MwdytJsnI niPZMUl4o7c17NKEzsW15lv6S25bRdyPbObWsoyQBsHt6ww68zISri+tRScWt9ysfNDV H+Kg== 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=kBKl49Jwq5ENci+1Q38KbeHdo1WHPfyM0G8XvPXRCAoRBq+7S69dVKXTRWks+ZfkpI dXh90anWaKeAcd8iDJdlyghbEHUdT+VafdGkCnj5P/7xE6RzfG7+aNX3v3AVKS6YHleC Yq3SCJNV2sbu7xItUz6/YYvwfsvbYDHAXJbDFD1CbJHxnNCcTEh8CnGBtiKj/lBJU/EQ 6Y1ebnLb2hd4l/ZRZRfX9JExm05zRGbIq4eWDMMPovQK9+RWjUuRIy2jrHOGihXlWPXg 0BsELniVtNxbh5MoTVBW5ySf7M0N+RyUN9avkV6IR7Ti8M+kqDoWrNU7XCBVM9YhihTM n1Hw== X-Gm-Message-State: AOAM533R12bnjpoBYXvdC8wM7Z95++X4P6WPDCs/sONuS12lgnHZV1ML LI63Tab2h13v/QLoh477hsfmjvzDorP2jg== X-Received: by 2002:a17:902:c389:b029:12c:a310:23d1 with SMTP id g9-20020a170902c389b029012ca31023d1mr412960plg.66.1627709758012; Fri, 30 Jul 2021 22:35:58 -0700 (PDT) Received: from localhost.localdomain ([103.157.220.250]) by smtp.googlemail.com with ESMTPSA id p34sm4312266pfh.172.2021.07.30.22.35.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Jul 2021 22:35:57 -0700 (PDT) From: Shubhanshu Saxena To: ffmpeg-devel@ffmpeg.org Date: Sat, 31 Jul 2021 11:05:10 +0530 Message-Id: <20210731053516.7700-2-shubhanshu.e01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210731053516.7700-1-shubhanshu.e01@gmail.com> References: <20210731053516.7700-1-shubhanshu.e01@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/8] 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: dHybB6CZ+1oJ 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