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

Changed kurento screenshare app RTMP broadcast messages to new format

Browse Source
This commit is contained in:
prlanzarin 2017-07-19 14:17:01 +00:00
parent 20fe7c2f24
commit 8c69de35cd
5 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
labs/kurento-screenshare/lib/bbb/messages/Constants.js
View File

@ -30,8 +30,8 @@
DESKSHARE_RTMP_BROADCAST_STOPPED: "deskshare_rtmp_broadcast_stopped_message",
//Message identifiers 2x
DESKSHARE_RTMP_BROADCAST_STARTED_2x: "DeskshareRtmpBroadcastStartedVoiceConfEvtMsg",
DESKSHARE_RTMP_BROADCAST_STOPPED_2x: "DeskshareRtmpBroadcastStoppedVoiceConfEvtMsg",
SCREENSHARE_RTMP_BROADCAST_STARTED_2x: "ScreenshareRtmpBroadcastStartedVoiceConfEvtMsg",
SCREENSHARE_RTMP_BROADCAST_STOPPED_2x: "ScreenshareRtmpBroadcastStoppedVoiceConfEvtMsg",
// Redis messages fields
// Transcoder
@ -42,7 +42,7 @@
// Screenshare
CONFERENCE_NAME: "voiceConf",
SCREENSHARE_CONF: "deskshareConf",
SCREENSHARE_CONF: "screenshareConf",
STREAM_URL: "stream",
TIMESTAMP: "timestamp",
VIDEO_WIDTH: "vidWidth",

16
labs/kurento-screenshare/lib/bbb/messages/Messaging.js
View File

@ -12,10 +12,10 @@ var DeskShareRTMPBroadcastStartedEventMessage =
require('./screenshare/DeskShareRTMPBroadcastStartedEventMessage.js')(Constants);
var DeskShareRTMPBroadcastStoppedEventMessage =
require('./screenshare/DeskShareRTMPBroadcastStoppedEventMessage.js')(Constants);
var DeskShareRTMPBroadcastStartedEventMessage2x =
require('./screenshare/DeskShareRTMPBroadcastStartedEventMessage2x.js')(Constants);
var DeskShareRTMPBroadcastStoppedEventMessage2x =
require('./screenshare/DeskShareRTMPBroadcastStoppedEventMessage2x.js')(Constants);
var ScreenshareRTMPBroadcastStartedEventMessage2x =
require('./screenshare/ScreenshareRTMPBroadcastStartedEventMessage2x.js')(Constants);
var ScreenshareRTMPBroadcastStoppedEventMessage2x =
require('./screenshare/ScreenshareRTMPBroadcastStoppedEventMessage2x.js')(Constants);
/**
@ -49,15 +49,15 @@ Messaging.prototype.generateDeskShareRTMPBroadcastStoppedEvent =
return stodrbem.toJson();
}
Messaging.prototype.generateDeskShareRTMPBroadcastStartedEvent2x =
Messaging.prototype.generateScreenshareRTMPBroadcastStartedEvent2x =
function(conferenceName, screenshareConf, streamUrl, vw, vh, timestamp) {
var stadrbem = new DeskShareRTMPBroadcastStartedEventMessage2x(conferenceName, screenshareConf, streamUrl, vw, vh, timestamp);
var stadrbem = new ScreenshareRTMPBroadcastStartedEventMessage2x(conferenceName, screenshareConf, streamUrl, vw, vh, timestamp);
return stadrbem.toJson();
}
Messaging.prototype.generateDeskShareRTMPBroadcastStoppedEvent2x =
Messaging.prototype.generateScreenshareRTMPBroadcastStoppedEvent2x =
function(conferenceName, screenshareConf, streamUrl, vw, vh, timestamp) {
var stodrbem = new DeskShareRTMPBroadcastStoppedEventMessage2x(conferenceName, screenshareConf, streamUrl, vw, vh, timestamp);
var stodrbem = new ScreenshareRTMPBroadcastStoppedEventMessage2x(conferenceName, screenshareConf, streamUrl, vw, vh, timestamp);
return stodrbem.toJson();
}

8
labs/kurento-screenshare/lib/bbb/messages/screenshare/DeskShareRTMPBroadcastStartedEventMessage2x.js → labs/kurento-screenshare/lib/bbb/messages/screenshare/ScreenshareRTMPBroadcastStartedEventMessage2x.js
View File

@ -6,9 +6,9 @@ var inherits = require('inherits');
var OutMessage2x = require('../OutMessage2x');
module.exports = function (C) {
function DeskShareRTMPBroadcastStartedEventMessage2x (conferenceName, screenshareConf,
function ScreenshareRTMPBroadcastStartedEventMessage2x (conferenceName, screenshareConf,
streamUrl, vw, vh, timestamp) {
DeskShareRTMPBroadcastStartedEventMessage2x.super_.call(this, C.DESKSHARE_RTMP_BROADCAST_STARTED_2x,
ScreenshareRTMPBroadcastStartedEventMessage2x.super_.call(this, C.SCREENSHARE_RTMP_BROADCAST_STARTED_2x,
{voiceConf: conferenceName}, {voiceConf: conferenceName});
this.core.body = {};
@ -20,6 +20,6 @@ module.exports = function (C) {
this.core.body[C.TIMESTAMP] = timestamp;
};
inherits(DeskShareRTMPBroadcastStartedEventMessage2x, OutMessage2x);
return DeskShareRTMPBroadcastStartedEventMessage2x;
inherits(ScreenshareRTMPBroadcastStartedEventMessage2x, OutMessage2x);
return ScreenshareRTMPBroadcastStartedEventMessage2x;
}

8
labs/kurento-screenshare/lib/bbb/messages/screenshare/DeskShareRTMPBroadcastStoppedEventMessage2x.js → labs/kurento-screenshare/lib/bbb/messages/screenshare/ScreenshareRTMPBroadcastStoppedEventMessage2x.js
View File

@ -6,9 +6,9 @@ var inherits = require('inherits');
var OutMessage2x = require('../OutMessage2x');
module.exports = function (C) {
function DeskShareRTMPBroadcastStoppedEventMessage2x (conferenceName, screenshareConf,
function ScreenshareRTMPBroadcastStoppedEventMessage2x (conferenceName, screenshareConf,
streamUrl, vw, vh, timestamp) {
DeskShareRTMPBroadcastStoppedEventMessage2x.super_.call(this, C.DESKSHARE_RTMP_BROADCAST_STOPPED_2x,
ScreenshareRTMPBroadcastStoppedEventMessage2x.super_.call(this, C.SCREENSHARE_RTMP_BROADCAST_STOPPED_2x,
{voiceConf: conferenceName}, {voiceConf: conferenceName});
this.core.body = {};
@ -20,6 +20,6 @@ module.exports = function (C) {
this.core.body[C.TIMESTAMP] = timestamp;
};
inherits(DeskShareRTMPBroadcastStoppedEventMessage2x, OutMessage2x);
return DeskShareRTMPBroadcastStoppedEventMessage2x;
inherits(ScreenshareRTMPBroadcastStoppedEventMessage2x, OutMessage2x);
return ScreenshareRTMPBroadcastStoppedEventMessage2x;
}

4
labs/kurento-screenshare/lib/screenshare.js
View File

@ -187,7 +187,7 @@ module.exports = class Screenshare {
if(self._voiceBridge === meetingId) {
// TODO correctly assemble this timestamp
let timestamp = now.format('hhmmss');
let dsrstom = Messaging.generateDeskShareRTMPBroadcastStoppedEvent2x(self._voiceBridge,
let dsrstom = Messaging.generateScreenshareRTMPBroadcastStoppedEvent2x(self._voiceBridge,
self._voiceBridge, self._streamUrl, self._vw, self._vh, timestamp);
self._BigBlueButtonGW.publish(dsrstom, C.FROM_VOICE_CONF_SYSTEM_CHAN, function(error) {});
}
@ -207,7 +207,7 @@ module.exports = class Screenshare {
// TODO correctly assemble this timestamp
let timestamp = now.format('hhmmss');
self._streamUrl = MediaHandler.generateStreamUrl(localIpAddress, voiceBridge, output);
let dsrbstam = Messaging.generateDeskShareRTMPBroadcastStartedEvent2x(self._voiceBridge,
let dsrbstam = Messaging.generateScreenshareRTMPBroadcastStartedEvent2x(self._voiceBridge,
self._voiceBridge, self._streamUrl, self._vw, self._vh, timestamp);
self._BigBlueButtonGW.publish(dsrbstam, C.FROM_VOICE_CONF_SYSTEM_CHAN, function(error) {});