Submit codec config frames with the corresponding flag to work around an TI OMAP 4 errata. Also add a file that documents the currently known codec errata.

.classpath

@@ -5,6 +5,5 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="lib" path="libs/limelight-common.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

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="16"
-    android:versionName="2.2.1.2" >
+    android:versionCode="18"
+    android:versionName="2.4" >
 
     <uses-sdk
         android:minSdkVersion="16"
@@ -10,6 +10,7 @@
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
     
     <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
 

decoder-errata.txt

@@ -0,0 +1,10 @@
+This file serves to document some of the decoder errata when using MediaCodec hardware decoders on certain devices.
+
+1. num_ref_frames is set to 16 by NVENC which causes decoders to allocate 16+ buffers. This can cause an OOM error on some devices.
+	- Affected decoders: TI OMAP4, possibly some Qualcomm chips too (Galaxy S3 on 4.3+)
+	
+2. Some decoders have a huge per-frame latency with the unmodified SPS sent from NVENC. Setting max_dec_frame_buffering fixes this latency issue.
+	- Affected decoders: NVIDIA Tegra 3 and 4
+
+3. Some decoders strictly require that you pass BUFFER_FLAG_CODEC_CONFIG and crash upon the IDR frame if you don't
+	- Affected decoders: TI OMAP4

lint.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="IconDuplicates">
+        <ignore path="res/drawable/app_icon.png" />
+    </issue>
+    <issue id="IconLocation">
+        <ignore path="res/drawable/app_icon.png" />
+    </issue>
+    <issue id="InvalidPackage">
+        <ignore path="libs/bcprov-jdk15on-150.jar" />
+    </issue>
+    <issue id="UnusedResources">
+        <ignore path="res/drawable-xhdpi/ouya_icon.png" />
+        <ignore path="res/drawable/app_icon.png" />
+    </issue>
+</lint>

src/com/limelight/Connection.java

@@ -1,5 +1,6 @@
 package com.limelight;
 
+import java.io.FileNotFoundException;
 import java.net.InetAddress;
 import java.net.SocketException;
 import java.net.UnknownHostException;
@@ -251,7 +252,7 @@ public class Connection extends Activity {
 					return;
 				}
 				
-				Toast.makeText(Connection.this, "Pairing...", Toast.LENGTH_LONG).show();
+				Toast.makeText(Connection.this, "Pairing...", Toast.LENGTH_SHORT).show();
 				new Thread(new Runnable() {
 					@Override
 					public void run() {
@@ -297,8 +298,11 @@ public class Connection extends Activity {
 									message = null;
 								}
 							}
-						} catch (UnknownHostException e1) {
+						} catch (UnknownHostException e) {
 							message = "Failed to resolve host";
+						} catch (FileNotFoundException e) {
+							message = "GFE returned an HTTP 404 error. Make sure your PC is running a supported GPU. Using remote desktop software can also cause this error. "
+									+ "Try rebooting your machine or reinstalling GFE.";
 						} catch (Exception e) {
 							message = e.getMessage();
 						}

src/com/limelight/Game.java

@@ -1,5 +1,12 @@
 package com.limelight;
 
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.InterfaceAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
+import java.util.Enumeration;
+
 import com.limelight.binding.PlatformBinding;
 import com.limelight.binding.input.ControllerHandler;
 import com.limelight.binding.input.KeyboardTranslator;
@@ -19,6 +26,8 @@ import android.content.SharedPreferences;
 import android.graphics.Point;
 import android.media.AudioManager;
 import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.Display;
@@ -56,6 +65,8 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 	private boolean connecting = false;
 	private boolean connected = false;
 	
+	private WifiManager.WifiLock wifiLock;
+	
 	private int drFlags = 0;
 	
 	public static final String PREFS_FILE_NAME = "gameprefs";
@@ -152,10 +163,35 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 		        
 		// Warn the user if they're on a metered connection
         checkDataConnection();
+        
+        // Make sure Wi-Fi is fully powered up
+		WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
+        wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "Limelight");
+		wifiLock.setReferenceCounted(false);
+		wifiLock.acquire();
 		
+		String host = Game.this.getIntent().getStringExtra("host");
+		InetAddress addr;
+		boolean enableLargePackets;
+		try {
+			// If this does a DNS lookup, it could cause a NetworkOnMainThread exception
+			// Chances are if it has to do this, we're not on the same network anyways
+			addr = InetAddress.getByName(host);
+			
+			// Check if we can enable large packets if we get this far
+			enableLargePackets = shouldEnableLargePackets(addr);
+		} catch (Exception e) {
+			// We don't want to deal with any exceptions here. The user will be notified
+			// when the connection fails
+			enableLargePackets = false;
+		}
+		
+		LimeLog.info("Using large packets? "+enableLargePackets);
+        
 		// Start the connection
-		conn = new NvConnection(Game.this.getIntent().getStringExtra("host"), Game.this,
-				new StreamConfiguration(width, height, refreshRate, bitrate * 1000), PlatformBinding.getCryptoProvider(this));
+		conn = new NvConnection(host, Game.this,
+				new StreamConfiguration("Steam", width, height, refreshRate, bitrate * 1000,
+						enableLargePackets ? 1460 : 1024), PlatformBinding.getCryptoProvider(this));
 		keybTranslator = new KeyboardTranslator(conn);
 		controllerHandler = new ControllerHandler(conn);
 		
@@ -163,6 +199,89 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 		sh.addCallback(this);
 	}
 	
+	private boolean shouldEnableLargePackets(InetAddress targetAddress) {
+		ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);		
+		NetworkInfo activeNetworkInfo = connMgr.getActiveNetworkInfo();
+		String matchingPrefix;
+		
+		if (activeNetworkInfo == null) {
+			return false;
+		}
+		
+		switch (activeNetworkInfo.getType())
+		{
+		case ConnectivityManager.TYPE_ETHERNET:
+			matchingPrefix = "eth";
+			break;
+		case ConnectivityManager.TYPE_WIFI:
+			matchingPrefix = "wlan";
+			break;
+
+		default:
+			// Must be on Ethernet or Wifi to consider that we can send large packets
+			return false;
+		}
+
+		// Try to find the interface that corresponds to the active network
+		try {
+			Enumeration<NetworkInterface> ifaceList = NetworkInterface.getNetworkInterfaces();
+			while (ifaceList.hasMoreElements()) {
+				NetworkInterface iface = ifaceList.nextElement();
+
+				// Look for an interface that matches the prefix we expect
+				if (iface.isUp() && iface.getName().startsWith(matchingPrefix)) {
+					// Find the IPv4 address for the interface
+					for (InterfaceAddress addr : iface.getInterfaceAddresses()) {
+						if (!(addr.getAddress() instanceof Inet4Address)) {
+							// Skip non-IPv4 addresses
+							continue;
+						}
+						
+						// Found the right address on the right interface
+						return isOnSameSubnet(targetAddress, addr.getAddress(), addr.getNetworkPrefixLength());
+					}
+				}
+			}
+		} catch (SocketException e) {
+			e.printStackTrace();
+		}
+
+		// We didn't find the interface or something else went wrong
+		return false;
+	}
+	
+	private boolean isOnSameSubnet(InetAddress targetAddress, InetAddress localAddress, short networkPrefixLength) {
+		byte[] targetBytes = targetAddress.getAddress();
+		byte[] localBytes = localAddress.getAddress();
+
+		for (int byteIndex = 0; networkPrefixLength > 0; byteIndex++) {
+			byte target = targetBytes[byteIndex];
+			byte local = localBytes[byteIndex];
+			
+			if (networkPrefixLength >= 8) {
+				// Do a full byte comparison
+				if (target != local) {
+					return false;
+				}
+				
+				networkPrefixLength -= 8;
+			}
+			else {
+				target &= (byte)(0xFF << (8 - networkPrefixLength));
+				local &= (byte)(0xFF << (8 - networkPrefixLength));
+				
+				// Do a masked comparison
+				if (target != local) {
+					return false;
+				}
+				
+				networkPrefixLength = 0;
+			}
+		}
+		
+		return true;
+	}
+	
 	private void checkDataConnection()
 	{
 		ConnectivityManager mgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
@@ -214,6 +333,13 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 		finish();
 	}
 	
+	@Override
+	protected void onDestroy() {
+		super.onDestroy();
+		
+		wifiLock.release();
+	}
+	
 	private static byte getModifierState(KeyEvent event) {
 		byte modifier = 0;
 		if (event.isShiftPressed()) {
@@ -439,6 +565,7 @@ public class Game extends Activity implements SurfaceHolder.Callback, OnGenericM
 		return onGenericMotionEvent(event);
 	}
 
+	@SuppressLint("ClickableViewAccessibility")
 	@Override
 	public boolean onTouch(View v, MotionEvent event) {
 		// Send it to the activity's touch event handler

src/com/limelight/binding/audio/AndroidAudioRenderer.java

@@ -14,7 +14,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
 	private AudioTrack track;
 
 	@Override
-	public void streamInitialized(int channelCount, int sampleRate) {
+	public boolean streamInitialized(int channelCount, int sampleRate) {
 		int channelConfig;
 		int bufferSize;
 
@@ -27,7 +27,8 @@ public class AndroidAudioRenderer implements AudioRenderer {
 			channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
 			break;
 		default:
-			throw new IllegalArgumentException("Decoder returned unhandled channel count");
+			LimeLog.severe("Decoder returned unhandled channel count");
+			return false;
 		}
 
 		bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
@@ -47,6 +48,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
 				AudioTrack.MODE_STREAM);
 
 		track.play();
+		return true;
 	}
 
 	@Override

src/com/limelight/binding/crypto/AndroidCryptoProvider.java

@@ -21,22 +21,26 @@ import java.security.cert.X509Certificate;
 import java.security.interfaces.RSAPrivateKey;
 import java.security.spec.InvalidKeySpecException;
 import java.security.spec.PKCS8EncodedKeySpec;
+import java.util.Calendar;
 import java.util.Date;
 
-import javax.security.auth.x500.X500Principal;
-
+import org.bouncycastle.asn1.x500.X500Name;
+import org.bouncycastle.asn1.x500.X500NameBuilder;
+import org.bouncycastle.asn1.x500.style.BCStyle;
+import org.bouncycastle.cert.X509v3CertificateBuilder;
+import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
+import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
 import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.bouncycastle.openssl.PEMWriter;
-import org.bouncycastle.x509.X509V3CertificateGenerator;
+import org.bouncycastle.operator.ContentSigner;
+import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.util.Base64;
 
 import com.limelight.LimeLog;
 import com.limelight.nvstream.http.LimelightCryptoProvider;
 
-@SuppressWarnings("deprecation")
 public class AndroidCryptoProvider implements LimelightCryptoProvider {
 
 	private File certFile;
@@ -112,11 +116,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 		return true;
 	}
 	
-	@SuppressLint("TrulyRandom")
 	private boolean generateCertKeyPair() {
-		X509V3CertificateGenerator certGenerator = new X509V3CertificateGenerator();
-		X500Principal principalName = new X500Principal("CN=NVIDIA GameStream Client");
-		
 		byte[] snBytes = new byte[8];
 		new SecureRandom().nextBytes(snBytes);
 		
@@ -136,21 +136,24 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
 		}
 		
 		Date now = new Date();
-		Date expirationDate = new Date();
 		
 		// Expires in 20 years
-		expirationDate.setYear(expirationDate.getYear() + 20);
+		Calendar calendar = Calendar.getInstance();
+		calendar.setTime(now);
+		calendar.add(Calendar.YEAR, 20);
+		Date expirationDate = calendar.getTime();
 		
-		certGenerator.setSerialNumber(new BigInteger(snBytes).abs());
-		certGenerator.setIssuerDN(principalName);
-		certGenerator.setNotBefore(now);
-		certGenerator.setNotAfter(expirationDate);
-		certGenerator.setSubjectDN(principalName);
-		certGenerator.setPublicKey(keyPair.getPublic());
-		certGenerator.setSignatureAlgorithm("SHA1withRSA");
+		BigInteger serial = new BigInteger(snBytes).abs();
 		
+		X500NameBuilder nameBuilder = new X500NameBuilder(BCStyle.INSTANCE);
+		nameBuilder.addRDN(BCStyle.CN, "NVIDIA GameStream Client");
+		X500Name name = nameBuilder.build();
+		
+		X509v3CertificateBuilder certBuilder = new JcaX509v3CertificateBuilder(name, serial, now, expirationDate, name, keyPair.getPublic());
+				
 		try {
-			cert = certGenerator.generate(keyPair.getPrivate(), "BC");
+			ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withRSA").setProvider(BouncyCastleProvider.PROVIDER_NAME).build(keyPair.getPrivate());
+			cert = new JcaX509CertificateConverter().setProvider(BouncyCastleProvider.PROVIDER_NAME).getCertificate(certBuilder.build(sigGen));
 			key = (RSAPrivateKey) keyPair.getPrivate();
 		} catch (Exception e) {
 			// Nothing should go wrong here

src/com/limelight/binding/input/ControllerHandler.java

@@ -29,7 +29,7 @@ public class ControllerHandler {
 	private long lastRbUpTime = 0;
 	private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;
 	
-	private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 10;
+	private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;
 	
 	private static final int EMULATING_SPECIAL = 0x1;
 	private static final int EMULATING_SELECT = 0x2;

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

@@ -13,6 +13,7 @@ import com.limelight.LimeLog;
 import com.limelight.nvstream.av.ByteBufferDescriptor;
 import com.limelight.nvstream.av.DecodeUnit;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.av.video.VideoDepacketizer;
 import com.limelight.nvstream.av.video.cpu.AvcDecoder;
 
 public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
@@ -80,7 +81,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 	}
 	
 	@Override
-	public void setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
+	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
 		this.targetFps = redrawRate;
 		
 		int perfLevel = findOptimalPerformanceLevel();
@@ -138,25 +139,28 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 		decoderBuffer = ByteBuffer.allocate(DECODER_BUFFER_SIZE + AvcDecoder.getInputPaddingSize());
 		
 		LimeLog.info("Using software decoding (performance level: "+perfLevel+")");
+		
+		return true;
 	}
 
 	@Override
-	public void start() {
+	public boolean start(final VideoDepacketizer depacketizer) {
 		rendererThread = new Thread() {
 			@Override
 			public void run() {
 				long nextFrameTime = System.currentTimeMillis();
-				
+				DecodeUnit du;
 				while (!isInterrupted())
 				{
+					du = depacketizer.pollNextDecodeUnit(); 
+					if (du != null) {
+						submitDecodeUnit(du);
+					}
+					
 					long diff = nextFrameTime - System.currentTimeMillis();
 
 					if (diff > WAIT_CEILING_MS) {
-						try {
-							Thread.sleep(diff);
-						} catch (InterruptedException e) {
-							return;
-						}
+						continue;
 					}
 
 					nextFrameTime = computePresentationTimeMs(targetFps);
@@ -165,7 +169,9 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 			}
 		};
 		rendererThread.setName("Video - Renderer (CPU)");
+		rendererThread.setPriority(Thread.MAX_PRIORITY);
 		rendererThread.start();
+		return true;
 	}
 	
 	private long computePresentationTimeMs(int frameRate) {
@@ -186,8 +192,7 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 		AvcDecoder.destroy();
 	}
 
-	@Override
-	public boolean submitDecodeUnit(DecodeUnit decodeUnit) {
+	private boolean submitDecodeUnit(DecodeUnit decodeUnit) {
 		byte[] data;
 		
 		// Use the reserved decoder buffer if this decode unit will fit

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

@@ -1,7 +1,7 @@
 package com.limelight.binding.video;
 
-import com.limelight.nvstream.av.DecodeUnit;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.av.video.VideoDepacketizer;
 
 public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
 
@@ -13,7 +13,7 @@ public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
 	}
 
 	@Override
-	public void setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
+	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
 		if ((drFlags & VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING) != 0 ||
 			((drFlags & VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING) == 0 &&
 			  MediaCodecDecoderRenderer.findSafeDecoder() != null)) {
@@ -22,12 +22,12 @@ public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
 		else {
 			decoderRenderer = new AndroidCpuDecoderRenderer();
 		}
-		decoderRenderer.setup(width, height, redrawRate, renderTarget, drFlags);
+		return decoderRenderer.setup(width, height, redrawRate, renderTarget, drFlags);
 	}
 
 	@Override
-	public void start() {
-		decoderRenderer.start();
+	public boolean start(VideoDepacketizer depacketizer) {
+		return decoderRenderer.start(depacketizer);
 	}
 
 	@Override
@@ -35,11 +35,6 @@ public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
 		decoderRenderer.stop();
 	}
 
-	@Override
-	public boolean submitDecodeUnit(DecodeUnit du) {
-		return decoderRenderer.submitDecodeUnit(du);
-	}
-
 	@Override
 	public int getCapabilities() {
 		return decoderRenderer.getCapabilities();

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

@@ -8,6 +8,7 @@ import com.limelight.LimeLog;
 import com.limelight.nvstream.av.ByteBufferDescriptor;
 import com.limelight.nvstream.av.DecodeUnit;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.av.video.VideoDepacketizer;
 
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
@@ -23,15 +24,13 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 	private ByteBuffer[] videoDecoderInputBuffers;
 	private MediaCodec videoDecoder;
 	private Thread rendererThread;
-	private int redrawRate;
 	private boolean needsSpsBitstreamFixup;
 	private boolean needsSpsNumRefFixup;
-	private boolean fastInputQueueing;
+	private VideoDepacketizer depacketizer;
 	
 	public static final List<String> blacklistedDecoderPrefixes;
 	public static final List<String> spsFixupBitsreamFixupDecoderPrefixes;
 	public static final List<String> spsFixupNumRefFixupDecoderPrefixes;
-	public static final List<String> fastInputQueueingPrefixes;
 	
 	static {
 		blacklistedDecoderPrefixes = new LinkedList<String>();
@@ -45,11 +44,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 		
 		spsFixupNumRefFixupDecoderPrefixes = new LinkedList<String>();
 		spsFixupNumRefFixupDecoderPrefixes.add("omx.TI");
-	}
-	
-	static {
-		fastInputQueueingPrefixes = new LinkedList<String>();
-		fastInputQueueingPrefixes.add("omx.nvidia");
+		spsFixupNumRefFixupDecoderPrefixes.add("omx.qcom");
 	}
 		
 	private static boolean isDecoderInList(List<String> decoderList, String decoderName) {
@@ -124,32 +119,32 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 	}
 	
 	@Override
-	public void setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {	
-		this.redrawRate = redrawRate;
-		
+	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
 		//dumpDecoders();
 		
-		MediaCodecInfo safeDecoder = findSafeDecoder();
-		if (safeDecoder != null) {
-			videoDecoder = MediaCodec.createByCodecName(safeDecoder.getName());
-			needsSpsBitstreamFixup = isDecoderInList(spsFixupBitsreamFixupDecoderPrefixes, safeDecoder.getName());
-			needsSpsNumRefFixup = isDecoderInList(spsFixupNumRefFixupDecoderPrefixes, safeDecoder.getName());
-			if (needsSpsBitstreamFixup) {
-				LimeLog.info("Decoder "+safeDecoder.getName()+" needs SPS bitstream restrictions fixup");
+		// It's nasty to put all this in a try-catch block,
+		// but codecs have been known to throw all sorts of crazy runtime exceptions
+		// due to implementation problems
+		try {
+			MediaCodecInfo safeDecoder = findSafeDecoder();
+			if (safeDecoder != null) {
+				videoDecoder = MediaCodec.createByCodecName(safeDecoder.getName());
+				needsSpsBitstreamFixup = isDecoderInList(spsFixupBitsreamFixupDecoderPrefixes, safeDecoder.getName());
+				needsSpsNumRefFixup = isDecoderInList(spsFixupNumRefFixupDecoderPrefixes, safeDecoder.getName());
+				if (needsSpsBitstreamFixup) {
+					LimeLog.info("Decoder "+safeDecoder.getName()+" needs SPS bitstream restrictions fixup");
+				}
+				if (needsSpsNumRefFixup) {
+					LimeLog.info("Decoder "+safeDecoder.getName()+" needs SPS ref num fixup");
+				}
 			}
-			if (needsSpsNumRefFixup) {
-				LimeLog.info("Decoder "+safeDecoder.getName()+" needs SPS ref num fixup");
+			else {
+				videoDecoder = MediaCodec.createDecoderByType("video/avc");
+				needsSpsBitstreamFixup = false;
+				needsSpsNumRefFixup = false;
 			}
-			fastInputQueueing = isDecoderInList(fastInputQueueingPrefixes, safeDecoder.getName());
-			if (fastInputQueueing) {
-				LimeLog.info("Decoder "+safeDecoder.getName()+" supports fast input queueing");
-			}
-		}
-		else {
-			videoDecoder = MediaCodec.createDecoderByType("video/avc");
-			needsSpsBitstreamFixup = false;
-			needsSpsNumRefFixup = false;
-			fastInputQueueing = false;
+		} catch (Exception e) {
+			return false;
 		}
 		
 		MediaFormat videoFormat = MediaFormat.createVideoFormat("video/avc", width, height);
@@ -160,6 +155,8 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 		videoDecoderInputBuffers = videoDecoder.getInputBuffers();
 		
 		LimeLog.info("Using hardware decoding");
+		
+		return true;
 	}
 	
 	private void startRendererThread()
@@ -167,60 +164,53 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 		rendererThread = new Thread() {
 			@Override
 			public void run() {
-				long nextFrameTimeUs = 0;
 				BufferInfo info = new BufferInfo();
+				DecodeUnit du;
 				while (!isInterrupted())
 				{
-					// Block for a maximum of 100 ms
-					int outIndex = videoDecoder.dequeueOutputBuffer(info, 100000);
-				    switch (outIndex) {
-				    case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
-				    	LimeLog.info("Output buffers changed");
-					    break;
-				    case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
-				    	LimeLog.info("Output format changed");
-				    	LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
-				    	break;
-				    default:
-				      break;
-				    }
-				    
+					du = depacketizer.pollNextDecodeUnit();
+					if (du != null) {
+						submitDecodeUnit(du);
+					}
+					
+					int outIndex = videoDecoder.dequeueOutputBuffer(info, 0);
 				    if (outIndex >= 0) {
 					    int lastIndex = outIndex;
-				    	boolean render = false;
-					    
-				    	if (currentTimeUs() >= nextFrameTimeUs) {
-				    		render = true;
-				    		nextFrameTimeUs = computePresentationTime(redrawRate);
-				    	}
 					    
 					    // Get the last output buffer in the queue
 					    while ((outIndex = videoDecoder.dequeueOutputBuffer(info, 0)) >= 0) {
 					    	videoDecoder.releaseOutputBuffer(lastIndex, false);
 					    	lastIndex = outIndex;
 					    }
-				    	
-					    // Render that buffer if it's time for the next frame
-				    	videoDecoder.releaseOutputBuffer(lastIndex, render);
+					    
+					    // Render the last buffer
+				    	videoDecoder.releaseOutputBuffer(lastIndex, true);
+				    } else {
+					    switch (outIndex) {
+					    case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
+					    	LimeLog.info("Output buffers changed");
+						    break;
+					    case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
+					    	LimeLog.info("Output format changed");
+					    	LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
+					    	break;
+					    default:
+					      break;
+					    }
 				    }
 				}
 			}
 		};
 		rendererThread.setName("Video - Renderer (MediaCodec)");
+		rendererThread.setPriority(Thread.MAX_PRIORITY);
 		rendererThread.start();
 	}
-	
-	private static long currentTimeUs() {
-		return System.nanoTime() / 1000;
-	}
-
-	private long computePresentationTime(int frameRate) {
-		return currentTimeUs() + (1000000 / frameRate);
-	}
 
 	@Override
-	public void start() {
+	public boolean start(VideoDepacketizer depacketizer) {
+		this.depacketizer = depacketizer;
 		startRendererThread();
+		return true;
 	}
 
 	@Override
@@ -239,24 +229,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 		}
 	}
 
-	@Override
-	public boolean submitDecodeUnit(DecodeUnit decodeUnit) {
-		if (decodeUnit.getType() != DecodeUnit.TYPE_H264) {
-			System.err.println("Unknown decode unit type");
-			return false;
-		}
-		
-		int mcFlags = 0;
-		
-		if ((decodeUnit.getFlags() & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
-			LimeLog.info("Codec config");
-			mcFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
-		}
-		if ((decodeUnit.getFlags() & DecodeUnit.DU_FLAG_SYNC_FRAME) != 0) {
-			LimeLog.info("Sync frame");
-			mcFlags |= MediaCodec.BUFFER_FLAG_SYNC_FRAME;
-		}
-		
+	private boolean submitDecodeUnit(DecodeUnit decodeUnit) {
 		int inputIndex = videoDecoder.dequeueInputBuffer(-1);
 		if (inputIndex >= 0)
 		{
@@ -264,8 +237,18 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 			// Clear old input data
 			buf.clear();
-
-			if (needsSpsBitstreamFixup || needsSpsNumRefFixup) {
+			
+			int codecFlags = 0;
+			int decodeUnitFlags = decodeUnit.getFlags();
+			if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
+				codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
+			}
+			if ((decodeUnitFlags & DecodeUnit.DU_FLAG_SYNC_FRAME) != 0) {
+				codecFlags |= MediaCodec.BUFFER_FLAG_SYNC_FRAME;
+			}
+			
+			if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0 &&
+				(needsSpsBitstreamFixup || needsSpsNumRefFixup)) {
 				ByteBufferDescriptor header = decodeUnit.getBufferList().get(0);
 				if (header.data[header.offset+4] == 0x67) {
 					// TI OMAP4 requires a reference frame count of 1 to decode successfully
@@ -312,7 +295,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 					videoDecoder.queueInputBuffer(inputIndex,
 							0, spsLength,
-							0, mcFlags);
+							0, codecFlags);
 					return true;
 				}
 			}
@@ -325,7 +308,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 			videoDecoder.queueInputBuffer(inputIndex,
 					0, decodeUnit.getDataLength(),
-					0, mcFlags);
+					0, codecFlags);
 		}
 		
 		return true;
@@ -333,7 +316,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 
 	@Override
 	public int getCapabilities() {
-		return fastInputQueueing ? VideoDecoderRenderer.CAPABILITY_DIRECT_SUBMIT : 0;
+		return 0;
 	}
 
 	/**

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

@@ -1,36 +0,0 @@
-package com.limelight.binding.video;
-
-import android.content.Context;
-import android.renderscript.Allocation;
-import android.renderscript.Element;
-import android.renderscript.RenderScript;
-import android.renderscript.Type;
-import android.view.Surface;
-
-public class RsRenderer {
-	private RenderScript rs;
-	private Allocation renderBuffer;
-	
-	public RsRenderer(Context context, int width, int height, Surface renderTarget) {
-		rs = RenderScript.create(context);
-
-		Type.Builder tb = new Type.Builder(rs, Element.RGBA_8888(rs));
-		tb.setX(width);
-		tb.setY(height);
-		Type bufferType = tb.create();
-
-		renderBuffer = Allocation.createTyped(rs, bufferType, Allocation.USAGE_SCRIPT | Allocation.USAGE_IO_OUTPUT);
-		renderBuffer.setSurface(renderTarget);
-	}
-	
-	public void release() {
-		renderBuffer.setSurface(null);
-		renderBuffer.destroy();
-		rs.destroy();
-	}
-	
-	public void render(byte[] rgbData) {
-		renderBuffer.copyFrom(rgbData);
-		renderBuffer.ioSend();
-	}
-}