From patchwork Sun Apr 30 15:39:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 41424 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp2675975pzb; Sun, 30 Apr 2023 08:40:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4oQVMgUgbsYS3b67ETUVH9QXxmoPO0Rx7/OGyQwkNVS+k7ndUuk1FazcqqG2hXBmEgDCLy X-Received: by 2002:a05:6402:456:b0:4fc:725:e670 with SMTP id p22-20020a056402045600b004fc0725e670mr4277105edw.11.1682869237542; Sun, 30 Apr 2023 08:40:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682869237; cv=none; d=google.com; s=arc-20160816; b=nzhyqgs6xtImUsGrK69Y69ICCQqCFlZtwr2u8sAWuTkjxCj8kG2FsuGEa7UKwzOs2M PH7c3GU04A7iUzqSGLJqmwpLr/64hg7MgMHgEYkNRGc+vRp+uZZ8P6y5ND5oqQn7//aK 6tIEj/ZMzKA8pAmL5X1bDR8qpAd1XcB9GWCs6pWGsWoVOQG2n+D2zoNSavNZmOYWGcIX VvAYxPsqFMb/9damy5+xalPQGowQNKPAJnBhd0E+OSLjZDXGBDX42jHviMgpk/btCS2F JWN5WBhHSbpnUTf3ESfNtfapDlRPvUl4QJpcPVmOimeuZTX+ZAcb3C4kv8T2TeaC8uxl vETA== 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:date :to:from:message-id:dkim-signature:delivered-to; bh=sjP09PpmdpLIk05H9+jbHd29JZRd78KZUORSUiHqL/0=; b=IC/AGBK/qg00ute1mPVdqZHEzWFpLwT1lCxvd0VTds3MUvdXLIH9C0AHXrXMz4NvxH InE7g1t+T4nKBZiWVJY9bm26vK9V5eeSqC5Wp/nk3ontv4Qh5gJFbcG/cVaVUElx39nl dduXgJnf3isPXy1QW09BmLH4e/oo+36kFW326sruxSJcRN3QJlIPWfXOkF1rliDPe47I 2nDcYvH/wuffh2ElKLFvzyDy7AKcjKuv4QiKbeCttM4mcse9tuurEqA88/MKUhRq3uDX 4jj6j4bvQmNGjJWFWp1QBQ2bOUl/yCyQ1UEEkQYOohZbNRhxFj5v1yIx55b5HUHCDK9O wqDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b="pN7aL4/I"; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d26-20020a50fb1a000000b0050281b75a38si18428447edq.386.2023.04.30.08.40.37; Sun, 30 Apr 2023 08:40:37 -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=@foxmail.com header.s=s201512 header.b="pN7aL4/I"; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2F48F68C0AC; Sun, 30 Apr 2023 18:39:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-87.mail.qq.com (out162-62-57-87.mail.qq.com [162.62.57.87]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1121768C086 for ; Sun, 30 Apr 2023 18:39:29 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1682869162; bh=kjEox5FCXrdbi6lBIcgorjAwZjuSsOeNjlQ4GP+5j5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pN7aL4/I2iJnB/J8/wVvgLFuehDRiy1A4L1NA2KFOfNi2IOjzwSpn5YH/Mwygg/M3 n9yUcJO5HL0nK5MgX4Lp3lDvUMIiZOOpzuASwbbR46S5C+Aybo/Ad8mQJHsnqsfj1R iuVI96QgO89VmTVqrS4FkhTC9KI8Dex/CMBrk/10= Received: from localhost.localdomain ([240e:446:1f30:84b4:ad7d:93a:9264:72d4]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id 9C494E77; Sun, 30 Apr 2023 23:39:04 +0800 X-QQ-mid: xmsmtpt1682869161tsh0bkhb0 Message-ID: X-QQ-XMAILINFO: OKkKo7I1HxIeOSnbYJQ9ANoDceZtZtC7YdDvC379WT67tudAz+DFbFszhMdxxj LIvDvPxbJ+HIEXzLiJWS6ynCdeE35ZlolWsEGywbzC7kY1lyWB/zHHITyz/g5H4NPShqnZL1vJ28 +VTaU33U9++MSOpuAifeeZdBRx7wVgOxhfxBvCbD9RvgWZjJPSVl5p7fBijLlHOOJ9HqQFQyc9xq GJqYvpPboAzUKNx2gjYMIFELcEabnL73N2crbGKqP5xGXBT+lKtSNBbkBNoPvDX/U1iTioHq70P9 k6tCcC0l5uFERO0lINRlZOK89uYkn9m5Y06NInDd1hZHsaFBW9S+zLET8pWNcePlN4dg6xeJBdLb V3gHhfO9gCux6R1sdidCvqkckJ9vLzM4OQQieCqcTxYYEJfyNTPpcvlARYcYdplwnotQJAu8RSjV EMDi5ZJt0WZTw6kJFas+yQfzuW146CTxNg/oS/df9i4fwcRzDnoTCfV4l8+thSMmfHjeAu5McPwu SHhXnhI1/EmNDGq7z0rjRkimjOxtp/aDqne3JZXPvGaEiXs6BzUSguyIa67fYC92yUjsnP1j8ttl MnyUXInRHZLsA8D7ibsrQ1vmNmtqNXJ497j1g7CXD0NeBTiJc0an3xIO3ga4eRTRqS3/kiH3l7MQ zHsxr3Sguztu61yiHJf/NxDwyx8oTKr4yh7Z7yofUv5pClD11cc9AfTgb9qNua9VlRCD6EXoYJb2 C/p/SC5D/2vqGdIWareo9Oq+WLDDf195AUIYloDQ/KOT1iXgLxJBNBmpoelhNAnCnUfj8WFHokJ7 4SksT50TYxJxYLNEMuMMhvjy1riNVHfNSznW/nYzLnf2bYwx0DWsUz0i/O+ZtILZs1bcfo6nnmpn KcbPFDsVh31uBXvGk9fPdeT/2mhvZSZgu4Q9Nvt67nAHapPDWth/vD8oQ1YemBXR5sj3titqeKfg QHOHFflkCx305eJhsNjKVPprR6rmG0PvAyJpw8ngOpEdEt6sKKTLpdn7uaWyOY From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Sun, 30 Apr 2023 23:39:00 +0800 X-OQ-MSGID: <20230430153902.48405-8-quinkblack@foxmail.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230430153902.48405-1-quinkblack@foxmail.com> References: <20230430153902.48405-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 08/10] avfilter/dnn_backend_tf: check TF_OperationOutputType return value 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7OkMZ30rmbai From: Zhao Zhili This also fixed a warning: implicit conversion from enumeration type 'TF_DataType' (aka 'enum TF_DataType') to different enumeration type 'DNNDataType'. Signed-off-by: Zhao Zhili --- libavfilter/dnn/dnn_backend_tf.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 74fe06d6fb..552a9f2fa1 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -274,6 +274,7 @@ static int get_input_tf(void *model, DNNData *input, const char *input_name) TFModel *tf_model = model; TFContext *ctx = &tf_model->ctx; TF_Status *status; + TF_DataType dt; int64_t dims[4]; TF_Output tf_output; @@ -284,7 +285,18 @@ static int get_input_tf(void *model, DNNData *input, const char *input_name) } tf_output.index = 0; - input->dt = TF_OperationOutputType(tf_output); + dt = TF_OperationOutputType(tf_output); + switch (dt) { + case TF_FLOAT: + input->dt = DNN_FLOAT; + break; + case TF_UINT8: + input->dt = DNN_UINT8; + break; + default: + av_log(ctx, AV_LOG_ERROR, "Unsupported output type %d in model\n", dt); + return AVERROR(EINVAL); + } input->order = DCO_RGB; status = TF_NewStatus();