From patchwork Fri May 28 09:24:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shubhanshu Saxena X-Patchwork-Id: 27970 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:b214:0:0:0:0:0 with SMTP id b20csp380860iof; Fri, 28 May 2021 02:47:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzrwvwNSScjU6ikyxPJsTNDtHjxWAMp7imh9qbSnyFY4BsiaPKOXM4w3egw2mi7TxRdn4X0 X-Received: by 2002:a05:6402:16db:: with SMTP id r27mr8593348edx.375.1622195275943; Fri, 28 May 2021 02:47:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622195275; cv=none; d=google.com; s=arc-20160816; b=W5xyXth8F3YmGX8J7HR/hLGpnyScVVirqoxY1/AvD/BfDw+ZpZLBbXXizMeqcYNSRo N3xzNcELOe0g0czd/Q1gaisuxe308tIrNhSwqbSbpCA2b95n6PMKGaHXLBmmTCyvajw7 z3YYi46Km3oiKt9fQMaFWX39F51JJd9mKfBwwtvcYjMhx5Ax7mfnf6RYmI5q0SJAFmke 84Ui6CDhH0PVjUI3aJFC8qktJjXXTx0ivDBzppbvCsizg+jIP9OqJNca7hDfT7GtM0lt FRNAa60ShZMB0Onb4M2BRMUC+kswXknreM5IIfIouBgTH4vtvb3xzlLK7+vjz5TcneMU h2YA== 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=IaxPZ3tvueq2v2c8DvnVgn+Wuu461fTeK73n8qCJ5dzywtvOEB8fgc8/N8E66M3RLH k0PDZrL9NmFlTyC0VE9VN1KmmHzytrAN3s6iBqm8fY2awif54FbhLmvmE7hMT692NUru eDzkOt8+AIG9LO5hM6FdDLRgORAhQXagYdB6vCECdqPbsLPiSm24hBYXl8ux1c1wxDKd 2rAaDnuYfLmZDqQ4c8AmBCY6mcx2yo39B69H7Ie+4IdhONPPvICDz4yABLjxCprAVw3V DstBGNEVJgXO0+e9oDMd39TlnqFrd9KQVd/kkjmaecvptY2qSjdCBNJ0mKUb76aUjwoU USZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=SZ0YF3BR; 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 m7si5040296edq.235.2021.05.28.02.47.55; Fri, 28 May 2021 02:47:55 -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=SZ0YF3BR; 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 502A468A214; Fri, 28 May 2021 12:47:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C42F68981B for ; Fri, 28 May 2021 12:47:46 +0300 (EEST) Received: by mail-pg1-f176.google.com with SMTP id f22so2115000pgb.9 for ; Fri, 28 May 2021 02:47:46 -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=SZ0YF3BR1YCdequQNDuW0DVhPqytU6iZhbSCXmqDxKrm5qgiRJkQtsCSeQJ/fRAsl0 DrdG8aOLmrFrMW1kiJ8s540MWzyamlpDujWr+P3OkFbEMl3Hh8M1KBrBlXzrLI5+C1ta OqEeIM9KG9nRo15jBOn9nHBJjdyE/V8KzZ+flcd/yLZRAlEad6TBg+C4WaXjbL9vyKVy yzhkXWaACAJNJm23fmAod5ena20TpRxsi+5mHUOxwMpIOJe6kdXqT8r2/bBD6W6UKIav 3r10Mz31rcwlQvRTNaOFae/yr0/cIgDnBsf15vV26UYfKzu8FMCQpDob+pebq5cNGy4q HJ5w== 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=LHWMlYDffXq1MoT+iSSdJUwkRWa/wWe5XRQBjwbi2uCzLCl2EAdN8QhuEWYJs7jKol 7s9qmv63b0jpnd0kc7UWkZxUg246Asq47Crr1rFtzks+EmHjVjjXKMSmQCjXZskvdq+o wofdA4vA7s2yMGL0mp/IrIaQPDmGh+3X5FoA06iCwYHF/XJ/xfWZtcLUvItEhJfmQw84 33KtC3k4kQVfuujrZhO2hXBI/jf66UYLVBxLeTKsFn3fgGnOQnJgilcmQfbOH85txpdY 27HNr1sfxJBRF2k217A9CoUfw3mCweFoPe1XT3q0dzyLkA5Ksyvt2waNuvyU90ADj3oi phqQ== X-Gm-Message-State: AOAM533N8I+CX2xiNEkVsD2hUkE3d+rAe7oVoGBpI1QqH1mPQY6wL8cZ wkDshHrbvt5RWWP1kYlV+Q/CbZ3Ok+Arvg== X-Received: by 2002:a17:903:2c2:b029:101:9c88:d928 with SMTP id s2-20020a17090302c2b02901019c88d928mr106086plk.62.1622193951579; Fri, 28 May 2021 02:25:51 -0700 (PDT) Received: from Pavilion-x360.bbrouter ([103.133.121.241]) by smtp.googlemail.com with ESMTPSA id q24sm3846892pgk.32.2021.05.28.02.25.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 May 2021 02:25:51 -0700 (PDT) From: Shubhanshu Saxena To: ffmpeg-devel@ffmpeg.org Date: Fri, 28 May 2021 14:54:47 +0530 Message-Id: <20210528092454.31874-3-shubhanshu.e01@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210528092454.31874-1-shubhanshu.e01@gmail.com> References: <20210528092454.31874-1-shubhanshu.e01@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 03/10] 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: YLpxXLnEfu6o 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);