BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,895 Commits 13 Branches 260 Tags 1.1 GiB
6beada63eb
Commit Graph

162 Commits

Author SHA1 Message Date
Richard Alam
e6da7afcdd - upgrade to red5 r4582 2013-03-07 19:48:03 +00:00
Richard Alam
3c53ceecec - upgrade to red5 r4581 2013-03-06 15:58:56 +00:00
Richard Alam
601afeaae3 - upgrade red5 to r4580 2013-03-04 18:12:07 +00:00
Richard Alam
eadd1e3ef0 - upgrade builds to red5 r4578 2013-03-03 12:34:25 +00: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
e689d1fec7 - build desktop sharing....need to put file-uploads jar into red5/lib 2013-02-28 00:26:32 +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
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
Richard Alam
46f8b07ae6 - setup testng tests framework 2011-03-18 16:20:14 -04:00
Richard Alam
d697d9d6cc - record deskshare 2011-03-18 15:35:10 -04:00
Richard Alam
52817279a2 - add streams directory for video and deskshare apps where we store recordings 2011-03-15 15:30:29 -04:00
Richard Alam
bcb88f4bb6 - add timestamp on recorded flv filename so that we can handle multiple recordings in a meeting 2011-03-15 15:21:09 -04:00
Richard Alam
adc52a459c - record deskshare stream by setting property 2011-03-12 19:29:06 -05:00
Richard Alam
e68520a3c6 - add license header for deskshare 2010-11-06 11:17:57 -04:00
Richard Alam
a1e08f0293 - upgrade applet jar file to 0.71 2010-11-03 13:47:08 -04:00
Richard Alam
ac86a3ebb6 - combine all blocks that has changed on a capture cycle into one packet 2010-10-12 17:52:56 -04:00
Richard Alam
cc53a33aa7 - add sequence numbers to messages from deskshare applet to the server. This allows us to drop 
late block changes.
 2010-10-12 14:24:01 -04:00
Richard Alam
374db34ab7 - schedule when receiving a generate key frame request. If there is a pengding request 
ignore other generate key frame request
 2010-10-07 06:42:43 -04:00
Richard Alam
63cc64e80e - generate serverside frame every 250ms 2010-09-30 21:26:43 -04:00
Richard Alam
99376a3dfe - cleanup 2010-09-28 15:52:39 -04:00
Richard Alam
4b7a3fbc14 - change license from AGPL to LGPL 2010-07-09 15:50:14 -04:00
Richard Alam
e4b4b7416c - missed the "break;" in a case statement...that's why loggin errors on mouse location updates. 2010-06-22 17:45:21 -04:00
Richard Alam
edeedf3b6d - add parameters to scale captured screen 2010-05-26 14:36:21 -04:00
Richard Alam
ae0e1dca2e - add deskshare folder 2010-05-25 20:56:20 -04:00
Richard Alam
31498e220c add build folder 2010-05-25 20:48:18 -04:00
Richard Alam
06921cc32f - pass width and height on onAppletStart call 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@115 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-05-20 20:35:28 +00:00
Richard Alam
48696dc081 - send mouse cursor location of sharer 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@108 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-05-11 18:01:27 +00:00
Richard Alam
b75b590791 - create stream even if no client is connected on scope yet 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@105 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-05-06 17:13:04 +00:00
Richard Alam
f2a2f01403 - guard against null room (NPE) 
- revert back deskstream to use react instead of receive

git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@104 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-05-04 15:01:12 +00:00
Richard Alam
afe6ebf6d6 - fix NPE when stream manager get a shared object to create a stream. This fixes the problem where the session manager dies mysteriously 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@103 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-30 19:41:19 +00:00
Richard Alam
d7aba8440a - add more logs 
- run deskshare stream on its own thread using receive

git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@101 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-23 14:43:05 +00:00
Richard Alam
b0e9bce64d - add more logs 
- exit actors when stopping desktop sharing

git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@100 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-21 21:11:41 +00:00
Richard Alam
3cc57d0b29 - more logging 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@99 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-20 02:12:10 +00:00
Richard Alam
bf84bf02b8 - remove session when there is a matching session in the manager 
- call parent on session closed/idle/create

git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@98 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-19 21:39:05 +00:00
Richard Alam
6a9759a8e1 - cleanup logging 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@97 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-15 15:10:45 +00:00
Richard Alam
9dc7a1c42a - add an audit so that if there are no updates from the applet for 1 minute, the stream/session is closed 
- the applet will use block 1 as a keep alive block. The keep alive block is send every 30 seconds.
- add more logs

git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@96 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-14 20:32:26 +00:00
Richard Alam
4a3ecf10ef - removing client invoker...make the deskshare stream notify client instead 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@94 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-09 16:12:06 +00:00
Richard Alam
2dcda1fd48 - more logs to narrow down why clientInvoker actor is not sending message 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@93 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-09 15:29:48 +00:00
Richard Alam
c10d11f505 - seems like it's not notifying the client..or the clientInvoker died 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@92 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-09 14:57:30 +00:00
Richard Alam
24a3cd14d1 - trying to narrow down why deskshare is going down 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@91 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-09 14:35:37 +00:00
Richard Alam
f0ae603e7e - fix compile error 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@90 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-09 14:10:55 +00:00
Richard Alam
bc70848814 - try to fix desktop sharing. it goes down after a while 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@89 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-04-09 14:03:18 +00:00
Richard Alam
6382a2e89c - upgrade build to red5-0.91 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@88 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-29 18:15:38 +00:00
Richard Alam
053c7518ef - cleanup of desktop sharing 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@85 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-09 18:37:06 +00:00
Richard Alam
2c8f0e0716 - http tunneling now works 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@84 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-09 15:48:36 +00:00
Richard Alam
edf2692713 - fix some exceptions on applet 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@83 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-08 20:31:38 +00:00
Richard Alam
faae2ceed0 - change location of deskshare.conf to keep it the same way as before so we don't have to change the way we package and bbb-conf 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@82 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-08 16:15:22 +00:00
Richard Alam
b024b4ecae - upgrade version numbers 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@79 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-05 15:12:30 +00:00
Richard Alam
9cdbda7506 git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@76 6ac8b576-4aa1-4e98-a958-8badfeb98c9d 2010-03-03 23:03:01 +00:00
Richard Alam
680e071517 - cleanup and logging 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@75 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-03 22:46:29 +00:00
Richard Alam
354f5a18a0 - cleanup 
git-svn-id: http://svn.bigbluebutton.org/project-bbb/trunk@74 6ac8b576-4aa1-4e98-a958-8badfeb98c9d
 2010-03-03 20:46:49 +00:00