Z991239-6004 #comment 连线相关实体日志精简优化

Module/mod_counterconnector/ConnectorFSM.cpp

@@ -179,7 +179,7 @@ ErrorCodeEnum ACMCallFSM::OnInit()
 		return Error;
 	}
 
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("m_strDefaultServer %s.", m_strDefaultServer.GetData());
+	//DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("m_strDefaultServer %s.", m_strDefaultServer.GetData());
 	if(m_strDefaultServer.GetLength() > 0){
 		iCount = ParseDefaultServer(m_strDefaultServer.GetData());
 	}

Module/mod_counterconnector/mod_counterconnector.cpp

@@ -804,7 +804,9 @@ void CCounterConnectorEntity ::SendCurAudioDevice()
 	CSmartPointer<IEntityFunction> Func = GetFunction();
 	CSimpleStringA strValue("");
 	Func->GetSysVar(SYSVAR_SOUNDCARDSTATE, strValue);
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Sound Card State is %s.", strValue.GetData());
+	if ('N' != strValue[0]) {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Sound Card State %s.", strValue.GetData());
+	}
 
 	if ('H' == strValue[0]) {
 		nDevice = 1;
@@ -822,7 +824,7 @@ void CCounterConnectorEntity ::SendCurAudioDevice()
 	buf & nDevice;
 	Info.data = buf.ToBlob();
 	m_pCounterConnectorChannel->Send(Info);
-	DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("send cur Audio device = %d",nDevice);
+	//DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("send cur Audio device = %d",nDevice);
 }
 
 

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -54,19 +54,19 @@
 
 
 #ifdef RVC_OS_WIN
-static void __audio_render_log(void* user_data, const char* fmt, va_list arg)
+static void __audio_render_log(audiorender_loglevel elevel, void* user_data, const char* fmt, va_list arg)
 {
 	int n = vsnprintf(NULL, 0, fmt, arg);
 	if (n >= MAX_PATH) {
 		char* buf = (char*)malloc((size_t)(n + 1));
 		vsnprintf(buf, n + 1, fmt, arg);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s", buf);
+		DbgWithLink((LOG_LEVEL_E)elevel, LOG_TYPE_SYSTEM)("%s", buf);
 		free(buf);
 	}
 	else{
 		char strlog[MAX_PATH] = {0};
 		vsnprintf(strlog, MAX_PATH, fmt, arg);
-		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("%s", strlog);
+		DbgWithLink((LOG_LEVEL_E)elevel, LOG_TYPE_SYSTEM)("%s", strlog);
 	}
 }
 #else
@@ -1819,7 +1819,9 @@ ErrorCodeEnum CMediaControllerEntity::StartCamera(bool bstartaudio)
 			CSimpleStringA strValue("");
 			Func->GetSysVar(SYSVAR_SOUNDCARDSTATE, strValue);
 			m_capture->config.strAudioState = strValue;
-			DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Sound Card State is %s.", strValue.GetData());
+			if ('N' != strValue[0]) {
+				DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Sound Card State %s.", strValue.GetData());
+			}
 
 			Error = capture_start(m_capture, bstartaudio);
 			if (Error != Error_Succeed)

Module/mod_recorder/mod_recorder.cpp

@@ -712,7 +712,10 @@ void CRecorderEntity::StartRecord(const char *videofilename)
 	CSmartPointer<IEntityFunction> Func = GetFunction();
 	CSimpleStringA strValue("");
 	Func->GetSysVar(SYSVAR_SOUNDCARDSTATE, strValue);
-	DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("Sound Card State is %s.", strValue.GetData());
+	if ('N' != strValue[0]) {
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Sound Card State %s.", strValue.GetData());
+	}
+
 	if ('N' == strValue[0] || 'P' == strValue[0]) {
 		tAudioParams.bMuteAudioMode = false;
 	}

Other/win/libaudiorender/iaudiorenderinterface.h

@@ -8,8 +8,16 @@
 
 #include <stdarg.h>
 
+enum audiorender_loglevel {
+	AUDIORENDER_LOG_DEBUG,
+	AUDIORENDER_LOG_INFO,
+	AUDIORENDER_LOG_WARN,
+	AUDIORENDER_LOG_ERROR,
+	AUDIORENDER_LOG_FATAL
+};
+
 typedef struct audiorender_callback_s {
-	void (*debug)(void* user_data, const char* fmt, va_list arg);
+	void (*debug)(audiorender_loglevel elevel, void* user_data, const char* fmt, va_list arg);
 	void (*on_render_failed)();
 	void (*on_audio_render_excption)();
 	void* user_data;

Other/win/libaudiorender/libaudiorender.cpp

@@ -2,7 +2,9 @@
 //
 
 #include "stdafx.h"
+#ifndef _CRT_SECURE_NO_WARNINGS
 #define _CRT_SECURE_NO_WARNINGS
+#endif
 
 #include "libaudiorender.h"
 #include "../../rvcmediacommon/rvc_media_common.h"
@@ -75,19 +77,19 @@ void AudioRenderImpl::LogRenderInfo()
 			uConvertRatio = (m_pwfx->nSamplesPerSec*m_pwfx->nChannels*m_pwfx->wBitsPerSample)/(m_frame_format->samplespersec*m_frame_format->nchannels*m_frame_format->bitspersample);
 		}
 	}
-	RenderLog("current speaker render audio convert ratio is %d.", uConvertRatio);
+	RenderLog(AUDIORENDER_LOG_DEBUG, "current speaker render audio convert ratio is %d.", uConvertRatio);
 
 	eSpeakerSamplingDepthRate eSampleType = GetSpeakerSampleRate(m_pwfx->wBitsPerSample, m_pwfx->nSamplesPerSec);
-	RenderLog("Speaker Sample Type is %d.", eSampleType);
+	RenderLog(AUDIORENDER_LOG_DEBUG, "Speaker Sample Type is %d.", eSampleType);
 }
 
-void AudioRenderImpl::RenderLog( const char *fmt, ... )
+void AudioRenderImpl::RenderLog(audiorender_loglevel elevel, const char *fmt, ... )
 {
 	if (m_audiorender_cb.debug){
 		va_list arg;
 		va_start(arg, fmt);
 		if (*m_audiorender_cb.debug){
-			(*m_audiorender_cb.debug)(m_audiorender_cb.user_data, fmt, arg);
+			(*m_audiorender_cb.debug)(elevel, m_audiorender_cb.user_data, fmt, arg);
 		}
 		va_end(arg);
 	}
@@ -189,8 +191,8 @@ int AudioRenderImpl::StartRender(int iQueue, void* pFrameformat, const char* pSw
 		goto error;
 	}
 	else{
-		RenderLog("speaker render format is %0x, channels is %d, samples rate is %d, buffer size is %d, block size of data is %d.",m_pwfx->wFormatTag, m_pwfx->nChannels, m_pwfx->nSamplesPerSec, m_pwfx->nAvgBytesPerSec, m_pwfx->nBlockAlign);   
-		RenderLog("destination audio frame format is %d, samples rate is %d, bits per sample is %d, channels number is %d.", m_frame_format->format, m_frame_format->samplespersec, m_frame_format->bitspersample, m_frame_format->nchannels);
+		RenderLog(AUDIORENDER_LOG_DEBUG, "speaker render format is %0x, channels is %d, samples rate is %d, buffer size is %d, block size of data is %d.",m_pwfx->wFormatTag, m_pwfx->nChannels, m_pwfx->nSamplesPerSec, m_pwfx->nAvgBytesPerSec, m_pwfx->nBlockAlign);
+		RenderLog(AUDIORENDER_LOG_DEBUG, "destination audio frame format is %d, samples rate is %d, bits per sample is %d, channels number is %d.", m_frame_format->format, m_frame_format->samplespersec, m_frame_format->bitspersample, m_frame_format->nchannels);
 	}
 
 	if (!AdjustFormatTo16Bits(m_pwfx)){
@@ -341,7 +343,7 @@ int AudioRenderImpl::InitQueueInfo(int iQueue)
 		m_audio_cap = new Clibaudioqueue(pQueueName);
 		if (NULL != m_audio_cap){
 			iRet = 0;
-			RenderLog("audio render insert queue name is %s.", pQueueName);
+			RenderLog(AUDIORENDER_LOG_DEBUG, "audio render insert queue name is %s.", pQueueName);
 		}
 	}
 	
@@ -373,7 +375,7 @@ uint32_t AudioRenderImpl::TranslateBuffer2DestFrameFormat(spx_int16_t* pOutAudio
 			memcpy(pSingleChannelBuf, pCbBuffer, uBufferLen);
 		}
 		else{
-			RenderLog("not support single channel convert to double channels.");
+			RenderLog(AUDIORENDER_LOG_INFO, "not support single channel convert to double channels.");
 		}
 	}
 
@@ -421,15 +423,15 @@ void AudioRenderImpl::RenderFunc()
 
 	st = speex_resampler_init_frac(1, m_pwfx->nSamplesPerSec, m_frame_format->samplespersec, m_pwfx->nSamplesPerSec, m_frame_format->samplespersec, 0, &err);
 
-	while (TRUE){
-		dwWaitResult = WaitForMultipleObjects(sizeof(waitArray) / sizeof(waitArray[0]), waitArray, FALSE, INFINITE);
+	while (true){
+		dwWaitResult = WaitForMultipleObjects(sizeof(waitArray) / sizeof(waitArray[0]), waitArray, false, INFINITE);
 		if (WAIT_OBJECT_0 == dwWaitResult) {
-			RenderLog("%s","exit circle for set event stop.");
+			RenderLog(AUDIORENDER_LOG_DEBUG, "exit circle for set event stop.");
 			break;
 		}
 
 		if (WAIT_OBJECT_0 + 1 != dwWaitResult){
-			RenderLog("%s","exit circle for time wake up.");
+			RenderLog(AUDIORENDER_LOG_DEBUG, "exit circle for time wake up.");
 			break;
 		}
 
@@ -461,9 +463,9 @@ void AudioRenderImpl::RenderFunc()
 		if (0 != nNumFramesToRead){
 			uIndex = TranslateBuffer2DestFrameFormat((spx_int16_t*)((char*)OutAudioBuffer+uIndex), &uValidAudioLen, uLeftBufferLen, pData, nNumFramesToRead*m_pwfx->nBlockAlign, st, m_frame_format);
 			uLeftBufferLen -= uValidAudioLen;
-			//Debug("translate valid audio len is %d,left buffer len is %d.", uValidAudioLen, uLeftBufferLen);
+			//RenderLog(AUDIORENDER_LOG_DEBUG, "translate valid audio len is %d,left buffer len is %d.", uValidAudioLen, uLeftBufferLen);
 			if (uLeftBufferLen <= RVC_AUDIO_BUFFER_LEN - m_frame_format->framesize){
-				//Debug("audio len = %d.", RVC_AUDIO_BUFFER_LEN - uLeftBufferLen);
+				//RenderLog(AUDIORENDER_LOG_DEBUG, "audio len = %d.", RVC_AUDIO_BUFFER_LEN - uLeftBufferLen);
 				if (m_audio_cap){
 					audio_frame framedata;
 					framedata.bitspersample = m_frame_format->bitspersample;
@@ -476,11 +478,11 @@ void AudioRenderImpl::RenderFunc()
 					bool bRet = m_audio_cap->InsertAudio(&framedata);
 					if (bRet){
 						if (0 == framedata.iseriesnumber % 1000){
-							RenderLog("speaker audio[%d] InsertAudio success.", framedata.iseriesnumber);
+							RenderLog(AUDIORENDER_LOG_DEBUG, "speaker audio[%d] InsertAudio success.", framedata.iseriesnumber);
 						}
 					} 
 					else{
-						RenderLog("%s","speaker audio InsertAudio failed.");
+						RenderLog(AUDIORENDER_LOG_INFO, "speaker audio InsertAudio failed.");
 					}
 
 					if (m_bRecordPCM){
@@ -495,7 +497,6 @@ void AudioRenderImpl::RenderFunc()
 			}
 			else{
 				uValidAudioLen = 0;
-				//Debug("continue next capture.");
 			}
 		}
 
@@ -514,9 +515,9 @@ void AudioRenderImpl::RenderFunc()
 }
 
 
-BOOL AudioRenderImpl::AdjustFormatTo16Bits(WAVEFORMATEX *pwfx)
+bool AudioRenderImpl::AdjustFormatTo16Bits(WAVEFORMATEX *pwfx)
 {
-	BOOL bRet = FALSE;
+	bool bRet = false;
 
 	if (NULL != pwfx){
 		if (pwfx->wFormatTag == WAVE_FORMAT_IEEE_FLOAT){
@@ -524,7 +525,7 @@ BOOL AudioRenderImpl::AdjustFormatTo16Bits(WAVEFORMATEX *pwfx)
 			pwfx->wBitsPerSample = 16;
 			pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample / 8;
 			pwfx->nAvgBytesPerSec = pwfx->nBlockAlign * pwfx->nSamplesPerSec;
-			bRet = TRUE;
+			bRet = true;
 		}
 		else if (pwfx->wFormatTag == WAVE_FORMAT_EXTENSIBLE){
 			PWAVEFORMATEXTENSIBLE pEx = reinterpret_cast<PWAVEFORMATEXTENSIBLE>(pwfx);
@@ -534,7 +535,7 @@ BOOL AudioRenderImpl::AdjustFormatTo16Bits(WAVEFORMATEX *pwfx)
 				pwfx->wBitsPerSample = 16;
 				pwfx->nBlockAlign = pwfx->nChannels * pwfx->wBitsPerSample / 8;
 				pwfx->nAvgBytesPerSec = pwfx->nBlockAlign * pwfx->nSamplesPerSec;
-				bRet = TRUE;
+				bRet = true;
 			}
 		}
 	}
@@ -544,7 +545,7 @@ BOOL AudioRenderImpl::AdjustFormatTo16Bits(WAVEFORMATEX *pwfx)
 
 int AudioRenderImpl::StopRender()
 {
-	RenderLog("%s","stop audio render.");
+	RenderLog(AUDIORENDER_LOG_DEBUG, "stop audio render.");
 	
 	m_bRecordPCM = false;
 	memset(m_strFilePathName, 0, MAX_PATH);
@@ -554,7 +555,7 @@ int AudioRenderImpl::StopRender()
 	}
 
 	SetEvent(m_hEventStop);
-	RenderLog("%s","m_hEventStop SetEvent.");
+	RenderLog(AUDIORENDER_LOG_DEBUG, "m_hEventStop SetEvent.");
 	WaitForSingleObject(m_hThread, -1);
 
 	if (m_audio_cap){

Other/win/libaudiorender/libaudiorender.h

@@ -33,7 +33,7 @@ class AudioRenderImpl : public IAudioRender
 public:
 	AudioRenderImpl(audiorender_callback_t* pCallback);
 	virtual int StartRender(int iQueue, void* pFrameformat, const char*pSwitchName);
-	BOOL AdjustFormatTo16Bits(WAVEFORMATEX *pwfx);
+	bool AdjustFormatTo16Bits(WAVEFORMATEX *pwfx);
 	static DWORD WINAPI pfThreadFunc(LPVOID lpThreadParameter);
 	uint32_t ConvertDouble2SingleChannel(char* pDstBuf, const uint32_t uDstLen, const unsigned char* pSrcBuf, uint32_t uSrcLen, uint32_t uBitDeepth);
 	eSpeakerSamplingDepthRate GetSpeakerSampleRate(uint32_t udepth, uint32_t usamplerate);
@@ -47,7 +47,7 @@ public:
 	void Close();
 	void LogRenderInfo(); 
 
-	virtual void RenderLog(const char *fmt, ...);
+	virtual void RenderLog(audiorender_loglevel elevel, const char *fmt, ...);
 	virtual void OnRenderFailed();
 	virtual void OnAudioRenderExcption();