代码优化

Code/MF_TRTInfer/MA_TRTInferAlgoBase.cpp

@@ -2,7 +2,7 @@
 #include "ML_Log.h"
 #include <time.h>
 
-MA_TRTInferAlgoBase::MA_TRTInferAlgoBase(const utils::InitParameter& param)
+MA_TRTInferAlgoBase::MA_TRTInferAlgoBase(const trtUtils::InitParameter& param)
 {
 	mStream = nullptr;
 	m_param = param;
@@ -71,12 +71,12 @@ bool MA_TRTInferAlgoBase::check()
 	return true;
 }
 
-bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<utils::MR_Result>* _detectRes, int* _user)
+bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user)
 {
 	return true;
 }
 
-bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<cv::Mat>& _bufImgs, std::vector<utils::MR_Result>* _detectRes, int* _user)
+bool MA_TRTInferAlgoBase::doTRTInfer(const std::vector<cv::Mat>& _bufImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user)
 {
 	return true;
 }

Code/MF_TRTInfer/MA_TRTInferAlgoBase.h

@@ -7,13 +7,13 @@ class ML_Log;
 class MA_TRTInferAlgoBase : public MI_VisionInterface
 {
 public:
-	MA_TRTInferAlgoBase(const utils::InitParameter& param);
+	MA_TRTInferAlgoBase(const trtUtils::InitParameter& param);
 	~MA_TRTInferAlgoBase();
 
 	virtual bool initEngine(const std::string& _onnxFileName);
 	virtual bool check();
-	virtual bool doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<utils::MR_Result>* _detectRes, int* _user);
-	virtual bool doTRTInfer(const std::vector<cv::Mat>& _matImgs, std::vector<utils::MR_Result>* _detectRes, int* _user);
+	virtual bool doTRTInfer(const std::vector<MN_VisionImage::MS_ImageParam>& _bufImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user);
+	virtual bool doTRTInfer(const std::vector<cv::Mat>& _matImgs, std::vector<trtUtils::MR_Result>* _detectRes, int* _user);
 	virtual std::string getError();
 	virtual void freeMemeory();
 
@@ -42,7 +42,7 @@ protected:
 	std::unique_ptr<nvinfer1::ICudaEngine> m_engine{ nullptr };
 	std::unique_ptr<nvinfer1::IExecutionContext> m_context{ nullptr };
 	cudaStream_t mStream{ nullptr };
-	utils::InitParameter m_param;
+	trtUtils::InitParameter m_param;
 	std::shared_ptr<ML_Log> mLogPtr{ nullptr };
 
 };

Code/MF_TRTInfer/MF_ImageClassificationBase.cpp

@@ -1,6 +1,6 @@
 #include "MF_ImageClassificationBase.h"
 
-MF_ImageClassificationBase::MF_ImageClassificationBase(const utils::InitParameter& _param):MA_TRTInferAlgoBase(_param)
+MF_ImageClassificationBase::MF_ImageClassificationBase(const trtUtils::InitParameter& _param):MA_TRTInferAlgoBase(_param)
 {
 
 }

Code/MF_TRTInfer/MF_ImageClassificationBase.h

@@ -5,7 +5,7 @@
 class MF_ImageClassificationBase : public MA_TRTInferAlgoBase
 {
 public:
-	MF_ImageClassificationBase(const utils::InitParameter& _param);
+	MF_ImageClassificationBase(const trtUtils::InitParameter& _param);
 	~MF_ImageClassificationBase();