diff --git a/do_run.cmd b/do_run.cmd deleted file mode 100644 index 32518bb..0000000 --- a/do_run.cmd +++ /dev/null @@ -1,2 +0,0 @@ -"C:\Program Files\Java\jdk1.6.0_01\bin\java" -classpath screenshare.jar org.redfire.screen.ScreenShare btg199251 xmpp 1935 screen_share flashsv1 -pause diff --git a/do_run2.cmd b/do_run2.cmd deleted file mode 100644 index 2a2b5b6..0000000 --- a/do_run2.cmd +++ /dev/null @@ -1,2 +0,0 @@ -"C:\Program Files\Java\jdk1.6.0_01\bin\java" -classpath screenshare.jar org.redfire.screen.ScreenShare btg199251 xmpp 1935 screen_share flashsv2 -pause diff --git a/log/screenshare.log b/log/screenshare.log deleted file mode 100644 index 0fbd831..0000000 --- a/log/screenshare.log +++ /dev/null @@ -1,48 +0,0 @@ -2011-03-31 09:45:17,090 [pool-1-thread-1] INFO o.r.screen.ScreenClientHandler - channel opened: [id: 0x010dc656] OPEN -2011-03-31 09:45:17,571 [New I/O client worker #1-1] INFO o.r.s.ScreenClientHandshakeHandler - connected, starting handshake -2011-03-31 09:45:17,681 [New I/O client worker #1-1] INFO com.flazr.rtmp.RtmpHandshake - using client version 00000000 -2011-03-31 09:45:20,565 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - handshake complete, sending 'connect' -2011-03-31 09:45:20,605 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - sending command (expecting result): [0 COMMAND_AMF0 c3 #0 t0 (0) s0] name: connect, transactionId: 1, object: {app=xmpp, flashVer=WIN 9,0,124,2, tcUrl=rtmp://btg199251:1935/xmpp, fpad=false, audioCodecs=1639.0, videoCodecs=252.0, objectEncoding=0.0, capabilities=15.0, videoFunction=1.0}, args: null -2011-03-31 09:45:22,548 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - server command: _result -2011-03-31 09:45:22,548 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - result for method call: connect -2011-03-31 09:45:22,548 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - sending command (expecting result): [0 COMMAND_AMF0 c3 #0 t0 (0) s0] name: createStream, transactionId: 2, object: null, args: [] -2011-03-31 09:45:22,839 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - server command: _result -2011-03-31 09:45:22,849 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - result for method call: createStream -2011-03-31 09:45:24,671 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - server command: onStatus -2011-03-31 09:45:24,671 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - onStatus code: NetStream.Publish.Start -2011-03-31 09:45:26,384 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 129375 -2011-03-31 09:45:39,412 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 260447 -2011-03-31 09:45:39,713 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 375972 -2011-03-31 09:45:49,477 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 499351 -2011-03-31 09:46:01,664 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 621614 -2011-03-31 09:46:13,692 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 744377 -2011-03-31 09:46:25,429 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 867371 -2011-03-31 09:46:35,894 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - server command: mouseMove -2011-03-31 09:46:35,894 [New I/O client worker #1-1] INFO org.redfire.screen.ScreenShare - mouseMove 527.0 186.0 959.0 631.0 -2011-03-31 09:46:35,924 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - mouseMove: 527.0 186.0 959.0 631.0 -2011-03-31 09:46:37,426 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1003453 -2011-03-31 09:46:40,931 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - server command: mouseMove -2011-03-31 09:46:40,931 [New I/O client worker #1-1] INFO org.redfire.screen.ScreenShare - mouseMove 27.0 139.0 959.0 631.0 -2011-03-31 09:46:40,931 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - mouseMove: 27.0 139.0 959.0 631.0 -2011-03-31 09:46:49,493 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1141653 -2011-03-31 09:46:49,764 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - server command: mouseMove -2011-03-31 09:46:49,764 [New I/O client worker #1-1] INFO org.redfire.screen.ScreenShare - mouseMove 518.0 0.0 959.0 631.0 -2011-03-31 09:46:49,764 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - mouseMove: 518.0 0.0 959.0 631.0 -2011-03-31 09:47:01,530 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1263458 -2011-03-31 09:47:13,548 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1391173 -2011-03-31 09:47:25,635 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1517586 -2011-03-31 09:47:37,582 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1642963 -2011-03-31 09:47:49,620 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1768223 -2011-03-31 09:48:01,627 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 1892422 -2011-03-31 09:48:13,744 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2017530 -2011-03-31 09:48:25,641 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2139397 -2011-03-31 09:48:37,679 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2260177 -2011-03-31 09:48:49,646 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2380087 -2011-03-31 09:49:01,683 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2498829 -2011-03-31 09:49:13,731 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2617020 -2011-03-31 09:49:25,748 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2735562 -2011-03-31 09:49:37,825 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2851340 -2011-03-31 09:49:49,722 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 2967138 -2011-03-31 09:50:01,740 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 3082902 -2011-03-31 09:50:13,797 [New I/O client worker #1-1] INFO o.r.screen.ScreenClientHandler - ack from server: [1 BYTES_READ c2 #0 t0 (0) s4] 3198672 -2011-03-31 09:50:18,794 [AWT-EventQueue-0] INFO o.r.screen.ScreenClientHandler - channel closed: [id: 0x010dc656, /192.168.1.64:1416 => btg199251/192.168.1.64:1935] CLOSED diff --git a/org/redfire/screen/ScreenShare$1.class b/org/redfire/screen/ScreenShare$1.class index 8f14324..73f5ae3 100644 Binary files a/org/redfire/screen/ScreenShare$1.class and b/org/redfire/screen/ScreenShare$1.class differ diff --git a/org/redfire/screen/ScreenShare$2.class b/org/redfire/screen/ScreenShare$2.class index 521293a..94cde93 100644 Binary files a/org/redfire/screen/ScreenShare$2.class and b/org/redfire/screen/ScreenShare$2.class differ diff --git a/org/redfire/screen/ScreenShare$3.class b/org/redfire/screen/ScreenShare$3.class index b57ff6c..17b53ce 100644 Binary files a/org/redfire/screen/ScreenShare$3.class and b/org/redfire/screen/ScreenShare$3.class differ diff --git a/org/redfire/screen/ScreenShare$4.class b/org/redfire/screen/ScreenShare$4.class index e372589..6836550 100644 Binary files a/org/redfire/screen/ScreenShare$4.class and b/org/redfire/screen/ScreenShare$4.class differ diff --git a/org/redfire/screen/ScreenShare$5.class b/org/redfire/screen/ScreenShare$5.class index d92ea53..df741f1 100644 Binary files a/org/redfire/screen/ScreenShare$5.class and b/org/redfire/screen/ScreenShare$5.class differ diff --git a/org/redfire/screen/ScreenShare$CaptureScreen.class b/org/redfire/screen/ScreenShare$CaptureScreen.class index 89910fc..bb1b252 100644 Binary files a/org/redfire/screen/ScreenShare$CaptureScreen.class and b/org/redfire/screen/ScreenShare$CaptureScreen.class differ diff --git a/org/redfire/screen/ScreenShare.class b/org/redfire/screen/ScreenShare.class index 3f8bb98..7374033 100644 Binary files a/org/redfire/screen/ScreenShare.class and b/org/redfire/screen/ScreenShare.class differ diff --git a/org/redfire/screen/ScreenShare.java b/org/redfire/screen/ScreenShare.java index efac221..b03223d 100644 --- a/org/redfire/screen/ScreenShare.java +++ b/org/redfire/screen/ScreenShare.java @@ -51,7 +51,8 @@ public class ScreenShare { public Integer playStreamId; public Integer publishStreamId; public String publishName; - public String codec = "flashsv1"; + public String codec = "flashsv2"; + public int frameRate = 10; public CaptureScreen capture = null; public Thread thread = null; @@ -107,19 +108,23 @@ public static void main(String[] args) { instance = ScreenShare.getInstance(); - if (args.length == 5) { + if (args.length == 6) { instance.host = args[0]; instance.app = args[1]; instance.port = Integer.parseInt(args[2]); instance.publishName = args[3]; instance.codec = args[4]; + try { + instance.frameRate = Integer.parseInt(args[5]); + } catch (Exception e) {} + System.out.println("User home " + System.getProperty("user.home")); System.out.println("User Dir " + System.getProperty("user.dir")); } else { instance = null; - System.out.println("\nRed5 SceenShare: use as java ScreenShare \n Example: SceenShare localhost oflaDemo 1935 screen_stream"); + System.out.println("\nRed5 SceenShare: use as java ScreenShare \n Example: SceenShare localhost oflaDemo 1935 screen_stream flashsv2 15"); System.exit(0); } @@ -598,7 +603,7 @@ public void run() double widthTransformScale = 0.5; double heightTransformScale = 0.5; - final int timeBetweenFrames = 1000; //frameRate + final int timeBetweenFrames = 1000 / frameRate; widthTransformScale = width > 1024 ? (double) (width/1024) : 1; heightTransformScale = height > 768 ? (double) (height/768) : 1; @@ -636,8 +641,14 @@ public void run() } final int spent = (int) (System.currentTimeMillis() - ctime); + final int sleep = Math.max(0, timeBetweenFrames - spent); + + if ( kt < 50 ) { + logger.debug( "Sleep " + sleep ); + System.out.println( "Sleep " + sleep); + } - Thread.sleep(Math.max(0, timeBetweenFrames - spent)); + Thread.sleep(sleep); } } catch (Exception e) diff --git a/screenshare.jar b/screenshare.jar deleted file mode 100644 index 3682ccb..0000000 Binary files a/screenshare.jar and /dev/null differ diff --git a/screenshare.jnlp b/screenshare.jnlp deleted file mode 100644 index b1dbba7..0000000 --- a/screenshare.jnlp +++ /dev/null @@ -1,25 +0,0 @@ - - - - Red5 ScreenShare - Dele Olajide - http://code.google.com/p/red5screnshare/ - Red5 ScreenShare - An Open Source Screen Share Java application for Adobe Flash using Red5 - - - - - - - - - - - btg199251 - redfire - 1935 - screen_share - flashsv2 - - \ No newline at end of file diff --git a/webapp/screenshare/do_run1.cmd b/webapp/screenshare/do_run1.cmd index fb16706..eb44ceb 100644 --- a/webapp/screenshare/do_run1.cmd +++ b/webapp/screenshare/do_run1.cmd @@ -1,2 +1,2 @@ -"C:\Program Files\Java\jdk1.6.0_01\bin\java" -classpath screenshare.jar org.redfire.screen.ScreenShare btg199251 screenshare 1935 screen_share flashsv1 +"C:\Program Files\Java\jdk1.6.0_01\bin\java" -classpath screenshare.jar org.redfire.screen.ScreenShare btg199251 screenshare 1935 screen_share flashsv1 30 pause diff --git a/webapp/screenshare/do_run2.cmd b/webapp/screenshare/do_run2.cmd index b3053ea..a374e57 100644 --- a/webapp/screenshare/do_run2.cmd +++ b/webapp/screenshare/do_run2.cmd @@ -1,2 +1,2 @@ -"C:\Program Files\Java\jdk1.6.0_01\bin\java" -classpath screenshare.jar org.redfire.screen.ScreenShare btg199251 screenshare 1935 screen_share flashsv2 +"C:\Program Files\Java\jdk1.6.0_01\bin\java" -classpath screenshare.jar org.redfire.screen.ScreenShare btg199251 screenshare 1935 screen_share flashsv2 30 pause diff --git a/webapp/screenshare/screenshare.jar b/webapp/screenshare/screenshare.jar index 742a143..5490daa 100644 Binary files a/webapp/screenshare/screenshare.jar and b/webapp/screenshare/screenshare.jar differ diff --git a/webapp/screenshare/screenshare.jnlp b/webapp/screenshare/screenshare.jnlp index fb462c4..08f7745 100644 --- a/webapp/screenshare/screenshare.jnlp +++ b/webapp/screenshare/screenshare.jnlp @@ -21,5 +21,6 @@ 1935 screen_share flashsv2 + 30 \ No newline at end of file