BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,638 Commits 13 Branches 260 Tags 1.1 GiB
830c44702f
Commit Graph

184 Commits

Author SHA1 Message Date
Ramon Souza
d3ed4d6ea6 rtl smart layout 2021-07-26 17:45:03 -03:00
Anton Georgiev
79485a2950
Merge pull request #12181 from lfzawacki/v2.2.x-external-video 
Overlay for external video with volume controller and reload button
 2021-07-21 12:07:06 -04:00
Ramon Souza
d8e19dbd9f remove unused variables 2021-06-28 08:20:49 -03:00
Ramon Souza
396fdc232f component size 2021-06-16 15:43:32 -03:00
Mario Gasparoni
127636f648 Merge remote-tracking branch 'lfzawacki/v2.2.x-external-video' into develop-external-video 2021-06-09 18:14:04 -03:00
Pedro Beschorner Marin
d4888f585c refactor(external videos): state as integer 
A media state may have more than 2 states. Moving this property back to
integer so it can be extended.
 2021-06-02 15:07:03 -03:00
Pedro Beschorner Marin
6c84a3295b refactor(external videos): frontend permissions 
Revoked extra frontend permission checks and removed dependency from
external video stop Meteor's system call.
 2021-06-02 13:03:04 -03:00
Max Franke
7f926edfcc refactor(external videos): add own collection 
Refactor the external videos collection, moving the logic and functionalities
outside of /imports/api/meetings to a new location in /external-videos/server/modifiers
in order to decrease the coupling between the functionalities, favoring
the maintenance.
 2021-06-02 12:50:40 -03:00
Ramon Souza
93d41f3f91 remove unused variables 2021-05-07 08:54:01 -03:00
Lucas Zawacki
89793662c5 Use icon names as per Pedro's suggestion 2021-04-28 16:46:14 -03:00
Lucas Zawacki
cb28639fc3 Add code with volume icon template 2021-04-28 15:12:52 -03:00
Lucas Zawacki
61d97862ef Tab indexes for external video overlay 2021-04-27 17:48:16 -03:00
Lucas Zawacki
7ceea175b0 Fix video overlay style 2021-04-27 17:30:20 -03:00
Lucas Zawacki
7198937872 Use bbb icon, use cursor pointer for volume slider 2021-04-27 16:44:05 -03:00
Lucas Zawacki
3c974b8c8c Fix icon size and hide on not hover 2021-04-27 16:26:12 -03:00
Lucas Zawacki
eae1b78e82 Reload button labels 2021-04-27 15:12:50 -03:00
Pedro Beschorner Marin
791c3394f6 Few changes at the reload button 
Tweaked a bit at the button's style to give it a little distance from
the borders and replaced by a larger circle button for the icon to appear
a few bigger and keep the roundness of the surrinding design. Also moved
the suppress control to the button component so it solves for both external
player, generic component and any other component that decides to use it in
the future.
 2021-04-27 15:01:15 -03:00
Lucas Zawacki
0a68ac34e2 Reload button for external video 2021-04-27 14:16:28 -03:00
Lucas
d7bbb1edef Update bigbluebutton-html5/imports/ui/components/external-video-player/component.jsx 
Fix indentation

Co-authored-by: Pedro Beschorner Marin <pedrobmarin@gmail.com>
 2021-04-26 18:18:16 -03:00
Lucas Zawacki
fd8825c7cd Volume slider for external video players 2021-04-26 18:16:41 -03:00
Ramon Souza
aab9945b46 stop viewer play/stop actions on external videos 2021-04-07 16:02:49 -03:00
Pedro Beschorner Marin
d69ed72b54 Fixing eventName overriding 2021-02-26 01:03:05 +00:00
Lucas Fialho Zawacki
ddc7a974bf Register external video playback events to Redis 2021-02-25 21:58:43 +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
55e8de4357 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into feb18-merge 2021-02-18 20:33:19 +00:00
Lucas Zawacki
7216619811 Don't validate insecure http urls for external video to prevent browser errors 2021-02-09 15:24:21 -03:00
Anton Georgiev
2dabeaae29 remove duplicated html id video-modal-input 2021-01-06 16:53:22 +00:00
hiroshisuga
3dc0aa83f2
Update component.jsx 2020-12-27 00:01:54 +09: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
Lucas Zawacki
7c704c78c1 PeerTube player, first version 2020-11-26 17:33:08 -03:00
Anton Georgiev
3faabd1821 Merge 2.2.29 and 2.2.30 into 2.3.x 2020-11-24 15:13:09 +00:00
Lucas Zawacki
7efcd3b87e Dont include extra dot in instructure media url 2020-10-21 14:00:51 -03:00
Anton Georgiev
0c7ead1916 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into oct16-merge 2020-10-21 14:48:02 +00:00
Lucas Zawacki
19d24cbb60 Make instructuremedia regexp more general 2020-10-09 18:09:35 -03:00
Anton Georgiev
1d86d0ea80
Merge pull request #10341 from vitormateusalmeida/issue-10339 
Fix bug when alternate panel. Fix external video size
 2020-09-11 09:18:10 -04:00
KDSBrowne
b33b5f3f01 Merge branch 'develop' of https://github.com/bigbluebutton/bigbluebutton into 2.3-remove-css-variable-duplicates 2020-09-01 21:17:25 +00:00
KDSBrowne
77b71a4d1f fix duplicate css variables being loaded (improve imports) 2020-09-01 18:46:13 +00: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
8cc8474655 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into 08-26-merge 2020-08-27 19:09:07 +00:00
Vitor Mateus De Almeida
9ed9d1fd6c Fix bug when alternate panel. Fix external video size 2020-08-27 09:44:41 -03:00
KDSBrowne
6f377c3d77 make external video MATCH_URL even more generic 2020-08-24 17:59:46 +00:00
Anton Georgiev
5be5aed1d9 Merge branch 'v2.2.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2020-08-12 2020-08-12 17:12:58 +00:00
KDSBrowne
84af0bc0cc improve panoptoMATCH_URL regex (more generic) 2020-08-05 17:08:57 +00:00
Stefan Weil
1d3d31107e Fix regular expression in Arc Player (LGTM) 
LGTM report:

    The escape sequence '\.' is equivalent to just '.', so the sequence may
    still represent a meta-character when it is used in a regular expression.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2020-08-04 08:28:36 +02:00
Lucas Zawacki
65892677ee Make file video player work on every browser 2020-06-30 17:41:44 -03:00
Lucas Zawacki
4158372ac7 Use panoto mp4 url to implement a version of external-video 2020-06-30 17:41:42 -03:00
Joao Siebel
3e95ed0e4b Merge remote-tracking branch 'upstream/v2.2.x-release' into merge-2.2 2020-06-16 16:40:56 -03:00
Lucas Zawacki
0e9baf8ac7 fix twitch option name 2020-06-12 15:06:58 -03:00
Lucas Zawacki
abf4f45602 Update react-player and fix twitch sharing 2020-06-12 15:01:15 -03:00
Lucas Zawacki
a5bd5d8086 Prevent playbackrate update if value hasn't changed 2020-06-09 16:55:25 -03:00
Lucas Zawacki
9b7c734f86 Prevent problems playing some vimeo videos by adding default options 2020-06-09 16:55:23 -03:00
Lucas Zawacki
71819feaab Call onmount for custom arc-player 2020-06-01 15:36:16 -03: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
Lucas Zawacki
aa8326995c Work with video time based in seconds (integers) 2020-05-18 12:11:12 -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
0088c348a5 Logic to throttle pause/un-pause messages coming from presenter 2020-02-27 16:42:07 -03:00
Lucas Zawacki
2102d0e66f Better handle and explain remote/local timestamp logic 2020-02-27 15:01:04 -03:00
Lucas Zawacki
6cbb4d6592 Adjust seek messages based on local and remote timestamps 2020-02-27 13:39:19 -03:00
Lucas Zawacki
f0d588511c Check presenter status outside of streamer 2020-02-27 13:39:00 -03:00
Lucas Zawacki
c7bba345c6 Remove unused setState playing:true in onReady method 2020-02-12 17:39:45 -03:00
Lucas Zawacki
be9202a648 Adding some checks for null player in getCurrentTime and getCurrentPlaybackRate 2020-02-11 15:08:26 -03:00
Lucas Zawacki
fcecc3bcfe Fix playbackrate state when being set from local player 2020-02-11 15:08:24 -03:00
Lucas Zawacki
a90be659d7 Attempt to limit flow of presenterSync messages just in case 2020-02-11 15:08:21 -03:00
Lucas Zawacki
9f2826949d External video: don't use react state for flags that don't need re-renders 2020-02-11 15:08:18 -03:00
Lucas Zawacki
8165cba402 External video: prevent presenter from sending multiple unecessary play/pause messages 2020-02-11 15:08:13 -03:00
Lucas Zawacki
4ade850a5a Pause synced video if presenter exits the room 2020-01-13 13:53:49 -03:00
Lucas Zawacki
14fd979955 Remove viewerJoined logic and prevent handleOnReady from running multiple times 2020-01-13 13:53:47 -03:00
Chad Pilkey
7174050fb3 adjust external video sync interval and emit check 2019-10-23 13:29:06 -07:00
Lucas Zawacki
9c76f62e63 Fix multiple external videos synced to different meetings 2019-10-22 17:19:57 -03:00
Lucas Zawacki
25b4c93283 Better style for autoplay blocked message that does not obscure play button 2019-10-16 14:48:12 -03:00
Lucas Zawacki
ceb8853231 Prevent problems if presenter reconnects while sharing a video 2019-10-16 14:48:09 -03:00
Lucas Zawacki
926d4bb36e Destructure assignments and fix wrong assignment for isPresenter 2019-10-16 14:47:22 -03:00
Lucas Zawacki
24198c48a6 Prevent erroneous autoplay warning if video player sends multiple ready messages 2019-10-10 19:09:39 -03:00
Lucas Zawacki
30b303a6d4 Making sure we show controls for all video formats because viewer always need to change volume 2019-10-10 19:09:39 -03:00
Lucas Zawacki
dcd0ea7d5d Fix style of external video modal after adding new note 2019-10-10 19:09:31 -03:00
Lucas Zawacki
22be388b70 Remove unused intl variable from external-video 2019-10-10 18:01:27 -03:00
Lucas Zawacki
0b99a4cf63 Add supported video urls in external video modal note 2019-10-09 12:51:17 -03:00
Lucas Zawacki
1fb6922712 Properly show/hide controls for more kinds of external video players 2019-10-09 11:54:54 -03:00
Lucas Zawacki
ec88bd24e4 Prevent viewers from playing before video has loaded for presenter 2019-10-07 15:42:37 -03:00
Lucas Zawacki
290cd481e5 Don't run synchronization code on a player with autoplay blocked and add an autoplay warning 2019-10-07 14:45:16 -03:00
Lucas Zawacki
0af7534c96 A few more checks to prevent errors with the Arc Player 2019-10-03 17:50:59 -03:00
Chad Pilkey
c7d481c042
Merge pull request #8110 from lfzawacki/fix-8044 
Detect presenter change and reassign external video to new presenter
 2019-09-26 19:24:29 -04:00
Lucas Zawacki
5dd46f8f48 Fix video swap when there's no presentation and/or screenshare/external video 2019-09-17 16:55:52 -03:00
Lucas Zawacki
f548281a07 Fix random swappings happening outside of the media service 2019-09-16 19:06:02 -03:00
Lucas Zawacki
4f7cfb8198 Detect presenter change and reassign external video to new presenter 2019-09-12 14:15:35 -03:00
Lucas Zawacki
00684f72ac Send most updated version of state.playing into the external video handlers 2019-09-11 18:43:25 -03:00
Anton Georgiev
208007926d improve on muting externalVideo while in echoTest 2019-09-10 16:36:56 -04:00
Anton Georgiev
dc0f68ba89 unsubscribe listeners when unmounting externalVideoPlayer 2019-09-10 16:36:35 -04:00
Anton Georgiev
4e38e08ec0 tweaks to #8006 share external video 2019-09-10 16:36:19 -04:00
Lucas Zawacki
ef29a56ed2 Call arcPlayer getCurrentTime promise everytime as a hacky way to prevent player desync 2019-08-27 16:11:59 -03:00
Lucas Zawacki
630f470672 First working version of Arc media player 2019-08-27 13:27:20 -03:00
Lucas Fialho Zawacki
41e0af264d WIP arc player 2019-08-27 13:26:54 -03:00
Lucas Zawacki
4774c47576 Prevent react errors on external video modal 2019-08-27 13:16:56 -03:00
Lucas Zawacki
f844d0daff Remove references to youtube video in favor of external video 2019-08-27 13:16:19 -03:00
Lucas Zawacki
332d03e7ea Fix playback rate in players that support it 2019-07-16 19:04:20 -03:00
Lucas Zawacki
3a5984de51 Update styles and packages for external video 2019-07-16 17:56:07 -03:00
Lucas Zawacki
a2068d06b6 Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into new-react-player 2019-07-16 17:33:27 -03:00
Lucas Fialho Zawacki
1316514ba4 Fix some options and remove unsed stuff for external video 2019-07-15 20:20:18 +00:00
Lucas Fialho Zawacki
e98333c45e Use react-player for external video 2019-07-12 20:08:55 +00:00