From patchwork Sat Jun 5 18:08:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhanshu Saxena X-Patchwork-Id: 28105 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp2157352iof; Sat, 5 Jun 2021 11:41:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwh4P3ADq9ZAv7RhTStDaosOfa1LHjvNeOFwpaJo6MJn4aXGzaiB0gAyE56av45ClZMRorC X-Received: by 2002:a17:906:6d43:: with SMTP id a3mr10381515ejt.142.1622918519244; Sat, 05 Jun 2021 11:41:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622918519; cv=none; d=google.com; s=arc-20160816; b=NLJNdUD3Xb7CqmqnPD4dvl1SbeaC2E0ahJEzzoZKKp8PHO7TZyqLWFkGHjvxXg1F94 WTLI/PLM4P8z3yvm64UhnyZXwX8aO1CJJYubgt7CE9nH5lF5+4flCa+mofWrbG8TXKI9 AVTA6ay5r9Rn/pkDwVIi5/llB/oDCMkSIG2s894JxcnFb/4qSe9yS5gmt5oHzTU/Yv95 vvmawHAO8hmFuqiYgfugEQBpatQgdJjxqxjAIf9Y1fO0FMbmVlUOEkeCDMFI9uipqqDF oirS6h9z2EMjY6QIU4PosZ4bQZHKFkxezQsAVYSXmFyao+JFpN/RPVDfUD0xxtzfXlNV jDNw== 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=emymKabnFv5Ls4izyJf7J1g0ntecFJkic0zFGt1/Iy0=; b=gL+XUwKTXwBZ9vB4vqKGTzp9Q6sb8dWBQmaIAOLEmHGSIF7G2DzwXLIJn+pkI3OfjE SKrG898ook704U5LFcUydvmacXZ31Ch5BQYsQlUQfL68WWp//b89EskPxFCwvE7aFH9p Ykl5JgeIXaD+Z1d7oxWTb88YypHZs6o5WuvnVIErQCQp0yht5wvVCd2IA04kPmEg9FTW fxmv1KR83kpcE0yLr7664se1IvJDzEAg16sY91/tbRGXhQ1ZvQNCKcBIjBhlESU3XTpP zTnIzuxDlE6jUcAu6tzXXQfteK09QFRAwg0j2DlkHR1dsBrMioGDWD/fcU1IPBF/HRZ3 kSjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=qbAbgD3W; 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 c10si9059426edn.209.2021.06.05.11.41.58; Sat, 05 Jun 2021 11:41:59 -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=qbAbgD3W; 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 6EB3168A636; Sat, 5 Jun 2021 21:41:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id ED86568A3AF for ; Sat, 5 Jun 2021 21:41:49 +0300 (EEST) Received: by mail-pf1-f170.google.com with SMTP id h12so7080974pfe.2 for ; Sat, 05 Jun 2021 11:41:49 -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=mFZCaPaO/WEp3G0w6D9geo+ojGtEwjtWaW8n6GNXQj0=; b=qbAbgD3WMJVWlU20cjM25+cXB5WRT9EitvlDov/oHtrgP+e9/Ur8Fsf1PMznFqHwZk 7Jv0nP5V/dEvHiPgIipGaiDpG1ly+N3FP7Kx8m1xWBai4xlG2XM94QSPBLNJYgVHdAq2 OATqFsi9b8JOYkeEwNvd582hz0nmk0k7EeWboD2Pf3vot6FEvY8l1qxWnlfQfYKIZG1L 6+HyKzRK/bNCLaHAcw8JkwcWD77vsdFt08t7SJVFrdLKaww9X83T6Xqi5yk7mu9xEX8q NnCVBODmiO7j1qhup0V7aQyPTyl1yjR9Lf8LWY/i/fvSp2PmtzRQZH07RgB4SnR6BIO8 itzg== 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=mFZCaPaO/WEp3G0w6D9geo+ojGtEwjtWaW8n6GNXQj0=; b=eUytHWH7cd3ajhZ8ZYOX6iiwe7ukEQMbdQ90Jx62aI312x/YkNJCPN8rgn+XpUYW5f PUj16d+ChxIY4DELZSiZdP1gR8o0kyHBHSub9yOLWp18uqMBSdcYGLo/rM561a//uHCy 5RH32qEjnLGe1t4rvlJM49dsX/GMfEdH3HEHLbukHuZ0yWt4RQX3a6ndEZo18UpZ/AJH ggnAjFtuRi5JP33josOm+HAAm45ncHleCRqHcqlDYzLhT6zWY+PAxBhQnA38CwddV7Dl Z/ShY5CFznuLBk07+ejg4wSzSQkSIA2w6PklDpGdoTRlsTFdfmd8mDfbsur1MH/SqLzd LauA== X-Gm-Message-State: AOAM533O2QdzZhhhVkz7pnsisiGam0w+XgpekIr0jDWBL93DQY+onsCz zIpoxwMiuKcBABNfxKyAY6kULIMU3wr0eA== X-Received: by 2002:a63:4145:: with SMTP id o66mr10842578pga.4.1622916524885; Sat, 05 Jun 2021 11:08:44 -0700 (PDT) Received: from Pavilion-x360.bbrouter ([103.157.221.215]) by smtp.googlemail.com with ESMTPSA id w14sm7818176pjf.12.2021.06.05.11.08.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Jun 2021 11:08:44 -0700 (PDT) From: Shubhanshu Saxena To: ffmpeg-devel@ffmpeg.org Date: Sat, 5 Jun 2021 23:38:04 +0530 Message-Id: <20210605180806.65831-3-shubhanshu.e01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210605180806.65831-1-shubhanshu.e01@gmail.com> References: <20210605180806.65831-1-shubhanshu.e01@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH V2 3/5] lavfi/dnn: Add nb_output to TaskItem 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: WgJ9V+A1wyQl Add nb_output property to TaskItem for use in TensorFlow backend and Native backend. Signed-off-by: Shubhanshu Saxena --- libavfilter/dnn/dnn_backend_common.h | 1 + libavfilter/dnn/dnn_backend_openvino.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/libavfilter/dnn/dnn_backend_common.h b/libavfilter/dnn/dnn_backend_common.h index f76a05026d..704cf921f1 100644 --- a/libavfilter/dnn/dnn_backend_common.h +++ b/libavfilter/dnn/dnn_backend_common.h @@ -35,6 +35,7 @@ typedef struct TaskItem { const char **output_names; int async; int do_ioproc; + uint32_t nb_output; uint32_t inference_todo; uint32_t inference_done; } TaskItem; diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index 0f3b235820..c2487c35be 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -678,6 +678,7 @@ static DNNReturnType get_output_ov(void *model, const char *input_name, int inpu task.in_frame = in_frame; task.output_names = &output_name; task.out_frame = out_frame; + task.nb_output = 1; task.model = ov_model; if (extract_inference_from_task(ov_model->model->func_type, &task, ov_model->inference_queue, NULL) != DNN_SUCCESS) { @@ -798,6 +799,7 @@ DNNReturnType ff_dnn_execute_model_ov(const DNNModel *model, DNNExecBaseParams * task.in_frame = exec_params->in_frame; task.output_names = &exec_params->output_names[0]; task.out_frame = exec_params->out_frame ? exec_params->out_frame : exec_params->in_frame; + task.nb_output = exec_params->nb_output; task.model = ov_model; if (extract_inference_from_task(ov_model->model->func_type, &task, ov_model->inference_queue, exec_params) != DNN_SUCCESS) { @@ -845,6 +847,7 @@ DNNReturnType ff_dnn_execute_model_async_ov(const DNNModel *model, DNNExecBasePa task->in_frame = exec_params->in_frame; task->output_names = &exec_params->output_names[0]; task->out_frame = exec_params->out_frame ? exec_params->out_frame : exec_params->in_frame; + task->nb_output = exec_params->nb_output; task->model = ov_model; if (ff_queue_push_back(ov_model->task_queue, task) < 0) { av_freep(&task);