Commit Graph

945 Commits

Author SHA1 Message Date
prlanzarin
01795860c8 Workaround on webcam viewer race condition when state changes rapidly 2018-11-28 22:27:44 +00:00
Tainan Felipe
3561681e75 Change the buttons on actions bar to ghost buttons 2018-11-28 10:59:03 -02:00
prlanzarin
d652eb7f9b Added voiceBridge prop to video-provider and forward it to SFU 2018-11-20 13:05:16 +00:00
Anton Georgiev
fb0610076c
Merge pull request #6230 from MaximKhlobystov/webcam-choice
Webcam Settings modal for choosing a webcam
2018-11-16 14:33:54 -05:00
Maxim Khlobystov
ce5c20ba7c Unsharing a webcam when page reloads. 2018-11-16 14:03:20 -05:00
Richard Alam
d1dad75898 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-v20-master-nov14 2018-11-14 08:47:21 -08:00
Maxim Khlobystov
91dad9d882 Fixing some linter error 2018-11-07 14:30:36 -05:00
Maxim Khlobystov
9f67ce4106 Merge branch 'master' of github.com:bigbluebutton/bigbluebutton into webcam-choice 2018-11-06 18:17:52 -05:00
Maxim Khlobystov
90f38561c3 Add Webcam Settings to choose a camera 2018-11-06 18:10:56 -05:00
Ghazi Triki
ff80b30df1 Merge remote-tracking branch 'bigbluebutton/master' into merge-2.x-release-into-master
# Conflicts:
#	bigbluebutton-html5/imports/ui/services/audio-manager/index.js
2018-11-02 21:02:02 +01:00
Ghazi Triki
653fd74440 Merge remote-tracking branch 'bigbluebutton/v2.0.x-release' into merge-2.x-release-into-master
# Conflicts:
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/users/UserLeaveReqMsgHdlr.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/models/Users2x.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/HandlerHelpers.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/running/MeetingActor.scala
#	akka-bbb-apps/src/main/scala/org/bigbluebutton/core2/testdata/FakeTestData.scala
#	bbb-common-web/src/main/java/org/bigbluebutton/api/MeetingService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/PresentationUrlDownloadService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Office2PdfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/OfficeDocumentValidator.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/Pdf2SwfPageConverter.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/PdfToSwfSlidesGenerationService.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/SvgImageCreatorImp.java
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/TextFileCreatorImp.java
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/bus/ReceivedJsonMsgHdlrActor.scala
#	bbb-common-web/src/main/scala/org/bigbluebutton/api2/meeting/OldMeetingMsgHdlrActor.scala
#	bigbluebutton-client/src/org/bigbluebutton/core/UsersUtil.as
#	bigbluebutton-client/src/org/bigbluebutton/main/events/BBBEvent.as
#	bigbluebutton-client/src/org/bigbluebutton/main/maps/ApplicationEventMap.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/JoinService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/NetConnectionDelegate.as
#	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
#	bigbluebutton-client/src/org/bigbluebutton/main/views/LoggedOutWindow.mxml
#	bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/managers/LayoutManager.as
#	bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/LayoutsCombo.mxml
#	bigbluebutton-client/src/org/bigbluebutton/modules/users/services/MessageReceiver.as
#	bigbluebutton-client/src/org/red5/flash/bwcheck/app/BandwidthDetectionApp.as
#	bigbluebutton-config/bigbluebutton-release
#	bigbluebutton-html5/client/compatibility/kurento-extension.js
#	bigbluebutton-html5/imports/api/users/server/modifiers/addUser.js
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy
2018-11-01 14:00:54 +01:00
Anton Georgiev
4b4390214f
Revert "Make it so that cameras use the full space of the video window" 2018-10-30 14:25:21 -04:00
Tainan Felipe
7243d3bbc3 Fix css variable was not working 2018-10-30 13:19:22 -03:00
Tainan Felipe
c6284a0fbb Add poiter cursor the hover over the video dropdown 2018-10-30 09:47:18 -03:00
Oswaldo Acauan
f71d32a464 Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
WIP

wip

wip

format

wip

Move from SCSS variables to CSS custom properties (variables) and add custom parameters for theming/skinning
2018-10-23 14:21:58 -02:00
prlanzarin
7f3d3c0d32 Fixed reconnecting webcam viewers and session overlaps 2018-10-11 18:23:26 +00:00
prlanzarin
2741022cb2 Updated kurento-utils WebRTC calls, added permission request on listen only for safari
Also fixed a resource leak on listen only fallback and transitioned the SFU listen only from a tag-based approach to MediaStream
2018-10-03 18:39:55 +00:00
Lucas Zawacki
1d38dc4f2e Make it so that cameras use the full space of the video window 2018-09-18 13:58:29 -03:00
João Francisco Siebel
4c35608c2b Add users-settings collection and handle dynamic configuration 2018-09-13 15:09:30 -03:00
Anton Georgiev
1462810b96 Merge branch 'v2.0.x-release' of github.com:bigbluebutton/bigbluebutton into merge-2.0 2018-09-06 22:06:40 +00:00
prlanzarin
9f9e248de7 Made webcam constraints configurable, removed fps limitations and resolution floor
Also fixed handlePlayStop and stopWebRTCPeer exceptions
2018-08-20 18:08:10 +00:00
Anton Georgiev
f83374491b
Merge pull request #5971 from MaximKhlobystov/ice-connection-state-errors
Better handling of video ice connection state errors.
2018-08-14 13:12:12 -04:00
Maxim Khlobystov
bfe48dc918 Uncommented the line that has been commented out for debugging purposes. 2018-08-14 10:40:52 -04:00
Maxim Khlobystov
ed85f109a0 Listening to closed ice connection state in case an error doesn't result in failed state. 2018-08-13 16:26:45 -04:00
Maxim Khlobystov
fdf0615d04 Fixing linter errors in the video-provider component. 2018-08-12 18:40:53 -04:00
Maxim Khlobystov
cf1de23629 Properly handling ice connection state errors. 2018-08-12 18:39:39 -04:00
KDSBrowne
fc6d4a582f fix webcams audio state indicator sizing 2018-08-03 02:53:46 +00:00
Tainan Felipe
ece61e9918
Merge branch 'master' into compability-to-npm 2018-08-02 17:27:23 -03:00
Tainan Felipe
0c2866ccfb move ReconnectingWebSocket to npm packages 2018-07-27 17:42:45 -03:00
Lucas Fialho Zawacki
f8d8e5c8e5 Prettier obj logs in audio, video, screenshare 2018-07-26 16:29:55 -03:00
Lucas Fialho Zawacki
e36c494252 Use newer logging calls for video,audio,screenshare 2018-07-26 15:26:56 -03:00
Lucas Fialho Zawacki
b667c53590 Get more detailed logs from the video component 2018-07-25 18:53:12 -03:00
Anton Georgiev
9f87a4f344 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into test-5822 2018-07-24 21:08:28 +00:00
Anton Georgiev
e4edb9f196
Merge pull request #5894 from prlanzarin/sfu-error-handling-3
SFU error handling part 3
2018-07-24 13:45:08 -04:00
Anton Georgiev
5dc3fe82c2
Merge branch 'v2.0.x-release' into custom-parameters 2018-07-23 10:29:29 -04:00
prlanzarin
75f70ad06c Added SFU error handling in video-provider component with localized messages 2018-07-20 19:34:50 +00:00
Lucas Fialho Zawacki
8e023d57c9 Ids for share video and share screen buttons 2018-07-19 17:45:03 -03:00
Bobak Oftadeh
a5354c9c10 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into fixes3 2018-07-13 12:18:55 -07:00
Bobak Oftadeh
c98bd10024 Replaced console.errors with client logger and alterted logger configurations 2018-07-13 12:16:50 -07:00
prlanzarin
7fb2f063dd Trying to fix video tag attachment race condition and correctly checking peer availability on server messages 2018-07-11 16:32:19 +00:00
prlanzarin
d2bdb67ed3 Propagating configs to WebRTC screenshare script and added support for STUN/TURN config to SFU components 2018-07-09 21:29:59 +00:00
Lucas Fialho Zawacki
a61d99afac Small corrections to screenshare recording 2018-06-19 17:36:42 -03:00
Lucas Fialho Zawacki
f5d0862f69 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into orientation-recording 2018-06-19 17:19:38 -03:00
Anton Georgiev
6e20c942f5 make linter happier 2018-06-14 19:20:14 +00:00
Anton Georgiev
8aed93c315 improve error logs 2018-06-14 19:01:49 +00:00
Lucas Fialho Zawacki
c5794217c7 Remove old orientation code, add some configuration options for sfu 2018-06-13 17:57:57 +00:00
prlanzarin
6f78cf057c Merge remote-tracking branch 'gutobenn/webrtc_stats' into webrtc_stats 2018-06-08 16:36:41 +00:00
Augusto Bennemann
6f16948824 webRTC video stats: fetch stats on VideoListItem 2018-06-04 13:53:41 -03:00
Lucas Fialho Zawacki
bfc9e207bc Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into orientation-recording 2018-05-30 17:36:20 +00:00
Lucas Fialho Zawacki
665773ece0 Small naming fixes in visibility events and attachStream function 2018-05-29 18:54:01 +00:00
Lucas Fialho Zawacki
cb5022681d Catch exceptions on video tag play 2018-05-29 17:51:50 +00:00
Lucas Fialho Zawacki
49843ad2e1 Throw recording events 2018-05-29 17:22:14 +00:00
Lucas Fialho Zawacki
4b2df07667 Fix webcam recording when changing orientation in a mobile device 2018-05-28 19:16:20 +00:00
Lucas Fialho Zawacki
32c587dc0d Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into better-video-stability 2018-05-28 18:43:29 +00:00
Augusto Bennemann
2eaa457442 Merge branch 'webrtc_stats' of github.com:gutobenn/bigbluebutton into webrtc_stats 2018-05-25 16:27:16 -03:00
Augusto Bennemann
a3584092ec Improve webRTC video stats code 2018-05-25 16:24:41 -03:00
Lucas Fialho Zawacki
3d92f252b6 Try to make sure that attach streams and stream restarts always work 2018-05-23 18:04:47 +00:00
Lucas Fialho Zawacki
6cae1678ef Separate webrtc errors, restart and ice in separate functions 2018-05-23 18:04:01 +00:00
Lucas Fialho Zawacki
b7b5230966 Only send camera share to api after sharer has received a play start 2018-05-23 17:54:26 +00:00
Lucas Fialho Zawacki
5433049ab7 Better handle visibility events and paused streams 2018-05-23 17:54:16 +00:00
Augusto Bennemann
384b912995
Fix error logging 2018-05-22 12:42:51 -03:00
Augusto Bennemann
e8c2e1219c Fix measure name 2018-05-17 15:08:27 -03:00
Augusto Bennemann
5f142fa793 Fix merge conflicts 2018-05-17 14:49:35 -03:00
Tainan Felipe
b77e5494e0 add error message for when media server is offline and fix decrtion of intl message 2018-05-17 10:23:18 -03:00
Tainan Felipe
1d348c0328 Remove log 2018-05-16 15:30:40 -03:00
Tainan Felipe
8b1eda92b6 Create intlMediaErrorsMessages and add messages of errors 2018-05-16 15:16:12 -03:00
Tainan Felipe
0c16518025 add specific messages to permissions errors 2018-05-16 14:12:57 -03:00
Anton Georgiev
9801a9f332
Merge pull request #5462 from Tainan404/issue-5455
Show listen only icon in webcam status.
2018-05-11 08:27:10 -04:00
Anton Georgiev
32309b0c3f
Merge pull request #5480 from lfzawacki/stop-streams
Pause streams on media server to save bandwith and processing
2018-05-08 15:53:19 -04:00
Anton Georgiev
375e844890
Merge pull request #5426 from prlanzarin/ss-toast-fix
Fixed screenshare extension toast and removed dock leftover code
2018-05-07 14:44:20 -04:00
Lucas Fialho Zawacki
c7bbb847d8 Small html5 stop streams corrections 2018-05-07 17:52:44 +00:00
Lucas Fialho Zawacki
6fcdc61e69 Merge branch 'v2.0.x-release' of https://github.com/bigbluebutton/bigbluebutton into stop-streams 2018-05-07 17:12:44 +00:00
Lucas Fialho Zawacki
aed6ffc3cb Pausing streams server side when client is not vieweing them 2018-05-04 20:58:35 +00:00
Tainan Felipe
44a5d6c600 add voice user icon for webcam status 2018-05-04 16:44:30 -03:00
Tainan Felipe
35e0fc9bbf Fix the audio status does not update on webcam video 2018-05-04 16:40:40 -03:00
prlanzarin
01f87d2718 Added websocket ping pong to SFU clients
Also updated SFUs package-lock
2018-05-03 13:57:03 +00:00
Lucas Fialho Zawacki
5b65cde0de Stop remote stream tracks for HTML5 video viewers when window is hidden 2018-05-02 20:09:22 +00:00
Augusto Bennemann
0c539f8e8c WebRTC stats: Fix bitrate 2018-05-02 19:03:36 +00:00
Augusto Bennemann
02c1c85891 WebRTC stats: support Safari 2018-05-02 18:42:36 +00:00
Augusto Bennemann
9237fa3235 Move webrtc_stats_bridge logic from external script to react 2018-04-27 20:53:02 +00:00
Augusto Bennemann
9840bec025 Fix for NaN bug on Firefox; Improve setStats() 2018-04-27 18:57:38 +00:00
Oswaldo Acauan
72498ca227
Fix webcam dropdown padding 2018-04-27 11:50:05 -04:00
prlanzarin
95506e50d9 Fixed screenshare extension toast and removed dock leftover code 2018-04-27 15:11:40 +00:00
Augusto Bennemann
6fe043730e Fix for Firefox and video unmounting 2018-04-26 23:35:05 +00:00
Anton Georgiev
35fae897fb
Merge pull request #5421 from antobinary/default-chrome-extension
add-on to pr #5420 - default chrome extension
2018-04-26 19:22:40 -04:00
Fred Dixon
46e9fecdad
Merge pull request #5420 from antobinary/default-chrome-extension
Set default KEY and LINK for Chrome screenshare extension
2018-04-26 19:13:52 -04:00
Augusto Bennemann
f163e7683d Improve WebRTC stats react code 2018-04-26 23:01:59 +00:00
Anton Georgiev
8e6e14f902 add custom vs default key and link 2018-04-26 22:55:45 +00:00
Anton Georgiev
6aea0b6297 add custom vs default key and link 2018-04-26 22:52:46 +00:00
Augusto Bennemann
1985958191 WebRTC stats for each video 2018-04-26 22:19:15 +00:00
prlanzarin
ea73a4d37a Fixed sfu ws regression and exceptions when recording not enabled in SFU 2018-04-26 15:39:24 +00:00
Anton Georgiev
9c82f1486b
Merge pull request #5402 from prlanzarin/screenshare-opt2
HTML5 Screenshare improvements
2018-04-25 21:08:47 -04:00
prlanzarin
28950edf3b Removed ICE error toast message 2018-04-25 22:14:59 +00:00
BobakOftadeh
8e50a232c7
Loading screen rotation spins counter-clockwise
The arrows for when a webcam is loading now correctly spins counter-clockwise.
2018-04-25 17:02:36 -04:00
Oswaldo Acauan
fb6aeb90f9 Fix autosharewebcam option not working on first join 2018-04-25 11:23:44 -03:00
Oswaldo Acauan
ad57657b18 Add metatag html5hidepresentation 2018-04-24 13:18:12 -03:00
Oswaldo Acauan
46559833e2 Add metatag html5autosharewebcam 2018-04-24 12:51:41 -03:00
prlanzarin
be8a63b89a Merge remote-tracking branch 'upstream/v2.0.x-release' into video-regpack 2018-04-18 18:28:09 +00:00
prlanzarin
c9cdb08095 Fixed WebRTC video viewer stop, media flow error handling and state inconsistensies 2018-04-18 18:16:26 +00:00
Anton Georgiev
92316727ce
Merge pull request #5356 from oswaldoacauan/fix-webcam-swap-resize
Follow up on the webcam swap/design
2018-04-17 17:52:28 -04:00
Oswaldo Acauan
6192c6d962 Disable swap button following constraints 2018-04-17 15:03:55 -03:00
prlanzarin
bd91cbf5a5 Raised max resolution for webcam constraints 2018-04-17 17:58:15 +00:00
Oswaldo Acauan
bd61d55c07 Fix wrong calc for optimal grid while having a focused cam 2018-04-17 10:21:18 -03:00
Oswaldo Acauan
86b2cb0040 Fix presentation and webcam not resizing correctly 2018-04-17 10:09:00 -03:00
Anton Georgiev
457eb28cd6
Merge pull request #5327 from oswaldoacauan/webcams-styling
Update on video designs and swap
2018-04-16 17:00:55 -04:00
Oswaldo Acauan
cc1cbe26cd Fix video-menu and horizontal list focus/hover styles 2018-04-13 17:34:46 -03:00
Lucas Fialho Zawacki
f6faac564c Correctly send sfu messages and correct webrtc connection flow in HTML5 2018-04-13 17:03:37 -03:00
Oswaldo Acauan
ccf4fbba9e Fix grid sizing on mount 2018-04-13 15:20:00 -03:00
Oswaldo Acauan
9c2e8472cc Merge branch 'presentation-styles' into webcams-styling 2018-04-13 10:06:11 -03:00
Anton Georgiev
45a9a4f331
Merge pull request #5333 from prlanzarin/sft
SFU improvements
2018-04-12 14:28:09 -04:00
prlanzarin
bf5413a7df Fixed WebRTC video stop procedures on media flow timeout cases 2018-04-12 16:40:32 +00:00
Oswaldo Acauan
599a1935d4 Improve webcam gaps sizing 2018-04-12 09:41:49 -03:00
Oswaldo Acauan
66b25e4417
Merge branch 'v2.0.x-release' into webcams-styling 2018-04-11 15:54:01 -03:00
Oswaldo Acauan
5b9433fc9f Fix webcams/sfu reconnect on every render and styles for 4:3 2018-04-11 15:50:14 -03:00
Tainan Felipe
7121a4c897 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256 2018-04-10 16:48:13 -03:00
prlanzarin
67f49442b6 Fixed HTML5 viewer video stop flow 2018-04-10 14:55:42 +00:00
Oswaldo Acauan
ed8d570a3d Fix gutter calc and reduce in favor of for statement 2018-04-10 10:36:58 -03:00
Oswaldo Acauan
c4e429dd01 Merge remote-tracking branch 'upstream/v2.0.x-release' into webcams-styling 2018-04-09 15:49:25 -03:00
Oswaldo Acauan
5bf71eee98 Add swap functionality 2018-04-09 15:48:21 -03:00
Oswaldo Acauan
fe11dd9a90 Improve media overlay/content styles 2018-04-09 15:28:54 -03:00
Anton Georgiev
aedb2633d5
Merge pull request #5312 from gutobenn/minor-bugs-fix
Fix small bugs on video-provider
2018-04-09 14:07:50 -04:00
Augusto Bennemann
89784d5d9f Remove box-shadow from close button 2018-04-09 14:26:29 -03:00
Oswaldo Acauan
5918fc4483 Impl new webcam design 2018-04-09 11:39:27 -03:00
Tainan Felipe
a5ccd54cc3 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256 2018-04-05 15:31:24 -03:00
Augusto Bennemann
79a49e596a Wait for user permission before starting timeout 2018-04-04 13:15:20 -03:00
Tainan Felipe
d206ffde93 Comply lock setting 'see other viewer's webcams' 2018-04-04 10:10:46 -03:00
Augusto Bennemann
47d3ddc017 Reenable video button after SFU or permission error 2018-04-03 18:22:15 -03:00
Augusto Bennemann
7470e370f2 Add box-shadow on video button 2018-04-03 17:20:20 -03:00
Tainan Felipe
8e1bca98f3 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256 2018-04-02 16:29:11 -03:00
Tainan Felipe Pauli de Almeida
70f34b7725 Merge remote-tracking branch 'upstream/v2.0.x-release' into issue-5256 2018-03-26 16:01:31 -03:00
João Francisco Siebel
fe0f6a67a3 Reverse data saving logic 2018-03-26 15:26:52 -03:00
Lucas Fialho Zawacki
44d5b706e7 Move user active stream user filtering into the video-dock container 2018-03-22 19:29:27 +00:00
Lucas Fialho Zawacki
7713f06c2c Simplify video constraints code 2018-03-22 17:21:33 +00:00
Lucas Fialho Zawacki
a9dc1c558b Fix another lock settings edge case with video-dock 2018-03-22 17:21:00 +00:00
Lucas Fialho Zawacki
cb90c21e84 Fix lock settings for video dock 2018-03-22 14:14:54 +00:00
Lucas Fialho Zawacki
e823308eba Filter active user list for video-dock component 2018-03-21 19:25:32 +00:00
Lucas Fialho Zawacki
c67c101be4 Fixes after video-dock refactor review 2018-03-21 18:33:53 +00:00
Lucas Fialho Zawacki
48092ad5e9 Remove old video-component file and fix problems when sharing video 2018-03-21 07:27:06 +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
97b3be0e22 Refactor video dock to have less responsabilities and code 2018-03-19 17:59:13 +00:00
Augusto Bennemann
efcd9340cc Adjusts on video dock refactor 2018-03-12 15:30:28 +00:00
Lucas Fialho Zawacki
388fee31b6 Renaming files to better suit html5 structure 2018-02-19 04:23:05 +00:00
Lucas Fialho Zawacki
b8264b23eb Removing some pieces of code and going back on the chrome modal in other file 2018-02-19 03:43:30 +00:00
Lucas Fialho Zawacki
a85410a85f Video dock refactor, almost ready 2018-02-16 21:11:59 +00:00
Lucas Fialho Zawacki
1b3633c8bd More components for video-dock 2018-02-16 19:24:35 +00:00