Commit Graph

47 Commits

Author SHA1 Message Date
Ramon Souza
ca345de246 add check after extractCredentials is used 2021-03-16 13:15:41 -03:00
Anton Georgiev
1268663030 wrap collection modifiers in try-catch blocks 2021-03-02 00:44:49 +00:00
Pedro Beschorner Marin
540ce10c24 Recording external video events 2021-02-26 00:59:40 +00:00
Lucas Fialho Zawacki
ddc7a974bf Register external video playback events to Redis 2021-02-25 21:58:43 +00:00
Anton Georgiev
aff272cbf3 Merge #7484 into #11447 ExternalVideo recording events 2021-02-25 19:54:22 +00:00
Anton Georgiev
740a3a9db9 stop external video if presenter changed 2021-02-21 12:19:01 +00:00
Anton Georgiev
0b6496618c Merge branch 'develop' of github.com:amguirado73/bigbluebutton into external-video-sync-lucas 2021-02-21 11:04:39 +00:00
Anton Georgiev
244a239810 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 2020-12-01-merge 2020-12-01 20:02:50 +00:00
Tiago D J
1e4c634dd9
Merge branch 'v2.2.x-release' into remove-callbacks 2020-11-27 13:43:36 -03:00
Anton Georgiev
698199454c Reduce cursor logging, fix ExternalVideo object logging 2020-11-26 15:31:00 -05:00
Joao Siebel
11f1a1ac47 Merge remote-tracking branch 'upstream/v2.2.x-release' into remove-callbacks 2020-11-25 10:54:18 -03:00
Anton Georgiev
21644a1a43 Remove string interpolation for server debug and verbose logs 2020-11-23 14:35:59 -05:00
Joao Siebel
700c91729e Prevent non presenters to start/stop an external video 2020-09-04 13:49:01 -03:00
João Francisco Siebel
52654bc927
Update bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
Co-authored-by: Anton Georgiev <antobinary@users.noreply.github.com>
2020-09-03 17:02:27 -03:00
Joao Siebel
5f03f23e02 Add check when start/stop an external video to prevent edge case 2020-09-03 16:07:54 -03:00
root
851c2645ea Committer: Antonio Guirado <amguirado73@gmail.com>
Changes to be committed:
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/ExternalVideoApp2x.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StartExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/StopExternalVideoPubMsgHdlr.scala
	new file:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/externalvideo/UpdateExternalVideoPubMsgHdlr.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/pubsub/senders/ReceivedJsonMsgHandlerActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
	modified:   akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/FromAkkaAppsMsgSenderActor.scala
	new file:   bbb-common-message/src/main/scala/org/bigbluebutton/common2/msgs/ExternalVideoMsgs.scala
	new file:   bigbluebutton-html5/imports/api/external-videos/server/eventHandlers.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/startExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/stopExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/handlers/updateExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/index.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/emitExternalVideoEvent.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/startWatchingExternalVideo.js
	modified:   bigbluebutton-html5/imports/api/external-videos/server/methods/stopWatchingExternalVideo.js
	new file:   bigbluebutton-html5/imports/api/external-videos/server/streamer.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/handlers/meetingDestruction.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/addMeeting.js
	modified:   bigbluebutton-html5/imports/api/meetings/server/modifiers/meetingHasEnded.js
	modified:   bigbluebutton-html5/imports/api/users/server/handlers/validateAuthToken.js
	modified:   bigbluebutton-html5/imports/api/users/server/store/bannedUsers.js
	modified:   bigbluebutton-html5/imports/startup/server/index.js
	modified:   bigbluebutton-html5/imports/startup/server/redis.js
	modified:   bigbluebutton-html5/imports/ui/components/external-video-player/service.js
	modified:   bigbluebutton-html5/private/config/settings.yml
2020-08-28 12:58:55 +02:00
Anton Georgiev
c9e996de21 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.2-into-develop 2020-05-25 17:32:24 +00:00
Lucas Zawacki
b9c75b4872 Remove timestamp correction logic 2020-05-18 13:16:03 -03:00
Chad Pilkey
eea6fa9763 fix extraCredentials usage in external video emit 2020-03-03 14:00:38 -08:00
Anton Georgiev
52969ed7a3
Update emitExternalVideoEvent.js 2020-03-03 11:21:08 -05:00
Lucas Zawacki
e6423d6116 Use Logger and remove unused code 2020-03-02 18:41:31 -03:00
Lucas Zawacki
e67781d133 Centralize external video presenter message emission via a meteor call 2020-03-02 17:58:51 -03:00
Lucas Zawacki
b48e474e84 Make sure stopWatchingExternalVideo works when called as a method and when called from the server 2020-02-27 17:30:35 -03:00
Lucas Zawacki
92a1fba0ae Use extractCredentials in stopWatchingExternalVideo thus fixing it 2020-02-27 16:42:53 -03:00
Lucas Zawacki
af3ba395ea Change server logger for external-video messages to debug 2020-02-27 15:06:45 -03:00
Lucas Zawacki
f0d588511c Check presenter status outside of streamer 2020-02-27 13:39:00 -03:00
Anton Georgiev
11edb3cae9 clear externalvideo stream properly on meeting removed 2020-02-13 16:01:36 -05:00
Anton Georgiev
0834f4bdcc handle edge case for credentials where meeting is removed 2020-02-13 14:40:15 -05:00
Anton Georgiev
a8f4827af8 utilize Meteor connection id instead of trusting client side meetingId, userId 2020-02-06 15:48:16 -05:00
Chad Pilkey
e55d9116a9 add the meetingId to the external video sync update logs 2020-01-17 09:12:44 -08:00
Chad Pilkey
ee1b0278d1 adjust external video logs 2020-01-13 15:07:21 -08:00
Lucas Zawacki
14fd979955 Remove viewerJoined logic and prevent handleOnReady from running multiple times 2020-01-13 13:53:47 -03:00
Chad Pilkey
51b70a1361 only attempt to stop ext video if it's sharing 2019-10-23 14:20:57 -07:00
Chad Pilkey
7174050fb3 adjust external video sync interval and emit check 2019-10-23 13:29:06 -07:00
Lucas Zawacki
a17b28b23f Fix variable definition in initializeExternalVideo 2019-10-23 16:24:34 -03:00
Lucas Zawacki
47661f2b08 Don't initialize streamer more than once, delete streamer object when meeting ends 2019-10-23 16:21:10 -03:00
Lucas Zawacki
16c1931eed Add initializeExternalVideo 2019-10-22 18:18:54 -03:00
Lucas Zawacki
9c76f62e63 Fix multiple external videos synced to different meetings 2019-10-22 17:19:57 -03:00
Lucas Zawacki
f844d0daff Remove references to youtube video in favor of external video 2019-08-27 13:16:19 -03:00
Joao Siebel
c4623f999d fix typo 2019-02-19 09:24:55 -03:00
Joao Siebel
6b66fa7a01 Adjust external video functions name 2019-02-19 09:19:13 -03:00
Joao Siebel
4a7a7fd661 stop sharing video if presenter leaves. close #6596 2019-02-19 09:14:29 -03:00
Lucas Zawacki
68e6e75525 More syntax fixes better log for external video auth 2019-01-17 14:12:32 -03:00
Lucas Zawacki
cff3c21212 Push start/stop external video events to REDIS 2019-01-16 10:57:48 -03:00
Lucas Zawacki
6d4d3daba3 Youtube video. Fix syntax, variable names, move some code into the service, remove unused code 2019-01-16 10:57:20 -03:00
Lucas Zawacki
dfea777fb3 Fixing youtube sync commits 2019-01-16 10:41:09 -03:00
Lucas Zawacki
550bbcd492 Share synchronized youtube video in presentation area 2019-01-14 14:40:27 -03:00