Z991239-5559 #comment 解决UOS抓拍存在实体lost问题（内存布局）

Module/mod_mediacontroller/capture.h

@@ -52,7 +52,7 @@ namespace MediaController {
 	typedef struct capture_t capture_t;
 	typedef struct rvc_sales_audio_capture_s rvc_sales_audio_capture_t;
 
-	typedef struct capture_config_t {
+	typedef struct capture_config_s {
 		int video_env_dev; // -1 means invalid
 		int video_opt_dev; // -1 means invalid
 		int video_env_rotate; // counter-clockwise degree, ignore currently

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -87,25 +87,29 @@ static int GetFormatString(char* strVala, size_t uValaLen, char* strValb, size_t
 }
 
 
-CMediaControllerEntity::CMediaControllerEntity(): m_capture(NULL), m_salesaudio_capture(NULL), m_lCaptureEnvCount(0), m_nCameraErrorCode(Error_Succeed),
-	m_lCaptureEnvOptCount(0), m_lCaptureOptCount(0), 
-	m_nCameraCount(2), m_pHMClient(NULL),m_pMediaControllerChannel(NULL),m_bIsRemoteRecord(false), m_bHasStartSpeakerRender(false), m_bConnectedAssist(false)
+CMediaControllerEntity::CMediaControllerEntity(): m_capture(NULL), m_salesaudio_capture(NULL), m_lCaptureEnvCount(0), m_lCaptureEnvOptCount(0), m_lCaptureOptCount(0),
+	m_pHMClient(NULL),m_pMediaControllerChannel(NULL),m_bIsRemoteRecord(false), m_bHasStartSpeakerRender(false), m_bConnectedAssist(false)
 {
-#ifdef RVC_OS_LINUX
+#ifdef RVC_OS_WIN
+	m_pAudioRenderObj = NULL;
+	m_bSpeakerCap = true;
+#else
 	m_env_mutex = PTHREAD_MUTEX_INITIALIZER;
 	m_opt_mutex = PTHREAD_MUTEX_INITIALIZER;
 	m_envopt_mutex = PTHREAD_MUTEX_INITIALIZER;
 	m_pAudioCap = NULL;
-#else
-	m_pAudioRenderObj = NULL;
-	m_bSpeakerCap = true;
 #endif
+
 	m_iCamTimeout = CAMERA_TIMEOUT;
 	m_iDelayTime = RVC_MAX_DELAY_TIME;
 	m_interValTime = RVC_CAM_INTERVAL_TIME;
 	m_bOnBusiness = false;
 	m_bJsOccupyCamera = false;
 	m_bCameraOffTimerOn = false;
+	m_eDeviceType = eStand2sType;
+	m_nCameraErrorCode = Error_Succeed;
+	memset(&conf, 0, sizeof(capture_config_t));
+	memset(&m_sales_audio_conf, 0, sizeof(rvc_audio_capture_config_t));
 }
 
 void CMediaControllerEntity::OnSysVarEvent(const char *pszKey, const char *pszValue,const char *pszOldValue,const char *pszEntityName)
@@ -240,9 +244,6 @@ void CMediaControllerEntity::OnStarted()
 	}
 #endif
 
-	memset(&conf,0,sizeof(capture_config_t));
-	memset(&m_sales_audio_conf, 0, sizeof(rvc_audio_capture_config_t));
-
 	int icamnum = 0;
 	Error = (ErrorCodeEnum)capture_lib_init(&icamnum);
 	if (Error == Error_Succeed)

Module/mod_mediacontroller/mod_mediacontroller.h

@@ -124,14 +124,11 @@ public:
 	void LogTransactionRecordCtrEvt(int iEvtType);
 
 public:
-	bool m_bSendCameraError;
 	DeviceTypeEnum m_eDeviceType;
 	bool m_bStartCamera;
 	capture_config_t conf;
-	rvc_audio_capture_config_s m_sales_audio_conf;			
-	ErrorCodeEnum m_nCameraErrorCode;
-	int m_nCurActiveCamera;
-	int m_nCameraCount;  
+	rvc_audio_capture_config_t m_sales_audio_conf;
+	ErrorCodeEnum m_nCameraErrorCode; 
 	capture_t* m_capture;
 	rvc_sales_audio_capture_t* m_salesaudio_capture;
 	bool m_bHasStartSpeakerRender;
@@ -139,15 +136,6 @@ public:
 	bool m_bJsOccupyCamera;
 
 private:
-	LONG m_lCaptureEnvCount;
-	LONG m_lCaptureOptCount;
-	LONG m_lCaptureEnvOptCount;
-	CAutoArray<CUUID> m_arrListener;
-	ChannelMediaControllerClient* m_pMediaControllerChannel;
-	HealthManagerService_ClientBase* m_pHMClient;					
-	bool m_bIsRemoteRecord;					
-	bool m_bConnectedAssist;
-	int m_iCamTimeout;
 
 #ifdef RVC_OS_WIN
 	IAudioRender* m_pAudioRenderObj;
@@ -159,6 +147,15 @@ private:
 	IAudioMgr* m_pAudioCap;
 #endif
 
+	LONG m_lCaptureEnvCount;
+	LONG m_lCaptureOptCount;
+	LONG m_lCaptureEnvOptCount;
+	CAutoArray<CUUID> m_arrListener;
+	ChannelMediaControllerClient* m_pMediaControllerChannel;
+	HealthManagerService_ClientBase* m_pHMClient;					
+	bool m_bIsRemoteRecord;					
+	bool m_bConnectedAssist;
+	int m_iCamTimeout;
 	int m_iDelayTime;
 	int m_interValTime;
 	bool m_bCameraOffTimerOn;