opencv
diff --git a/‎CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎CMakeLists.txt
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎cmake/OpenCVFindFlatBuffers.cmake
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions b/‎cmake/OpenCVFindFlatBuffers.cmake
Copy file name to clipboard
+15Lines changed: 15 additions & 0 deletions
diff --git a/‎modules/dnn/CMakeLists.txt
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions b/‎modules/dnn/CMakeLists.txt
Copy file name to clipboard
+17Lines changed: 17 additions & 0 deletions
diff --git a/‎modules/dnn/include/opencv2/dnn/dnn.hpp
Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions b/‎modules/dnn/include/opencv2/dnn/dnn.hpp
Copy file name to clipboard
+20Lines changed: 20 additions & 0 deletions
diff --git a/‎modules/dnn/misc/objc/gen_dict.json
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion b/‎modules/dnn/misc/objc/gen_dict.json
Copy file name to clipboard
+3-1Lines changed: 3 additions & 1 deletion
diff --git a/‎modules/dnn/src/dnn_read.cpp
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions b/‎modules/dnn/src/dnn_read.cpp
Copy file name to clipboard
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎modules/dnn/src/tflite/builtin_op_data.h
Copy file name to clipboard
+41Lines changed: 41 additions & 0 deletions b/‎modules/dnn/src/tflite/builtin_op_data.h
Copy file name to clipboard
+41Lines changed: 41 additions & 0 deletions
@@ -471,6 +471,9 @@ OCV_OPTION(WITH_OBSENSOR "Include obsensor support (Orbbec RGB-D modules: Astra+
 OCV_OPTION(WITH_CANN "Include CANN support" OFF
   VISIBLE_IF TRUE
   VERIFY HAVE_CANN)
+OCV_OPTION(WITH_FLATBUFFERS "Include FlatBuffers support" OFF
+  VISIBLE_IF TRUE
+  VERIFY HAVE_FLATBUFFERS)
 
 # OpenCV build components
 # ===================================================
@@ -750,6 +753,7 @@ include(cmake/OpenCVFindLibsVideo.cmake)
 include(cmake/OpenCVFindLibsPerf.cmake)
 include(cmake/OpenCVFindLAPACK.cmake)
 include(cmake/OpenCVFindProtobuf.cmake)
+include(cmake/OpenCVFindFlatBuffers.cmake)
 if(WITH_TENGINE)
   include(cmake/OpenCVFindTengine.cmake)
 endif()
 
@@ -0,0 +1,15 @@
+set(HAVE_FLATBUFFERS FALSE)
+
+if(NOT WITH_FLATBUFFERS)
+  return()
+endif()
+
+list(APPEND CUSTOM_STATUS flatbuffers)
+
+find_package(flatbuffers QUIET)
+if(flatbuffers_FOUND)
+  set(HAVE_FLATBUFFERS 1)
+  list(APPEND CUSTOM_STATUS_flatbuffers "    FlatBuffers:" "${flatbuffers_VERSION}")
+else()
+  list(APPEND CUSTOM_STATUS_flatbuffers "    FlatBuffers:" "NO")
+endif()
@@ -133,6 +133,17 @@ if(NOT BUILD_PROTOBUF)
   list(APPEND include_dirs ${Protobuf_INCLUDE_DIRS})
 endif()
 
+if(HAVE_FLATBUFFERS)
+  list(APPEND libs flatbuffers::flatbuffers)
+  list(APPEND fw_srcs "${CMAKE_CURRENT_BINARY_DIR}/schema_generated.h")
+
+  add_custom_command(
+        OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/schema_generated.h"
+        COMMAND flatbuffers::flatc --cpp -o "${CMAKE_CURRENT_BINARY_DIR}" "${CMAKE_CURRENT_LIST_DIR}/src/tflite/schema.fbs")
+
+  ocv_target_compile_definitions(${the_module} PRIVATE "HAVE_FLATBUFFERS=1")
+endif()
+
 set(sources_options "")
 
 list(APPEND libs ${LAPACK_LIBRARIES})
@@ -280,3 +291,9 @@ if(TARGET ocv.3rdparty.cann AND OPENCV_TEST_DNN_CANN)
     ocv_target_link_libraries(opencv_test_dnn ocv.3rdparty.cann)
   endif()
 endif()
+
+if(HAVE_FLATBUFFERS)
+  if(TARGET opencv_test_dnn)
+    ocv_target_compile_definitions(opencv_test_dnn PRIVATE "HAVE_FLATBUFFERS=1")
+  endif()
+endif()
@@ -953,6 +953,26 @@ CV__DNN_INLINE_NS_BEGIN
     CV_EXPORTS Net readNetFromTensorflow(const char *bufferModel, size_t lenModel,
                                          const char *bufferConfig = NULL, size_t lenConfig = 0);
 
+    /** @brief Reads a network model stored in <a href="https://www.tensorflow.org/lite">TFLite</a> framework's format.
+      * @param model  path to the .tflite file with binary flatbuffers description of the network architecture
+      * @returns Net object.
+      */
+    CV_EXPORTS_W Net readNetFromTFLite(const String &model);
+
+    /** @brief Reads a network model stored in <a href="https://www.tensorflow.org/lite">TFLite</a> framework's format.
+      * @param bufferModel buffer containing the content of the tflite file
+      * @returns Net object.
+      */
+    CV_EXPORTS_W Net readNetFromTFLite(const std::vector<uchar>& bufferModel);
+
+    /** @brief Reads a network model stored in <a href="https://www.tensorflow.org/lite">TFLite</a> framework's format.
+      * @details This is an overloaded member function, provided for convenience.
+      * It differs from the above function only in what argument(s) it accepts.
+      * @param bufferModel buffer containing the content of the tflite file
+      * @param lenModel length of bufferModel
+      */
+    CV_EXPORTS Net readNetFromTFLite(const char *bufferModel, size_t lenModel);
+
     /**
      *  @brief Reads a network model stored in <a href="https://torch.ch">Torch7</a> framework's format.
      *  @param model    path to the file, dumped from Torch by using torch.save() function.
 
@@ -8,7 +8,9 @@
             "(Net*)readNetFromONNX:(NSString*)onnxFile" : { "readNetFromONNX" : {"name" : "readNetFromONNXFile"} },
             "(Net*)readNetFromONNX:(ByteVector*)buffer" : { "readNetFromONNX" : {"name" : "readNetFromONNXBuffer"} },
             "(Net*)readNetFromTensorflow:(NSString*)model config:(NSString*)config" : { "readNetFromTensorflow" : {"name" : "readNetFromTensorflowFile"} },
-            "(Net*)readNetFromTensorflow:(ByteVector*)bufferModel bufferConfig:(ByteVector*)bufferConfig" : { "readNetFromTensorflow" : {"name" : "readNetFromTensorflowBuffer"} }
+            "(Net*)readNetFromTensorflow:(ByteVector*)bufferModel bufferConfig:(ByteVector*)bufferConfig" : { "readNetFromTensorflow" : {"name" : "readNetFromTensorflowBuffer"} },
+            "(Net*)readNetFromTFLite:(NSString*)model" : { "readNetFromTFLite" : {"name" : "readNetFromTFLiteFile"} },
+            "(Net*)readNetFromTFLite:(ByteVector*)buffer" : { "readNetFromTFLite" : {"name" : "readNetFromTFLiteBuffer"} }
         },
         "Net": {
             "(void)forward:(NSMutableArray<Mat*>*)outputBlobs outputName:(NSString*)outputName" : { "forward" : {"name" : "forwardOutputBlobs"} },
 
@@ -29,6 +29,10 @@ Net readNet(const String& _model, const String& _config, const String& _framewor
             std::swap(model, config);
         return readNetFromTensorflow(model, config);
     }
+    if (framework == "tflite" || modelExt == "tflite")
+    {
+        return readNetFromTFLite(model);
+    }
     if (framework == "torch" || modelExt == "t7" || modelExt == "net" || configExt == "t7" || configExt == "net")
     {
         return readNetFromTorch(model.empty() ? config : model);
@@ -66,6 +70,8 @@ Net readNet(const String& _framework, const std::vector<uchar>& bufferModel,
         CV_Error(Error::StsNotImplemented, "Reading Torch models from buffers");
     else if (framework == "dldt")
         return readNetFromModelOptimizer(bufferConfig, bufferModel);
+    else if (framework == "tflite")
+        return readNetFromTFLite(bufferModel);
     CV_Error(Error::StsError, "Cannot determine an origin framework with a name " + framework);
 }
 
 
@@ -0,0 +1,41 @@
+// source: https://github.com/tensorflow/tensorflow/blob/b2f5959ff823a8ed5bf4883e785f8f96d4253a8b/tensorflow/lite/core/c/builtin_op_data.h
+typedef enum {
+    kTfLitePaddingUnknown = 0,
+    kTfLitePaddingSame,
+    kTfLitePaddingValid,
+} TfLitePadding;
+
+typedef enum {
+    kTfLiteActNone = 0,
+    kTfLiteActRelu,
+    kTfLiteActReluN1To1,  // min(max(-1, x), 1)
+    kTfLiteActRelu6,      // min(max(0, x), 6)
+    kTfLiteActTanh,
+    kTfLiteActSignBit,
+    kTfLiteActSigmoid,
+} TfLiteFusedActivation;
+
+typedef struct {
+    int width;
+    int height;
+    int width_offset;
+    int height_offset;
+} TfLitePaddingValues;
+
+typedef struct {
+    TfLitePadding padding;
+    int stride_width;
+    int stride_height;
+    int filter_width;
+    int filter_height;
+    TfLiteFusedActivation activation;
+    struct {
+        TfLitePaddingValues padding;
+    } computed;
+} TfLitePoolParams;
+
+typedef struct {
+    TfLitePadding padding;
+    int stride_width;
+    int stride_height;
+} TfLiteTransposeConvParams;
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,10 @@ Net readNet(const String& _model, const String& _config, const String& _framewor`
`29`	`29`	`std::swap(model, config);`
`30`	`30`	`return readNetFromTensorflow(model, config);`
`31`	`31`	`}`
	`32`	`+ if (framework == "tflite" \|\| modelExt == "tflite")`
	`33`	`+ {`
	`34`	`+ return readNetFromTFLite(model);`
	`35`	`+ }`
`32`	`36`	`if (framework == "torch" \|\| modelExt == "t7" \|\| modelExt == "net" \|\| configExt == "t7" \|\| configExt == "net")`
`33`	`37`	`{`
`34`	`38`	`return readNetFromTorch(model.empty() ? config : model);`
`@@ -66,6 +70,8 @@ Net readNet(const String& _framework, const std::vector<uchar>& bufferModel,`
`66`	`70`	`CV_Error(Error::StsNotImplemented, "Reading Torch models from buffers");`
`67`	`71`	`else if (framework == "dldt")`
`68`	`72`	`return readNetFromModelOptimizer(bufferConfig, bufferModel);`
	`73`	`+ else if (framework == "tflite")`
	`74`	`+ return readNetFromTFLite(bufferModel);`
`69`	`75`	`CV_Error(Error::StsError, "Cannot determine an origin framework with a name " + framework);`
`70`	`76`	`}`
`71`	`77`