Added new parameter to control framerate

deleolajide · Jun 6, 2011 · 97ee10f · 97ee10f
1 parent 754c2ce
commit 97ee10f
Show file tree

Hide file tree

Showing 17 changed files with 19 additions and 84 deletions.
diff --git a/do_run.cmd b/do_run.cmd
diff --git a/do_run2.cmd b/do_run2.cmd
diff --git a/log/screenshare.log b/log/screenshare.log
diff --git a/org/redfire/screen/ScreenShare$1.class b/org/redfire/screen/ScreenShare$1.class
diff --git a/org/redfire/screen/ScreenShare$2.class b/org/redfire/screen/ScreenShare$2.class
diff --git a/org/redfire/screen/ScreenShare$3.class b/org/redfire/screen/ScreenShare$3.class
diff --git a/org/redfire/screen/ScreenShare$4.class b/org/redfire/screen/ScreenShare$4.class
diff --git a/org/redfire/screen/ScreenShare$5.class b/org/redfire/screen/ScreenShare$5.class
diff --git a/org/redfire/screen/ScreenShare$CaptureScreen.class b/org/redfire/screen/ScreenShare$CaptureScreen.class
diff --git a/org/redfire/screen/ScreenShare.class b/org/redfire/screen/ScreenShare.class
diff --git 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 <host> <app name> <port> <stream name>\n Example: SceenShare localhost oflaDemo 1935 screen_stream");
+			System.out.println("\nRed5 SceenShare: use as java ScreenShare <host> <app name> <port> <stream name> <codec> <frame rate>\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
diff --git a/screenshare.jnlp b/screenshare.jnlp
diff --git 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
@@ -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
diff --git a/webapp/screenshare/screenshare.jnlp b/webapp/screenshare/screenshare.jnlp
@@ -21,5 +21,6 @@
     	<argument>1935</argument> 
     	<argument>screen_share</argument>   
     	<argument>flashsv2</argument>      	
+    	<argument>30</argument>      	
     </application-desc> 
 </jnlp>