Z991239-5745 #comment 增加音频识别流程

Module/mod_sipphone/mod_sipphone.cpp

@@ -894,13 +894,13 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("audio config is invalid.");
 		SetSoundCardSysVar(SOUNDCARD_CONFIG_EMPTY);
 		GetFunction()->SetSysVar("AuthErrMsg", "音频配置缺失，请使用硬件配置修改");
-		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA3101")("音频配置缺失，请使用硬件配置修改");
+		DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR0402301A3").setResultCode("RTA3101")("音频配置缺失，请使用硬件配置修改");
 		return Error_Param;
 	}
 	
 	uint32_t uCheckRet = CheckAudioDevice();
 	if (RVC_AUDIO_NO_ERROR == uCheckRet) {
-		DbgWithLink(LOG_LEVEL_DEBUG, LOG_TYPE_SYSTEM)("no audio device config error.");
+		DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM).setLogCode("QLR0402301A3")("load audio device config success.");
 		SetSoundCardSysVar(SOUNDCARD_NO_ERROR);
 	}
 	else {
@@ -908,7 +908,7 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 		if (IsBothSoundCardError(uCheckRet)) {		//两组声卡都故障
 			SetSoundCardSysVar(SOUNDCARD_BOTH_ERROR);
 			GetFunction()->SetSysVar("AuthErrMsg", "音频设备故障，请联系厂商排查");
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA3102")("音频设备故障，请联系厂商排查");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR0402301A3").setResultCode("RTA3102")("音频设备故障，请联系厂商排查");
 			return Error_Param;
 		}
 
@@ -916,12 +916,12 @@ ErrorCodeEnum CSIPEntity::__OnStart(ErrorCodeEnum preOperationError)
 			DbgWithLink(LOG_LEVEL_INFO, LOG_TYPE_SYSTEM)("can't find handfree audio device.");
 			SetSoundCardSysVar(SOUNDCARD_HANDFREE_ERROR);
 			HandleHandfreeAudioDeviceErrorEvent();
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA3103")("识别不到免提声卡");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR0402301A3").setResultCode("RTA3103")("识别不到免提声卡");
 		}
 
 		if ((uCheckRet == (RVC_AUDIO_PICKUPIN_ERROR | RVC_AUDIO_PICKUPOUT_ERROR)) || (uCheckRet == RVC_AUDIO_PICKUPIN_ERROR) || (uCheckRet == RVC_AUDIO_PICKUPOUT_ERROR)) {
 			SetSoundCardSysVar(SOUNDCARD_PICKUP_ERROR);
-			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setResultCode("RTA3104")("话筒声卡故障声卡");
+			DbgWithLink(LOG_LEVEL_WARN, LOG_TYPE_SYSTEM).setLogCode("QLR0402301A3").setResultCode("RTA3104")("话筒声卡故障声卡");
 		}
 	}
 
@@ -2102,10 +2102,10 @@ ErrorCodeEnum CSIPEntity::LoadConfig(endpoint_conf_t *conf)
 		table.AddEntryInt("video", "mtu", conf->mtu, 0);
 		Error = table.Load(spRootConfig);
 		if (Error == Error_Succeed) {
-			_snprintf(conf->audio_handfree_in_dev, MAX_PATH, "%s", strHandFreeIn.GetData());
-			_snprintf(conf->audio_handfree_out_dev, MAX_PATH, "%s", strHandFreeOut.GetData());
-			_snprintf(conf->audio_pickup_in_dev, MAX_PATH, "%s", strPickupIn.GetData());
-			_snprintf(conf->audio_pickup_out_dev, MAX_PATH, "%s", strPickupOut.GetData());
+			rvc_snprintf(conf->audio_handfree_in_dev, MAX_PATH, "%s", strHandFreeIn.GetData());
+			rvc_snprintf(conf->audio_handfree_out_dev, MAX_PATH, "%s", strHandFreeOut.GetData());
+			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());

Module/mod_sipphone/mod_sipphone.h

@@ -63,6 +63,14 @@ using namespace AssistantChannel;
 #endif
 #endif
 
+#ifndef rvc_snprintf
+#ifdef RVC_OS_WIN
+#define rvc_snprintf _snprintf
+#else
+#define rvc_snprintf snprintf
+#endif // RVC_OS_WIN
+#endif // rvc_snprintf
+
 typedef enum
 {
 	RVC_AUDIO_NO_ERROR = 0x0,				

Other/win/libmediadeviceinfo/linux/videodevice_info_linux.cpp

@@ -244,7 +244,7 @@ int  rvc_videocap_get_device_fullpathname(int device_id, char* fullnamebuf, int
 		tFmtDesc.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
 
 		while ((ioctl(fd, VIDIOC_ENUM_FMT, &tFmtDesc)) == 0) {
-			if (V4L2_PIX_FMT_YUYV == tFmtDesc.pixelformat || V4L2_PIX_FMT_RGB565 == tFmtDesc.pixelformat)
+			if (V4L2_PIX_FMT_YUYV == tFmtDesc.pixelformat || V4L2_PIX_FMT_MJPEG == tFmtDesc.pixelformat)
 			{
 				iPixelFormat = tFmtDesc.pixelformat;
 				break;