From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 0D0D04541F for ; Sun, 30 Apr 2023 15:40:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 032FF68C0A3; Sun, 30 Apr 2023 18:39:39 +0300 (EEST) 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: 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(); -- 2.40.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".