Commit Graph

120 Commits

Author SHA1 Message Date
Pedro Beschorner Marin
d50f65fce1 Moved akka-transcode messages to 2.0 format 2017-07-25 13:23:20 +00:00
Pedro Beschorner Marin
d6b1dd09b9 Merge remote-tracking branch 'mconf-akka-transcoding' into 1.1-transcode
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/apps/VideoApp.scala
2017-06-08 18:57:37 +00:00
Pedro Beschorner Marin
55d12b331b Fixed wrong package path 2017-06-08 18:31:30 +00:00
Pedro Beschorner Marin
555c7e351f Merge remote-tracking branch 'mconf-akka-transcoding' into merging-into-bbb-1.1
Conflicts:
	akka-bbb-apps/src/main/java/org/bigbluebutton/core/pubsub/receivers/UsersMessageReceiver.java
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/BigBlueButtonActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MeetingActor.scala
	akka-bbb-apps/src/main/scala/org/bigbluebutton/core/MessageSenderActor.scala
	bbb-video/src/main/java/org/bigbluebutton/app/video/VideoApplication.java
	bbb-video/src/main/java/org/bigbluebutton/app/video/converter/H263Converter.java
	bigbluebutton-config/bin/bbb-conf
2017-06-07 18:18:54 -03:00
Pedro Beschorner Marin
8ecef2f1f2 Included a redis pub service in deskshare 2017-06-06 20:47:33 +00:00
Pedro Beschorner Marin
c74cc682c4 Merge remote-tracking branch 'mconf/mconf' 2017-03-20 19:45:59 +00:00
Pedro Beschorner Marin
20d21ea313 Unregistering Java client deskshare stream
Conflicts:
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/red5/DeskshareApplication.scala
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/stream/StreamManager.scala
2016-09-14 14:01:01 -03:00
Pedro Beschorner Marin
e9cc024e5e Added exception handlers to deskshare actors and refactored the akka ones 2016-02-03 18:41:49 +00:00
Richard Alam
f501fb5803 - expire redis recording keys after 14 days 2016-01-21 20:43:28 +00:00
Richard Alam
4d27b460ae - expire redis keys for events that are stored even if meeting is not recorded 2015-09-23 22:31:15 +00:00
Richard Alam
cacfbf7e35 - update jar to latest red5 2015-08-10 21:32:00 +00:00
Richard Alam
bef5e77357 - generate key frames regularly instead of just when the user joins. This allows us to enable
dropping of packets for slow connections in red5
2015-07-21 20:16:14 +00:00
Richard Alam
96e8fde865 - change format of logs to add timezone 2015-02-09 18:40:31 +00:00
Richard Alam
fca1798868 - increase the number of log history 2015-01-08 20:21:47 +00:00
Richard Alam
ce07751d79 - fix https://code.google.com/p/bigbluebutton/issues/detail?id=1837 2014-11-28 14:24:28 -08:00
Richard Alam
ee4e5f1a47 Merge branch 'master' into upgrade-to-red5-nov-4-2014 2014-11-14 03:49:14 -08:00
Felipe Cecagno
7ce57fbc46 implemented the policy request on deskshare service, to support check on port 9123 by the client checker 2014-11-11 15:47:54 -02:00
Richard Alam
000ddbd9d7 - add more logging about the connection to red5 2014-11-07 22:09:49 +00:00
Richard Alam
3c28f36786 - initiate closing of applet from server side 2014-08-24 13:04:08 -07:00
Richard Alam
57b7de8b36 - stop sharing from server side instead of destroing the applet from the client side 2014-08-24 12:12:29 -07:00
Richard Alam
97262dfba5 - make recording process work 2014-06-12 12:31:24 -07:00
Richard Alam
7970495c58 - try to fix why BBB apps isn't starting 2014-04-14 10:44:25 -07:00
Richard Alam
e709ff4fbd - build with red5 1.0.2-M1 2014-04-07 17:31:49 +00:00
Richard Alam
2f0af49f40 - update blocks by row instead of by block to speed up updates in eyes of user 2013-10-22 20:11:46 +00:00
Richard Alam
2e9aa55756 - fix bug where requesting to send a key frame fails to get the correct stream name 2013-10-22 19:55:39 +00:00
Fred Dixon
e08c6802d4 Update configuration to record desktop sharing by default 2013-06-15 08:25:09 -07:00
Richard Alam
19d2472fd0 - move logback config into resources dir so we don't need to copy it as last step in gradle war 2013-02-28 01:03:31 +00:00
Richard Alam
5f0b2a7ea7 - change logging history from 30 days to 5 days...don't need that much history 2013-02-26 14:08:12 +00:00
Markos Calderon
8ae4001b81 Merge branch 'master' into try-fixing-deskshare-red5-context 2013-01-28 12:42:04 -05:00
Fred Dixon
ac6679563b Moved XML declaration to top 2013-01-26 19:18:29 -05:00
Fred Dixon
d8bd3029ff Moved XML declaration to top so the xml files are well formed 2013-01-26 19:05:56 -05:00
Richard Alam
3b91a08efd - publish deskshare streams in the app context so that context isn't removed when last user disconnects 2013-01-26 21:31:47 +00:00
Markos Calderon
c639bdbac2 Added license to deskshare 2013-01-21 13:58:37 -05:00
Richard Alam
ad35b2ab08 - upgrade to red5 r4415 2012-09-12 20:39:34 +00:00
Richard Alam
2c67f67e9c - make deskshare and voice work with latest red5 (r4406) 2012-09-04 20:20:29 +00:00
Richard Alam
420d5f13dd - try to fix why it's not working properly 2012-09-03 18:39:51 +00:00
Richard Alam
808588cb5d - try upgrading to red5 r4406 2012-09-03 17:15:46 +00:00
Richard Alam
e04da4042a Merge remote branch 'rsippl/deskshare-improvements' into merge-svc2-deskshare
Conflicts:
	bigbluebutton-client/resources/prod/bbb-deskshare-applet-0.8.jar
	deskshare/applet/src/main/java/org/bigbluebutton/deskshare/client/net/NetworkHttpStreamSender.java
2012-08-17 19:21:34 +00:00
dtrusty
2f13cbb86b improve speed of desktop sharing when in tunneling mode. 2012-08-15 10:03:12 -05:00
Ralf Sippl
68bf9f027b added SVC2 (Screen Video V2) support to deskshare 2012-07-16 23:01:49 +02:00
Ralf Sippl
a709b8ebcf a couple of fixes that enabled an upgrade to Scala 2.9.2 and make deskshare debuggable in Eclipse (w. Scala IDE) 2012-07-10 22:22:05 +02:00
Richard Alam
a802ab7e5a - make some improvements to dekstop sharing by
1. Convert the initial image that is sent to the server as grayscale
  2. Add some debug logs on the applet to determine which step is taking
     a long time. As suspected, it is on the network, esp. using http.
  3. Fix a bug in the server side. Turns out we are not incrementing the
     timestamps in constant interval like we do with the voice. Not doing so,
     doesn't allow the Flash Player to drop frames when packets arrive late.
2012-05-10 14:10:01 -07:00
Richard Alam
ba16c09a02 add some debug logs to print how long it takes to capture the screen, process the blocks,
send the blocks to the server, and how long it takes for the server to receive all the blocks.
2012-05-09 10:59:03 -07:00
Richard Alam
ccbd3df12c - provide option to wait for all the blocks from the applet before displaying
the screen caltured to other users
2012-05-08 12:49:10 -07:00
Richard Alam
45af49b733 change default color to gray 2012-05-08 11:18:07 -07:00
Richard Alam
095563e7fc - generate keyframe using configurable interval 2012-05-04 20:10:50 +00:00
Richard Alam
902e83d8b3 - add a timeout when applet is connecting to socket. This way if port is closed, we fall back to http tunneling quickly
- change how we update the blocks so we don't have to send key frames to late comers. Instead we update each block regularly.
 - make inter-frame interval configurable
2012-05-04 18:06:18 +00:00
Richard Alam
7df802b818 - make sure the last packet gets processed 2012-04-21 15:53:59 +00:00
Richard Alam
49bab2514b - change how we decode byte stream into frames
- add an end frame delimeter so we can handle frames easily
2012-04-12 21:49:37 +00:00
Richard Alam
878ca71018 - let the exception handler from decoder handle the exception 2012-03-28 18:44:05 +00:00