Z991239-2234 #comment fix: 删除框架日志函数功能调用

Other/libaudioqueue/CMakeLists.txt

@@ -2,11 +2,11 @@ set(MODULE_NAME "audioqueue")
 set(MODULE_PREFIX "LIB_AUDIOQUEUE_FUNC")
 
 
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
+#if(RVC_DEBUG_MODE)
+#    set(SPBASE_LIB spbased)
+#else()
+#    set(SPBASE_LIB spbase)
+#endif(RVC_DEBUG_MODE)
 
 if(MSVC)
     set(STDAFXCPP stdafx.cpp)
@@ -39,7 +39,7 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	)
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	
-	${SPBASE_LIB}
+	#${SPBASE_LIB}
 	sharememory
 	)  
 

Other/libaudioqueue/libaudioqueue.cpp

@@ -6,9 +6,9 @@
 #include "../libsharememory/libsharememory.h"
 #include<stdlib.h>
 #include<string.h>
-#include "SpBase.h"
+//#include "SpBase.h"
 
-#define TESTSHAREMEM 0
+//#define TESTSHAREMEM 0
 
 void Debug(const char* fmt, ...)
 {
@@ -19,7 +19,7 @@ void Debug(const char* fmt, ...)
 //#ifdef TESTSHAREMEM
 //	printf("%s\n", strfmt);
 //#else
-//	//Dbg("%s", strfmt);
+//	Dbg("%s", strfmt);
 //#endif
 //	va_end(args);
 //	fflush(stdout);
@@ -84,7 +84,7 @@ public:
 	bool InitQueue(char* szName,int framesize=MAX_AUDIOQNODE_SIZE)
 	{
 		bool bret = false;
-		Dbg("%s:%d InitQueue name is %s, and framesize is %d.", __FUNCTION__, __LINE__, szName, framesize);
+		Debug("%s:%d InitQueue name is %s, and framesize is %d.", __FUNCTION__, __LINE__, szName, framesize);
 		m_nQueueAddrLens = sizeof(linkqueue);
 		m_nQnodeAddrLens = MAX_AUDIOQUEUE_LENS*sizeof(Qnode);
 		m_nFrameAddrLens = MAX_AUDIOQUEUE_LENS*sizeof(audio_frame);
@@ -210,7 +210,7 @@ public:
 					audiotmp->iseriesnumber			= Audio->iseriesnumber;
 					memcpy(audiotmp->data,Audio->data,Audio->framesize);
 					rearptrfront->nextqnodeindex = m_pQueue->rearindex;
-					Debug("audio series number is %d", audiotmp->iseriesnumber);
+					Debug("audio series number is %d, m_pQueue->queuelens = %d.", audiotmp->iseriesnumber, m_pQueue->queuelens);
 					//delete Audio->data;
 					//delete Audio;
 				}
@@ -279,7 +279,7 @@ public:
 			m_lpMem = m_ShareMem.Lock(1000);
 			if(m_lpMem != NULL)
 			{
-				Debug("%s:%d share memory Lock success!", __FUNCTION__, __LINE__);
+				Debug("%s:%d share memory Lock success, m_pQueue->queuelens = %d.", __FUNCTION__, __LINE__, m_pQueue->queuelens);
 				if (m_pQueue->queuelens == 0)
 				{
 					Debug("%s:%d m_pQueue queuelens is 0!", __FUNCTION__, __LINE__);
@@ -305,6 +305,7 @@ public:
 					qnodetmp->nextqnodeindex	= 0;
 					m_pQueue->queuelens--;
 					m_ShareMem.Unlock();
+					Debug("%s:%d m_pQueue->queuelens = %d.", __FUNCTION__, __LINE__, m_pQueue->queuelens);
 					return true;
 				}
 			}

Other/libvideoqueue/CMakeLists.txt

@@ -2,11 +2,11 @@ set(MODULE_NAME "videoqueue")
 set(MODULE_PREFIX "LIB_VIDEOQUEUE_FUNC")
 
 
-if(RVC_DEBUG_MODE)
-    set(SPBASE_LIB spbased)
-else()
-    set(SPBASE_LIB spbase)
-endif(RVC_DEBUG_MODE)
+#if(RVC_DEBUG_MODE)
+#    set(SPBASE_LIB spbased)
+#else()
+#    set(SPBASE_LIB spbase)
+#endif(RVC_DEBUG_MODE)
 
 if(MSVC)
     set(STDAFXCPP stdafx.cpp)
@@ -43,7 +43,7 @@ target_link_directories(${MODULE_NAME} PRIVATE
 	)
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
-	${SPBASE_LIB}
+#	${SPBASE_LIB}
 	${CONAN_PKG_LIBS_IPP}
 	sharememory
 	)