From patchwork Thu May 6 08:46:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Ting" X-Patchwork-Id: 27614 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:6109:0:0:0:0:0 with SMTP id v9csp1098254iob; Thu, 6 May 2021 01:56:11 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz0DkCgqrpc+8nBk7ZZQTyPWKAMp8pWxtIxnEBmd9ytUHgFRmORFe8bo1DuLBGrzeTZjzzM X-Received: by 2002:a17:906:e206:: with SMTP id gf6mr3193920ejb.434.1620291371113; Thu, 06 May 2021 01:56:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620291371; cv=none; d=google.com; s=arc-20160816; b=A//XENbkgNBEuEh5KyRdgYsPosha11COG/sSezOIqY6lCSIUo0qSz9CTwYGC1Ey4wZ sqW26c8AroGHOAE71IDFh9qRZH8FU7NRVBeL1L73xEZU61G9TsTEhzRGSmOkB2O4IaYE zWC2YAvDNyst9n1NpEgpa23hbWKdC9s37HKSAUOhqewqRWYj29tpBpcvxeDYHNBQZhSt VK2IPkhSZWi8y819MrZtSk0pXDsXRv1RnysumsHH4qAMZCZwsRiFliII3qAKe36kUq4B wV/oKA5Pog5O/OC5mNO6DUSKRxurJGxK+iKVYKCWiabWsEbZiO34uIjJ0xEC2N7l24P0 RJcg== 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:ironport-sdr :ironport-sdr:delivered-to; bh=NAWxRGGlma+qwKJZ8gG5IraveUDaXiln4PrUU5HDVBg=; b=ZJoal81z4cSKFHBIa7ZyNyw2h29ysWp0rah1+dN4mSZI+/+UOHvE5rRG8PIstN0Lk2 CX2vqGG4VZqfb7bak93UUkAUaytvaOEnvicIj19ygbFHnwQTbJ5/uywJhGl0Bf5Yu7Lv vaniQDZhBT0eOvFKtrKUHef+0ShZsAZhkhnBQri/M5T824mfULgmXreKm/sEPGFr5UpT Ii3cOxakiwg5Mk7SUecmVPo9ilNjtf1LwyZ01kB6VlUCO1y7JTH8BFrruOzsRLoAHFw8 WAuTor/AF5veEUV2uUuyq/PUl/N+IeRDJka6mKj9DOEFHGwNJvC8G5W65OeEIqwNPqH9 /Zmw== ARC-Authentication-Results: i=1; mx.google.com; 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=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a20si1707613edx.287.2021.05.06.01.56.10; Thu, 06 May 2021 01:56:11 -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; 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=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7888668022F; Thu, 6 May 2021 11:56:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E5F1680260 for ; Thu, 6 May 2021 11:55:56 +0300 (EEST) IronPort-SDR: M2UdRm74NIXrZ3RxBfqVNrA1tIVsGLzeP4uYCPhF9OwTYyjpYbfSRlul9SB9jDYt+VP4GyXORR g/Ym2FG5s9GQ== X-IronPort-AV: E=McAfee;i="6200,9189,9975"; a="177977575" X-IronPort-AV: E=Sophos;i="5.82,277,1613462400"; d="scan'208";a="177977575" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 May 2021 01:55:52 -0700 IronPort-SDR: 6vJ0kLw2WRPvATJQUdsxnzRnzWjCWaalbn/pGfMNVfbmbYcc/gOBHvFYHchJ0yoGZmSOdBQwTy v8n5BSpv3N1g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,277,1613462400"; d="scan'208";a="607740287" Received: from semmer-ubuntu.sh.intel.com ([10.239.159.83]) by orsmga005.jf.intel.com with ESMTP; 06 May 2021 01:55:51 -0700 From: Ting Fu To: ffmpeg-devel@ffmpeg.org Date: Thu, 6 May 2021 16:46:07 +0800 Message-Id: <20210506084610.23487-1-ting.fu@intel.com> X-Mailer: git-send-email 2.17.1 Subject: [FFmpeg-devel] [PATCH V2 1/4] dnn: add DCO_RGB color order to 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: 9ZkyM3GhQmhE Adding DCO_RGB color order to DNNColorOrder, since tensorflow model needs this kind of color oder as input. Signed-off-by: Ting Fu --- V2: Rebase patch to latest code libavfilter/dnn/dnn_backend_tf.c | 1 + libavfilter/dnn/dnn_io_proc.c | 14 +++++++++++--- libavfilter/dnn_interface.h | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/libavfilter/dnn/dnn_backend_tf.c b/libavfilter/dnn/dnn_backend_tf.c index 03fe310b03..45da29ae70 100644 --- a/libavfilter/dnn/dnn_backend_tf.c +++ b/libavfilter/dnn/dnn_backend_tf.c @@ -143,6 +143,7 @@ static DNNReturnType get_input_tf(void *model, DNNData *input, const char *input tf_output.index = 0; input->dt = TF_OperationOutputType(tf_output); + input->order = DCO_RGB; 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 5f60d68078..1e2bef3f9a 100644 --- a/libavfilter/dnn/dnn_io_proc.c +++ b/libavfilter/dnn/dnn_io_proc.c @@ -168,11 +168,19 @@ static DNNReturnType proc_from_frame_to_dnn_frameprocessing(AVFrame *frame, DNND static enum AVPixelFormat get_pixel_format(DNNData *data) { - if (data->dt == DNN_UINT8 && data->order == DCO_BGR) { - return AV_PIX_FMT_BGR24; + if (data->dt == DNN_UINT8) { + switch (data->order) { + case DCO_BGR: + return AV_PIX_FMT_BGR24; + case DCO_RGB: + return AV_PIX_FMT_RGB24; + default: + av_assert0(!"unsupported data pixel format.\n"); + return AV_PIX_FMT_BGR24; + } } - av_assert0(!"not supported yet.\n"); + av_assert0(!"unsupported data type.\n"); return AV_PIX_FMT_BGR24; } diff --git a/libavfilter/dnn_interface.h b/libavfilter/dnn_interface.h index 799244ee14..5e9ffeb077 100644 --- a/libavfilter/dnn_interface.h +++ b/libavfilter/dnn_interface.h @@ -39,6 +39,7 @@ typedef enum {DNN_FLOAT = 1, DNN_UINT8 = 4} DNNDataType; typedef enum { DCO_NONE, DCO_BGR, + DCO_RGB, } DNNColorOrder; typedef enum {