support on dtk24.04.2

Signed-off-by: lijian <lijian6@sugon.com>

CMakeLists.txt

@@ -8,7 +8,7 @@ add_definitions(-DUNICODE -D_UNICODE)
 add_definitions("-Wall")
 
 # project include
-set(INCLUDE_PATH    /usr/local/include
+set(INCLUDE_PATH    /usr/local/include/opencv4
                     ${CMAKE_CURRENT_SOURCE_DIR}/include
                     $ENV{ROCM_PATH}/include)
 include_directories(${INCLUDE_PATH})
@@ -20,7 +20,7 @@ set(LIBRARY_PATH    /usr/local/lib
 link_directories(${LIBRARY_PATH})
 
 # project lib
-set(LIBRARY     avcodec avdevice avfilter avformat avutil swresample swscale postproc
+set(LIBRARY     avcodec avdevice avfilter avformat avutil swresample swscale
                 opencv_core opencv_imgproc opencv_imgcodecs opencv_dnn opencv_highgui opencv_videoio
                 onnxruntime)
 link_libraries(${LIBRARY})

README.md

@@ -19,7 +19,7 @@ YOLOv7的作者提出了 Extended-ELAN (E-ELAN)结构。E-ELAN采用了ELAN类
 拉取镜像：
 
 ```plaintext
-docker pull image.sourcefind.cn:5000/dcu/admin/base/custom:tvm0.10_ort1.14.0_migraphx3.0.0-dtk23.04
+docker pull image.sourcefind.cn:5000/dcu/admin/base/custom:opencv49_ffmpeg4.2.1_ubuntu20.04-dtk24.04.2
 ```
 
 创建并启动容器：

docker/Dockerfile

-FROM image.sourcefind.cn:5000/dcu/admin/base/custom:tvm0.10_ort1.14.0_migraphx3.0.0-dtk23.04
+FROM image.sourcefind.cn:5000/dcu/admin/base/custom:opencv49_ffmpeg4.2.1_ubuntu20.04-dtk24.04.2

include/CommonUtils.h

@@ -2,7 +2,7 @@
 #define __COMMON_UTILS_H__
 
 #include <opencv2/core.hpp>
-#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
+#include <onnxruntime_cxx_api.h>
 #include <numeric>
 #include <sys/stat.h>
 

include/Decoder.h

 /* 
  * Decoder
- * 2022.09.23 sugon
+ * 2024.11.04 sugon
  * */
 
 #ifndef __DECODER_H__
@@ -12,8 +12,8 @@ extern "C"
 #include <stdlib.h>
 #include <string.h>
 #include <libavcodec/avcodec.h>
-#include <libavcodec/packet.h>
-#include <libavcodec/codec.h>
+//#include <libavcodec/packet.h>
+//#include <libavcodec/codec.h>
 #include <libavutil/imgutils.h>
 #include <libavutil/samplefmt.h>
 #include <libavutil/timestamp.h>
@@ -37,7 +37,6 @@ public:
     int video_stream_idx = -1;
 
     const char *src_filename = "../Resource/Images/cr7_1920x1080.h264";
-    //const char *src_filename = "../Resource/Images/Mean.mp4";
 };
 
 

include/DetectorYOLOV3.h

@@ -4,7 +4,7 @@
 
 #include <string>
 #include <fstream>
-#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
+#include <onnxruntime_cxx_api.h>
 #include <opencv2/opencv.hpp>
 #include <opencv2/dnn.hpp>
 #include "CommonUtils.h"

include/DetectorYOLOV5.h

@@ -4,7 +4,7 @@
 
 #include <string>
 #include <fstream>
-#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
+#include <onnxruntime_cxx_api.h>
 #include <opencv2/opencv.hpp>
 #include <opencv2/dnn.hpp>
 #include "CommonUtils.h"

include/DetectorYOLOV7.h

@@ -4,7 +4,7 @@
 
 #include <string>
 #include <fstream>
-#include <onnxruntime/core/session/onnxruntime_cxx_api.h>
+#include <onnxruntime_cxx_api.h>
 #include <opencv2/opencv.hpp>
 #include <opencv2/dnn.hpp>
 #include "CommonUtils.h"

include/Queuethread.h

@@ -22,7 +22,7 @@ using std::queue;
 class Queue
 {
 public:
-    Queue(size_t Capacity = CAPACITY);
+    Queue(size_t Capacity);
 
     ~Queue();