From patchwork Mon May 23 09:29:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ting Fu X-Patchwork-Id: 35894 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:9992:b0:82:461d:f3b with SMTP id ve18csp1821081pzb; Mon, 23 May 2022 02:43:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwOCk0d2uzzVqR6wZk9mIzyZRX/t1sgwuKxIaNrLENjZovKtHCrMiGNonDZKPF5aivogYuc X-Received: by 2002:a17:906:4fce:b0:6f4:f41c:3233 with SMTP id i14-20020a1709064fce00b006f4f41c3233mr17668692ejw.117.1653298993218; Mon, 23 May 2022 02:43:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653298993; cv=none; d=google.com; s=arc-20160816; b=S+MxwC/CYhl86GJFz3a4ow1dnutlCOVkAhbYoIZgrp3XLk8ZkJCI5IvFZMgdWHqj97 9j+x7nCdDDbbVGzIPb+mxRW+K9lYMO58C2evh6gGst/5MumQTXSnBJC02atz/gN03zbH m16grXaTztIiUavPpa2h+1xX89RQpqnYgMGOdIzHj0KEViJBcrYjZVCUNMmu7JQCx5f5 7m1VwxnsAiAoupP9J5ixrn63ZBO8DNiWNTzTnfU8Q/GUrgrDrA68wMjo0EEO2ugosrr8 wpM8uzAWulwXhYN6dNbxlzoWw3N5ft0iXth2OB4kwu4L4E5gmNGVfM45OU2Y5y6+R7jA kqOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=6YmLHemWTxIPk5Y2DcmocdS9FrObH2AqCYjiwaYe4iQ=; b=wwCVnDH9giuhPKrTo5S0wHg4frouQWgEPlYI/JMf73JnvqJi1gcTND/LOLIHePKgNo hSN+lwsElMEZ0z7CBlWKb/7Bh2uJ9iqiR3dNdYXvp+AVXr6l7HHcNLNzg1m0h9E/j8sO HLwbycPozFzx1au7v+M8kV5CdtfZwWb2Dlj0QcPAFuDM4cmspmkk1pKcX5E1A9s5c2ZM xC6DfStbgc0G3uCf+KvdcRRNH9nt/vD7fwmHzah6QJ+32/yoVo+PkMeMuXVQDOqaCJbz doqnC8ZRn5sdd/VYrYtzG7VUKadJ6T6kbGuXYptkhTWXpvzhHbEOKKYTaFc16Q59tKtG /ygw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=Kj15HZR+; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id y21-20020aa7c255000000b004289e7be14esi13900427edo.105.2022.05.23.02.43.10; Mon, 23 May 2022 02:43:13 -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=@intel.com header.s=Intel header.b=Kj15HZR+; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DBC9B68B49C; Mon, 23 May 2022 12:43:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8050A68B1B5 for ; Mon, 23 May 2022 12:42:59 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653298984; x=1684834984; h=from:to:subject:date:message-id; bh=f1rS3FPoX70ONXkCgYt5wYlBlfgRcX5bRoQAd8ZvJRQ=; b=Kj15HZR+G3D+qjclXVCYw4RpYU8MxADMS33zwEr5mToEHzxttE4bz2VL FMnuQynbvN2O35xZGXGjwDcfhj8vPboUDioO72tadIvzYMahxOFpPQe8r h6Ui83CCfPeu1XbwR48vKUPtWiETHlbLiKnXpKDKnO1YLPb57WZe8EpLc 5kC4ANZ1WEdgiq2yErnRofrlyIXHDbNwOTu5GP+TmQ6JHAi3w0PkBegFv fpyZOwGDKgr8ufhnq9GeZShf07pC1lvh5wt1E+FK1PQDQHAp9NOacQxXA XI4M7dmqmxLFUkmbucY0gNIjuevXprl8bj5Ev+2P013bOBm6+cXIHDdyP g==; X-IronPort-AV: E=McAfee;i="6400,9594,10355"; a="359560325" X-IronPort-AV: E=Sophos;i="5.91,246,1647327600"; d="scan'208";a="359560325" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 May 2022 02:42:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,246,1647327600"; d="scan'208";a="600553065" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.83]) by orsmga008.jf.intel.com with ESMTP; 23 May 2022 02:42:56 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 May 2022 17:29:17 +0800 Message-Id: <20220523092918.9548-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH 1/2] libavfi/dnn: refine enum DNNColorOrder 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: hz8Fs+AvsspN Change the DCO_RGB and DCO_BGR color order in DNNColorOrder to DCO_RGB_PACKED and DCO_GBR_PACKED for following RGB planar support. Signed-off-by: Ting Fu --- libavfilter/dnn/dnn_backend_openvino.c | 2 +- libavfilter/dnn/dnn_backend_tf.c | 2 +- libavfilter/dnn/dnn_io_proc.c | 4 ++-- libavfilter/dnn_interface.h | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_openvino.c b/libavfilter/dnn/dnn_backend_openvino.c index cf012aca4c..92e180a0eb 100644 --- a/libavfilter/dnn/dnn_backend_openvino.c +++ b/libavfilter/dnn/dnn_backend_openvino.c @@ -156,7 +156,7 @@ static int fill_model_input_ov(OVModel *ov_model, OVRequestItem *request) input.dt = precision_to_datatype(precision); // all models in openvino open model zoo use BGR as input, // change to be an option when necessary. - input.order = DCO_BGR; + input.order = DCO_BGR_PACKED; for (int i = 0; i < ctx->options.batch_size; ++i) { lltask = ff_queue_pop_front(ov_model->lltask_queue); diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 3b5084b67b..e639b3cecd 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -294,7 +294,7 @@ static int get_input_tf(void *model, DNNData *input, const char *input_name) tf_output.index = 0; input->dt = TF_OperationOutputType(tf_output); - input->order = DCO_RGB; + input->order = DCO_RGB_PACKED; status = TF_NewStatus(); TF_GraphGetTensorShape(tf_model->graph, tf_output, dims, 4, status); diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c index 7961bf6b95..532b089002 100644 --- a/libavfilter/dnn/dnn_io_proc.c +++ b/libavfilter/dnn/dnn_io_proc.c @@ -176,9 +176,9 @@ static enum AVPixelFormat get_pixel_format(DNNData *data) { if (data->dt == DNN_UINT8) { switch (data->order) { - case DCO_BGR: + case DCO_BGR_PACKED: return AV_PIX_FMT_BGR24; - case DCO_RGB: + case DCO_RGB_PACKED: return AV_PIX_FMT_RGB24; default: av_assert0(!"unsupported data pixel format.\n"); diff --git a/libavfilter/dnn_interface.h b/libavfilter/dnn_interface.h index ef8d7ae66f..d94baa90c4 100644 --- a/libavfilter/dnn_interface.h +++ b/libavfilter/dnn_interface.h @@ -38,8 +38,8 @@ typedef enum {DNN_FLOAT = 1, DNN_UINT8 = 4} DNNDataType; typedef enum { DCO_NONE, - DCO_BGR, - DCO_RGB, + DCO_BGR_PACKED, + DCO_RGB_PACKED, } DNNColorOrder; typedef enum {