Z991239-2234 #comment fix: 音频采集增加音频包序列号

Module/mod_mediacontroller/audiocapobj.cpp

@@ -8,9 +8,7 @@
 
 AudioCapObj::AudioCapObj()
 {
-	Dbg("%s:%d", __FUNCTION__, __LINE__);
 	m_pAudioMgr = CreateAudioMgrObj(this);
-	Dbg("%s:%d", __FUNCTION__, __LINE__);
 }
 
 AudioCapObj::~AudioCapObj()

Module/mod_mediacontroller/capture.cpp

@@ -211,10 +211,6 @@ static int StreamCallback(const void* input,
 			//	Dbg("[StreamCallback] InsertAudio to shm_queue success! frameCount:%d and framesize is :%d, and shm_queue length is %d.", frameCount, frm.framesize, audio_cap->shm_queue->GetAudioLens());
 			//}
 
-			if (!audio_cap->handfree_shm_queue->InsertAudio(&dst_frm)) {
-				Dbg("[StreamCallback] InsertAudio to handfree_shm_queue failed! frameCount:%d", frameCount);
-			}
-
 			//if (!audio_cap->salesol_shm_queue->InsertAudio(&dst_frm)) {
 			//	Dbg("[StreamCallback] InsertAudio to salesol_shm_queue failed! frameCount:%d", frameCount);
 			//}
@@ -231,13 +227,6 @@ static int StreamCallback(const void* input,
 			//	Dbg("[StreamCallback] InsertAudio to shm_queue success! frameCount:%d and framesize is :%d, and shm_queue length is %d.", frameCount, frm.framesize, audio_cap->shm_queue->GetAudioLens());
 			//}
 
-			if (!audio_cap->handfree_shm_queue->InsertAudio(&frm)) {
-				Dbg("[StreamCallback] InsertAudio to handfree_shm_queue failed! frameCount:%d", frameCount);
-			}
-			//else {
-			//	Dbg("[StreamCallback] InsertAudio to handfree_shm_queue success! and framesize is :%d, and handfree_shm_queue length is %d.", frm.framesize, audio_cap->handfree_shm_queue->GetAudioLens());
-			//}
-
 			//if (!audio_cap->salesol_shm_queue->InsertAudio(&frm)) {
 			//	Dbg("[StreamCallback] InsertAudio to salesol_shm_queue failed! frameCount:%d", frameCount);
 			//}
@@ -545,14 +534,18 @@ static void audio_data_callback(const void* input, unsigned long audiolen, void*
 			frm.framesize = RVC_AUDIO_BUFFER_LEN;
 			frm.nchannels = 1;
 			frm.samplespersec = 8000;
-			frm.iseriesnumber = 0;
+			frm.iseriesnumber = audio_cap->iseriesnumber++;
+			
+			if (audio_cap->iseriesnumber >= INT_MAX){
+				audio_cap->iseriesnumber = 0;
+			}
 
 			if (!audio_cap->shm_queue->InsertAudio(&frm)) {
-				Dbg("[StreamCallback] InsertAudio to shm_queue failed!");
-			}
-			else {
-				//Dbg("[StreamCallback] InsertAudio to shm_queue success! and framesize is :%d, and shm_queue length is %d.", frm.framesize, audio_cap->shm_queue->GetAudioLens());
+				Dbg("%s:%d InsertAudio to shm_queue failed!", __FUNCTION__, __LINE__);
 			}
+			//else {
+			//	Dbg("%s:%d InsertAudio to shm_queue success! and framesize is :%d, and shm_queue length is %d, frm.iseriesnumber = %d.", __FUNCTION__, __LINE__, frm.framesize, audio_cap->shm_queue->GetAudioLens(), frm.iseriesnumber);
+			//}
 			audio_cap->uaudiolen = 0;
 			if (ileft > 0){
 				if (ileft > RVC_AUDIO_BUFFER_LEN){

Module/mod_mediacontroller/capture.h

@@ -95,18 +95,10 @@ namespace MediaController {
 		char* paudio_buffer;
 		size_t uaudiolen;
 #endif
-		
 		Clibaudioqueue *shm_queue;
-		Clibaudioqueue* handfree_shm_queue;		// 远程连线时免提音频队列
-		Clibaudioqueue *salesol_shm_queue;		// 在线双录音频队列
-		//PaStream *sales_stream;				// 现场销售录像音频流
-		//Clibaudioqueue *sales_shm_queue;		// 现场销售录像音频队列
+		Clibaudioqueue *salesol_shm_queue;		
 		capture_t *parent;
-
-		//dev real open param
-		int dev_bitspersample;
-		int dev_channels;
-		int dev_samplespersec;
+		int iseriesnumber;									// 音频包序号
 	}audio_capture_t;
 
 	//音频采集结构体
@@ -119,10 +111,6 @@ namespace MediaController {
 		Clibaudioqueue *audio_shm_queue;					// 音频包存储队列
 		rvc_sales_audio_capture_t *parent;
 
-		//dev real open param
-		int dev_bitspersample;
-		int dev_channels;
-		int dev_samplespersec;
 		//setting param
 		int iaudio_capture_samplerate;						// 音频采样率,默认值为8K
 		int iaudio_capture_peroid;							// 音频采样率周期，默认20ms，每秒50个包