Z991239-1563 #comment other: 解决libvideocapture库linux debug版编译失败问题

Module/mod_counterconnector/CMakeLists.txt

@@ -19,11 +19,6 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	${ThirdPartyLib}
 )
 
-if(NOT MSVC)
-target_compile_definitions(${MODULE_NAME} PRIVATE "DEPEND_MODS_NOT_FINISHED")
-endif(NOT MSVC)
-
-
 # 添加实体需要依赖的其他共享库（包括系统库）
 set(${MODULE_PREFIX}_LIBS  ${MODULE_BASE_LIBS})
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -130,11 +130,8 @@ using namespace CounterConnector;
 				return Error;
 			}
 		}
-#ifdef DEPEND_MODS_NOT_FINISHED
 
-#else
 		m_fsm.Init(this);
-#endif	
 		int i = 0;
 
 		m_arrListener.Init(24);

Other/libvideocapture/CMakeLists.txt

@@ -30,38 +30,38 @@ BUILD missing)
 endif(WIN32)
 
 
-if(WIN32)
-conan_cmake_run(REQUIRES libyuv/1766@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-else(WIN32)
-conan_cmake_run(REQUIRES libyuv/1766@LR04.02_ThirdParty/shared
-libjpeg/9d@LR04.02_ThirdParty/shared
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
-endif(WIN32)
+#if(WIN32)
+#conan_cmake_run(REQUIRES libyuv/1766@LR04.02_ThirdParty/shared
+#BASIC_SETUP CMAKE_TARGETS
+#BUILD missing)
+#else(WIN32)
+#conan_cmake_run(REQUIRES libyuv/1766@LR04.02_ThirdParty/shared
+#libjpeg/9d@LR04.02_ThirdParty/shared
+#BASIC_SETUP CMAKE_TARGETS
+#BUILD missing)
+#endif(WIN32)
 
 message(STATUS "CONAN_INCLUDE_DIRS_LIBYUV = ${CONAN_INCLUDE_DIRS_LIBYUV}")
 target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_FFMPEG}
-	${CONAN_INCLUDE_DIRS_LIBYUV}
-	${CONAN_INCLUDE_DIRS_LIBJPEG}
+	#${CONAN_INCLUDE_DIRS_LIBYUV}
+	#${CONAN_INCLUDE_DIRS_LIBJPEG}
 	)
 
 
 message(STATUS "CONAN_LIB_DIRS_LIBYUV = ${CONAN_LIB_DIRS_LIBYUV}")
 target_link_directories(${MODULE_NAME} PRIVATE
 	${CONAN_LIB_DIRS_FFMPEG}
-	${CONAN_LIB_DIRS_LIBYUV}
-	${CONAN_LIB_DIRS_LIBJPEG}
+	#${CONAN_LIB_DIRS_LIBYUV}
+	#${CONAN_LIB_DIRS_LIBJPEG}
 	${CONAN_LIB_DIRS_RVCFRAMEWORK}
 	)
 
 message(STATUS "CONAN_LIBS_LIBYUV = ${CONAN_LIBS_LIBYUV}")
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS} 
 	${CONAN_LIBS_FFMPEG}
-	${CONAN_LIBS_LIBYUV}
-	${CONAN_LIBS_LIBJPEG}
+	#${CONAN_LIBS_LIBYUV}
+	#${CONAN_LIBS_LIBJPEG}
 	libvideoframework
 	${SPBASE_LIB}
 	)  

Other/libvideocapture/libvideocapture.cpp

@@ -14,8 +14,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include "libyuv.h"
-#include "libyuv/convert_argb.h"
+//#include "libyuv.h"
+//#include "libyuv/convert_argb.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -198,43 +198,43 @@ int VideoCaptureImpl::VideoCaptureSetParam(videocap_param_t* param)
 	return 0;
 }
 
-int ConvertVideoType(VideoType video_type) {
-	switch (video_type) {
-	case VideoType::kUnknown:
-		return libyuv::FOURCC_ANY;
-	case VideoType::kI420:
-		return libyuv::FOURCC_I420;
-	case VideoType::kIYUV:  // same as VideoType::kYV12
-	case VideoType::kYV12:
-		return libyuv::FOURCC_YV12;
-	case VideoType::kRGB24:
-		return libyuv::FOURCC_24BG;
-	case VideoType::kABGR:
-		return libyuv::FOURCC_ABGR;
-	case VideoType::kRGB565:
-		return libyuv::FOURCC_RGBP;
-	case VideoType::kYUY2:
-		return libyuv::FOURCC_YUY2;
-	case VideoType::kUYVY:
-		return libyuv::FOURCC_UYVY;
-	case VideoType::kMJPEG:
-		return libyuv::FOURCC_MJPG;
-	case VideoType::kNV21:
-		return libyuv::FOURCC_NV21;
-	case VideoType::kNV12:
-		return libyuv::FOURCC_NV12;
-	case VideoType::kARGB:
-		return libyuv::FOURCC_ARGB;
-	case VideoType::kBGRA:
-		return libyuv::FOURCC_BGRA;
-	case VideoType::kARGB4444:
-		return libyuv::FOURCC_R444;
-	case VideoType::kARGB1555:
-		return libyuv::FOURCC_RGBO;
-	}
-
-	return libyuv::FOURCC_ANY;
-}
+//int ConvertVideoType(VideoType video_type) {
+//	switch (video_type) {
+//	case VideoType::kUnknown:
+//		return libyuv::FOURCC_ANY;
+//	case VideoType::kI420:
+//		return libyuv::FOURCC_I420;
+//	case VideoType::kIYUV:  // same as VideoType::kYV12
+//	case VideoType::kYV12:
+//		return libyuv::FOURCC_YV12;
+//	case VideoType::kRGB24:
+//		return libyuv::FOURCC_24BG;
+//	case VideoType::kABGR:
+//		return libyuv::FOURCC_ABGR;
+//	case VideoType::kRGB565:
+//		return libyuv::FOURCC_RGBP;
+//	case VideoType::kYUY2:
+//		return libyuv::FOURCC_YUY2;
+//	case VideoType::kUYVY:
+//		return libyuv::FOURCC_UYVY;
+//	case VideoType::kMJPEG:
+//		return libyuv::FOURCC_MJPG;
+//	case VideoType::kNV21:
+//		return libyuv::FOURCC_NV21;
+//	case VideoType::kNV12:
+//		return libyuv::FOURCC_NV12;
+//	case VideoType::kARGB:
+//		return libyuv::FOURCC_ARGB;
+//	case VideoType::kBGRA:
+//		return libyuv::FOURCC_BGRA;
+//	case VideoType::kARGB4444:
+//		return libyuv::FOURCC_R444;
+//	case VideoType::kARGB1555:
+//		return libyuv::FOURCC_RGBO;
+//	}
+//
+//	return libyuv::FOURCC_ANY;
+//}
 
 size_t CalcBufferSize(VideoType type, int width, int height) 
 {