Commit Graph

322 Commits

Author SHA1 Message Date
Richard Alam
4838840aa5 - upgrading red5 jar 2013-02-25 20:41:50 +00:00
Richard Alam
0a233bd391 - fix the problem where the applet will display 800x600 on full screen 2013-02-07 20:47:13 +00:00
Markos Calderon
f9b2600cdc updating jar in order to not show warning message 2013-02-07 13:49:18 -05:00
Richard Alam
8a6decd12d - bind to 127.0.0.1 for lifeline as sometimes anti-virus will complain when binding to real PC IP 2013-01-28 22:02:29 +00:00
Markos Calderon
db79ff62ab Update build.xml and applet 2013-01-28 16:14:32 -05:00
Markos Calderon
8ae4001b81 Merge branch 'master' into try-fixing-deskshare-red5-context 2013-01-28 12:42:04 -05:00
Richard Alam
84097bed6e - try to make the applet run 2013-01-27 20:55:37 +00: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
Richard Alam
2429d13756 - fix full screen when not passing -w and -t param 2013-01-26 19:47:15 +00:00
Richard Alam
a274763f1e - scale desktop sharing properly and remove letter boxing 2013-01-25 18:19:34 +00:00
Richard Alam
fcf9ca5dff - simple calculation for mouse loc 2013-01-24 13:17:28 +00:00
Richard Alam
de022bfa54 - scale fullscreen to fit into requested scale 2013-01-24 13:02:38 +00:00
Richard Alam
b68f41d6d1 - pre-calculate video stream size 2013-01-24 10:45:41 +00:00
Richard Alam
ee4a872e1f - put star sharing button in middle 2013-01-24 08:41:31 +00:00
Markos Calderon
c639bdbac2 Added license to deskshare 2013-01-21 13:58:37 -05:00
Richard Alam
cf199e9ec3 - sync mouse location for case where capture is greater than scale 2013-01-18 08:17:07 +00:00
Richard Alam
3df54860d8 - scale to maintain aspect ratio when cature sides are greater than scale 2013-01-18 07:01:03 +00:00
Richard Alam
ea49110e5d - sync mouse location 2013-01-18 05:14:22 +00:00
Richard Alam
0d94de897d - fix fit-to-height mouse loc 2013-01-17 21:48:29 +00:00
Richard Alam
7495666c2e - can't seem to sync mouse for fit-to-height 2013-01-17 21:31:13 +00:00
Richard Alam
3cbff0a300 - calculate mouse y for fit-to-width 2013-01-17 20:30:06 +00:00
Richard Alam
6f0e12bbb1 - calculate mouse x for fit-to-width 2013-01-17 20:25:51 +00:00
Markos Calderon
efd601c029 accidently, removed the lines for self signed certificate 2013-01-17 12:54:20 -05:00
Richard Alam
303f2c1eff - capture smaller than scale works now on mouse location 2013-01-17 17:52:33 +00:00
Markos Calderon
290e8646e5 Sign jar with Certificate using pkcs12 file 2013-01-17 12:19:16 -05:00
Richard Alam
2795556723 - remote mouse tracking in screen capture...do not want to embed mouse cursor into image as it will trigger lots of block updates 2013-01-17 15:45:08 +00:00
Richard Alam
9d9a3913b9 - try to position mouse pointer 2013-01-16 23:08:29 +00:00
Richard Alam
75107c5db0 - use quality scaling always 2013-01-16 16:20:12 +00:00
Richard Alam
0fc1bb4161 - scale captured image properly 2013-01-16 16:07:34 +00:00
Richard Alam
8efd3c7b58 - try to fix scaling problem with deskshare 2013-01-15 20:52:41 +00:00
Markos Calderon
df8c646bea latest change for fix deskshare 2013-01-15 13:36:09 -05:00
Markos Calderon
f658d937e1 added scaled values for region capture 2013-01-15 13:35:53 -05:00
Markos Calderon
ed49bd02ff Merge remote-tracking branch 'rsippl/deskshare-optimizations' 2013-01-14 10:33:57 -05:00
Markos Calderon
abaaf5da5d Added a checking when scaled values are passed in fullscreen mode 2013-01-10 17:23:05 -05:00
Ralf Sippl
d2277a4a32 Traffic optimization that causes block updates to be held back, they're sent either when the block's content stops changing, or after a timeout (currently set to 10 screen sampling intervals, see DIRTY_COUNT_LIMIT) 2012-12-16 13:19:55 +01:00
Ralf Sippl
0eb2cff138 Fixed a bug that caused lots of unnecessary mouse location updates to be sent (while not moving the mouse) 2012-12-16 12:43:14 +01:00
Ralf Sippl
557d81c992 Reduced number of sender threads to 1; minor cleanup 2012-12-16 12:34:24 +01: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
dtrusty
7252204d9c improve speed of deskshare, when in tunneling mode. 2012-08-15 10:00:06 -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
d4b1c41298 - updating deskshare applet filename to 0.8 2012-06-05 21:09:37 +00:00
Richard Alam
c1a59722f2 - remove grayscale step when sharing desktop 2012-05-22 17:53:27 +00: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
76e4d807d3 - add some info logs for deskshare applet 2012-05-09 19:23: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
80b85ba9bb - upgrade filename to 0.71 2012-04-24 22:22:20 +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
af8620f292 - remove tunnel log on java console as it is confusing 2012-04-16 18:37:45 +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
b2a823ab62 - create message to stop sender threads when stopping desk share 2012-01-19 17:40:17 +00: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
bfd6316040 - stick with scala 2.7.7 for now as we have compile problems with upgrad 2011-11-19 19:53:47 +00:00
Richard Alam
6b61b49ea0 - remove dependencies on children as we don't build the parent project but build each individually 2011-11-19 18:15:08 +00:00
Richard Alam
7ca98289b6 - parent build.gradle needs compile instead of providedCompile 2011-11-19 17:46:40 +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
7bd56ac755 - change diconnected display text 2010-11-26 13:29:14 -05:00
realwatbbb
8e484c8c56 2010.11.19 _PTS_272_ 2010-11-19 15:42:43 +07:00
realwatbbb
c4d40d4776 Update Header 2010-11-17 10:18:08 +07:00
realwatbbb
0ddf745b68 fixed Problem 644 and 647 2010-11-16 11:46:56 +07:00
realwatbbb
2d25162fb1 fixed problem 647 2010-11-15 13:52:06 +07:00
Richard Alam
76ff233218 - fix http tunneling for desktop sharing 2010-11-09 15:56:42 -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
5e185717b0 - seems like sending by row is faster 2010-10-12 21:05:20 -04:00
Richard Alam
f41167c044 - send all changed blocks together 2010-10-12 20:47:08 -04:00
Richard Alam
8d8f81b1a8 - send changed blocks one row at a time 2010-10-12 20:29:23 -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
a36e2bc287 - mark the block as clean after sending. This prevents unecessarily sending block changes to
the server when the block is changing quickly.
2010-10-12 16:14:09 -04:00
Richard Alam
b7865a2073 - init sequence number to zero 2010-10-12 14:46:01 -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
54ea5e4f8a - modify logic so that we don't unnecessarily compute if the block has changed if it's already
dirty and wating to be sent to the server.
2010-10-10 12:28:55 -04:00
Richard Alam
519a287cd5 - fix problem where blocks don't get updated when moving the capture region 2010-10-10 12:05:06 -04:00
Richard Alam
8b0812ba97 - reset checksum when sending block 2010-10-10 11:27:20 -04:00
Richard Alam
cd039d3a3e - synch setting of the flag so that new screen caps are propagated properly 2010-10-07 11:37:24 -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
86c8a006b0 - revert back to 64x64 blocks 2010-10-06 21:38:31 -04:00
Richard Alam
ca9d954b93 - bind lifeline only to localhost 2010-10-06 21:25:14 -04:00
Richard Alam
e2a169c041 - remove tray icon when stopping deskshare 2010-10-06 12:02:45 -04:00
Richard Alam
d25cdbd36b - remove resize listeners and make border solid blue when sharing 2010-10-06 10:46:32 -04:00
Richard Alam
2fb57a1879 - remove frame when stopping desktop sharing 2010-09-30 22:47:18 -04:00
Richard Alam
63cc64e80e - generate serverside frame every 250ms 2010-09-30 21:26:43 -04:00
Richard Alam
7fcc2937da - center capture region when starting 2010-09-30 21:22:28 -04:00
Richard Alam
d6dcbfca14 - change text to start sharing 2010-09-30 15:15:29 -04:00
Richard Alam
f3209f6514 - remove start button when sharing. Users will now have to quit from the client until we figure out the
best way to start/stop sharing.
2010-09-30 15:12:36 -04:00
Richard Alam
61fc30239e - when sharing full screen, it the width is greater than 1280, scale the output to 1280 2010-09-30 11:28:24 -04:00
Richard Alam
b828761f0e - don't scale when sharing fullscreen 2010-09-30 11:04:34 -04:00
Richard Alam
3a877a3270 - update applet and cleanup 2010-09-30 10:34:55 -04:00
Richard Alam
a73bcd4faa - start/stop deskshare properly 2010-09-30 10:21:35 -04:00
Richard Alam
436cead11d - add source and target compatibility to 1.6 2010-09-30 09:45:33 -04:00
Richard Alam
99376a3dfe - cleanup 2010-09-28 15:52:39 -04:00
Richard Alam
1670890939 - start and stop network connection properly 2010-09-28 12:59:07 -04:00
Richard Alam
5cd65fc593 - change border color from red to blue when capturing 2010-09-28 08:21:23 -04:00
Richard Alam
04375f3426 - clean up 2010-09-27 17:39:21 -04:00
Richard Alam
af948c2e99 - can now capture region inside the frame without the borders 2010-09-27 17:17:57 -04:00
Richard Alam
96e717b5b5 - checkpoint: refactor to make capturing of region work. There is still a minor issue
where the right and bottom border gets captured.
2010-09-27 15:44:07 -04:00
Richard Alam
597df03b93 - restructure client code so that in only expose few interfaces 2010-09-26 13:40:16 -04:00
Richard Alam
33b60b738a - refactor the capture frame to the deskshareClient because we want it to be available too for standalone
(more work to be done).
2010-09-25 13:04:41 -04:00
Richard Alam
cd847c98f2 - fix typos 2010-09-21 16:22:02 -04:00
Richard Alam
83b2519b60 - convert pixels from int[] to byte[] and use the byte[] to calculate checksum to determine if a block has chnaged 2010-09-17 14:53:20 -04:00
Richard Alam
0cfe1d1efa - use all pixels to calculate checksum when determining if a block has changed 2010-09-17 11:52:36 -04:00
Richard Alam
d7138b3f0c - cleanup 2010-09-08 17:14:42 -04:00
deniszgonjanin
205ca72fb1 Applet was in wrong spot for client to build deskshare. Recommiting in the proper spot 2010-09-08 04:31:59 +00:00
deniszgonjanin
b8a1b45e0d Desktop Sharing region selection 2010-09-08 03:56:31 +00:00
Richard Alam
df84f1222b - have the applet tunnel by default 2010-09-03 15:10:17 -04:00
Leif Jackson
f236dc5c1c Merge commit 'bbb/master' sync with bbb 2010-07-11 04:28:39 +00:00
Richard Alam
4b7a3fbc14 - change license from AGPL to LGPL 2010-07-09 15:50:14 -04:00