BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Added checking for HTML5 webcams"

Browse Source 
This reverts commit 51b62ed30d.
This commit is contained in:
prlanzarin 2017-12-22 18:30:40 +00:00
parent 31fb95bf72
commit 3f8e7c308c
3 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserBroadcastCamStartMsgHdlr.scala
View File

@ -16,7 +16,7 @@ trait UserBroadcastCamStartMsgHdlr {
val envelope = BbbCoreEnvelope(UserBroadcastCamStartedEvtMsg.NAME, routing) val envelope = BbbCoreEnvelope(UserBroadcastCamStartedEvtMsg.NAME, routing)
val header = BbbClientMsgHeader(UserBroadcastCamStartedEvtMsg.NAME, props.meetingProp.intId, msg.header.userId) val header = BbbClientMsgHeader(UserBroadcastCamStartedEvtMsg.NAME, props.meetingProp.intId, msg.header.userId)
val body = UserBroadcastCamStartedEvtMsgBody(msg.header.userId, msg.body.stream, msg.body.isHtml5Client) val body = UserBroadcastCamStartedEvtMsgBody(msg.header.userId, msg.body.stream)
val event = UserBroadcastCamStartedEvtMsg(header, body) val event = UserBroadcastCamStartedEvtMsg(header, body)
val msgEvent = BbbCommonEnvCoreMsg(envelope, event) val msgEvent = BbbCommonEnvCoreMsg(envelope, event)
outGW.send(msgEvent) outGW.send(msgEvent)

2
bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/WebcamsMsgs.scala
View File

@ -3,7 +3,7 @@ package org.bigbluebutton.common2.msgs
object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" } object UserBroadcastCamStartedEvtMsg { val NAME = "UserBroadcastCamStartedEvtMsg" }
case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader, case class UserBroadcastCamStartedEvtMsg(header: BbbClientMsgHeader,
body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg body: UserBroadcastCamStartedEvtMsgBody) extends BbbCoreMsg
case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String, isHtml5Client: Boolean = false) case class UserBroadcastCamStartedEvtMsgBody(userId: String, stream: String)
object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" } object UserBroadcastCamStartMsg { val NAME = "UserBroadcastCamStartMsg" }
case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends StandardMsg case class UserBroadcastCamStartMsg(header: BbbClientMsgHeader, body: UserBroadcastCamStartMsgBody) extends StandardMsg

7
bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
View File

@ -487,7 +487,7 @@ package org.bigbluebutton.modules.users.services
logData.tags = ["users"]; logData.tags = ["users"];
logData.status = "user_ejected"; logData.status = "user_ejected";
logData.message = "User ejected from meeting."; logData.message = "User ejected from meeting.";
LOGGER.debug(JSON.stringify(logData)); LOGGER.info(JSON.stringify(logData));
} }
private function handleUserLocked(msg:Object):void { private function handleUserLocked(msg:Object):void {
@ -698,16 +698,13 @@ package org.bigbluebutton.modules.users.services
private function handleUserBroadcastCamStartedEvtMsg(msg:Object):void { private function handleUserBroadcastCamStartedEvtMsg(msg:Object):void {
var userId: String = msg.body.userId as String; var userId: String = msg.body.userId as String;
var streamId: String = msg.body.stream as String; var streamId: String = msg.body.stream as String;
var isHtml5Client: Boolean = msg.body.isHtml5Client as Boolean;
var logData:Object = UsersUtil.initLogData(); var logData:Object = UsersUtil.initLogData();
logData.tags = ["webcam"]; logData.tags = ["webcam"];
logData.message = "UserBroadcastCamStartedEvtMsg server message"; logData.message = "UserBroadcastCamStartedEvtMsg server message";
logData.user.webcamStream = streamId; logData.user.webcamStream = streamId;
logData.user.isHtml5Client = isHtml5Client;
LOGGER.info(JSON.stringify(logData)); LOGGER.info(JSON.stringify(logData));
if (!isHtml5Client) {
var mediaStream: MediaStream = new MediaStream(streamId, userId) var mediaStream: MediaStream = new MediaStream(streamId, userId)
LiveMeeting.inst().webcams.add(mediaStream); LiveMeeting.inst().webcams.add(mediaStream);
@ -715,7 +712,7 @@ package org.bigbluebutton.modules.users.services
if (webUser != null) { if (webUser != null) {
sendStreamStartedEvent(userId, webUser.name, streamId); sendStreamStartedEvent(userId, webUser.name, streamId);
} }
}
} }
private function sendStreamStartedEvent(userId: String, name: String, stream: String):void{ private function sendStreamStartedEvent(userId: String, name: String, stream: String):void{