Z991239-5945 #comment 完善停止摄像头渲染接口

Module/mod_mediacontroller/brightnessinfo.h

@@ -82,8 +82,8 @@ struct BrightnessInfoHTTPRet : CHTTPRet {
 			m_success = root[REFLECTION(success)].asBool();
 			m_code = root[REFLECTION(code)].asString();
 			m_message = root[REFLECTION(message)].asString();
-			m_returnCode = root[REFLECTION(returnCode)].asString();
-			m_errorMsg = root[REFLECTION(errorMsg)].asString();
+			m_returnCode = root[REFLECTION(return_code)].asString();
+			m_errorMsg = root[REFLECTION(error_msg)].asString();
 			m_data = root[REFLECTION(data)].asBool();
 		}
 		else {

Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -37,6 +37,7 @@
 #define RVC_CAMERA_OFF_TIMER 3
 #endif // !RVC_CAMERA_OFF_TIMER
 
+
 #ifndef RVC_CAMERA_CAP_PROCESS
 #define RVC_CAMERA_CAP_PROCESS 4
 #endif // !RVC_CAMERA_CAP_PROCESS

Module/mod_sipphone/mod_sipphone.cpp

@@ -2857,8 +2857,14 @@ void CSIPPhoneSession::Handle_StartCameraRender(SpReqAnsContext<PhoneService_Sta
 
 void CSIPPhoneSession::Handle_StopCameraRender(SpReqAnsContext<PhoneService_StopCameraRender_Req, PhoneService_StopCameraRender_Ans>::Pointer ctx)
 {
-	int iRet = m_pEntity->StopCameraRender();
-	ctx->Ans.result = iRet;
+	if (m_pEntity->m_bIsCameraRender) {
+		int iRet = m_pEntity->StopCameraRender();
+		ctx->Ans.result = iRet;
+	}
+	else {
+		ctx->Ans.result = 0;
+	}
+
 	ctx->Answer(Error_Succeed);
 }