Z991239-6004 #comment 优化音量信息告警

Module/mod_localmediaplay/Event.h

@@ -17,4 +17,5 @@
 #define LOG_EVT_MEDIAPLAY_COST_TIME_ERROR	0x3130010D
 #define LOG_EVT_ADV_PLAYLIST_INFO			0x3130010E
 #define LOG_EVT_NOTSUPPORT_AUDIOFORMAT		0x3130010F
-#define LOG_EVT_ADV_PLAYLIST_VALIDTIME		0x31300110
+#define LOG_EVT_ADV_PLAYLIST_VALIDTIME		0x31300110
+#define LOG_EVT_LOCALMEDIAPLAY_VOLUME		0x31300111

Module/mod_localmediaplay/mod_localmediaplay.cpp

@@ -985,6 +985,22 @@ int CLocalMediaPlayEntity::GetAudioOutDev()
 }
 
 
+void CLocalMediaPlayEntity::LogLocalMediaPlayVolumeInfo()
+{
+	int iAudioVolume = 50;
+	auto audioret = GetLocalAudioVolume();
+	if (audioret.first) {
+		iAudioVolume = audioret.second;
+	}
+
+	int iVideoVolume = 50;
+	GetLocalVideoVolume(0, iVideoVolume);
+
+	CSimpleStringA strJson("");
+	strJson += CSimpleStringA::Format("\"%s\":\"%d\",\"%s\":\"%d\"", "LocalAudio", iAudioVolume, "LocalVideo", iVideoVolume);
+	LogWarn(Severity_Low, Error_Debug, LOG_EVT_LOCALMEDIAPLAY_VOLUME, CSimpleStringA::Format("[{%s}]", strJson.GetData()).GetData());
+}
+
 ErrorCodeEnum CLocalMediaPlayEntity::LoadEntityConfig()
 {
 	SpIniMappingTable table;
@@ -1106,6 +1122,9 @@ void CLocalMediaPlayEntity::OnStarted()
 		SetLocalVideoVolume(0, 50);
 		SetLocalAudioVolume(50);
 	}
+	else {
+		LogLocalMediaPlayVolumeInfo();
+	}
 
 	setMediaPath();
 	

Module/mod_localmediaplay/mod_localmediaplay.h

@@ -205,6 +205,8 @@ private:
 
 	int GetAudioOutDev();
 
+	void LogLocalMediaPlayVolumeInfo();
+
 private:
 	int m_id_seq;
 	

Module/mod_sipphone/mod_sipphone.cpp

@@ -619,7 +619,9 @@ void CSIPEntity::OnStarted()
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("Sound Card State %s.", strValue.GetData());
 		}
 	}
-
+	
+	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_VOLUME_INFO, generateVolumeJson(m_kept_volume_in[DEV_HANDFREE], m_kept_volume_out[DEV_HANDFREE], m_kept_volume_in[DEV_PICKUP], m_kept_volume_out[DEV_PICKUP]).GetData());
+	
 	LogEvent(Severity_Middle, LOG_EVT_MOD_SIPPHONE_STARTED_SUCCESS, "sipphone entity started successfully.");
 	LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_ENTITY_STARTED, "sipphone entity started.");
 
@@ -2118,7 +2120,6 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 			rvc_snprintf(conf->audio_pickup_in_dev, MAX_PATH, "%s", strPickupIn.GetData());
 			rvc_snprintf(conf->audio_pickup_out_dev, MAX_PATH, "%s", strPickupOut.GetData());
 
-			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_VOLUME_INFO, generateVolumeJson(m_kept_volume_in[DEV_HANDFREE], m_kept_volume_out[DEV_HANDFREE], m_kept_volume_in[DEV_PICKUP], m_kept_volume_out[DEV_PICKUP]).GetData());
 			LogWarn(Severity_Low, Error_Debug, EVENT_MOD_SIP_AUDIO_DSP_INFO, generateAudioDspFlags(conf->audio_dsp).GetData());
 
 			AudioDspFlagsUseCentersetting(conf);