diff --git a/gen/com/limelight/R.java b/gen/com/limelight/R.java
index 8f8362c7..3362315f 100644
--- a/gen/com/limelight/R.java
+++ b/gen/com/limelight/R.java
@@ -35,16 +35,20 @@ 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 hardwareDec=0x7f080006;
         public static final int hostTextView=0x7f080000;
-        public static final int imageQualityCheckbox=0x7f080002;
-        public static final int pairButton=0x7f080003;
-        public static final int res1080pSelected=0x7f080006;
-        public static final int res720pSelected=0x7f080005;
-        public static final int resolutionGroup=0x7f080004;
-        public static final int rr30Selected=0x7f080007;
-        public static final int rr60Selected=0x7f080008;
+        public static final int imageQualityCheckbox=0x7f08000a;
+        public static final int pairButton=0x7f080002;
+        public static final int res1080pSelected=0x7f08000c;
+        public static final int res720pSelected=0x7f08000b;
+        public static final int resolutionGroup=0x7f080007;
+        public static final int rr30Selected=0x7f080008;
+        public static final int rr60Selected=0x7f080009;
+        public static final int rrGroup=0x7f080003;
+        public static final int softwareDec=0x7f080004;
         public static final int statusButton=0x7f080001;
-        public static final int surfaceView=0x7f080009;
+        public static final int surfaceView=0x7f08000d;
     }
     public static final class layout {
         public static final int activity_connection=0x7f030000;
diff --git a/libs/limelight-common.jar b/libs/limelight-common.jar
index 2441db4a..0f48d119 100644
Binary files a/libs/limelight-common.jar and b/libs/limelight-common.jar differ
diff --git a/res/layout/activity_connection.xml b/res/layout/activity_connection.xml
index ed8f9d22..ba580c54 100644
--- a/res/layout/activity_connection.xml
+++ b/res/layout/activity_connection.xml
@@ -32,14 +32,6 @@
         
         </Button>
 
-    <CheckBox
-        android:id="@+id/imageQualityCheckbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignLeft="@+id/hostTextView"
-        android:layout_below="@+id/pairButton"
-        android:text="Prefer image quality over performance" />
-
     <Button
         android:id="@+id/pairButton"
         android:layout_width="wrap_content"
@@ -47,37 +39,85 @@
         android:layout_below="@+id/statusButton"
         android:layout_centerHorizontal="true"
         android:text="Pair with PC" />
-    
-    <RadioGroup android:id="@+id/resolutionGroup"
-    	android:layout_width="fill_parent"
-    	android:layout_height="wrap_content"
-    	android:layout_centerHorizontal="true"
-    	android:layout_below="@+id/imageQualityCheckbox"
-    	android:orientation="horizontal">
-    	<RadioButton android:id="@+id/res720pSelected"
-        	android:layout_width="wrap_content"
-        	android:layout_height="wrap_content"
-        	android:text="720p"/>
-    	<RadioButton android:id="@+id/res1080pSelected"
-        	android:layout_width="wrap_content"
-        	android:layout_height="wrap_content"
-        	android:text="1080p (may increase lag)"/>
-	</RadioGroup>
-	
+
     <RadioGroup
-    	android:layout_width="fill_parent"
-    	android:layout_height="wrap_content"
-    	android:layout_centerHorizontal="true"
-    	android:layout_below="@+id/resolutionGroup"
-    	android:orientation="horizontal">
-    	<RadioButton android:id="@+id/rr30Selected"
-        	android:layout_width="wrap_content"
-        	android:layout_height="wrap_content"
-        	android:text="30 FPS"/>
-    	<RadioButton android:id="@+id/rr60Selected"
-        	android:layout_width="wrap_content"
-        	android:layout_height="wrap_content"
-        	android:text="60 FPS"/>
-	</RadioGroup>
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/rrGroup"
+        android:layout_below="@+id/rrGroup"
+        android:layout_marginTop="25dp"
+        android:orientation="vertical" >
+
+        <RadioButton
+            android:id="@+id/softwareDec"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Force Software Decoding" />
+
+        <RadioButton
+            android:id="@+id/autoDec"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Auto-select Decoder" />
+
+        <RadioButton
+            android:id="@+id/hardwareDec"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Force Hardware Decoding" />
+    </RadioGroup>
+
+    <RadioGroup
+        android:id="@+id/rrGroup"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/resolutionGroup"
+        android:layout_below="@+id/resolutionGroup"
+        android:layout_marginTop="15dp"
+        android:orientation="horizontal" >
+
+        <RadioButton
+            android:id="@+id/rr30Selected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="30 FPS" />
+
+        <RadioButton
+            android:id="@+id/rr60Selected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="60 FPS (may increase lag)" />
+    </RadioGroup>
+
+    <RadioGroup
+        android:id="@+id/resolutionGroup"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignLeft="@+id/imageQualityCheckbox"
+        android:layout_below="@+id/imageQualityCheckbox"
+        android:layout_marginTop="17dp"
+        android:orientation="horizontal" >
+
+        <RadioButton
+            android:id="@+id/res720pSelected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="720p" />
+
+        <RadioButton
+            android:id="@+id/res1080pSelected"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="1080p (may increase lag)" />
+    </RadioGroup>
+
+    <CheckBox
+        android:id="@+id/imageQualityCheckbox"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/pairButton"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="16dp"
+        android:text="Prefer image quality over performance" />
 
 </RelativeLayout>
diff --git a/src/com/limelight/Connection.java b/src/com/limelight/Connection.java
index 8f94bd39..68e35375 100644
--- a/src/com/limelight/Connection.java
+++ b/src/com/limelight/Connection.java
@@ -33,6 +33,7 @@ public class Connection extends Activity {
 	private SharedPreferences prefs;
 	private CheckBox qualityCheckbox;
 	private RadioButton rbutton720p, rbutton1080p, rbutton30fps, rbutton60fps;
+	private RadioButton forceSoftDec, autoDec, forceHardDec;
 	
 	private static final String DEFAULT_HOST = "";
 	public static final String HOST_KEY = "hostText";
@@ -61,6 +62,9 @@ public class Connection extends Activity {
 		this.rbutton1080p = (RadioButton) findViewById(R.id.res1080pSelected);
 		this.rbutton30fps = (RadioButton) findViewById(R.id.rr30Selected);
 		this.rbutton60fps = (RadioButton) findViewById(R.id.rr60Selected);
+		this.forceSoftDec = (RadioButton) findViewById(R.id.softwareDec);
+		this.autoDec = (RadioButton) findViewById(R.id.autoDec);
+		this.forceHardDec = (RadioButton) findViewById(R.id.hardwareDec);
 
 		prefs = getSharedPreferences(Game.PREFS_FILE_NAME, Context.MODE_MULTI_PROCESS);
 		this.hostText.setText(prefs.getString(Connection.HOST_KEY, Connection.DEFAULT_HOST));
@@ -84,6 +88,24 @@ public class Connection extends Activity {
 			rbutton30fps.setChecked(false);
 		}
 		
+		switch (prefs.getInt(Game.DECODER_PREF_STRING, Game.DEFAULT_DECODER)) {
+		case Game.FORCE_SOFTWARE_DECODER:
+			forceSoftDec.setChecked(true);
+			autoDec.setChecked(false);
+			forceHardDec.setChecked(false);
+			break;
+		case Game.AUTOSELECT_DECODER:
+			forceSoftDec.setChecked(false);
+			autoDec.setChecked(true);
+			forceHardDec.setChecked(false);
+			break;
+		case Game.FORCE_HARDWARE_DECODER:
+			forceSoftDec.setChecked(false);
+			autoDec.setChecked(false);
+			forceHardDec.setChecked(true);
+			break;
+		}
+		
 		OnCheckedChangeListener occl = new OnCheckedChangeListener() {
 			@Override
 			public void onCheckedChanged(CompoundButton buttonView,
@@ -107,12 +129,24 @@ public class Connection extends Activity {
 					prefs.edit().putInt(Game.WIDTH_PREF_STRING, 1920).
 						putInt(Game.HEIGHT_PREF_STRING, 1080).commit();
 				}
+				else if (buttonView == forceSoftDec) {
+					prefs.edit().putInt(Game.DECODER_PREF_STRING, Game.FORCE_SOFTWARE_DECODER).commit();
+				}
+				else if (buttonView == forceHardDec) {
+					prefs.edit().putInt(Game.DECODER_PREF_STRING, Game.FORCE_HARDWARE_DECODER).commit();
+				}
+				else if (buttonView == autoDec) {
+					prefs.edit().putInt(Game.DECODER_PREF_STRING, Game.AUTOSELECT_DECODER).commit();
+				}
 			}
 		};
 		rbutton720p.setOnCheckedChangeListener(occl);
 		rbutton1080p.setOnCheckedChangeListener(occl);
 		rbutton30fps.setOnCheckedChangeListener(occl);
 		rbutton60fps.setOnCheckedChangeListener(occl);
+		forceSoftDec.setOnCheckedChangeListener(occl);
+		forceHardDec.setOnCheckedChangeListener(occl);
+		autoDec.setOnCheckedChangeListener(occl);
 		
 		this.qualityCheckbox.setOnCheckedChangeListener(new OnCheckedChangeListener() {
 			@Override
diff --git a/src/com/limelight/Game.java b/src/com/limelight/Game.java
index aa427f8c..ab9ee03f 100644
--- a/src/com/limelight/Game.java
+++ b/src/com/limelight/Game.java
@@ -1,6 +1,7 @@
 package com.limelight;
 
 import com.limelight.binding.PlatformBinding;
+import com.limelight.binding.video.ConfigurableDecoderRenderer;
 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.NvConnectionListener;
 import com.limelight.nvstream.StreamConfiguration;
@@ -52,10 +53,16 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
 	public static final String WIDTH_PREF_STRING = "Width";
 	public static final String HEIGHT_PREF_STRING = "Height";
 	public static final String REFRESH_RATE_PREF_STRING = "RefreshRate";
+	public static final String DECODER_PREF_STRING = "Decoder";
 	
 	public static final int DEFAULT_WIDTH = 1280;
 	public static final int DEFAULT_HEIGHT = 720;
 	public static final int DEFAULT_REFRESH_RATE = 30;
+	public static final int DEFAULT_DECODER = 0;
+	
+	public static final int FORCE_HARDWARE_DECODER = -1;
+	public static final int AUTOSELECT_DECODER = 0;
+	public static final int FORCE_SOFTWARE_DECODER = 1;
 	
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
@@ -91,6 +98,17 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
 		if (prefs.getBoolean(QUALITY_PREF_STRING, false)) {
 			drFlags |= VideoDecoderRenderer.FLAG_PREFER_QUALITY;
 		}
+		switch (prefs.getInt(Game.DECODER_PREF_STRING, Game.DEFAULT_DECODER)) {
+		case Game.FORCE_SOFTWARE_DECODER:
+			drFlags |= VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING;
+			break;
+		case Game.AUTOSELECT_DECODER:
+			break;
+		case Game.FORCE_HARDWARE_DECODER:
+			drFlags |= VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING;
+			break;
+		}
+
 		int width, height, refreshRate;
 		width = prefs.getInt(WIDTH_PREF_STRING, DEFAULT_WIDTH);
 		height = prefs.getInt(HEIGHT_PREF_STRING, DEFAULT_HEIGHT);
@@ -104,7 +122,7 @@ public class Game extends Activity implements OnGenericMotionListener, OnTouchLi
 		conn = new NvConnection(Game.this.getIntent().getStringExtra("host"), Game.this,
 				new StreamConfiguration(width, height, refreshRate));
 		conn.start(PlatformBinding.getDeviceName(), sv.getHolder(), drFlags,
-				PlatformBinding.getAudioRenderer(), PlatformBinding.chooseDecoderRenderer());
+				PlatformBinding.getAudioRenderer(), new ConfigurableDecoderRenderer());
 	}
 	
 	private void checkDataConnection()
diff --git a/src/com/limelight/binding/PlatformBinding.java b/src/com/limelight/binding/PlatformBinding.java
index 4b1ac989..487f4e73 100644
--- a/src/com/limelight/binding/PlatformBinding.java
+++ b/src/com/limelight/binding/PlatformBinding.java
@@ -1,29 +1,9 @@
 package com.limelight.binding;
 
-import android.os.Build;
-
 import com.limelight.binding.audio.AndroidAudioRenderer;
-import com.limelight.binding.video.AndroidCpuDecoderRenderer;
-import com.limelight.binding.video.MediaCodecDecoderRenderer;
 import com.limelight.nvstream.av.audio.AudioRenderer;
-import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 
 public class PlatformBinding {
-	public static VideoDecoderRenderer chooseDecoderRenderer() {
-		if (Build.HARDWARE.equals("goldfish")) {
-			// Emulator - don't render video (it's slow!)
-			return null;
-		}
-		else if (MediaCodecDecoderRenderer.findSafeDecoder() != null) {
-			// Hardware decoding
-			return new MediaCodecDecoderRenderer();
-		}
-		else {
-			// Software decoding
-			return new AndroidCpuDecoderRenderer();
-		}
-	}
-	
 	public static String getDeviceName() {
 		String deviceName = android.os.Build.MODEL;
         deviceName = deviceName.replace(" ", "");
diff --git a/src/com/limelight/binding/video/AndroidCpuDecoderRenderer.java b/src/com/limelight/binding/video/AndroidCpuDecoderRenderer.java
index 4f4adb5f..fc4839ba 100644
--- a/src/com/limelight/binding/video/AndroidCpuDecoderRenderer.java
+++ b/src/com/limelight/binding/video/AndroidCpuDecoderRenderer.java
@@ -78,8 +78,8 @@ public class AndroidCpuDecoderRenderer implements VideoDecoderRenderer {
 	}
 	
 	@Override
-	public void setup(int width, int height, Object renderTarget, int drFlags) {
-		this.targetFps = 30;
+	public void setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
+		this.targetFps = redrawRate;
 		
 		int perfLevel = findOptimalPerformanceLevel();
 		int threadCount;
diff --git a/src/com/limelight/binding/video/ConfigurableDecoderRenderer.java b/src/com/limelight/binding/video/ConfigurableDecoderRenderer.java
new file mode 100644
index 00000000..5721e3ef
--- /dev/null
+++ b/src/com/limelight/binding/video/ConfigurableDecoderRenderer.java
@@ -0,0 +1,43 @@
+package com.limelight.binding.video;
+
+import com.limelight.nvstream.av.DecodeUnit;
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+
+public class ConfigurableDecoderRenderer implements VideoDecoderRenderer {
+
+	private VideoDecoderRenderer decoderRenderer;
+	
+	@Override
+	public void release() {
+		decoderRenderer.release();
+	}
+
+	@Override
+	public void 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)) {
+			decoderRenderer = new MediaCodecDecoderRenderer();
+		}
+		else {
+			decoderRenderer = new AndroidCpuDecoderRenderer();
+		}
+		decoderRenderer.setup(width, height, redrawRate, renderTarget, drFlags);
+	}
+
+	@Override
+	public void start() {
+		decoderRenderer.start();
+	}
+
+	@Override
+	public void stop() {
+		decoderRenderer.stop();
+	}
+
+	@Override
+	public boolean submitDecodeUnit(DecodeUnit du) {
+		return decoderRenderer.submitDecodeUnit(du);
+	}
+
+}
diff --git a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
index 9aa450fb..bc83a19b 100644
--- a/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
+++ b/src/com/limelight/binding/video/MediaCodecDecoderRenderer.java
@@ -20,6 +20,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 	private ByteBuffer[] videoDecoderInputBuffers;
 	private MediaCodec videoDecoder;
 	private Thread rendererThread;
+	private int redrawRate;
 	
 	public static final List<String> blacklistedDecoderPrefixes;
 	
@@ -71,14 +72,20 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 	}
 	
 	@Override
-	public void setup(int width, int height, Object renderTarget, int drFlags) {
-		videoDecoder = MediaCodec.createByCodecName(findSafeDecoder().getName());
-		MediaFormat videoFormat = MediaFormat.createVideoFormat("video/avc", width, height);
-
-		videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
-
-		videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
+	public void setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {	
+		this.redrawRate = redrawRate;
 		
+		MediaCodecInfo safeDecoder = findSafeDecoder();
+		if (safeDecoder != null) {
+			videoDecoder = MediaCodec.createByCodecName(safeDecoder.getName());
+		}
+		else {
+			videoDecoder = MediaCodec.createDecoderByType("video/avc");
+		}
+		
+		MediaFormat videoFormat = MediaFormat.createVideoFormat("video/avc", width, height);
+		videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
+		videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
 		videoDecoder.start();
 
 		videoDecoderInputBuffers = videoDecoder.getInputBuffers();
@@ -112,7 +119,7 @@ public class MediaCodecDecoderRenderer implements VideoDecoderRenderer {
 				    	
 				    	if (currentTimeUs() >= nextFrameTimeUs) {
 				    		render = true;
-				    		nextFrameTimeUs = computePresentationTime(60);
+				    		nextFrameTimeUs = computePresentationTime(redrawRate);
 				    	}
 				    	
 				    	videoDecoder.releaseOutputBuffer(outIndex, render);