Commit Graph

105 Commits

Author SHA1 Message Date
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
b5b6d5f954 - update red5 to latest (r4316) 2012-04-22 15:03:43 +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
Richard Alam
85db87b71f - close session when wrong header 2012-03-23 14:46:33 +00:00
Richard Alam
0723e820b6 - add more logging to figure out why deskskare hangs when getting exceptions 2012-03-21 17:32:32 +00:00
Richard Alam
f17f03e228 minor cleanup 2012-03-15 22:10:44 +00:00
Richard Alam
ec372dd538 - try to make deskshare resilient to corrupted packets 2012-03-15 22:06:33 +00:00
Richard Alam
56987a92e0 cleanup 2012-03-15 21:42:49 +00:00
Fred Dixon
fe61d3e7d5 Saving of desktop sharing video defaults to false (not needed for built-in slides) 2012-02-19 15:20:52 -05:00
Fred Dixon
60675c5ca1 reformatted XML so <beans ...> is on a single line. This enables bbb-playback-matterhorn to enable recording using xmlstarlet 2012-02-18 16:32:47 -05:00
Fred Dixon
b566041eb7 Turn off recording of desktop and webcams by default 2012-02-18 14:14:08 -05:00
Richard Alam
c8ec2df6a6 - make key fram interval configurable 2012-01-19 17:09:08 +00:00
Richard Alam
ce49090bd0 - make deskshare port configurable 2012-01-18 16:04:53 +00:00
Richard Alam
97b4a3e38a - change jars that we need to package with red5 2011-11-19 17:38:04 +00:00
Richard Alam
5ea0e41b2d upgrading to fixed red.jar for rtmpt 2011-11-16 21:28:09 +00:00
Richard Alam
a668e79494 - commons-fileupload and commons-io needs to be in red5/lib otherwise we get class not found FileItemFactory 2011-11-04 14:45:41 +00:00
Richard Alam
4172426a01 - deskshare works on socket but has exceptions on startup for tunneling 2011-11-04 14:00:26 +00:00
Richard Alam
bb86f44150 - compile with red5-r4293
- still some errors to resolve
   - had to add aop jars in bbb-apps
   - deskshare is choking on tunneling
   - exceptions when starting red5 manually
2011-11-04 02:07:35 +00:00
Markos Calderon
3d9f861617 Update deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/svc1/BlockManager.scala 2011-10-25 15:48:30 -05:00
Richard Alam
4ff0c75675 - null out buffers so that garbage collector can reclaim memory quickly 2011-10-24 22:09:23 +00:00
BigBlueButton
4dda2b980f - remove deskshare client callback 2011-10-24 19:29:57 +00:00
Richard Alam
e40a6f9639 - upgrade deskshare to red5 1.0rc1 2011-05-04 11:05:27 -04:00
Richard Alam
4e55a6e157 - notify client on the status of deskshare recording
- this should just display alert boxes for now. we need to figure out the best way
   to display record status that will also be used for voice, video, and events (chat, presentation, whiteboard, etc.)
2011-03-29 15:28:59 -04:00
Richard Alam
1ddb70d528 - fix so that deskshare start and stop events are stored properly in Redis and the ingest/proc scripts is able to retrieve the events 2011-03-29 10:03:21 -04:00
Richard Alam
190c4eb794 - record desktop sharing events to redis 2011-03-28 11:43:06 -04:00
Richard Alam
f39dbd4f11 - implement recording listeners for desktop sharing 2011-03-26 15:50:19 -04:00
Richard Alam
0d3ff179d9 - cleanup FlvStreamToFile.java 2011-03-25 17:06:42 -04:00
Richard Alam
0468104a43 - cleanup
- add checks to recording directory to make sure that it has been created with proper permissions
2011-03-25 11:58:20 -04:00
Richard Alam
1800cc3681 - setup testng for deskshare server app
- add config file for deskshare app and make recording directory configurable
 - add build dir to .gitignore
2011-03-23 15:38:32 -04:00
Richard Alam
bc4be2b7bf - add jedis dependency
- change copyToLib task to resolveDeps so it's consistent with the other subsystems
2011-03-22 10:43:31 -04:00