Update version to 2.5.0.3

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="21"
-    android:versionName="2.5.0.1" >
+    android:versionCode="23"
+    android:versionName="2.5.0.3" >
 
     <uses-sdk
         android:minSdkVersion="16"

src/com/limelight/AddComputerManually.java

@@ -2,6 +2,7 @@ package com.limelight;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
+import java.util.concurrent.LinkedBlockingQueue;
 
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.utils.Dialog;
@@ -22,51 +23,86 @@ import android.widget.Toast;
 public class AddComputerManually extends Activity {
 	private Button addPcButton;
 	private TextView hostText;
+	private ComputerManagerService.ComputerManagerBinder managerBinder;
+	private LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
+	private Thread addThread;
 	private ServiceConnection serviceConnection = new ServiceConnection() {
 		public void onServiceConnected(ComponentName className, final IBinder binder) {
-			new Thread() {
-				@Override
-				public void run() {
-					String msg;
-					boolean finish = false;
-					try {
-						InetAddress addr = InetAddress.getByName(hostText.getText().toString());
-						
-						if (!((ComputerManagerService.ComputerManagerBinder)binder).addComputerBlocking(addr)){
-							msg = "Unable to connect to the specified computer. Make sure the required ports are allowed through the firewall.";
-						}
-						else {
-							msg = "Successfully added computer";
-							finish = true;
-						}
-					} catch (UnknownHostException e) {
-						msg = "Unable to resolve PC address. Make sure you didn't make a typo in the address.";
-					}
-					
-					final boolean toastFinish = finish;
-					final String toastMsg = msg;
-					AddComputerManually.this.runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-							// Unbind from this service
-							unbindService(AddComputerManually.this.serviceConnection);
-							
-							Toast.makeText(AddComputerManually.this, toastMsg, Toast.LENGTH_LONG).show();
-							
-							if (toastFinish) {
-								// Close the activity
-								AddComputerManually.this.finish();
-							}
-						}
-					});
-				}
-			}.start();
+			managerBinder = ((ComputerManagerService.ComputerManagerBinder)binder);
+			startAddThread();
 		}
 
 		public void onServiceDisconnected(ComponentName className) {
+			joinAddThread();
+			managerBinder = null;
 		}
 	};
 	
+	private void doAddPc(String host) {
+		String msg;
+		boolean finish = false;
+		try {
+			InetAddress addr = InetAddress.getByName(host);
+			
+			if (!managerBinder.addComputerBlocking(addr)){
+				msg = "Unable to connect to the specified computer. Make sure the required ports are allowed through the firewall.";
+			}
+			else {
+				msg = "Successfully added computer";
+				finish = true;
+			}
+		} catch (UnknownHostException e) {
+			msg = "Unable to resolve PC address. Make sure you didn't make a typo in the address.";
+		}
+		
+		final boolean toastFinish = finish;
+		final String toastMsg = msg;
+		AddComputerManually.this.runOnUiThread(new Runnable() {
+			@Override
+			public void run() {
+				Toast.makeText(AddComputerManually.this, toastMsg, Toast.LENGTH_LONG).show();
+				
+				if (toastFinish && !isFinishing()) {
+					// Close the activity
+					AddComputerManually.this.finish();
+				}
+			}
+		});
+	}
+	
+	private void startAddThread() {
+		addThread = new Thread() {
+			@Override
+			public void run() {
+				while (!isInterrupted()) {
+					String computer;
+					
+					try {
+						computer = computersToAdd.take();
+					} catch (InterruptedException e) {
+						return;
+					}
+					
+					doAddPc(computer);
+				}
+			}
+		};
+		addThread.setName("UI - AddComputerManually");
+		addThread.start();
+	}
+	
+	private void joinAddThread() {
+		if (addThread != null) {
+			addThread.interrupt();
+			
+			try {
+				addThread.join();
+			} catch (InterruptedException e) {}
+			
+			addThread = null;
+		}
+	}
+
 	@Override
 	protected void onStop() {
 		super.onStop();
@@ -74,6 +110,16 @@ public class AddComputerManually extends Activity {
 		Dialog.closeDialogs();
 	}
 	
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		if (managerBinder != null) {
+			joinAddThread();
+			unbindService(serviceConnection);
+		}
+	}
+	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
@@ -82,6 +128,10 @@ public class AddComputerManually extends Activity {
 		
 		this.addPcButton = (Button) findViewById(R.id.addPc);
 		this.hostText = (TextView) findViewById(R.id.hostTextView);
+		
+		// Bind to the ComputerManager service
+		bindService(new Intent(AddComputerManually.this,
+				ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
 	
 		addPcButton.setOnClickListener(new OnClickListener() {
 			@Override
@@ -92,9 +142,7 @@ public class AddComputerManually extends Activity {
 				}
 				
 				Toast.makeText(AddComputerManually.this, "Adding PC...", Toast.LENGTH_SHORT).show();
-				
-				// Bind to the service which will try to add the PC
-				bindService(new Intent(AddComputerManually.this, ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
+				computersToAdd.add(hostText.getText().toString());
 			}
 		});
 	}

src/com/limelight/PcView.java

@@ -148,9 +148,16 @@ public class PcView extends Activity {
 	}
 	
 	private void stopComputerUpdates() {
-		freezeUpdates = true;
-		managerBinder.stopPolling();
-		runningPolling = false;
+		if (managerBinder != null) {
+			if (!runningPolling) {
+				return;
+			}
+			
+			freezeUpdates = true;
+			
+			managerBinder.stopPolling();
+			runningPolling = false;
+		}
 	}
 	
 	@Override
@@ -229,6 +236,11 @@ public class PcView extends Activity {
 					"You must close the game before pairing.", Toast.LENGTH_LONG).show();
 			return;
 		}
+		if (managerBinder == null) {
+			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
+			return;
+		}
 		
 		Toast.makeText(PcView.this, "Pairing...", Toast.LENGTH_SHORT).show();
 		new Thread(new Runnable() {
@@ -330,6 +342,11 @@ public class PcView extends Activity {
 			Toast.makeText(PcView.this, "Computer is offline", Toast.LENGTH_SHORT).show();
 			return;
 		}
+		if (managerBinder == null) {
+			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
+			return;
+		}
 		
 		Toast.makeText(PcView.this, "Unpairing...", Toast.LENGTH_SHORT).show();
 		new Thread(new Runnable() {
@@ -387,6 +404,11 @@ public class PcView extends Activity {
 			Toast.makeText(PcView.this, "Computer is offline", Toast.LENGTH_SHORT).show();
 			return;
 		}
+		if (managerBinder == null) {
+			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
+			return;
+		}
 		
 		Intent i = new Intent(this, AppView.class);
 		i.putExtra(AppView.NAME_EXTRA, computer.name);
@@ -422,9 +444,12 @@ public class PcView extends Activity {
         	return true;
         	
         case DELETE_ID:
-        	if (managerBinder != null) {
-        		managerBinder.removeComputer(computer.details.name);
-        	}
+    		if (managerBinder == null) {
+    			Toast.makeText(PcView.this, "The ComputerManager service is not running. " +
+    					"Please wait a few seconds or restart the app.", Toast.LENGTH_LONG).show();
+    			return true;
+    		}
+        	managerBinder.removeComputer(computer.details.name);
         	removeListView(computer.details);
         	return true;
         	

src/com/limelight/binding/video/AndroidCpuDecoderRenderer.java

@@ -31,6 +31,9 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 	private static final int MED_PERF = 2;
 	private static final int HIGH_PERF = 3;
 	
+	private int totalFrames;
+	private long totalTimeMs;
+	
 	private int cpuCount = Runtime.getRuntime().availableProcessors();
 	
 	private int findOptimalPerformanceLevel() {
@@ -155,6 +158,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 					du = depacketizer.pollNextDecodeUnit(); 
 					if (du != null) {
 						submitDecodeUnit(du);
+						depacketizer.freeDecodeUnit(du);
 					}
 					
 					long diff = nextFrameTime - System.currentTimeMillis();
@@ -215,7 +219,19 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 			}
 		}
 		
-		return (AvcDecoder.decode(data, 0, decodeUnit.getDataLength()) == 0);
+		boolean success = (AvcDecoder.decode(data, 0, decodeUnit.getDataLength()) == 0);
+		if (success) {
+			long timeAfterDecode = System.currentTimeMillis();
+			
+		    // Add delta time to the totals (excluding probable outliers)
+		    long delta = timeAfterDecode - decodeUnit.getReceiveTimestamp();
+			if (delta >= 0 && delta < 300) {
+			    totalTimeMs += delta;
+			    totalFrames++;
+			}
+		}
+		
+		return success;
 	}
 
 	@Override
@@ -230,6 +246,9 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 
 	@Override
 	public int getAverageEndToEndLatency() {
-		return 0;
+		if (totalFrames == 0) {
+			return 0;
+		}
+		return (int)(totalTimeMs / totalFrames);
 	}
 }

src/com/limelight/binding/video/MediaCodecDecoderRenderer.java

@@ -177,27 +177,30 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 					du = depacketizer.pollNextDecodeUnit();
 					if (du != null) {
 						submitDecodeUnit(du);
+						depacketizer.freeDecodeUnit(du);
 					}
 					
 					int outIndex = videoDecoder.dequeueOutputBuffer(info, 0);
 				    if (outIndex >= 0) {
+				    	long presentationTimeUs = info.presentationTimeUs;
 					    int lastIndex = outIndex;
 					    
-					    // Add delta time to the totals (excluding probable outliers)
-					    long delta = System.currentTimeMillis()-(info.presentationTimeUs/1000);
-					    if (delta > 5 && delta < 300) {
-					    	decoderTimeMs += delta;
-						    totalTimeMs += delta;
-					    }
-					    
 					    // Get the last output buffer in the queue
 					    while ((outIndex = videoDecoder.dequeueOutputBuffer(info, 0)) >= 0) {
 					    	videoDecoder.releaseOutputBuffer(lastIndex, false);
 					    	lastIndex = outIndex;
+					    	presentationTimeUs = info.presentationTimeUs;
 					    }
 					    
 					    // Render the last buffer
 				    	videoDecoder.releaseOutputBuffer(lastIndex, true);
+				    	
+					    // Add delta time to the totals (excluding probable outliers)
+					    long delta = System.currentTimeMillis()-(presentationTimeUs/1000);
+					    if (delta > 5 && delta < 300) {
+					    	decoderTimeMs += delta;
+						    totalTimeMs += delta;
+					    }
 				    } else {
 					    switch (outIndex) {
 					    case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:

src/com/limelight/computers/ComputerDatabaseManager.java

@@ -35,7 +35,6 @@ public class ComputerDatabaseManager {
 			c.deleteDatabase(COMPUTER_DB_NAME);
 			computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
 		}
-		computerDb.enableWriteAheadLogging();
 		initializeDb();
 	}
 	

src/com/limelight/computers/ComputerManagerService.java

@@ -48,12 +48,13 @@ public class ComputerManagerService extends Service {
 	private ServiceConnection discoveryServiceConnection = new ServiceConnection() {
 		public void onServiceConnected(ComponentName className, IBinder binder) {
 			synchronized (discoveryServiceConnection) {
-				discoveryBinder = ((DiscoveryService.DiscoveryBinder)binder);
+				DiscoveryService.DiscoveryBinder privateBinder = ((DiscoveryService.DiscoveryBinder)binder);
 				
 				// Set us as the event listener
-				discoveryBinder.setListener(createDiscoveryListener());
+				privateBinder.setListener(createDiscoveryListener());
 				
 				// Signal a possible waiter that we're all setup
+				discoveryBinder = privateBinder;
 				discoveryServiceConnection.notifyAll();
 			}
 		}