Remove extra files from TinyRTSP Jar

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.limelight"
-    android:versionCode="12"
-    android:versionName="2.1.6" >
+    android:versionCode="14"
+    android:versionName="2.2.1" >
 
     <uses-sdk
         android:minSdkVersion="16"

gen/com/limelight/R.java

@@ -35,18 +35,21 @@ or to a theme attribute in the form "<code>?[<i>package</i>:][<i>type</i>:]<i>na
         public static final int ic_launcher=0x7f020000;
     }
     public static final class id {
-        public static final int autoDec=0x7f080005;
-        public static final int config1080p30Selected=0x7f080009;
-        public static final int config1080p60Selected=0x7f08000a;
-        public static final int config720p30Selected=0x7f080007;
-        public static final int config720p60Selected=0x7f080008;
-        public static final int hardwareDec=0x7f080006;
+        public static final int autoDec=0x7f080006;
+        public static final int bitrateLabel=0x7f08000c;
+        public static final int bitrateSeekBar=0x7f08000d;
+        public static final int config1080p30Selected=0x7f08000a;
+        public static final int config1080p60Selected=0x7f08000b;
+        public static final int config720p30Selected=0x7f080008;
+        public static final int config720p60Selected=0x7f080009;
+        public static final int decoderConfigGroup=0x7f080003;
+        public static final int hardwareDec=0x7f080007;
         public static final int hostTextView=0x7f080000;
         public static final int pairButton=0x7f080002;
-        public static final int softwareDec=0x7f080004;
+        public static final int softwareDec=0x7f080005;
         public static final int statusButton=0x7f080001;
-        public static final int streamConfigGroup=0x7f080003;
-        public static final int surfaceView=0x7f08000b;
+        public static final int streamConfigGroup=0x7f080004;
+        public static final int surfaceView=0x7f08000e;
     }
     public static final class layout {
         public static final int activity_connection=0x7f030000;

res/layout/activity_connection.xml

@@ -5,7 +5,7 @@
     android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingTop="10dp"
     tools:context=".Connection" >
     
     <RelativeLayout
@@ -45,12 +45,13 @@
         android:text="Pair with PC" />
 
     <RadioGroup
+        android:id="@+id/decoderConfigGroup"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/streamConfigGroup"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="15dp"
         android:orientation="vertical" >
 
         <RadioButton
@@ -79,7 +80,7 @@
         android:layout_alignParentLeft="true"
         android:layout_alignParentRight="true"
         android:layout_below="@+id/pairButton"
-        android:layout_marginTop="25dp"
+        android:layout_marginTop="10dp"
         android:orientation="vertical" >
 
         <RadioButton
@@ -92,24 +93,42 @@
             android:id="@+id/config720p60Selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="7dp"
             android:text="720p 60 FPS (Recommended for most devices and networks)" />
 
         <RadioButton
             android:id="@+id/config1080p30Selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="7dp"
             android:text="1080p 30 FPS (Recommended for most devices if 1080p streaming is desired)" />
 
         <RadioButton
             android:id="@+id/config1080p60Selected"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="7dp"
             android:text="1080p 60 FPS (Requires extremely fast device and network)" />
     </RadioGroup>
 
+    <TextView
+        android:id="@+id/bitrateLabel"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="5dp"
+        android:layout_marginTop="10dp"
+        android:layout_alignParentRight="true"
+        android:layout_below="@+id/decoderConfigGroup" />
+
+    <SeekBar
+        android:id="@+id/bitrateSeekBar"
+        android:layout_marginTop="10dp"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentLeft="true"
+        android:layout_below="@+id/decoderConfigGroup"
+        android:layout_toLeftOf="@+id/bitrateLabel" />
+    
 	</RelativeLayout>
 	
 </ScrollView>

src/com/limelight/Connection.java

@@ -20,6 +20,8 @@ import android.widget.Button;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.RadioButton;
+import android.widget.SeekBar;
+import android.widget.SeekBar.OnSeekBarChangeListener;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.app.Activity;
@@ -33,6 +35,8 @@ public class Connection extends Activity {
 	private SharedPreferences prefs;
 	private RadioButton rbutton720p30, rbutton720p60, rbutton1080p30, rbutton1080p60;
 	private RadioButton forceSoftDec, autoDec, forceHardDec;
+	private SeekBar bitrateSlider;
+	private TextView bitrateLabel;
 	
 	private static final String DEFAULT_HOST = "";
 	public static final String HOST_KEY = "hostText";
@@ -42,6 +46,7 @@ public class Connection extends Activity {
 		SharedPreferences.Editor editor = prefs.edit();
 		
 		editor.putString(Connection.HOST_KEY, this.hostText.getText().toString());
+		editor.putInt(Game.BITRATE_PREF_STRING, bitrateSlider.getProgress());
 		editor.apply();
 		
 		super.onPause();
@@ -66,12 +71,18 @@ public class Connection extends Activity {
 		this.forceSoftDec = (RadioButton) findViewById(R.id.softwareDec);
 		this.autoDec = (RadioButton) findViewById(R.id.autoDec);
 		this.forceHardDec = (RadioButton) findViewById(R.id.hardwareDec);
+		this.bitrateLabel = (TextView) findViewById(R.id.bitrateLabel);
+		this.bitrateSlider = (SeekBar) findViewById(R.id.bitrateSeekBar);
 
 		prefs = getSharedPreferences(Game.PREFS_FILE_NAME, Context.MODE_MULTI_PROCESS);
 		this.hostText.setText(prefs.getString(Connection.HOST_KEY, Connection.DEFAULT_HOST));
 		
 		boolean res720p = prefs.getInt(Game.HEIGHT_PREF_STRING, Game.DEFAULT_HEIGHT) == 720;
 		boolean fps30 = prefs.getInt(Game.REFRESH_RATE_PREF_STRING, Game.DEFAULT_REFRESH_RATE) == 30;
+		
+		bitrateSlider.setMax(Game.BITRATE_CEILING);
+		bitrateSlider.setProgress(prefs.getInt(Game.BITRATE_PREF_STRING, Game.DEFAULT_BITRATE));
+		updateBitrateLabel();
 
 		rbutton720p30.setChecked(false);
 		rbutton720p60.setChecked(false);
@@ -124,22 +135,30 @@ public class Connection extends Activity {
 				if (buttonView == rbutton720p30) {
 					prefs.edit().putInt(Game.WIDTH_PREF_STRING, 1280).
 					putInt(Game.HEIGHT_PREF_STRING, 720).
-					putInt(Game.REFRESH_RATE_PREF_STRING, 30).commit();
+					putInt(Game.REFRESH_RATE_PREF_STRING, 30).
+					putInt(Game.BITRATE_PREF_STRING, Game.BITRATE_DEFAULT_720_30).commit();
+					bitrateSlider.setProgress(Game.BITRATE_DEFAULT_720_30);
 				}
 				else if (buttonView == rbutton720p60) {
 					prefs.edit().putInt(Game.WIDTH_PREF_STRING, 1280).
 					putInt(Game.HEIGHT_PREF_STRING, 720).
-					putInt(Game.REFRESH_RATE_PREF_STRING, 60).commit();
+					putInt(Game.REFRESH_RATE_PREF_STRING, 60).
+					putInt(Game.BITRATE_PREF_STRING, Game.BITRATE_DEFAULT_720_60).commit();
+					bitrateSlider.setProgress(Game.BITRATE_DEFAULT_720_60);
 				}
 				else if (buttonView == rbutton1080p30) {
 					prefs.edit().putInt(Game.WIDTH_PREF_STRING, 1920).
 					putInt(Game.HEIGHT_PREF_STRING, 1080).
-					putInt(Game.REFRESH_RATE_PREF_STRING, 30).commit();
+					putInt(Game.REFRESH_RATE_PREF_STRING, 30).
+					putInt(Game.BITRATE_PREF_STRING, Game.BITRATE_DEFAULT_1080_30).commit();
+					bitrateSlider.setProgress(Game.BITRATE_DEFAULT_1080_30);
 				}
 				else if (buttonView == rbutton1080p60) {
 					prefs.edit().putInt(Game.WIDTH_PREF_STRING, 1920).
 					putInt(Game.HEIGHT_PREF_STRING, 1080).
-					putInt(Game.REFRESH_RATE_PREF_STRING, 60).commit();
+					putInt(Game.REFRESH_RATE_PREF_STRING, 60).
+					putInt(Game.BITRATE_PREF_STRING, Game.BITRATE_DEFAULT_1080_60).commit();
+					bitrateSlider.setProgress(Game.BITRATE_DEFAULT_1080_60);
 				}
 				else if (buttonView == forceSoftDec) {
 					prefs.edit().putInt(Game.DECODER_PREF_STRING, Game.FORCE_SOFTWARE_DECODER).commit();
@@ -160,6 +179,45 @@ public class Connection extends Activity {
 		forceHardDec.setOnCheckedChangeListener(occl);
 		autoDec.setOnCheckedChangeListener(occl);
 		
+		this.bitrateSlider.setOnSeekBarChangeListener(new OnSeekBarChangeListener() {
+			@Override
+			public void onProgressChanged(SeekBar seekBar, int progress,
+					boolean fromUser) {
+				
+				// Verify the user's selection
+				if (fromUser) {
+					int floor;
+					if (rbutton720p30.isChecked()) {
+						floor = Game.BITRATE_FLOOR_720_30;
+					}
+					else if (rbutton720p60.isChecked()){
+						floor = Game.BITRATE_FLOOR_720_60;
+					}
+					else if (rbutton1080p30.isChecked()){
+						floor = Game.BITRATE_FLOOR_1080_30;
+					}
+					else /*if (rbutton1080p60.isChecked())*/ {
+						floor = Game.BITRATE_FLOOR_1080_60;
+					}
+					
+					if (progress < floor) {
+						seekBar.setProgress(floor);
+						return;
+					}
+				}
+				
+				updateBitrateLabel();
+			}
+
+			@Override
+			public void onStartTrackingTouch(SeekBar seekBar) {
+			}
+
+			@Override
+			public void onStopTrackingTouch(SeekBar seekBar) {
+			}
+		});
+		
 		this.statusButton.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View arg0) {
@@ -168,6 +226,12 @@ public class Connection extends Activity {
 					return;
 				}
 				
+				// Ensure that the bitrate preference is up to date before
+				// starting the game activity
+				prefs.edit().
+				putInt(Game.BITRATE_PREF_STRING, bitrateSlider.getProgress()).
+				commit();
+				
 				Intent intent = new Intent(Connection.this, Game.class);
 				intent.putExtra("host", Connection.this.hostText.getText().toString());
 				Connection.this.startActivity(intent);
@@ -240,4 +304,7 @@ public class Connection extends Activity {
 
 	}
 
+	private void updateBitrateLabel() {
+		bitrateLabel.setText("Max Bitrate: "+bitrateSlider.getProgress()+" Mbps");
+	}
 }

src/com/limelight/Game.java

@@ -20,6 +20,7 @@ import android.graphics.Point;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
 import android.os.Bundle;
+import android.os.Handler;
 import android.view.Display;
 import android.view.InputDevice;
 import android.view.KeyEvent;
@@ -63,11 +64,25 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 	public static final String HEIGHT_PREF_STRING = "ResV";
 	public static final String REFRESH_RATE_PREF_STRING = "FPS";
 	public static final String DECODER_PREF_STRING = "Decoder";
+	public static final String BITRATE_PREF_STRING = "Bitrate";
+	
+	public static final int BITRATE_FLOOR_720_30 = 2;
+	public static final int BITRATE_FLOOR_720_60 = 4;
+	public static final int BITRATE_FLOOR_1080_30 = 4;
+	public static final int BITRATE_FLOOR_1080_60 = 10;
+	
+	public static final int BITRATE_DEFAULT_720_30 = 5;
+	public static final int BITRATE_DEFAULT_720_60 = 10;
+	public static final int BITRATE_DEFAULT_1080_30 = 10;
+	public static final int BITRATE_DEFAULT_1080_60 = 30;
+	
+	public static final int BITRATE_CEILING = 50;
 	
 	public static final int DEFAULT_WIDTH = 1280;
 	public static final int DEFAULT_HEIGHT = 720;
 	public static final int DEFAULT_REFRESH_RATE = 60;
 	public static final int DEFAULT_DECODER = 0;
+	public static final int DEFAULT_BITRATE = BITRATE_DEFAULT_720_60;
 	
 	public static final int FORCE_HARDWARE_DECODER = -1;
 	public static final int AUTOSELECT_DECODER = 0;
@@ -77,15 +92,24 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		
+		// We don't want a title bar
+		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		
 		// Full-screen and don't let the display go off
-		getWindow().setFlags(
-				WindowManager.LayoutParams.FLAG_FULLSCREEN |
-				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON,
+		getWindow().addFlags(
 				WindowManager.LayoutParams.FLAG_FULLSCREEN |
 				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 		
-		// We don't want a title bar
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
+		// If we're going to use immersive mode, we want to have
+		// the entire screen
+		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+			getWindow().getDecorView().setSystemUiVisibility(
+					View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
+					View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
+					View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+			
+			getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
+		}
 		
 		// Change volume button behavior
 		setVolumeControlStream(AudioManager.STREAM_MUSIC);
@@ -116,10 +140,11 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 			break;
 		}
 
-		int refreshRate;
+		int refreshRate, bitrate;
 		width = prefs.getInt(WIDTH_PREF_STRING, DEFAULT_WIDTH);
 		height = prefs.getInt(HEIGHT_PREF_STRING, DEFAULT_HEIGHT);
 		refreshRate = prefs.getInt(REFRESH_RATE_PREF_STRING, DEFAULT_REFRESH_RATE);
+		bitrate = prefs.getInt(BITRATE_PREF_STRING, DEFAULT_BITRATE);
 		sh.setFixedSize(width, height);
 		
 		Display display = getWindowManager().getDefaultDisplay();
@@ -130,7 +155,7 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 		
 		// Start the connection
 		conn = new NvConnection(Game.this.getIntent().getStringExtra("host"), Game.this,
-				new StreamConfiguration(width, height, refreshRate));
+				new StreamConfiguration(width, height, refreshRate, bitrate * 1000));
 		keybTranslator = new KeyboardTranslator(conn);
 		controllerHandler = new ControllerHandler(conn);
 		
@@ -147,8 +172,7 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 	}
 
 	@SuppressLint("InlinedApi")
-	private void hideSystemUi() {
-		runOnUiThread(new Runnable() {
+	private Runnable hideSystemUi = new Runnable() {
 			@Override
 			public void run() {
 				// Use immersive mode on 4.4+ or standard low profile on previous builds
@@ -167,7 +191,14 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 							View.SYSTEM_UI_FLAG_LOW_PROFILE);
 				}
 			}
-		});
+	};
+
+	private void hideSystemUi() {
+		Handler h = getWindow().getDecorView().getHandler();
+		if (h != null) {
+			h.removeCallbacks(hideSystemUi);
+			h.postDelayed(hideSystemUi, 1000);               
+		}
 	}
 	
 	@Override
@@ -220,6 +251,16 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 	
 	@Override
 	public boolean onKeyUp(int keyCode, KeyEvent event) {
+		// Pressing a volume button drops the immersive flag so the UI shows up again and doesn't
+		// go away. I'm not sure if that's a bug or a feature, but we're working around it here
+		if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN || keyCode == KeyEvent.KEYCODE_VOLUME_UP) {
+			Handler h = getWindow().getDecorView().getHandler();
+			if (h != null) {
+				h.removeCallbacks(hideSystemUi);
+				h.postDelayed(hideSystemUi, 2000);               
+			}
+		}
+
 		if (event.getDevice() != null &&
 			(event.getDevice().getKeyboardType() == InputDevice.KEYBOARD_TYPE_ALPHABETIC)) {
 			short translated = keybTranslator.translate(event.getKeyCode());

src/com/limelight/utils/Dialog.java

@@ -25,8 +25,11 @@ public class Dialog implements Runnable {
 	
 	public static void closeDialogs()
 	{
-		for (Dialog d : rundownDialogs)
-			d.alert.dismiss();
+		for (Dialog d : rundownDialogs) {
+			if (d.alert.isShowing()) {
+				d.alert.dismiss();
+			}
+		}
 		
 		rundownDialogs.clear();
 	}

src/com/limelight/utils/SpinnerDialog.java

@@ -33,8 +33,11 @@ public class SpinnerDialog implements Runnable,OnCancelListener {
 	
 	public static void closeDialogs()
 	{
-		for (SpinnerDialog d : rundownDialogs)
-			d.progress.dismiss();
+		for (SpinnerDialog d : rundownDialogs) {
+			if (d.progress.isShowing()) {
+				d.progress.dismiss();
+			}
+		}
 		
 		rundownDialogs.clear();
 	}
@@ -86,7 +89,9 @@ public class SpinnerDialog implements Runnable,OnCancelListener {
 		}
 		else
 		{
-			progress.dismiss();
+			if (progress.isShowing()) {
+				progress.dismiss();
+			}
 		}
 	}