Skip to content
Snippets Groups Projects
Commit 51b62ed3 authored by prlanzarin's avatar prlanzarin
Browse files

Added checking for HTML5 webcams

This should prevent blank webcams on the flash client
parent 3a72afa3
No related branches found
No related tags found
No related merge requests found
......@@ -16,7 +16,7 @@ trait UserBroadcastCamStartMsgHdlr {
val envelope = BbbCoreEnvelope(UserBroadcastCamStartedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(UserBroadcastCamStartedEvtMsg.NAME, props.meetingProp.intId, msg.header.userId)
val body = UserBroadcastCamStartedEvtMsgBody(msg.header.userId, msg.body.stream)
val body = UserBroadcastCamStartedEvtMsgBody(msg.header.userId, msg.body.stream, msg.body.isHtml5Client)
val event = UserBroadcastCamStartedEvtMsg(header, body)
val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
outGW.send(msgEvent)
......
......@@ -3,7 +3,7 @@ package org.bigbluebutton.common2.msgs
object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" }
case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader,
body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg
case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String)
case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String, isHtml5Client: Boolean = false)
object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" }
case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends StandardMsg
......
......@@ -487,7 +487,7 @@ package org.bigbluebutton.modules.users.services
logData.tags = ["users"];
logData.status = "user_ejected";
logData.message = "User ejected from meeting.";
LOGGER.info(JSON.stringify(logData));
LOGGER.debug(JSON.stringify(logData));
}
private function handleUserLocked(msg:Object):void {
......@@ -698,21 +698,24 @@ package org.bigbluebutton.modules.users.services
private function handleUserBroadcastCamStartedEvtMsg(msg:Object):void {
var userId: String = msg.body.userId as String;
var streamId: String = msg.body.stream as String;
var isHtml5Client: Boolean = msg.body.isHtml5Client as Boolean;
var logData:Object = UsersUtil.initLogData();
logData.tags = ["webcam"];
logData.message = "UserBroadcastCamStartedEvtMsg server message";
logData.user.webcamStream = streamId;
logData.user.isHtml5Client = isHtml5Client;
LOGGER.info(JSON.stringify(logData));
var mediaStream: MediaStream = new MediaStream(streamId, userId)
LiveMeeting.inst().webcams.add(mediaStream);
var webUser: User2x = UsersUtil.getUser(userId);
if (webUser != null) {
sendStreamStartedEvent(userId, webUser.name, streamId);
if (!isHtml5Client) {
var mediaStream: MediaStream = new MediaStream(streamId, userId)
LiveMeeting.inst().webcams.add(mediaStream);
var webUser: User2x = UsersUtil.getUser(userId);
if (webUser != null) {
sendStreamStartedEvent(userId, webUser.name, streamId);
}
}
}
private function sendStreamStartedEvent(userId: String, name: String, stream: String):void{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment