Reduce code duplication

Bump version to 3.1.11
Add support for mouse drag using long press
2015-10-17 15:44:24 -07:00 · 2015-10-15 02:00:29 -07:00 · 2015-10-15 01:50:05 -07:00 · 2015-10-15 01:48:31 -07:00 · 2015-10-15 00:55:05 -07:00 · 2015-10-13 19:29:36 -07:00
39 changed files with 647 additions and 309 deletions
@@ -1,14 +1,14 @@
-#Limelight
+#Moonlight

-Limelight is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
+[Moonlight](http://moonlight-stream.com) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
 We reverse engineered the Shield streaming software and created a version that can be run on any Android device.

-Limelight will allow you to stream your full collection of games from your Windows PC to your Android device,
+Moonlight will allow you to stream your full collection of games from your Windows PC to your Android device,
 whether in your own home or over the internet.

-[Limelight-pc](https://github.com/limelight-stream/limelight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/limelight-stream/limelight-ios) and [Windows and Windows Phone](https://github.com/limelight-stream/limelight-windows) are also in development.
+[Moonlight-pc](https://github.com/moonlight-stream/moonlight-pc) is also currently in development for Windows, OS X and Linux. Versions for [iOS](https://github.com/moonlight-stream/moonlight-ios) and [Windows and Windows Phone](https://github.com/moonlight-stream/moonlight-windows) are also in development.

-Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for more detailed information or a troubleshooting guide. 
+Check our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki) for more detailed information or a troubleshooting guide. 

 ##Features

@@ -18,8 +18,8 @@ Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for

 ##Installation

-* Download and install Limelight for Android from
-[Google Play](https://play.google.com/store/apps/details?id=com.limelight)
+* Download and install Moonlight for Android from
+[Google Play](https://play.google.com/store/apps/details?id=com.limelight), [Amazon App Store](http://www.amazon.com/gp/product/B00JK4MFN2), or directly from the [releases page](https://github.com/moonlight-stream/moonlight-android/releases)
 * Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC

 ##Requirements
@@ -33,7 +33,7 @@ Check our [wiki](https://github.com/limelight-stream/limelight-android/wiki) for
 * Turn on GameStream in the GFE settings
 * If you are connecting from outside the same network, turn on internet
  streaming
-* When on the same network as your PC, open Limelight and tap on your PC in the list
+* When on the same network as your PC, open Moonlight and tap on your PC in the list
 * Accept the pairing confirmation on your PC
 * Tap your PC again to view the list of apps to stream
 * Play games!
@@ -46,8 +46,6 @@ This project is being actively developed at [XDA Developers](http://forum.xda-de
 2. Write code
 3. Send Pull Requests

-Check out our [website](http://limelight-stream.com) for project links and information.
-
 ##Authors

 * [Cameron Gutman](https://github.com/cgutman)  
@@ -55,5 +53,5 @@ Check out our [website](http://limelight-stream.com) for project links and infor
 * [Aaron Neyer](https://github.com/Aaronneyer)  
 * [Andrew Hennessy](https://github.com/yetanothername)

-Limelight is the work of students at [Case Western](http://case.edu) and was
+Moonlight is the work of students at [Case Western](http://case.edu) and was
 started as a project at [MHacks](http://mhacks.org).
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="limelight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="moonlight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="android-gradle" name="Android-Gradle">
      <configuration>
@@ -13,8 +13,11 @@
        <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
        <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugAndroidTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateNonRootDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugAndroidTestSources" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileNonRootDebugAndroidTestSources" />
+        <afterSyncTasks>
+          <task>generateNonRootDebugAndroidTestSources</task>
+          <task>generateNonRootDebugSources</task>
+        </afterSyncTasks>
        <option name="ALLOW_USER_CONFIGURATION" value="false" />
        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,7 +26,7 @@
      </configuration>
    </facet>
  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
    <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/nonRoot/debug" />
    <exclude-output />
@@ -33,7 +36,7 @@
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/nonRoot/debug" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/nonRoot/debug" isTestSource="false" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/nonRoot/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/nonRoot/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/nonRoot/debug" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/assets" type="java-resource" />
@@ -46,7 +49,7 @@
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/nonRoot/debug" isTestSource="true" generated="true" />
      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/nonRoot/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/nonRoot/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/nonRoot/debug" type="java-test-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" />
      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" />
@@ -103,16 +106,15 @@
      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
    </content>
-    <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
+    <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="bcprov-jdk15on-1.51" level="project" />
-    <orderEntry type="library" exported="" name="jmdns-fixed" level="project" />
-    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.51" level="project" />
+    <orderEntry type="library" exported="" name="bcprov-jdk15on-1.52" level="project" />
+    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.52" level="project" />
    <orderEntry type="library" exported="" name="tinyrtsp" level="project" />
    <orderEntry type="library" exported="" name="limelight-common" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.2.0" level="project" />
-    <orderEntry type="library" exported="" name="jcodec-0.1.9" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.2.0" level="project" />
+    <orderEntry type="library" exported="" name="jmdns-3.4.2" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.4.0" level="project" />
+    <orderEntry type="library" exported="" name="jcodec-0.1.9-patched" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.5.0" level="project" />
  </component>
-</module>
-
+</module>
@@ -4,15 +4,15 @@ import org.apache.tools.ant.taskdefs.condition.Os
 apply plugin: 'com.android.application'

 android {
-    compileSdkVersion 22
-    buildToolsVersion "21.1.2"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.1"

    defaultConfig {
        minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23

-        versionName "3.1.3"
-        versionCode = 58
+        versionName "3.1.11"
+        versionCode = 66
    }

    productFlavors {
@@ -62,15 +62,14 @@ android {
 }

 dependencies {
-    compile group: 'org.jcodec', name: 'jcodec', version: '0.1.9'
+    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.52'
+    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.52'

-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '1.51'
-    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '1.51'
+    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.4.0'
+    compile group: 'com.squareup.okio', name:'okio', version:'1.5.0'

-    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'2.2.0'
-    compile group: 'com.squareup.okio', name:'okio', version:'1.2.0'
-
-    compile files('libs/jmdns-fixed.jar')
+    compile files('libs/jmdns-3.4.2.jar')
    compile files('libs/limelight-common.jar')
    compile files('libs/tinyrtsp.jar')
+    compile files('libs/jcodec-0.1.9-patched.jar')
 }
@@ -16,6 +16,10 @@
        android:allowBackup="true"
        android:icon="@drawable/ic_launcher"
        android:theme="@style/AppTheme" >
+
+        <!-- Samsung multi-window support -->
+        <uses-library android:name="com.sec.android.app.multiwindow" android:required="false" />
+        <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
        
        <!-- Launcher for traditional devices -->
        <activity
@@ -24,6 +28,7 @@
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />
                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="android.intent.category.MULTIWINDOW_LAUNCHER" />
                <category android:name="tv.ouya.intent.category.APP" />
            </intent-filter>
        </activity>
@@ -1,19 +1,14 @@
 package com.limelight;

-import java.io.FileNotFoundException;
 import java.io.StringReader;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
 import java.util.List;
 import java.util.Locale;
 import java.util.UUID;

-import com.limelight.binding.PlatformBinding;
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.grid.AppGridAdapter;
 import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 import com.limelight.preferences.PreferenceConfiguration;
@@ -26,10 +21,8 @@ import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;

 import android.app.Activity;
-import android.app.AlertDialog;
 import android.app.Service;
 import android.content.ComponentName;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.res.Configuration;
@@ -520,9 +520,56 @@ public class Game extends Activity implements SurfaceHolder.Callback,
        }
        else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0)
        {
+            // This case is for mice
+            if (event.getSource() == InputDevice.SOURCE_MOUSE)
+            {
+                int changedButtons = event.getButtonState() ^ lastButtonState;
+
+                if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
+                    // Send the vertical scroll packet
+                    byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
+                    conn.sendMouseScroll(vScrollClicks);
+                }
+
+                if ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
+                    if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {
+                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
+                    }
+                    else {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+                    }
+                }
+
+                if ((changedButtons & MotionEvent.BUTTON_SECONDARY) != 0) {
+                    if ((event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
+                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+                    }
+                    else {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+                    }
+                }
+
+                if ((changedButtons & MotionEvent.BUTTON_TERTIARY) != 0) {
+                    if ((event.getButtonState() & MotionEvent.BUTTON_TERTIARY) != 0) {
+                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_MIDDLE);
+                    }
+                    else {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_MIDDLE);
+                    }
+                }
+
+                // First process the history
+                for (int i = 0; i < event.getHistorySize(); i++) {
+                    updateMousePosition((int)event.getHistoricalX(i), (int)event.getHistoricalY(i));
+                }
+
+                // Now process the current values
+                updateMousePosition((int)event.getX(), (int)event.getY());
+
+                lastButtonState = event.getButtonState();
+            }
            // This case is for touch-based input devices
-            if (event.getSource() == InputDevice.SOURCE_TOUCHSCREEN ||
-                    event.getSource() == InputDevice.SOURCE_STYLUS)
+            else
            {
                int actionIndex = event.getActionIndex();

@@ -601,59 +648,6 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                    return false;
                }
            }
-            // This case is for mice
-            else if (event.getSource() == InputDevice.SOURCE_MOUSE)
-            {
-                int changedButtons = event.getButtonState() ^ lastButtonState;
-
-                if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
-                    // Send the vertical scroll packet
-                    byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
-                    conn.sendMouseScroll(vScrollClicks);
-                }
-
-                if ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
-                    if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {
-                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
-                    }
-                    else {
-                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
-                    }
-                }
-
-                if ((changedButtons & MotionEvent.BUTTON_SECONDARY) != 0) {
-                    if ((event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
-                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
-                    }
-                    else {
-                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
-                    }
-                }
-
-                if ((changedButtons & MotionEvent.BUTTON_TERTIARY) != 0) {
-                    if ((event.getButtonState() & MotionEvent.BUTTON_TERTIARY) != 0) {
-                        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_MIDDLE);
-                    }
-                    else {
-                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_MIDDLE);
-                    }
-                }
-
-                // First process the history
-                for (int i = 0; i < event.getHistorySize(); i++) {
-                    updateMousePosition((int)event.getHistoricalX(i), (int)event.getHistoricalY(i));
-                }
-
-                // Now process the current values
-                updateMousePosition((int)event.getX(), (int)event.getY());
-
-                lastButtonState = event.getButtonState();
-            }
-            else
-            {
-                // Unknown source
-                return false;
-            }

            // Handled a known source
            return true;
@@ -53,7 +53,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    private RelativeLayout noPcFoundLayout;
    private PcGridAdapter pcGridAdapter;
    private ComputerManagerService.ComputerManagerBinder managerBinder;
-    private boolean freezeUpdates, runningPolling;
+    private boolean freezeUpdates, runningPolling, hasResumed;
    private final ServiceConnection serviceConnection = new ServiceConnection() {
        public void onServiceConnected(ComponentName className, IBinder binder) {
            final ComputerManagerService.ComputerManagerBinder localBinder =
@@ -215,6 +215,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    protected void onResume() {
        super.onResume();

+        hasResumed = true;
        startComputerUpdates();
    }

@@ -222,6 +223,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    protected void onPause() {
        super.onPause();

+        hasResumed = false;
        stopComputerUpdates(false);
    }

@@ -241,13 +243,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                
        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            startComputerUpdates();
-            return;
-        }
-        
+
        // Inflate the context menu
-        if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
+        if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE ||
+            computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
            menu.add(Menu.NONE, WOL_ID, 1, getResources().getString(R.string.pcview_menu_send_wol));
            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
        }
@@ -271,7 +270,11 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {

    @Override
    public void onContextMenuClosed(Menu menu) {
-        startComputerUpdates();
+        // For some reason, this gets called again _after_ onPause() is called on this activity.
+        // We don't want to start computer updates again, so we need to keep track of whether we're paused.
+        if (hasResumed) {
+            startComputerUpdates();
+        }
    }

    private void doPair(final ComputerDetails computer) {
@@ -306,6 +309,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
                        addr = computer.remoteIp;
                    }
+                    else {
+                        LimeLog.warning("Unknown reachability - using local IP");
+                        addr = computer.localIp;
+                    }

                    httpConn = new NvHTTP(addr,
                            managerBinder.getUniqueId(),
@@ -374,7 +381,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    }

    private void doWakeOnLan(final ComputerDetails computer) {
-        if (computer.reachability != ComputerDetails.Reachability.OFFLINE) {
+        if (computer.state == ComputerDetails.State.ONLINE) {
            Toast.makeText(PcView.this, getResources().getString(R.string.wol_pc_online), Toast.LENGTH_SHORT).show();
            return;
        }
@@ -431,6 +438,10 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                    else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
                        addr = computer.remoteIp;
                    }
+                    else {
+                        LimeLog.warning("Unknown reachability - using local IP");
+                        addr = computer.localIp;
+                    }

                    httpConn = new NvHTTP(addr,
                            managerBinder.getUniqueId(),
@@ -606,10 +617,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
            public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
                                    long id) {
                ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(pos);
-                if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-                    // Do nothing
-                } else if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
-                    // Open the context menu if a PC is offline
+                if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN ||
+                    computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
+                    // Open the context menu if a PC is offline or refreshing
                    openContextMenu(arg1);
                } else if (computer.details.pairState != PairState.PAIRED) {
                    // Pair an unpaired machine by default
@@ -1,10 +1,8 @@
 package com.limelight.binding.input;

-import java.util.HashMap;
-import java.util.Map;
-
 import android.hardware.input.InputManager;
 import android.os.SystemClock;
+import android.util.SparseArray;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
@@ -31,7 +29,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener {

    private final Vector2d inputVector = new Vector2d();

-    private final HashMap<String, ControllerContext> contexts = new HashMap<String, ControllerContext>();
+    private final SparseArray<ControllerContext> contexts = new SparseArray<ControllerContext>();

    private final NvConnection conn;
    private final double stickDeadzone;
@@ -52,8 +50,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
        deadzonePercentage = 10;

        int[] ids = InputDevice.getDeviceIds();
-        for (int i = 0; i < ids.length; i++) {
-            InputDevice dev = InputDevice.getDevice(ids[i]);
+        for (int id : ids) {
+            InputDevice dev = InputDevice.getDevice(id);
            if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0 ||
                    (dev.getSources() & InputDevice.SOURCE_GAMEPAD) != 0) {
                // This looks like a gamepad, but we'll check X and Y to be sure
@@ -97,18 +95,6 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
        return range;
    }

-    private short assignNewControllerNumber() {
-        for (short i = 0; i < 4; i++) {
-            if ((currentControllers & (1 << i)) == 0) {
-                // Found an unused controller value
-                currentControllers |= (1 << i);
-                return i;
-            }
-        }
-
-        return 0;
-    }
-
    @Override
    public void onInputDeviceAdded(int deviceId) {
        // Nothing happening here yet
@@ -116,13 +102,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener {

    @Override
    public void onInputDeviceRemoved(int deviceId) {
-        for (Map.Entry<String, ControllerContext> device : contexts.entrySet()) {
-            if (device.getValue().id == deviceId) {
-                LimeLog.info("Removed controller: "+device.getValue().name);
-                releaseControllerNumber(device.getValue().controllerNumber);
-                contexts.remove(device.getKey());
-                return;
-            }
+        ControllerContext context = contexts.get(deviceId);
+        if (context != null) {
+            LimeLog.info("Removed controller: "+context.name+" ("+deviceId+")");
+            releaseControllerNumber(context);
+            contexts.remove(deviceId);
        }
    }

@@ -133,9 +117,47 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
        onInputDeviceAdded(deviceId);
    }

-    private void releaseControllerNumber(int controllerNumber) {
-        LimeLog.info("Controller number "+controllerNumber+" is now available");
-        currentControllers &= ~(1 << controllerNumber);
+    private void releaseControllerNumber(ControllerContext context) {
+        if (context.reservedControllerNumber) {
+            LimeLog.info("Controller number "+context.controllerNumber+" is now available");
+            currentControllers &= ~(1 << context.controllerNumber);
+        }
+    }
+
+    // Called before sending input but after we've determined that this
+    // is definitely a controller (not a keyboard, mouse, or something else)
+    private void assignControllerNumberIfNeeded(ControllerContext context) {
+        if (context.assignedControllerNumber) {
+            return;
+        }
+
+        LimeLog.info(context.name+" ("+context.id+") needs a controller number assigned");
+        if (context.name != null && context.name.contains("gpio-keys")) {
+            // This is the back button on Shield portable consoles
+            LimeLog.info("Built-in buttons hardcoded as controller 0");
+            context.controllerNumber = 0;
+        }
+        else if (multiControllerEnabled && context.hasJoystickAxes) {
+            context.controllerNumber = 0;
+
+            LimeLog.info("Reserving the next available controller number");
+            for (short i = 0; i < 4; i++) {
+                if ((currentControllers & (1 << i)) == 0) {
+                    // Found an unused controller value
+                    currentControllers |= (1 << i);
+                    context.controllerNumber = i;
+                    context.reservedControllerNumber = true;
+                    break;
+                }
+            }
+        }
+        else {
+            LimeLog.info("Not reserving a controller number");
+            context.controllerNumber = 0;
+        }
+
+        LimeLog.info("Assigned as controller "+context.controllerNumber);
+        context.assignedControllerNumber = true;
    }

    private ControllerContext createContextForDevice(InputDevice dev) {
@@ -251,6 +273,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
            }
        }

+        // Ignore the back buttonn if a controller has both buttons
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+            boolean[] hasSelectKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BACK, 0);
+            if (hasSelectKey[0] && hasSelectKey[1]) {
+                LimeLog.info("Ignoring back button because select is present");
+                context.ignoreBack = true;
+            }
+        }
+
        if (devName != null) {
            // For the Nexus Player (and probably other ATV devices), we should
            // use the back button as start since it doesn't have a start/menu button
@@ -274,7 +305,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
            else if (devName.contains("Fire TV Remote") || devName.contains("Nexus Remote")) {
                // It's only a remote if it doesn't any sticks
                if (!context.hasJoystickAxes) {
-                    context.isRemote = true;
+                    context.ignoreBack = true;
                }
            }
            // SHIELD controllers will use small stick deadzones
@@ -282,23 +313,22 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
                context.leftStickDeadzoneRadius = 0.07f;
                context.rightStickDeadzoneRadius = 0.07f;
            }
+            // Samsung's face buttons appear as a non-virtual button so we'll explicitly ignore
+            // back presses on this device
+            else if (devName.equals("sec_touchscreen")) {
+                context.ignoreBack = true;
+            }
+            // The Serval has a couple of unknown buttons that are start and select. It also has
+            // a back button which we want to ignore since there's already a select button.
+            else if (devName.contains("Razer Serval")) {
+                context.isServal = true;
+                context.ignoreBack = true;
+            }
        }

        LimeLog.info("Analog stick deadzone: "+context.leftStickDeadzoneRadius+" "+context.rightStickDeadzoneRadius);
        LimeLog.info("Trigger deadzone: "+context.triggerDeadzone);

-        if (devName != null && devName.equals("gpio-keys")) {
-            // This is the back button on Shield portable consoles
-            context.controllerNumber = 0;
-        }
-        else if (multiControllerEnabled && context.hasJoystickAxes) {
-            context.controllerNumber = assignNewControllerNumber();
-        }
-        else {
-            context.controllerNumber = 0;
-        }
-        LimeLog.info("Assigned as controller "+context.controllerNumber);
-
        return context;
    }

@@ -308,22 +338,21 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
            return defaultContext;
        }

-        String descriptor = dev.getDescriptor();
-
        // Return the existing context if it exists
-        ControllerContext context = contexts.get(descriptor);
+        ControllerContext context = contexts.get(dev.getId());
        if (context != null) {
            return context;
        }

        // Otherwise create a new context
        context = createContextForDevice(dev);
-        contexts.put(descriptor, context);
+        contexts.put(dev.getId(), context);

        return context;
    }

    private void sendControllerInputPacket(ControllerContext context) {
+        assignControllerNumberIfNeeded(context);
        conn.sendControllerInput(context.controllerNumber, context.inputMap,
                context.leftTrigger, context.rightTrigger,
                context.leftStickX, context.leftStickY,
@@ -333,8 +362,8 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
    // Return a valid keycode, 0 to consume, or -1 to not consume the event
    // Device MAY BE NULL
    private int handleRemapping(ControllerContext context, KeyEvent event) {
-        // For remotes, don't capture the back button
-        if (context.isRemote) {
+        // Don't capture the back button if configured
+        if (context.ignoreBack) {
            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
                return -1;
            }
@@ -378,6 +407,16 @@ public class ControllerHandler implements InputManager.InputDeviceListener {
                return 0;
            }
        }
+        // If this is a Serval controller sending an unknown key code, it's probably
+        // the start and select buttons
+        else if (context.isServal && event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
+            switch (event.getScanCode())  {
+                case 314:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
+                case 315:
+                    return KeyEvent.KEYCODE_BUTTON_START;
+            }
+        }

        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
            switch (event.getKeyCode()) {
@@ -799,11 +838,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener {

        public boolean isDualShock4;
        public boolean isXboxController;
+        public boolean isServal;
        public boolean backIsStart;
        public boolean modeIsSelect;
-        public boolean isRemote;
+        public boolean ignoreBack;
        public boolean hasJoystickAxes;

+        public boolean assignedControllerNumber;
+        public boolean reservedControllerNumber;
        public short controllerNumber;

        public short inputMap = 0x0000;
@@ -3,6 +3,9 @@ package com.limelight.binding.input;
 import com.limelight.nvstream.NvConnection;
 import com.limelight.nvstream.input.MouseButtonPacket;

+import java.util.Timer;
+import java.util.TimerTask;
+
 public class TouchContext {
    private int lastTouchX = 0;
    private int lastTouchY = 0;
@@ -10,14 +13,20 @@ public class TouchContext {
    private int originalTouchY = 0;
    private long originalTouchTime = 0;
    private boolean cancelled;
+    private boolean confirmedMove;
+    private boolean confirmedDrag;
+    private Timer dragTimer;
+    private double distanceMoved;

    private final NvConnection conn;
    private final int actionIndex;
    private final double xFactor;
    private final double yFactor;

-    private static final int TAP_MOVEMENT_THRESHOLD = 10;
+    private static final int TAP_MOVEMENT_THRESHOLD = 20;
+    private static final int TAP_DISTANCE_THRESHOLD = 25;
    private static final int TAP_TIME_THRESHOLD = 250;
+    private static final int DRAG_TIME_THRESHOLD = 650;

    public TouchContext(NvConnection conn, int actionIndex, double xFactor, double yFactor)
    {
@@ -32,15 +41,19 @@ public class TouchContext {
        return actionIndex;
    }

+    private boolean isWithinTapBounds(int touchX, int touchY)
+    {
+        int xDelta = Math.abs(touchX - originalTouchX);
+        int yDelta = Math.abs(touchY - originalTouchY);
+        return xDelta <= TAP_MOVEMENT_THRESHOLD &&
+                yDelta <= TAP_MOVEMENT_THRESHOLD;
+    }
+
    private boolean isTap()
    {
-        int xDelta = Math.abs(lastTouchX - originalTouchX);
-        int yDelta = Math.abs(lastTouchY - originalTouchY);
        long timeDelta = System.currentTimeMillis() - originalTouchTime;

-        return xDelta <= TAP_MOVEMENT_THRESHOLD &&
-                yDelta <= TAP_MOVEMENT_THRESHOLD &&
-                timeDelta <= TAP_TIME_THRESHOLD;
+        return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
    }

    private byte getMouseButtonIndex()
@@ -58,7 +71,13 @@ public class TouchContext {
        originalTouchX = lastTouchX = eventX;
        originalTouchY = lastTouchY = eventY;
        originalTouchTime = System.currentTimeMillis();
-        cancelled = false;
+        cancelled = confirmedDrag = confirmedMove = false;
+        distanceMoved = 0;
+
+        if (actionIndex == 0) {
+            // Start the timer for engaging a drag
+            startDragTimer();
+        }

        return true;
    }
@@ -69,10 +88,17 @@ public class TouchContext {
            return;
        }

-        if (isTap())
-        {
-            byte buttonIndex = getMouseButtonIndex();
+        // Cancel the drag timer
+        cancelDragTimer();

+        byte buttonIndex = getMouseButtonIndex();
+
+        if (confirmedDrag) {
+            // Raise the button after a drag
+            conn.sendMouseButtonUp(buttonIndex);
+        }
+        else if (isTap())
+        {
            // Lower the mouse button
            conn.sendMouseButtonDown(buttonIndex);

@@ -87,24 +113,101 @@ public class TouchContext {
        }
    }

+    private synchronized void startDragTimer() {
+        dragTimer = new Timer(true);
+        dragTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (TouchContext.this) {
+                    // Check if someone already set move
+                    if (confirmedMove) {
+                        return;
+                    }
+
+                    // Check if someone cancelled us
+                    if (dragTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    dragTimer = null;
+
+                    // We haven't been cancelled before the timer expired so begin dragging
+                    confirmedDrag = true;
+                    conn.sendMouseButtonDown(getMouseButtonIndex());
+                }
+            }
+        }, DRAG_TIME_THRESHOLD);
+    }
+
+    private synchronized void cancelDragTimer() {
+        if (dragTimer != null) {
+            dragTimer.cancel();
+            dragTimer = null;
+        }
+    }
+
+    private synchronized void checkForConfirmedMove(int eventX, int eventY) {
+        // If we've already confirmed something, get out now
+        if (confirmedMove || confirmedDrag) {
+            return;
+        }
+
+        // If it leaves the tap bounds before the drag time expires, it's a move.
+        if (!isWithinTapBounds(eventX, eventY)) {
+            confirmedMove = true;
+            cancelDragTimer();
+            return;
+        }
+
+        // Check if we've exceeded the maximum distance moved
+        distanceMoved += Math.sqrt(Math.pow(eventX - lastTouchX, 2) + Math.pow(eventY - lastTouchY, 2));
+        if (distanceMoved >= TAP_DISTANCE_THRESHOLD) {
+            confirmedMove = true;
+            cancelDragTimer();
+            return;
+        }
+    }
+
    public boolean touchMoveEvent(int eventX, int eventY)
    {
        if (eventX != lastTouchX || eventY != lastTouchY)
        {
-            // We only send moves for the primary touch point
+            // We only send moves and drags for the primary touch point
            if (actionIndex == 0) {
+                checkForConfirmedMove(eventX, eventY);
+
                int deltaX = eventX - lastTouchX;
                int deltaY = eventY - lastTouchY;

                // Scale the deltas based on the factors passed to our constructor
-                deltaX = (int)Math.round((double)deltaX * xFactor);
-                deltaY = (int)Math.round((double)deltaY * yFactor);
+                deltaX = (int)Math.round((double)Math.abs(deltaX) * xFactor);
+                deltaY = (int)Math.round((double)Math.abs(deltaY) * yFactor);
+
+                // Fix up the signs
+                if (eventX < lastTouchX) {
+                    deltaX = -deltaX;
+                }
+                if (eventY < lastTouchY) {
+                    deltaY = -deltaY;
+                }
+
+                // If the scaling factor ended up rounding deltas to zero, wait until they are
+                // non-zero to update lastTouch that way devices that report small touch events often
+                // will work correctly
+                if (deltaX != 0) {
+                    lastTouchX = eventX;
+                }
+                if (deltaY != 0) {
+                    lastTouchY = eventY;
+                }

                conn.sendMouseMove((short)deltaX, (short)deltaY);
            }
-
-            lastTouchX = eventX;
-            lastTouchY = eventY;
+            else {
+                lastTouchX = eventX;
+                lastTouchY = eventY;
+            }
        }

        return true;
@@ -112,6 +215,14 @@ public class TouchContext {

    public void cancelTouch() {
        cancelled = true;
+
+        // Cancel the drag timer
+        cancelDragTimer();
+
+        // If it was a confirmed drag, we'll need to raise the button now
+        if (confirmedDrag) {
+            conn.sendMouseButtonUp(getMouseButtonIndex());
+        }
    }

    public boolean isCancelled() {
@@ -177,10 +177,10 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
        rendererThread = new Thread() {
            @Override
            public void run() {
-                long nextFrameTime = System.currentTimeMillis();
+                long nextFrameTime = MediaCodecHelper.getMonotonicMillis();
                while (!isInterrupted())
                {
-                    long diff = nextFrameTime - System.currentTimeMillis();
+                    long diff = nextFrameTime - MediaCodecHelper.getMonotonicMillis();

                    if (diff > WAIT_CEILING_MS) {
                        try {
@@ -203,7 +203,7 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
    }

    private long computePresentationTimeMs(int frameRate) {
-        return System.currentTimeMillis() + (1000 / frameRate);
+        return MediaCodecHelper.getMonotonicMillis() + (1000 / frameRate);
    }

    @Override
@@ -231,7 +231,8 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
        if (decodeUnit.getDataLength() <= DECODER_BUFFER_SIZE) {
            decoderBuffer.clear();

-            for (ByteBufferDescriptor bbd : decodeUnit.getBufferList()) {
+            for (ByteBufferDescriptor bbd = decodeUnit.getBufferHead();
+                 bbd != null; bbd = bbd.nextDescriptor) {
                decoderBuffer.put(bbd.data, bbd.offset, bbd.length);
            }

@@ -241,7 +242,8 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {
            data = new byte[decodeUnit.getDataLength()+AvcDecoder.getInputPaddingSize()];

            int offset = 0;
-            for (ByteBufferDescriptor bbd : decodeUnit.getBufferList()) {
+            for (ByteBufferDescriptor bbd = decodeUnit.getBufferHead();
+                 bbd != null; bbd = bbd.nextDescriptor) {
                System.arraycopy(bbd.data, bbd.offset, data, offset, bbd.length);
                offset += bbd.length;
            }
@@ -249,7 +251,7 @@ public class AndroidCpuDecoderRenderer extends EnhancedDecoderRenderer {

        boolean success = (AvcDecoder.decode(data, 0, decodeUnit.getDataLength()) == 0);
        if (success) {
-            long timeAfterDecode = System.currentTimeMillis();
+            long timeAfterDecode = MediaCodecHelper.getMonotonicMillis();

            // Add delta time to the totals (excluding probable outliers)
            long delta = timeAfterDecode - decodeUnit.getReceiveTimestamp();
@@ -13,7 +13,6 @@ import com.limelight.nvstream.av.DecodeUnit;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 import com.limelight.nvstream.av.video.VideoDepacketizer;

-import android.annotation.TargetApi;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
@@ -22,15 +21,17 @@ import android.media.MediaCodec.CodecException;
 import android.os.Build;
 import android.view.SurfaceHolder;

-@SuppressWarnings("unused")
 public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {

-    private ByteBuffer[] videoDecoderInputBuffers;
+    // Used on versions < 5.0
+    private ByteBuffer[] legacyInputBuffers;
+
    private MediaCodec videoDecoder;
    private Thread rendererThread;
    private final boolean needsSpsBitstreamFixup, isExynos4;
    private VideoDepacketizer depacketizer;
    private final boolean adaptivePlayback, directSubmit;
+    private final boolean constrainedHighProfile;
    private int initialWidth, initialHeight;

    private boolean needsBaselineSpsHack;
@@ -46,7 +47,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
    private int numPpsIn;
    private int numIframeIn;

-    @TargetApi(Build.VERSION_CODES.KITKAT)
    public MediaCodecDecoderRenderer() {
        //dumpDecoders();

@@ -57,7 +57,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        if (decoder == null) {
            // This case is handled later in setup()
            needsSpsBitstreamFixup = isExynos4 =
-            adaptivePlayback = directSubmit = false;
+            adaptivePlayback = directSubmit =
+            constrainedHighProfile = false;
            return;
        }

@@ -68,6 +69,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(decoderName, decoder);
        needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(decoderName, decoder);
        needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(decoderName, decoder);
+        constrainedHighProfile = MediaCodecHelper.decoderNeedsConstrainedHighProfile(decoderName, decoder);
        isExynos4 = MediaCodecHelper.isExynos4Device();
        if (needsSpsBitstreamFixup) {
            LimeLog.info("Decoder "+decoderName+" needs SPS bitstream restrictions fixup");
@@ -75,6 +77,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        if (needsBaselineSpsHack) {
            LimeLog.info("Decoder "+decoderName+" needs baseline SPS hack");
        }
+        if (constrainedHighProfile) {
+            LimeLog.info("Decoder "+decoderName+" needs constrained high profile");
+        }
        if (isExynos4) {
            LimeLog.info("Decoder "+decoderName+" is on Exynos 4");
        }
@@ -118,7 +123,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        return true;
    }

-    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
    private void handleDecoderException(Exception e, ByteBuffer buf, int codecFlags) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
            if (e instanceof CodecException) {
@@ -134,18 +138,20 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
            }
        }

-        if (buf != null || codecFlags != 0) {
-            throw new RendererException(this, e, buf, codecFlags);
-        }
-        else {
-            throw new RendererException(this, e);
+        // Only throw if this happens at the beginning of a stream
+        if (totalFrames < 60) {
+            if (buf != null || codecFlags != 0) {
+                throw new RendererException(this, e, buf, codecFlags);
+            }
+            else {
+                throw new RendererException(this, e);
+            }
        }
    }

    private void startDirectSubmitRendererThread()
    {
        rendererThread = new Thread() {
-            @SuppressWarnings("deprecation")
            @Override
            public void run() {
                BufferInfo info = new BufferInfo();
@@ -169,7 +175,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                            videoDecoder.releaseOutputBuffer(lastIndex, true);

                            // Add delta time to the totals (excluding probable outliers)
-                            long delta = System.currentTimeMillis() - (presentationTimeUs / 1000);
+                            long delta = MediaCodecHelper.getMonotonicMillis() - (presentationTimeUs / 1000);
                            if (delta >= 0 && delta < 1000) {
                                decoderTimeMs += delta;
                                totalTimeMs += delta;
@@ -178,9 +184,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                            switch (outIndex) {
                                case MediaCodec.INFO_TRY_AGAIN_LATER:
                                    break;
-                                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());
@@ -204,17 +207,17 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        int index;
        long startTime, queueTime;

-        startTime = System.currentTimeMillis();
+        startTime = MediaCodecHelper.getMonotonicMillis();

        index = videoDecoder.dequeueInputBuffer(wait ? (infiniteWait ? -1 : 3000) : 0);
        if (index < 0) {
            return index;
        }

-        queueTime = System.currentTimeMillis();
+        queueTime = MediaCodecHelper.getMonotonicMillis();

        if (queueTime - startTime >= 20) {
-            LimeLog.warning("Queue input buffer ran long: "+(queueTime - startTime)+" ms");
+            LimeLog.warning("Queue input buffer ran long: " + (queueTime - startTime) + " ms");
        }

        return index;
@@ -223,7 +226,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
    private void startLegacyRendererThread()
    {
        rendererThread = new Thread() {
-            @SuppressWarnings("deprecation")
            @Override
            public void run() {
                BufferInfo info = new BufferInfo();
@@ -239,17 +241,17 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                            for (int i = 0; i < 5; i++) {
                                inputIndex = dequeueInputBuffer(false, false);
                                du = depacketizer.pollNextDecodeUnit();
+                                if (du != null) {
+                                    lastDuDequeueTime = MediaCodecHelper.getMonotonicMillis();
+                                    notifyDuReceived(du);
+                                }

                                // Stop if we can't get a DU or input buffer
                                if (du == null || inputIndex == -1) {
-                                    if (du != null) {
-                                        lastDuDequeueTime = System.currentTimeMillis();
-                                    }
-
                                    break;
                                }

-                                submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+                                submitDecodeUnit(du, inputIndex);

                                du = null;
                                inputIndex = -1;
@@ -282,19 +284,20 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                    if (du == null) {
                        du = depacketizer.pollNextDecodeUnit();
                        if (du != null) {
-                            lastDuDequeueTime = System.currentTimeMillis();
+                            lastDuDequeueTime = MediaCodecHelper.getMonotonicMillis();
+                            notifyDuReceived(du);
                        }
                    }

                    // If we've got both a decode unit and an input buffer, we'll
                    // submit now. Otherwise, we wait until we have one.
                    if (du != null && inputIndex >= 0) {
-                        long submissionTime = System.currentTimeMillis();
+                        long submissionTime = MediaCodecHelper.getMonotonicMillis();
                        if (submissionTime - lastDuDequeueTime >= 20) {
                            LimeLog.warning("Receiving an input buffer took too long: "+(submissionTime - lastDuDequeueTime)+" ms");
                        }

-                        submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+                        submitDecodeUnit(du, inputIndex);

                        // DU and input buffer have both been consumed
                        du = null;
@@ -320,7 +323,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                            videoDecoder.releaseOutputBuffer(lastIndex, true);

                            // Add delta time to the totals (excluding probable outliers)
-                            long delta = System.currentTimeMillis()-(presentationTimeUs/1000);
+                            long delta = MediaCodecHelper.getMonotonicMillis()-(presentationTimeUs/1000);
                            if (delta >= 0 && delta < 1000) {
                                decoderTimeMs += delta;
                                totalTimeMs += delta;
@@ -334,9 +337,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                                        LockSupport.parkNanos(1);
                                    }
                                    break;
-                                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());
@@ -364,7 +364,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        // Start the decoder
        videoDecoder.start();

-        videoDecoderInputBuffers = videoDecoder.getInputBuffers();
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            legacyInputBuffers = videoDecoder.getInputBuffers();
+        }

        if (directSubmit) {
            startDirectSubmitRendererThread();
@@ -405,7 +407,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        for (i = 0; i < 25; i++) {
            try {
                videoDecoder.queueInputBuffer(inputBufferIndex,
-                        0, length,
+                        offset, length,
                        timestampUs, codecFlags);
                break;
            } catch (Exception e) {
@@ -419,16 +421,44 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        }
    }

-    @SuppressWarnings("deprecation")
-    private void submitDecodeUnit(DecodeUnit decodeUnit, ByteBuffer buf, int inputBufferIndex) {
-        long currentTime = System.currentTimeMillis();
-        long delta = currentTime-decodeUnit.getReceiveTimestamp();
-        if (delta >= 0 && delta < 1000) {
-            totalTimeMs += currentTime-decodeUnit.getReceiveTimestamp();
-            totalFrames++;
+    // Using the new getInputBuffer() API on Lollipop allows
+    // the framework to do some performance optimizations for us
+    private ByteBuffer getEmptyInputBuffer(int inputBufferIndex) {
+        ByteBuffer buf;
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            buf = videoDecoder.getInputBuffer(inputBufferIndex);
+        }
+        else {
+            buf = legacyInputBuffers[inputBufferIndex];
+
+            // Clear old input data pre-Lollipop
+            buf.clear();
        }

-        long timestampUs = currentTime * 1000;
+        return buf;
+    }
+
+    private void doProfileSpecificSpsPatching(SeqParameterSet sps) {
+        // Some devices benefit from setting constraint flags 4 & 5 to make this Constrained
+        // High Profile which allows the decoder to assume there will be no B-frames and
+        // reduce delay and buffering accordingly. Some devices (Marvell, Exynos 4) don't
+        // like it so we only set them on devices that are confirmed to benefit from it.
+        if (sps.profile_idc == 100 && constrainedHighProfile) {
+            LimeLog.info("Setting constraint set flags for constrained high profile");
+            sps.constraint_set_4_flag = true;
+            sps.constraint_set_5_flag = true;
+        }
+        else {
+            // Force the constraints unset otherwise (some may be set by default)
+            sps.constraint_set_4_flag = false;
+            sps.constraint_set_5_flag = false;
+        }
+    }
+
+    @SuppressWarnings("deprecation")
+    private void submitDecodeUnit(DecodeUnit decodeUnit, int inputBufferIndex) {
+        long timestampUs = System.nanoTime() / 1000;
        if (timestampUs <= lastTimestampUs) {
            // We can't submit multiple buffers with the same timestamp
            // so bump it up by one before queuing
@@ -436,8 +466,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        }
        lastTimestampUs = timestampUs;

-        // Clear old input data
-        buf.clear();
+        ByteBuffer buf = getEmptyInputBuffer(inputBufferIndex);

        int codecFlags = 0;
        int decodeUnitFlags = decodeUnit.getFlags();
@@ -452,7 +481,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        boolean needsSpsReplay = false;

        if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
-            ByteBufferDescriptor header = decodeUnit.getBufferList().get(0);
+            ByteBufferDescriptor header = decodeUnit.getBufferHead();
            if (header.data[header.offset+4] == 0x67) {
                numSpsIn++;

@@ -489,19 +518,44 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                LimeLog.info("Patching num_ref_frames in SPS");
                sps.num_ref_frames = 1;

+                // GFE 2.5.11 changed the SPS to add additional extensions
+                // Some devices don't like these so we remove them here.
+                sps.vuiParams.video_signal_type_present_flag = false;
+                sps.vuiParams.colour_description_present_flag = false;
+                sps.vuiParams.chroma_loc_info_present_flag = false;
+
                if (needsSpsBitstreamFixup || isExynos4) {
                    // The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag
                    // or max_dec_frame_buffering which increases decoding latency on Tegra.
-                    LimeLog.info("Adding bitstream restrictions");

-                    sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
-                    sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
+                    // GFE 2.5.11 started sending bitstream restrictions
+                    if (sps.vuiParams.bitstreamRestriction == null) {
+                        LimeLog.info("Adding bitstream restrictions");
+                        sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
+                        sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
+                        sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16;
+                        sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16;
+                        sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0;
+                    }
+                    else {
+                        LimeLog.info("Patching bitstream restrictions");
+                    }
+
+                    // Some devices throw errors if max_dec_frame_buffering < num_ref_frames
+                    sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = sps.num_ref_frames;
+
+                    // These values are the defaults for the fields, but they are more aggressive
+                    // than what GFE sends in 2.5.11, but it doesn't seem to cause picture problems.
                    sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2;
                    sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1;
-                    sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16;
-                    sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16;
-                    sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0;
-                    sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = 1;
+
+                    // log2_max_mv_length_horizontal and log2_max_mv_length_vertical are set to more
+                    // conservative values by GFE 2.5.11. We'll let those values stand.
+                }
+                else {
+                    // Devices that didn't/couldn't get bitstream restrictions before GFE 2.5.11
+                    // will continue to not receive them now
+                    sps.vuiParams.bitstreamRestriction = null;
                }

                // If we need to hack this SPS to say we're baseline, do so now
@@ -511,6 +565,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                    savedSps = sps;
                }

+                // Patch the SPS constraint flags
+                doProfileSpecificSpsPatching(sps);
+
                // Write the annex B header
                buf.put(header.data, header.offset, 5);

@@ -537,8 +594,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        }

        // Copy data from our buffer list into the input buffer
-        for (ByteBufferDescriptor desc : decodeUnit.getBufferList())
-        {
+        for (ByteBufferDescriptor desc = decodeUnit.getBufferHead();
+             desc != null; desc = desc.nextDescriptor) {
            buf.put(desc.data, desc.offset, desc.length);
        }

@@ -555,9 +612,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {

    private void replaySps() {
        int inputIndex = dequeueInputBuffer(true, true);
-        ByteBuffer inputBuffer = videoDecoderInputBuffers[inputIndex];
-
-        inputBuffer.clear();
+        ByteBuffer inputBuffer = getEmptyInputBuffer(inputIndex);

        // Write the Annex B header
        inputBuffer.put(new byte[]{0x00, 0x00, 0x00, 0x01, 0x67});
@@ -565,6 +620,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        // Switch the H264 profile back to high
        savedSps.profile_idc = 100;

+        // Patch the SPS constraint flags
+        doProfileSpecificSpsPatching(savedSps);
+
        // Write the SPS data
        savedSps.write(inputBuffer);

@@ -574,7 +632,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        // Queue the new SPS
        queueInputBuffer(inputIndex,
                0, inputBuffer.position(),
-                System.currentTimeMillis() * 1000,
+                System.nanoTime() / 1000,
                MediaCodec.BUFFER_FLAG_CODEC_CONFIG);

        LimeLog.info("SPS replay complete");
@@ -614,10 +672,21 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        return decoderName;
    }

+    private void notifyDuReceived(DecodeUnit du) {
+        long currentTime = MediaCodecHelper.getMonotonicMillis();
+        long delta = currentTime-du.getReceiveTimestamp();
+        if (delta >= 0 && delta < 1000) {
+            totalTimeMs += currentTime-du.getReceiveTimestamp();
+            totalFrames++;
+        }
+    }
+
    @Override
    public void directSubmitDecodeUnit(DecodeUnit du) {
        int inputIndex;

+        notifyDuReceived(du);
+
        for (;;) {
            try {
                inputIndex = dequeueInputBuffer(true, true);
@@ -628,7 +697,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
        }

        if (inputIndex >= 0) {
-            submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+            submitDecodeUnit(du, inputIndex);
        }
    }

@@ -659,6 +728,8 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
            str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
            str += "In stats: "+renderer.numSpsIn+", "+renderer.numPpsIn+", "+renderer.numIframeIn+"\n";
            str += "Total frames: "+renderer.totalFrames+"\n";
+            str += "Average end-to-end client latency: "+getAverageEndToEndLatency()+"ms\n";
+            str += "Average hardware decoder latency: "+getAverageDecoderLatency()+"ms\n";

            if (currentBuffer != null) {
                str += "Current buffer: ";
@@ -27,6 +27,7 @@ public class MediaCodecHelper {
 	private static final List<String> whitelistedAdaptiveResolutionPrefixes;
    private static final List<String> baselineProfileHackPrefixes;
    private static final List<String> directSubmitPrefixes;
+	private static final List<String> constrainedHighProfilePrefixes;

    static {
        directSubmitPrefixes = new LinkedList<String>();
@@ -39,6 +40,7 @@ public class MediaCodecHelper {
        directSubmitPrefixes.add("omx.intel");
        directSubmitPrefixes.add("omx.brcm");
        directSubmitPrefixes.add("omx.TI");
+        directSubmitPrefixes.add("omx.arc");
    }

 	static {
@@ -57,7 +59,6 @@ public class MediaCodecHelper {
 		spsFixupBitstreamFixupDecoderPrefixes = new LinkedList<String>();
 		spsFixupBitstreamFixupDecoderPrefixes.add("omx.nvidia");
 		spsFixupBitstreamFixupDecoderPrefixes.add("omx.qcom");
-		spsFixupBitstreamFixupDecoderPrefixes.add("omx.mtk");
        spsFixupBitstreamFixupDecoderPrefixes.add("omx.brcm");

        baselineProfileHackPrefixes = new LinkedList<String>();
@@ -68,6 +69,9 @@ public class MediaCodecHelper {
 		whitelistedAdaptiveResolutionPrefixes.add("omx.qcom");
 		whitelistedAdaptiveResolutionPrefixes.add("omx.sec");
 		whitelistedAdaptiveResolutionPrefixes.add("omx.TI");
+
+		constrainedHighProfilePrefixes = new LinkedList<String>();
+		constrainedHighProfilePrefixes.add("omx.intel");
 	}

 	private static boolean isDecoderInList(List<String> decoderList, String decoderName) {
@@ -82,6 +86,10 @@ public class MediaCodecHelper {
 		
 		return false;
 	}
+
+	public static long getMonotonicMillis() {
+		return System.nanoTime() / 1000000L;
+	}
 	
 	@TargetApi(Build.VERSION_CODES.KITKAT)
 	public static boolean decoderSupportsAdaptivePlayback(String decoderName, MediaCodecInfo decoderInfo) {
@@ -112,6 +120,10 @@ public class MediaCodecHelper {
 		return false;
 	}

+	public static boolean decoderNeedsConstrainedHighProfile(String decoderName, MediaCodecInfo decoderInfo) {
+		return isDecoderInList(constrainedHighProfilePrefixes, decoderName);
+	}
+
    public static boolean decoderCanDirectSubmit(String decoderName, MediaCodecInfo decoderInfo) {
        return isDecoderInList(directSubmitPrefixes, decoderName) && !isExynos4Device();
    }
@@ -81,6 +81,7 @@ public class ComputerManagerService extends Service {
            if (!pollComputer(details)) {
                if (!newPc && offlineCount < OFFLINE_POLL_TRIES) {
                    // Return without calling the listener
+                    releaseLocalDatabaseReference();
                    return false;
                }

@@ -367,6 +368,11 @@ public class ComputerManagerService extends Service {
    }

    private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
+        // Fast poll this address first to determine if we can connect at the TCP layer
+        if (!fastPollIp(ipAddr)) {
+            return null;
+        }
+
        try {
            NvHTTP http = new NvHTTP(ipAddr, idManager.getUniqueId(),
                    null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
@@ -392,7 +398,7 @@ public class ComputerManagerService extends Service {
    private boolean fastPollIp(InetAddress addr) {
        Socket s = new Socket();
        try {
-            s.connect(new InetSocketAddress(addr, NvHTTP.PORT), FAST_POLL_TIMEOUT);
+            s.connect(new InetSocketAddress(addr, NvHTTP.HTTPS_PORT), FAST_POLL_TIMEOUT);
            s.close();
            return true;
        } catch (IOException e) {
@@ -450,7 +456,7 @@ public class ComputerManagerService extends Service {
        return ComputerDetails.Reachability.OFFLINE;
    }

-    private boolean pollComputer(ComputerDetails details) throws InterruptedException {
+    private ReachabilityTuple pollForReachability(ComputerDetails details) throws InterruptedException {
        ComputerDetails polledDetails;
        ComputerDetails.Reachability reachability;

@@ -464,11 +470,11 @@ public class ComputerManagerService extends Service {
            LimeLog.info("Starting fast poll for "+details.name+" ("+details.localIp+", "+details.remoteIp+")");
            reachability = fastPollPc(details.localIp, details.remoteIp);
            LimeLog.info("Fast poll for "+details.name+" returned "+reachability.toString());
-        }

-        // If no connection could be established to either IP address, there's nothing we can do
-        if (reachability == ComputerDetails.Reachability.OFFLINE) {
-            return false;
+            // If no connection could be established to either IP address, there's nothing we can do
+            if (reachability == ComputerDetails.Reachability.OFFLINE) {
+                return null;
+            }
        }

        boolean localFirst = (reachability == ComputerDetails.Reachability.LOCAL);
@@ -480,6 +486,7 @@ public class ComputerManagerService extends Service {
            polledDetails = tryPollIp(details, details.remoteIp);
        }

+        InetAddress reachableAddr = null;
        if (polledDetails == null && !details.localIp.equals(details.remoteIp)) {
            // Failed, so let's try the fallback
            if (!localFirst) {
@@ -489,27 +496,59 @@ public class ComputerManagerService extends Service {
                polledDetails = tryPollIp(details, details.remoteIp);
            }

-            // The fallback poll worked
            if (polledDetails != null) {
-                polledDetails.reachability = !localFirst ? ComputerDetails.Reachability.LOCAL :
-                    ComputerDetails.Reachability.REMOTE;
+                // The fallback poll worked
+                reachableAddr = !localFirst ? details.localIp : details.remoteIp;
            }
        }
        else if (polledDetails != null) {
-            polledDetails.reachability = localFirst ? ComputerDetails.Reachability.LOCAL :
-                ComputerDetails.Reachability.REMOTE;
+            reachableAddr = localFirst ? details.localIp : details.remoteIp;
        }

-        // Machine was unreachable both tries
-        if (polledDetails == null) {
+        if (reachableAddr == null) {
+            return null;
+        }
+
+        if (polledDetails.remoteIp.equals(reachableAddr)) {
+            polledDetails.reachability = ComputerDetails.Reachability.REMOTE;
+        }
+        else if (polledDetails.localIp.equals(reachableAddr)) {
+            polledDetails.reachability = ComputerDetails.Reachability.LOCAL;
+        }
+        else {
+            polledDetails.reachability = ComputerDetails.Reachability.UNKNOWN;
+        }
+
+        return new ReachabilityTuple(polledDetails, reachableAddr);
+    }
+
+    private boolean pollComputer(ComputerDetails details) throws InterruptedException {
+        ReachabilityTuple initialReachTuple = pollForReachability(details);
+        if (initialReachTuple == null) {
            return false;
        }

+        if (initialReachTuple.computer.reachability == ComputerDetails.Reachability.UNKNOWN) {
+            // Neither IP address reported in the serverinfo response was the one we used.
+            // Poll again to see if we can contact this machine on either of its reported addresses.
+            ReachabilityTuple confirmationReachTuple = pollForReachability(initialReachTuple.computer);
+            if (confirmationReachTuple == null) {
+                // Neither of those seem to work, so we'll hold onto the address that did work
+                initialReachTuple.computer.localIp = initialReachTuple.reachableAddress;
+                initialReachTuple.computer.reachability = ComputerDetails.Reachability.LOCAL;
+            }
+            else {
+                // We got it on one of the returned addresses; replace the original reach tuple
+                // with the new one
+                initialReachTuple = confirmationReachTuple;
+            }
+        }
+
        // Save the old MAC address
        String savedMacAddress = details.macAddress;

        // If we got here, it's reachable
-        details.update(polledDetails);
+        details.update(initialReachTuple.computer);

        // If the new MAC address is empty, restore the old one (workaround for GFE bug)
        if (details.macAddress.equals("00:00:00:00:00:00") && savedMacAddress != null) {
@@ -638,7 +677,7 @@ public class ComputerManagerService extends Service {
                                        if (cacheOut != null) {
                                            cacheOut.close();
                                        }
-                                    } catch (IOException e) {}
+                                    } catch (IOException ignored) {}
                                }

                                // Update the computer
@@ -684,4 +723,14 @@ class PollingTuple {
        this.computer = computer;
        this.thread = thread;
    }
+}
+
+class ReachabilityTuple {
+    public final InetAddress reachableAddress;
+    public final ComputerDetails computer;
+
+    public ReachabilityTuple(ComputerDetails computer, InetAddress reachableAddress) {
+        this.computer = computer;
+        this.reachableAddress = reachableAddress;
+    }
 }
@@ -27,7 +27,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {

    private final CachedAppAssetLoader loader;

-    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) throws KeyManagementException, NoSuchAlgorithmException {
+    public AppGridAdapter(Activity activity, boolean listMode, boolean small, ComputerDetails computer, String uniqueId) {
        super(activity, listMode ? R.layout.simple_row : (small ? R.layout.app_grid_item_small : R.layout.app_grid_item), R.drawable.image_loading);

        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
@@ -40,7 +40,7 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
            dp = LARGE_WIDTH_DP;
        }

-        double scalingDivisor = ART_WIDTH_PX / (dp * (dpi / 160));
+        double scalingDivisor = ART_WIDTH_PX / (dp * (dpi / 160.0));
        if (scalingDivisor < 1.0) {
            // We don't want to make them bigger before draw-time
            scalingDivisor = 1.0;
@@ -10,6 +10,7 @@ import android.widget.ImageView;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;

+import java.io.IOException;
 import java.io.InputStream;
 import java.lang.ref.WeakReference;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -97,9 +98,18 @@ public class CachedAppAssetLoader {
                // Write the stream straight to disk
                diskLoader.populateCacheWithStream(tuple, in);

+                // Close the network input stream
+                try {
+                    in.close();
+                } catch (IOException ignored) {}
+
                // If there's a task associated with this load, we should return the bitmap
                if (task != null) {
-                    return diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+                    // If the cached bitmap is valid, return it. Otherwise, we'll try the load again
+                    Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+                    if (bmp != null) {
+                        return bmp;
+                    }
                }
                else {
                    // Otherwise it's a background load and we return nothing
@@ -13,6 +13,9 @@ import java.io.InputStream;
 import java.io.OutputStream;

 public class DiskAssetLoader {
+    // 5 MB
+    private final long MAX_ASSET_SIZE = 5 * 1024 * 1024;
+
    private final File cacheDir;

    public DiskAssetLoader(File cacheDir) {
@@ -27,13 +30,19 @@ public class DiskAssetLoader {
        InputStream in = null;
        Bitmap bmp = null;
        try {
+            // Make sure the cached asset doesn't exceed the maximum size
+            if (CacheHelper.getFileSize(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png") > MAX_ASSET_SIZE) {
+                LimeLog.warning("Removing cached tuple exceeding size threshold: "+tuple);
+                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+                return null;
+            }
+
            in = CacheHelper.openCacheFileForInput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
            BitmapFactory.Options options = new BitmapFactory.Options();
            options.inSampleSize = sampleSize;
+            options.inPreferredConfig = Bitmap.Config.RGB_565;
            bmp = BitmapFactory.decodeStream(in, null, options);
-        } catch (FileNotFoundException ignored) {
-        } catch (IOException e) {
-            e.printStackTrace();
+        } catch (IOException ignored) {
        } finally {
            if (in != null) {
                try {
@@ -51,9 +60,11 @@ public class DiskAssetLoader {

    public void populateCacheWithStream(CachedAppAssetLoader.LoaderTuple tuple, InputStream input) {
        OutputStream out = null;
+        boolean success = false;
        try {
            out = CacheHelper.openCacheFileForOutput(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
-            CacheHelper.writeInputStreamToOutputStream(input, out);
+            CacheHelper.writeInputStreamToOutputStream(input, out, MAX_ASSET_SIZE);
+            success = true;
        } catch (IOException e) {
            e.printStackTrace();
        } finally {
@@ -62,6 +73,11 @@ public class DiskAssetLoader {
                    out.close();
                } catch (IOException ignored) {}
            }
+
+            if (!success) {
+                LimeLog.warning("Unable to populate cache with tuple: "+tuple);
+                CacheHelper.deleteCacheFile(cacheDir, "boxart", tuple.computer.uuid.toString(), tuple.app.getAppId() + ".png");
+            }
        }
    }
 }
@@ -26,7 +26,7 @@ public class NetworkAssetLoader {
        InputStream in = null;
        try {
            in = http.getBoxArt(tuple.app);
-        } catch (IOException e) {}
+        } catch (IOException ignored) {}

        if (in != null) {
            LimeLog.info("Network asset load complete: " + tuple);
@@ -3,6 +3,7 @@ package com.limelight.preferences;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.preference.PreferenceManager;

 public class PreferenceConfiguration {
@@ -69,9 +70,18 @@ public class PreferenceConfiguration {

    public static boolean getDefaultSmallMode(Context context) {
        PackageManager manager = context.getPackageManager();
-        if (manager != null && manager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+        if (manager != null) {
            // TVs shouldn't use small mode by default
-            return false;
+            if (manager.hasSystemFeature(PackageManager.FEATURE_TELEVISION)) {
+                return false;
+            }
+
+            // API 21 uses LEANBACK instead of TELEVISION
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                if (manager.hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
+                    return false;
+                }
+            }
        }

        // Use small mode on anything smaller than a 7" tablet
@@ -80,24 +90,7 @@ public class PreferenceConfiguration {

    public static int getDefaultBitrate(Context context) {
        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        String str = prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS);
-        if (str.equals("720p30")) {
-            return BITRATE_DEFAULT_720_30;
-        }
-        else if (str.equals("720p60")) {
-            return BITRATE_DEFAULT_720_60;
-        }
-        else if (str.equals("1080p30")) {
-            return BITRATE_DEFAULT_1080_30;
-        }
-        else if (str.equals("1080p60")) {
-            return BITRATE_DEFAULT_1080_60;
-        }
-        else {
-            // Should never get here
-            return DEFAULT_BITRATE;
-        }
+        return getDefaultBitrate(prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS));
    }

    private static int getDecoderValue(Context context) {
@@ -16,14 +16,17 @@ import com.limelight.utils.UiHelper;
 import java.util.Locale;

 public class StreamSettings extends Activity {
+    private PreferenceConfiguration previousPrefs;
+
    @Override
    protected void onCreate(Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);

-        String locale = PreferenceConfiguration.readPreferences(this).language;
-        if (!locale.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
+        previousPrefs = PreferenceConfiguration.readPreferences(this);
+
+        if (!previousPrefs.language.equals(PreferenceConfiguration.DEFAULT_LANGUAGE)) {
            Configuration config = new Configuration(getResources().getConfiguration());
-            config.locale = new Locale(locale);
+            config.locale = new Locale(previousPrefs.language);
            getResources().updateConfiguration(config, getResources().getDisplayMetrics());
        }

@@ -39,10 +42,16 @@ public class StreamSettings extends Activity {
    public void onBackPressed() {
        finish();

-        // Restart the PC view to apply UI changes
-        Intent intent = new Intent(this, PcView.class);
-        intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
-        startActivity(intent, null);
+        // Check for changes that require a UI reload to take effect
+        PreferenceConfiguration newPrefs = PreferenceConfiguration.readPreferences(this);
+        if (newPrefs.listMode != previousPrefs.listMode ||
+                newPrefs.smallIconMode != previousPrefs.smallIconMode ||
+                !newPrefs.language.equals(previousPrefs.language)) {
+            // Restart the PC view to apply UI changes
+            Intent intent = new Intent(this, PcView.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK | Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent, null);
+        }
    }

    public static class SettingsFragment extends PreferenceFragment {
@@ -30,6 +30,14 @@ public class CacheHelper {
        return f;
    }

+    public static long getFileSize(File root, String... path) {
+        return openPath(false, root, path).length();
+    }
+
+    public static boolean deleteCacheFile(File root, String... path) {
+        return openPath(false, root, path).delete();
+    }
+
    public static boolean cacheFileExists(File root, String... path) {
        return openPath(false, root, path).exists();
    }
@@ -42,11 +50,15 @@ public class CacheHelper {
        return new BufferedOutputStream(new FileOutputStream(openPath(true, root, path)));
    }

-    public static void writeInputStreamToOutputStream(InputStream in, OutputStream out) throws IOException {
+    public static void writeInputStreamToOutputStream(InputStream in, OutputStream out, long maxLength) throws IOException {
        byte[] buf = new byte[4096];
        int bytesRead;

        while ((bytesRead = in.read(buf)) != -1) {
+            maxLength -= bytesRead;
+            if (maxLength <= 0) {
+                throw new IOException("Stream exceeded max size");
+            }
            out.write(buf, 0, bytesRead);
        }
    }
@@ -61,6 +73,10 @@ public class CacheHelper {
            sb.append(buf, 0, bytesRead);
        }

+        try {
+            in.close();
+        } catch (IOException ignored) {}
+
        return sb.toString();
    }

@@ -102,7 +102,7 @@

    <string name="category_ui_settings">Impostazioni Interfaccia</string>
    <string name="title_language_list">Lingua</string>
-    <string name="summary_language_list">Lingua da usare in Limelight</string>
+    <string name="summary_language_list">Lingua da usare in Moonlight</string>
    <string name="title_checkbox_list_mode">Usa lista invece della griglia</string>
    <string name="summary_checkbox_list_mode">Visualizza applicazioni e computers in una lista invece di una griglia</string>
    <string name="title_checkbox_small_icon_mode">Usa icone piccole</string>
@@ -44,9 +44,9 @@
    <string name="conn_establishing_title">Establishing Connection</string>
    <string name="conn_establishing_msg">Starting connection</string>
    <string name="conn_metered">Warning: Your active network connection is metered!</string>
-    <string name="conn_client_latency">Average client-side frame latency:</string>
+    <string name="conn_client_latency">Average frame decoding latency:</string>
    <string name="conn_client_latency_hw">hardware decoder latency:</string>
-    <string name="conn_hardware_latency">Average hardware decoder latency:</string>
+    <string name="conn_hardware_latency">Average hardware decoding latency:</string>
    <string name="conn_starting">Starting</string>
    <string name="conn_error_title">Connection Error</string>
    <string name="conn_error_msg">Failed to start</string>
@@ -102,7 +102,7 @@

    <string name="category_ui_settings">UI Settings</string>
    <string name="title_language_list">Language</string>
-    <string name="summary_language_list">Language to use for Limelight</string>
+    <string name="summary_language_list">Language to use for Moonlight</string>
    <string name="title_checkbox_list_mode">Use lists instead of grids</string>
    <string name="summary_checkbox_list_mode">Display apps and PCs in lists instead of grids</string>
    <string name="title_checkbox_small_icon_mode">Use small icons</string>
@@ -2,5 +2,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- Non-root application name -->
-    <application android:label="Limelight" />
+    <application android:label="Moonlight" />
 </manifest>
@@ -5,5 +5,5 @@
    <uses-permission android:name="android.permission.ACCESS_SUPERUSER" />

    <!-- Root application name -->
-    <application android:label="Limelight (Root)" />
+    <application android:label="Moonlight (Root)" />
 </manifest>
@@ -4,7 +4,7 @@ buildscript {
        jcenter()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
+        classpath 'com.android.tools.build:gradle:1.3.0'
    }
 }

@@ -12,8 +12,8 @@ This file serves to document some of the decoder errata when using MediaCodec ha
 4. Some decoders require num_ref_frames=1 and max_dec_frame_buffering=1 to avoid crashing on SPS on first I-frame
 	- Affected decoders: Qualcomm in GS3 on 4.3+, Exynos 4 at 1080p only

-5. Some decoders will hang if max_dec_frame_buffering is not present
-	- Affected decoders: MediaTek decoder in Fire HD 7 (2014)
+5. Some decoders will hang or crash if max_dec_frame_buffering is not present and level_idc is >= 50
+	- Affected decoders: MediaTek decoder in Fire HD 6/7 (2014)
 	
 6. Some decoders will hang if max_dec_frame_buffering IS present
 	- Affected decoders: Exynos 5 in Galaxy Note 10.1 (2014)
@@ -21,5 +21,11 @@ This file serves to document some of the decoder errata when using MediaCodec ha
 7. Some decoders will not enter low latency mode if adaptive playback is enabled
 	- Affected decoders: Intel decoder in Nexus Player

-8. Some decoders will not enter low latency mode if the profile isn't baseline in the first SPS.
-	- Affected decoders: Intel decoder in Nexus Player
+8. Some decoders will not enter low latency mode if the profile isn't baseline in the first SPS because B-frames may be present.
+	- Affected decoders: Intel decoder in Nexus Player (prior to Android 6.0)
+
+9. Some decoders will not enter low latency mode if the profile isn't constrained high profile because B-frames may be present.
+	- Affected decoders: Intel decoder in Nexus Player (after Android 6.0)
+
+10. Some decoders actually suffer increased latency when max_dec_frame_buffering=1
+	- Affected decoders: MediaTek decoder in Fire TV 2015
@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="moonlight-android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
  <component name="FacetManager">
    <facet type="java-gradle" name="Java-Gradle">
      <configuration>
        <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
      </configuration>
    </facet>
  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
    <exclude-output />
    <content url="file://$MODULE_DIR$">
      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
@@ -15,5 +16,4 @@
    <orderEntry type="inheritedJdk" />
    <orderEntry type="sourceFolder" forTests="false" />
  </component>
-</module>
-
+</module>
Author	SHA1	Message	Date
Cameron Gutman	c025f9f02b	Reduce code duplication	2015-10-17 15:44:24 -07:00
Cameron Gutman	b737acedb0	Bump version to 3.1.11	2015-10-15 02:00:29 -07:00
Cameron Gutman	f15bfe3038	Add support for mouse drag using long press	2015-10-15 01:50:05 -07:00
Cameron Gutman	8938f51292	Fix weird stair-stepping upward mouse movement on devices with a low scaling factor caused by rounding error (Nexus 9)	2015-10-15 01:48:31 -07:00
Cameron Gutman	4b92b8f714	Fix bug allowing computer polling to continue when the stream is resumed from the PcView activity	2015-10-15 00:55:05 -07:00
Cameron Gutman	5f13b9bca4	Don't set constraints 4 & 5 when using baseline profile hack	2015-10-13 19:29:36 -07:00
Cameron Gutman	2f219aac6f	Only apply the constrained high profile SPS modification to Intel devices to avoid crashing other devices	2015-10-12 20:54:50 -07:00
Cameron Gutman	1d9efb30e2	Update to version 3.1.10	2015-10-11 17:11:48 -07:00
Cameron Gutman	ed7be00881	Update IML file	2015-10-11 17:11:08 -07:00
Cameron Gutman	a6003f6bff	Remove MediaTek decoders from the decoders that need bitstream restrictions. The correct fix was to lower level_idc to reduce the required buffering. On newer MediaTek chipsets, sending bitstream restrictions actually slows down decoding by a factor of 3.	2015-10-11 16:57:37 -07:00
Cameron Gutman	4619045375	Revert "Update common to increase SSL handshake timeout" This reverts commit `57b0da1a3a`.	2015-10-11 14:54:45 -07:00
Cameron Gutman	e61b8f1b34	Try a TCP connection before trying HTTPS to quickly eliminate transport layer connectivity issues	2015-10-11 14:39:02 -07:00
Cameron Gutman	79b6ec839a	Fix machines becoming unreachable after they report IP addresses that they can't be contacted with	2015-10-11 14:16:38 -07:00
Cameron Gutman	fd12e30c53	Set constraint flags corresponding to Constrained High Profile on KitKat and higher. Fixes Nexus Player high latency on Android 6.0.	2015-10-10 23:28:48 -07:00
Cameron Gutman	87a9ca4318	Make touchscreen and stylus support more robust (supporting Bluetooth stylus in 6.0 and hopefully fixing broken touchscreen input on some devices)	2015-10-10 19:17:19 -07:00
Cameron Gutman	3f64411174	Only reload the PcView activity if UI settings were changed	2015-10-10 18:53:10 -07:00
Cameron Gutman	57b0da1a3a	Update common to increase SSL handshake timeout	2015-10-10 18:15:01 -07:00
Cameron Gutman	7d3e74a67f	Allow the offline context menu to be opened when the PC state is unknown	2015-10-10 18:10:57 -07:00
Cameron Gutman	d704e322df	Use RGB_565 for box art to reduce image size in memory	2015-10-10 18:09:51 -07:00
Cameron Gutman	f598153818	Small improvements to Media Codec DR	2015-10-10 15:17:24 -07:00
Cameron Gutman	f395a0c170	Fix warning	2015-10-10 15:04:49 -07:00
Cameron Gutman	654b33d27f	Update build tools version to 23.0.1	2015-10-10 15:04:16 -07:00
Cameron Gutman	6c12da96c9	Add patched Jcodec library built from master a5d138efec2e940897e7e3d91a63a1f58abedd95 with changes from https://github.com/jcodec/jcodec/pull/90	2015-10-10 15:03:47 -07:00
Cameron Gutman	1a6f639b81	Fix discovery issues when adding a PC	2015-10-10 14:43:29 -07:00
Cameron Gutman	59a00a38c9	Limit box art assets to 5 MB each to prevent OOM crashes	2015-10-10 14:43:17 -07:00
Cameron Gutman	2beee168e3	Update README.md with additional download links	2015-08-30 12:37:23 -07:00
Cameron Gutman	a92bbc7e5a	Increment version to 3.1.9	2015-08-18 00:44:01 -07:00
Cameron Gutman	fbc921dd07	Update build files	2015-08-18 00:39:01 -07:00
Cameron Gutman	59c6c3d777	Target Android 6.0 SDK	2015-08-18 00:38:49 -07:00
Cameron Gutman	e7ab61c8d0	Use jmDNS 3.4.2 which works properly on Android 6.0	2015-08-17 23:14:20 -07:00
Cameron Gutman	7023760782	Use monotonic system time for rendering timestamps. This is required now in Android 6.0 since these timestamps are propagated to the codec.	2015-08-17 18:40:25 -07:00
Cameron Gutman	932ce435b5	Remove unnecessary buffer clear	2015-08-17 18:26:33 -07:00
Cameron Gutman	af384d88f7	Handle potentially poisoned bitmap cache caused by truncated images from the server	2015-08-17 17:59:15 -07:00
Cameron Gutman	792846ddad	Update MediaCodec renderer to avoid deprecated features on Lollipop	2015-08-17 17:52:57 -07:00
Cameron Gutman	1187d9c78c	Update libraries	2015-08-14 09:29:56 -07:00
Cameron Gutman	37db9ab072	Update common with latest fixes	2015-08-12 00:39:07 -07:00
Cameron Gutman	fb40060560	Upgrade common jar to incorporate IDR frame fix	2015-08-04 23:46:20 -07:00
Cameron Gutman	a4f4887647	Upgrade build tools and libraries	2015-08-04 23:46:03 -07:00
Cameron Gutman	f1d7f556fd	Bump to version 3.1.8	2015-07-21 18:03:37 -07:00
Cameron Gutman	1e70e1d329	GFE 2.5.11 update to fix black screen on Fire TV Stick	2015-07-18 17:06:41 -07:00
Cameron Gutman	e02a009635	Add support for the Razer Serval controller. The start and select buttons are manually handled for devices without a mapping for them. The back button is ignored so it can be used to exit the stream.	2015-07-18 00:46:25 -07:00
Cameron Gutman	bd6ff35603	Update to 3.1.7	2015-06-15 10:37:58 -07:00
Cameron Gutman	1cb7727dc7	Update common	2015-06-15 10:28:31 -07:00
Cameron Gutman	0c73e3d0ae	Only propagate a decoder exception if it happens at the beginning of a stream	2015-06-15 10:28:09 -07:00
Cameron Gutman	6371d364e1	Lint warning cleanup	2015-05-29 23:22:40 -05:00
Cameron Gutman	ded9c9140d	Handle being online but not having a known reachability	2015-05-29 23:20:04 -05:00
Cameron Gutman	7c8a108e28	Use the leanback feature on API 21+ devices	2015-05-29 23:18:56 -05:00
Cameron Gutman	2a18ffcdba	Update to Gradle 1.2.3	2015-05-19 10:10:18 -05:00
Cameron Gutman	381d0d5e81	Add support for multi-window functionality on Samsung devices	2015-05-10 00:02:04 -05:00
Cameron Gutman	be126acfd1	Update version info to 3.1.6	2015-05-05 20:52:53 -04:00
Cameron Gutman	fc2f5cfe4d	Manually pass through Samsung capacitive buttons	2015-05-05 20:20:37 -04:00
Cameron Gutman	9878902a89	Use IDs to track controllers instead of descriptors. Fixes #64	2015-05-05 20:08:58 -04:00
Cameron Gutman	f1230d46f3	Android Studio 1.2 and Grade 1.2.2 update	2015-05-05 20:02:53 -04:00
Michelle Bergeron	d8822392f1	Link to site	2015-05-03 23:36:19 -07:00
Cameron Gutman	1d9cf71517	Total Eclipse of the Lime	2015-04-21 21:50:40 -04:00
Cameron Gutman	2160e87fef	Fix division by zero in ARC	2015-03-31 20:29:22 -04:00
Cameron Gutman	88249ba8aa	Enable direct submission for ARC	2015-03-31 19:59:16 -04:00
Cameron Gutman	2856617fb3	Only release controller numbers if they were reserved	2015-03-31 19:58:47 -04:00
Cameron Gutman	d822980d5a	Fix missing close of Closeables caught by StrictMode	2015-03-29 23:25:00 -04:00
Cameron Gutman	b5ba59b413	Fix database reference leak	2015-03-29 23:06:32 -04:00
Cameron Gutman	1148e0163c	Only assign a controller number when a valid controller input has been received. Fixes misdetection of other input devices as controllers (issue #65 ).	2015-03-29 22:54:48 -04:00
Cameron Gutman	cf36c7adb1	Increment version	2015-03-25 02:33:46 -04:00
Cameron Gutman	eac6998e17	Update the latency message strings to be more clear that this isn't end to end latency	2015-03-25 01:20:55 -04:00
Cameron Gutman	17afbffdb5	Include the time it takes to get an input buffer in the frame latency calculation	2015-03-25 01:08:23 -04:00
Cameron Gutman	072a439c2d	Update common and decode unit API	2015-03-25 00:32:22 -04:00