|
@@ -1172,6 +1172,9 @@ ErrorCodeEnum CMediaControllerEntity::LoadConfig(capture_config_t *conf)
|
|
|
LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_OPT_CAMERA_INFO, conf->strVideoOpt.GetData());
|
|
|
LogWarn(Severity_Low, Error_Debug, LOG_EVT_MEDIACONTROLLER_CAMERA_INFOS, generateCameraInfosJson(conf->strVideoEnv, conf->strVideoOpt, conf->video_env_rotate, conf->video_opt_rotate, imtu).GetData());
|
|
|
|
|
|
+#ifdef RVC_OS_WIN
|
|
|
+
|
|
|
+#else
|
|
|
Error = AutoGetVideoDeviceName(conf);
|
|
|
CSimpleStringA strInfo = CSimpleStringA::Format("env = %s,opt = %s", conf->strVideoEnv.GetData(), conf->strVideoOpt.GetData());
|
|
|
if (Error_Succeed == Error){
|
|
@@ -1180,6 +1183,8 @@ ErrorCodeEnum CMediaControllerEntity::LoadConfig(capture_config_t *conf)
|
|
|
else {
|
|
|
LogWarn(Severity_Low, Error_Debug, ERROR_MOD_MEDIACONTROLLER_VIDEO_AUTO_MATHED_FAILED, strInfo.GetData());
|
|
|
}
|
|
|
+#endif // RVC_OS_WIN
|
|
|
+
|
|
|
Error = CheckConfigCameraName(conf, m_eDeviceType);
|
|
|
if (Error == Error_EnvCamera || Error == Error_AllCamera){
|
|
|
char strMessage[MAX_PATH*2] = {0};
|