[FFmpeg-cvslog] dnn_interface.h: add enum DNNColorOrder

Guo, Yejun git at videolan.org
Thu Feb 18 04:27:13 EET 2021


ffmpeg | branch: master | Guo, Yejun <yejun.guo at intel.com> | Mon Feb  8 09:53:39 2021 +0800| [0884063f88a9b726b296722cabe397b12337b16a] | committer: Guo, Yejun

dnn_interface.h: add enum DNNColorOrder

the data type and order together decide the color format, we could
not use AVPixelFormat directly because not all the possible formats
are covered by it.

Signed-off-by: Guo, Yejun <yejun.guo at intel.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0884063f88a9b726b296722cabe397b12337b16a
---

 libavfilter/dnn_interface.h | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/libavfilter/dnn_interface.h b/libavfilter/dnn_interface.h
index 2fb9b15676..d3a0c58a61 100644
--- a/libavfilter/dnn_interface.h
+++ b/libavfilter/dnn_interface.h
@@ -36,6 +36,11 @@ typedef enum {DNN_NATIVE, DNN_TF, DNN_OV} DNNBackendType;
 
 typedef enum {DNN_FLOAT = 1, DNN_UINT8 = 4} DNNDataType;
 
+typedef enum {
+    DCO_NONE,
+    DCO_BGR,
+} DNNColorOrder;
+
 typedef enum {
     DAST_FAIL,              // something wrong
     DAST_EMPTY_QUEUE,       // no more inference result to get
@@ -52,8 +57,10 @@ typedef enum {
 
 typedef struct DNNData{
     void *data;
-    DNNDataType dt;
     int width, height, channels;
+    // dt and order together decide the color format
+    DNNDataType dt;
+    DNNColorOrder order;
 } DNNData;
 
 typedef struct DNNModel{



More information about the ffmpeg-cvslog mailing list