Commit Graph

1758 Commits

Author SHA1 Message Date
prlanzarin
c2143f9a50 Added first working versions of join/exitAudio for kurento bridge and fixed SFU session termination for freeswitch adapter 2018-04-29 00:18:54 +00:00
prlanzarin
47120111dd Fixed adapter calls in SFU and added bridge hooks for kurento listen only 2018-04-27 21:37:41 +00:00
prlanzarin
0610d82eb7 SFU audio module now uses BaseProcess and BaseManager 2018-04-27 20:16:48 +00:00
prlanzarin
10fe1d6a00 Fixed parameterization of name and adapter on mcs-core
It was broken on merging upstream
2018-04-27 20:16:35 +00:00
Pedro Beschorner Marin
1523305b4b Fixed bad index 2018-04-27 19:46:22 +00:00
Pedro Beschorner Marin
d92796f255 Listen to disconnect users from server to eject the remaining audio participants 2018-04-27 19:46:11 +00:00
Pedro Beschorner Marin
722ab679e3 Included extra BigBlueButton messages to connect a listen only user 2018-04-27 19:45:17 +00:00
prlanzarin
11e6c445da Added freeswitch config to SFU default.example.yml 2018-04-27 19:43:48 +00:00
prlanzarin
3b329f1c71 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-audio 2018-04-27 19:42:33 +00:00
prlanzarin
9fe4fecf2c Improved chrome screensharing constraints and fixed SFU exception 2018-04-27 14:37:18 +00:00
Lucas Fialho Zawacki
b38a096ed5 Fix some typos and wrong code in bbb-webrtc-sfu 2018-04-26 22:15:25 +00:00
Lucas Fialho Zawacki
08a86d2a5f Expire all the recordings keys generate by bbb-webrtc-sfu in 14 days 2018-04-26 21:48:43 +00:00
Lucas Fialho Zawacki
61e08b4396 REALLY respect recorded=false authority when recording on HTML5 2018-04-26 21:29:46 +00:00
Lucas Fialho Zawacki
a2b670174b Merge branch 'final-recordings' into html5-video-recording 2018-04-26 16:43:18 +00:00
prlanzarin
0a68c5d9b2 Another round of fixes to screenshare hanging process and additional logging 2018-04-26 16:22:20 +00:00
prlanzarin
ea73a4d37a Fixed sfu ws regression and exceptions when recording not enabled in SFU 2018-04-26 15:39:24 +00:00
Lucas Fialho Zawacki
c04cddd61c Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into html5-video-recording 2018-04-26 02:14:29 +00:00
Lucas Fialho Zawacki
ebef86abbe Respcect the recorded=false authority 2018-04-26 01:52:48 +00:00
Lucas Fialho Zawacki
c99590fb36 Use mkv format for writing files 2018-04-26 01:34:34 +00:00
prlanzarin
1adc09660f Fixed hanging processes in bbb-webrtc-sfu 2018-04-25 22:43:33 +00:00
Lucas Fialho Zawacki
f47737f7f5 Have html5 recordings as disabled in the example config file 2018-04-25 20:28:40 +00:00
prlanzarin
fd40540464 Fixed event emitter leak in screenshare transcoder handling 2018-04-25 19:14:30 +00:00
prlanzarin
94801ddc3d Fixed MediaSession stop routine and status 2018-04-25 18:59:36 +00:00
prlanzarin
4cb7dcab7c Refactored WebRTC screenshare flow and fixed mcs-core event emission 2018-04-25 16:56:16 +00:00
Lucas Fialho Zawacki
cc8385011a Slightly different naming scheme for kurento recordings 2018-04-25 15:29:51 +00:00
Lucas Fialho Zawacki
e4a14011da Send a screenshare stop event directly from bbb-webrtc-sfu 2018-04-25 15:17:46 +00:00
Lucas Fialho Zawacki
8f1a128e24 Send webrtc screenshare event for recordings 2018-04-25 14:36:37 +00:00
Lucas Fialho Zawacki
5c40eb1651 Yet another step in adding html5 recording messages into redis 2018-04-24 22:49:16 +00:00
Lucas Fialho Zawacki
2d6143fb04 Record html5 screenshare in a different path 2018-04-24 19:30:18 +00:00
Lucas Fialho Zawacki
a4ddf580df Correct typo in BaseManager.js error log 2018-04-24 19:28:44 +00:00
Lucas Fialho Zawacki
7cdb3f495d Write the recording events for webrtc cameras properly in redis 2018-04-24 18:11:14 +00:00
Lucas Fialho Zawacki
11a93e1875 Add monotonic timestamp to Start/Stop share events 2018-04-23 20:28:00 +00:00
Lucas Fialho Zawacki
6bce22c554 Send shareWebcam events via bbb-webrtc-sfu 2018-04-23 19:17:17 +00:00
Lucas Fialho Zawacki
d088882c53 Merge remote-tracking branch 'upstream/v2.0.x-release' into html5-video-recording 2018-04-19 19:53:09 +00:00
Lucas Fialho Zawacki
29f64ce596 Catch some exceptions on recording and emit events once 2018-04-19 19:38:58 +00:00
Lucas Fialho Zawacki
13883d529e Screenshare recording and extract some recording behavior to to MediaSession 2018-04-19 17:08:28 +00:00
prlanzarin
d603098f38 Moved some of the session/ICE queue handling to base in screenshare manager 2018-04-19 16:43:52 +00:00
prlanzarin
78404e128c Starting providers refactor to fix screensharing pandemonium 2018-04-19 16:05:57 +00:00
prlanzarin
62209e9c1a Fixed screenshare viewers for non-h264 enforced streams
Also fixed error checkings
2018-04-18 18:27:51 +00:00
Lucas Fialho Zawacki
7cbd8454f0 Fix recording after merging with upstream 2018-04-16 21:44:19 +00:00
Lucas Fialho Zawacki
dc099cf843 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into html5-video-recording 2018-04-16 20:30:35 +00:00
prlanzarin
52ecf277e0 Fixed finally clause on video.js and error handling calls on media session 2018-04-12 18:09:26 +00:00
prlanzarin
ef0459e22b Fixed h264 enforcement for WebRTC screenshare viewers 2018-04-12 17:54:53 +00:00
prlanzarin
50b8bbce72 Refactored media-server element checkings 2018-04-12 17:26:05 +00:00
prlanzarin
bf5413a7df Fixed WebRTC video stop procedures on media flow timeout cases 2018-04-12 16:40:32 +00:00
Lucas Fialho Zawacki
aeac7769b4 Configure enabling/disabling of recordings on html5 2018-04-11 21:11:43 +00:00
prlanzarin
261c34fca8 Removed leftover logging 2018-04-10 19:16:50 +00:00
prlanzarin
b8f54afdc8 Added config options to force h264 (video/screenshare) on SFU 2018-04-10 19:12:23 +00:00
Lucas Fialho Zawacki
38db6175bd Proper stopAndWait code for recordings 2018-04-10 17:38:42 +00:00
prlanzarin
a2a77c9f75 Fixed video stop on websocket closure and renamed the sessionId prop in video to connectionId 2018-04-10 17:20:34 +00:00
prlanzarin
cf838eca16 Fixed SFU session stop function checking 2018-04-10 15:58:13 +00:00
prlanzarin
67f49442b6 Fixed HTML5 viewer video stop flow 2018-04-10 14:55:42 +00:00
prlanzarin
1f153dcbf7 Merge remote-tracking branch 'upstream/v2.0.x-release' into sft 2018-04-10 14:53:44 +00:00
prlanzarin
553ea58fcc SFU responding to media server offline event and closing active media sessions 2018-04-10 14:49:24 +00:00
Fred Dixon
61ad7072c6 Updated log path 2018-04-10 06:19:15 -05:00
Augusto Bennemann
0085b4122b Fix call to isError() on SFU's media-server.js 2018-04-06 12:37:09 -03:00
prlanzarin
a01154dbe9 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-opt-next 2018-04-05 19:16:44 +00:00
Lucas Fialho Zawacki
4f598b7352 Only do recording after media flow 2018-04-04 20:26:11 +00:00
Lucas Fialho Zawacki
58241c0c76 Make recording names compatible with red5 2018-04-03 18:35:38 +00:00
Lucas Fialho Zawacki
e51a30b75d Initial video recording work for html5 2018-03-29 18:19:53 +00:00
Lucas Fialho Zawacki
ba56ac9296 Message file missing from bbb-webrtc-sfu UserBroadcastCamStop 2018-03-21 07:28:55 +00:00
Lucas Fialho Zawacki
65a2fb592f Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into video-dock-refactor 2018-03-20 17:22:11 +00:00
Lucas Fialho Zawacki
49debcfa8f Send UserBroadcastCamStop event when video media stops flowing 2018-03-19 17:50:38 +00:00
prlanzarin
6e126ba64e Added Kurento autoreconnect to bbb-webrtc-sfu 2018-03-15 21:39:45 +00:00
prlanzarin
7b60342cb0 Fixed WebRTC screenshare stop routine 2018-03-15 15:48:12 +00:00
prlanzarin
b55955cba3 Refactor SFU video session handling and made it use BaseManager 2018-03-14 20:44:47 +00:00
prlanzarin
1937890de1 Added BaseManager class and made ScreenshareManager extend it, pending VideoManager 2018-03-14 16:23:46 +00:00
prlanzarin
bdb72d60c1 Forcing H264 in HTML5 video 2018-03-14 14:38:18 +00:00
prlanzarin
36aebf39b0 SFU VideoManager using ES6 class and VideoProcess with BaseProcess 2018-03-14 00:22:32 +00:00
prlanzarin
4149e106f8 Removed test calls from BaseProcess 2018-03-13 21:06:33 +00:00
prlanzarin
16b52a1a41 Gracefully exiting screenshare process on SFU 2018-03-13 21:04:54 +00:00
Augusto Bennemann
efcd9340cc Adjusts on video dock refactor 2018-03-12 15:30:28 +00:00
prlanzarin
33f03be558 Implemented parent MediaSession at SFU mcs-core and did some cleanup 2018-03-10 23:55:55 +00:00
prlanzarin
6c8a6223e0 Some more work on error handling at kurento adapter 2018-03-09 14:16:12 +00:00
Anton Georgiev
c104d65ff6
Merge pull request #5213 from prlanzarin/sfu-optimizations
bbb-webrtc-sfu optimizations
2018-03-06 10:44:13 -05:00
Anton Georgiev
4da5bf2948 add gitignore to .bbb-webrtc-sfu 2018-03-05 17:29:05 -05:00
Anton Georgiev
e0a0bd1935 minor adjustments to bbb-webrtc-sfu 2018-03-05 17:28:17 -05:00
Pedro Beschorner Marin
ebadcb22fa Trying to fix media FLOWING problem and including some extra debug logging 2018-02-26 17:01:35 +00:00
Augusto Bennemann
d5cda55220 Improve video adjusting code 2018-02-08 12:52:29 -02:00
prlanzarin
944ea1665f Added Audio support to SFU and a new Freeswitch adapter 2018-02-07 14:17:34 +00:00
Lucas Fialho Zawacki
4dce4676cb Wait a while before closing streams if media stops flowing on bbb-webrtc-sfu 2018-02-01 18:02:22 +00:00
prlanzarin
5e384e2d4a bbb-webrtc-sfu now rotates logs daily 2018-01-30 13:50:43 +00:00
prlanzarin
281a14baf8 Merge remote-tracking branch 'upstream/v2.0.x-release' into sfu-logging 2018-01-29 22:51:53 +00:00
prlanzarin
a7a310481f Merge branch 'sfu-logging' into sfu-optimizations 2018-01-29 15:30:30 +00:00
prlanzarin
544e8853ba Fixed SFU pipeline fetching 2018-01-29 15:28:26 +00:00
prlanzarin
f9bd7a5e37 Tracking media pipeline active subscribers in SFU to properly clean them
Also did some more work on error handling at the kurento adapter
2018-01-29 15:10:05 +00:00
prlanzarin
438faef3d7 Renamed sfu process variable to avoid using reserved word 2018-01-29 15:08:45 +00:00
prlanzarin
30696c6b23 Further refining bbb-webrtc-sfu log messages 2018-01-28 18:29:49 +00:00
Lucas Fialho Zawacki
89debdb8a7 More refactors in bbb-webrtc-sfu js code 2018-01-26 19:58:02 +00:00
prlanzarin
6a9c610379 Refactored subprocesses handling in bbb-webrtc-sfu
They should now restart when crashing and shouldnt be stuck anymore
2018-01-26 19:10:01 +00:00
prlanzarin
9b36199908 Added detection and handling for when Kurento is offline to SFU adapter 2018-01-26 06:04:55 +00:00
prlanzarin
9ee970ca36 Updated bbb-webrtc-sfu moment dependency 2018-01-26 04:42:38 +00:00
prlanzarin
8500c0b80f Added better logging to SFU using Winston and made a cleanup on unused files 2018-01-26 04:33:40 +00:00
Lucas Fialho Zawacki
deb6efad09 HTML5 video refactor some js 2018-01-25 04:08:00 +00:00
prlanzarin
3fb91aa8b6 Better diferentiate ICE from different sessions in bbb-webrtc-sfu 2018-01-18 13:56:08 +00:00
Lucas Fialho Zawacki
b6abec579a Better clean up on the bbb-wbertc serverside to fix html5 video problems 2018-01-12 19:36:57 +00:00
Augusto Bennemann
67cb4b073b Error notifications for video and screenshare 2018-01-05 17:16:46 +00:00
Lucas Zawacki
3641a5713f Put rid dependency in production part of package.json 2017-12-22 16:17:21 -02:00
Lucas Zawacki
06f8b56a82 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-video-media-flow
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-20 18:43:33 -02:00
Lucas Zawacki
7df986da3d Use more readable uids for bbb-webrtc-sfu 2017-12-20 18:23:56 -02:00
prlanzarin
362335f727 Made the users own webcam local instead of server-side 2017-12-20 20:06:27 +00:00
Lucas Zawacki
113aca16a2 Merge remote-tracking branch 'prlanzarin1/ghost-webcams' into html5-development-reconnect-issues
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	labs/bbb-webrtc-sfu/lib/video/VideoManager.js
	labs/bbb-webrtc-sfu/lib/video/video.js
2017-12-20 17:20:56 -02:00
prlanzarin
2fb291cec2 Fixed video session management on bbb-webrtc-sfu
This should solve the most severe cases of ghost webcams
2017-12-20 18:01:27 +00:00
Lucas Zawacki
0974c69d48 Small fixes on the server and iceCandidate sending 2017-12-20 14:56:28 -02:00
Lucas Zawacki
4aac6d8413 Tweaks on the video media flow 2017-12-20 00:32:31 -02:00
Lucas Zawacki
ecda3f460e Don't send the 'media not flowing' event until we figure things out 2017-12-15 13:57:29 -02:00
Lucas Zawacki
a370285f0b Capture several errors and crashes in client and bbb-webrtc-sfu 2017-12-14 16:42:13 -02:00
Lucas Zawacki
4e2833aa07 Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
2017-12-05 17:58:58 -02:00
Lucas Zawacki
1f2f5dc218 More reconnect logic and some translations 2017-12-01 21:40:25 -02:00
prlanzarin
4f22f7acab Correctly stopping WebRTC video sessions 2017-12-01 20:35:00 +00:00
prlanzarin
eb9d7fb7b4 Updated bbb-webrtc-sfu dependencies 2017-11-28 12:25:27 +00:00
prlanzarin
fdca5356c3 Finished making bbb-webrtc-sfu answer in single path
Started standardizing video and screenshare RPC messages

Video now uses redis message routing
2017-11-24 18:59:40 +00:00
prlanzarin
ce1b0ca85e Added voiceBridge parameter to akka-bbb-transcode
Also forcing h264-only video
2017-11-21 14:11:59 +00:00
prlanzarin
dcab1d8e07 Finished porting screensharing process to core media lib
Also added correct stop logic to the video process
2017-11-17 18:57:39 +00:00
prlanzarin
f43b77c19f Merge branch 'node-bbb-apps-packaging' into bbb-webrtc-sfu
Conflicts:
	bigbluebutton-html5/imports/startup/client/base.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx
	bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx
	bigbluebutton-html5/imports/ui/components/app/container.jsx
	bigbluebutton-html5/imports/ui/components/screenshare/service.js
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx
	bigbluebutton-html5/imports/ui/components/video-dock/container.jsx
	bigbluebutton-html5/private/locales/en.json bigbluebutton-html5/server/main.js
2017-11-11 03:41:37 +00:00
prlanzarin
4fd4cc1eb1 Renaming node-bbb-apps to bbb-webrtc-sfu 2017-11-11 01:44:50 +00:00
prlanzarin
f048d30ad6 Cleaning up deprecated kurento video and screensharing apps 2017-11-11 01:40:11 +00:00
prlanzarin
4dc8085648 Making the screenshare process have its own websocket
This is temporary while we fix the server-side message routing
2017-11-11 01:39:04 +00:00
prlanzarin
1170a82906 Temporary fix for ICE exchange race condition 2017-11-11 01:35:01 +00:00
prlanzarin
4d5a671a19 Finished porting the video server app to use base media library 2017-11-10 21:05:51 +00:00
prlanzarin
014bf59d09 Merge remote-tracking branch 'origin/html5-video-screenshare' into node-bbb-apps-packaging 2017-11-06 15:47:53 +00:00
prlanzarin
c04e3da068 Added kurento screensharing viewer stop logic 2017-11-06 14:23:48 +00:00
prlanzarin
9175400c2e Tryin to prevent overlapping video instances from the same connection 2017-11-06 14:22:36 +00:00
prlanzarin
26303748c8 Merge remote-tracking branch 'origin/html5-video-screenshare' into node-bbb-apps-packaging 2017-10-16 13:50:22 +00:00
prlanzarin
340fac36cb Added bbb-webrtc-sfu WS session identification 2017-10-16 13:37:13 +00:00
prlanzarin
07f50252bb Properly close webrtc peers when sharing webcam 2017-10-13 21:13:41 +00:00
prlanzarin
eec9c8c3b1 Removed postinstall from node app package.json 2017-10-13 20:06:16 +00:00
prlanzarin
b49362d8d5 Some screensharing pubsub rework
Added package.json
2017-10-13 19:51:50 +00:00
prlanzarin
6b24bb0080 Configurable client port for node-bbb-apps 2017-10-13 15:00:16 +00:00
prlanzarin
5ce924f892 node-bbb-apps config example and keys dir removal 2017-10-13 14:50:41 +00:00
Augusto Bennemann
ec941bacab Improve video reconnection 2017-10-13 13:50:48 +00:00
prlanzarin
fa1043d432 First draft of node-bbb-apps module 2017-10-13 13:50:17 +00:00
prlanzarin
67da01e81c Merge remote-tracking branch 'gutobenn/html5-kurento-screenshare-presenter' into html5-video-screenshare 2017-10-10 17:10:03 +00:00
Augusto Bennemann
31f2e1cac7 HTML5 ScreenShare Presenter 2017-09-12 17:47:06 -03:00
Augusto Bennemann
1aa5cc5235 HTML5 ScreenShare Viewer
HTML5 ScreenShare Viewer
2017-09-11 13:40:56 -03:00
Augusto Bennemann
5ec827e17d HTML5 video with kurento (port) 2017-09-01 12:26:57 -03:00
prlanzarin
c3ba4eaac4 Fixed kurento-screenshare session ending 2017-07-27 13:17:55 +00:00
prlanzarin
ade78eaff0 Changed kurento-screenshare session index to voiceBridge 2017-07-26 16:59:05 +00:00
prlanzarin
54faf33001 Modified transcode responses to 2x format in kurento-screenshare 2017-07-25 20:13:41 +00:00
Pedro Beschorner Marin
cd34d2c139 Merge remote-tracking branch 'bbb-2x-mconf' into transcode-new-messages
Conflicts:
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
2017-07-25 14:47:21 +00:00
Pedro Beschorner Marin
d50f65fce1 Moved akka-transcode messages to 2.0 format 2017-07-25 13:23:20 +00:00
prlanzarin
8c69de35cd Changed kurento screenshare app RTMP broadcast messages to new format 2017-07-19 14:17:01 +00:00
prlanzarin
758bb0142b Added 2x Deskshare RTMP Broadcast messages to kurento-screenshare server
Old 1.1 messages are still available there
2017-07-17 19:36:49 +00:00
prlanzarin
b50cf7b23a Added kurento-screenshare ConnetionManager and media-controller modules 2017-07-10 20:56:00 +00:00
prlanzarin
02a6373c96 Refactored kurento-screenshare server to decouple it from kurento
Theres still some work to do on that regarding ICE handling
2017-07-10 20:51:06 +00:00
prlanzarin
f26a275b05 Updated kurento lib in BigBlueButton.html
Generic addresses for Kurento on the screenshare server
2017-07-05 17:58:19 +00:00
prlanzarin
114be67f29 Added AVPF profile to WebRTC screenshare SDP
Some server-side cleanup
2017-07-03 16:54:00 +00:00
prlanzarin
5a77b1b69d Added first prototype of Kurento WebRTC screensharing server module 2017-06-13 15:53:51 +00:00
mikhailnov
675b4bbaeb old firefox CLI call not working on newer versions, updated to a newer one 2017-03-08 22:15:23 +03:00
Ghazi Triki
875e0a59b7 Rename README to README.md to force its parcing 2016-03-10 22:03:17 +01:00