Bump version to 3.1.12

This reverts commit 57b0da1a3a.

README.md

@@ -19,7 +19,7 @@ Check our [wiki](https://github.com/moonlight-stream/moonlight-android/wiki) for
 ##Installation
 
 * Download and install Moonlight for Android from
-[Google Play](https://play.google.com/store/apps/details?id=com.limelight)
+[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

app/app.iml

@@ -12,10 +12,12 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateNonRootDebugSources" />
         <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugAndroidTest" />
         <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileNonRootDebugAndroidTestSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugAndroidTestSources" />
+        <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" />
@@ -24,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 />
@@ -34,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" />
@@ -47,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" />
@@ -104,15 +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>

app/build.gradle

@@ -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.2"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 23
 
-        versionName "3.1.6"
-        versionCode = 61
+        versionName "3.1.12"
+        versionCode = 69
     }
 
     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')
 }

app/src/main/AndroidManifest.xml

@@ -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>

app/src/main/java/com/limelight/AppView.java

@@ -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;

app/src/main/java/com/limelight/Game.java

@@ -1,7 +1,6 @@
 package com.limelight;
 
 
-import com.limelight.LimelightBuildProps;
 import com.limelight.binding.PlatformBinding;
 import com.limelight.binding.input.ControllerHandler;
 import com.limelight.binding.input.KeyboardTranslator;
@@ -64,6 +63,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private final TouchContext[] touchContextMap = new TouchContext[2];
     private long threeFingerDownTime = 0;
 
+    private static final double REFERENCE_HORIZ_RES = 1280;
+    private static final double REFERENCE_VERT_RES = 720;
+
     private static final int THREE_FINGER_TAP_THRESHOLD = 300;
 
     private ControllerHandler controllerHandler;
@@ -77,6 +79,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
     private boolean displayedFailureDialog = false;
     private boolean connecting = false;
     private boolean connected = false;
+    private boolean deferredSurfaceResize = false;
 
     private EvdevWatcher evdevWatcher;
     private int modifierFlags = 0;
@@ -207,17 +210,36 @@ public class Game extends Activity implements SurfaceHolder.Callback,
         InputManager inputManager = (InputManager) getSystemService(Context.INPUT_SERVICE);
         inputManager.registerInputDeviceListener(controllerHandler, null);
 
+        boolean aspectRatioMatch = false;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+            // On KitKat and later (where we can use the whole screen via immersive mode), we'll
+            // calculate whether we need to scale by aspect ratio or not. If not, we'll use
+            // setFixedSize so we can handle 4K properly. The only known devices that have
+            // >= 4K screens have exactly 4K screens, so we'll be able to hit this good path
+            // on these devices. On Marshmallow, we can start changing to 4K manually but no
+            // 4K devices run 6.0 at the moment.
+            double screenAspectRatio = ((double)screenSize.y) / screenSize.x;
+            double streamAspectRatio = ((double)prefConfig.height) / prefConfig.width;
+            if (Math.abs(screenAspectRatio - streamAspectRatio) < 0.001) {
+                LimeLog.info("Stream has compatible aspect ratio with output display");
+                aspectRatioMatch = true;
+            }
+        }
+
         SurfaceHolder sh = sv.getHolder();
-        if (prefConfig.stretchVideo || !decoderRenderer.isHardwareAccelerated()) {
+        if (prefConfig.stretchVideo || !decoderRenderer.isHardwareAccelerated() || aspectRatioMatch) {
             // Set the surface to the size of the video
             sh.setFixedSize(prefConfig.width, prefConfig.height);
         }
+        else {
+            deferredSurfaceResize = true;
+        }
 
         // Initialize touch contexts
         for (int i = 0; i < touchContextMap.length; i++) {
             touchContextMap[i] = new TouchContext(conn, i,
-                    ((double)prefConfig.width / (double)screenSize.x),
-                    ((double)prefConfig.height / (double)screenSize.y));
+                    (REFERENCE_HORIZ_RES / (double)screenSize.x),
+                    (REFERENCE_VERT_RES / (double)screenSize.y));
         }
 
         if (LimelightBuildProps.ROOT_BUILD) {
@@ -520,9 +542,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 +670,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;
@@ -687,8 +703,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
             // Scale the deltas if the device resolution is different
             // than the stream resolution
-            deltaX = (int)Math.round((double)deltaX * ((double)prefConfig.width / (double)screenSize.x));
-            deltaY = (int)Math.round((double)deltaY * ((double)prefConfig.height / (double)screenSize.y));
+            deltaX = (int)Math.round((double)deltaX * (REFERENCE_HORIZ_RES / (double)screenSize.x));
+            deltaY = (int)Math.round((double)deltaY * (REFERENCE_VERT_RES / (double)screenSize.y));
 
             conn.sendMouseMove((short)deltaX, (short)deltaY);
         }
@@ -806,7 +822,7 @@ public class Game extends Activity implements SurfaceHolder.Callback,
 
             // Resize the surface to match the aspect ratio of the video
             // This must be done after the surface is created.
-            if (!prefConfig.stretchVideo && decoderRenderer.isHardwareAccelerated()) {
+            if (deferredSurfaceResize) {
                 resizeSurfaceWithAspectRatio((SurfaceView) findViewById(R.id.surfaceView),
                         prefConfig.width, prefConfig.height);
             }

app/src/main/java/com/limelight/PcView.java

@@ -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

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

@@ -9,14 +9,13 @@ import com.limelight.nvstream.av.audio.AudioRenderer;
 
 public class AndroidAudioRenderer implements AudioRenderer {
 
-    private static final int FRAME_SIZE = 960;
-
     private AudioTrack track;
 
     @Override
-    public boolean streamInitialized(int channelCount, int sampleRate) {
+    public boolean streamInitialized(int channelCount, int channelMask, int samplesPerFrame, int sampleRate) {
         int channelConfig;
         int bufferSize;
+        int bytesPerFrame = (samplesPerFrame * 2);
 
         switch (channelCount)
         {
@@ -26,6 +25,12 @@ public class AndroidAudioRenderer implements AudioRenderer {
         case 2:
             channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
             break;
+        case 4:
+            channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
+            break;
+        case 6:
+            channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
+            break;
         default:
             LimeLog.severe("Decoder returned unhandled channel count");
             return false;
@@ -38,7 +43,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
         // use the recommended larger buffer size.
         try {
             // Buffer two frames of audio if possible
-            bufferSize = FRAME_SIZE * 2;
+            bufferSize = bytesPerFrame * 2;
 
             track = new AudioTrack(AudioManager.STREAM_MUSIC,
                     sampleRate,
@@ -59,10 +64,10 @@ public class AndroidAudioRenderer implements AudioRenderer {
             bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
                             channelConfig,
                             AudioFormat.ENCODING_PCM_16BIT),
-                    FRAME_SIZE * 2);
+                    bytesPerFrame * 2);
 
             // Round to next frame
-            bufferSize = (((bufferSize + (FRAME_SIZE - 1)) / FRAME_SIZE) * FRAME_SIZE);
+            bufferSize = (((bufferSize + (bytesPerFrame - 1)) / bytesPerFrame) * bytesPerFrame);
 
             track = new AudioTrack(AudioManager.STREAM_MUSIC,
                     sampleRate,

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

@@ -1,7 +1,5 @@
 package com.limelight.binding.input;
 
-import java.util.Map;
-
 import android.hardware.input.InputManager;
 import android.os.SystemClock;
 import android.util.SparseArray;
@@ -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
@@ -275,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
@@ -298,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
@@ -306,10 +313,16 @@ 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 classify them as remotes
-            // so the back button gets passed through to exit streaming
+            // 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.isRemote = true;
+                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;
             }
         }
 
@@ -349,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;
             }
@@ -394,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()) {
@@ -815,9 +838,10 @@ 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;

app/src/main/java/com/limelight/binding/input/TouchContext.java

@@ -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() {

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

@@ -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
@@ -251,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();

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

@@ -4,6 +4,7 @@ import java.nio.ByteBuffer;
 import java.util.Locale;
 import java.util.concurrent.locks.LockSupport;
 
+import org.jcodec.codecs.h264.H264Utils;
 import org.jcodec.codecs.h264.io.model.SeqParameterSet;
 import org.jcodec.codecs.h264.io.model.VUIParameters;
 
@@ -13,7 +14,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 +22,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 +48,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     private int numPpsIn;
     private int numIframeIn;
 
-    @TargetApi(Build.VERSION_CODES.KITKAT)
     public MediaCodecDecoderRenderer() {
         //dumpDecoders();
 
@@ -57,7 +58,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 +70,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 +78,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 +124,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 +139,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 +176,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 +185,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 +208,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 +227,6 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     private void startLegacyRendererThread()
     {
         rendererThread = new Thread() {
-            @SuppressWarnings("deprecation")
             @Override
             public void run() {
                 BufferInfo info = new BufferInfo();
@@ -240,7 +243,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                                 inputIndex = dequeueInputBuffer(false, false);
                                 du = depacketizer.pollNextDecodeUnit();
                                 if (du != null) {
-                                    lastDuDequeueTime = System.currentTimeMillis();
+                                    lastDuDequeueTime = MediaCodecHelper.getMonotonicMillis();
                                     notifyDuReceived(du);
                                 }
 
@@ -249,7 +252,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                                     break;
                                 }
 
-                                submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+                                submitDecodeUnit(du, inputIndex);
 
                                 du = null;
                                 inputIndex = -1;
@@ -282,7 +285,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                     if (du == null) {
                         du = depacketizer.pollNextDecodeUnit();
                         if (du != null) {
-                            lastDuDequeueTime = System.currentTimeMillis();
+                            lastDuDequeueTime = MediaCodecHelper.getMonotonicMillis();
                             notifyDuReceived(du);
                         }
                     }
@@ -290,12 +293,12 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                     // 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;
@@ -321,7 +324,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;
@@ -335,9 +338,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());
@@ -365,7 +365,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();
@@ -406,7 +408,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) {
@@ -420,9 +422,44 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         }
     }
 
+    // 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();
+        }
+
+        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, ByteBuffer buf, int inputBufferIndex) {
-        long timestampUs = System.currentTimeMillis() * 1000;
+    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
@@ -430,8 +467,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();
@@ -455,7 +491,9 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
                 // Skip to the start of the NALU data
                 spsBuf.position(header.offset+5);
 
-                SeqParameterSet sps = SeqParameterSet.read(spsBuf);
+                // The H264Utils.readSPS function safely handles
+                // Annex B NALUs (including NALUs with escape sequences)
+                SeqParameterSet sps = H264Utils.readSPS(spsBuf);
 
                 // Some decoders rely on H264 level to decide how many buffers are needed
                 // Since we only need one frame buffered, we'll set the level as low as we can
@@ -483,19 +521,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
@@ -505,11 +568,16 @@ 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);
 
-                // Write the modified SPS to the input buffer
-                sps.write(buf);
+                // The H264Utils.writeSPS function safely handles
+                // Annex B NALUs (including NALUs with escape sequences)
+                ByteBuffer escapedNalu = H264Utils.writeSPS(sps, header.length);
+                buf.put(escapedNalu);
 
                 queueInputBuffer(inputBufferIndex,
                         0, buf.position(),
@@ -549,9 +617,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});
@@ -559,6 +625,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);
 
@@ -568,7 +637,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");
@@ -609,7 +678,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
     }
 
     private void notifyDuReceived(DecodeUnit du) {
-        long currentTime = System.currentTimeMillis();
+        long currentTime = MediaCodecHelper.getMonotonicMillis();
         long delta = currentTime-du.getReceiveTimestamp();
         if (delta >= 0 && delta < 1000) {
             totalTimeMs += currentTime-du.getReceiveTimestamp();
@@ -633,7 +702,7 @@ public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
         }
 
         if (inputIndex >= 0) {
-            submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
+            submitDecodeUnit(du, inputIndex);
         }
     }
 
@@ -664,6 +733,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: ";

app/src/main/java/com/limelight/binding/video/MediaCodecHelper.java

@@ -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>();
@@ -58,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>();
@@ -69,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) {
@@ -83,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) {
@@ -113,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();
     }

app/src/main/java/com/limelight/computers/ComputerManagerService.java

@@ -31,11 +31,12 @@ import android.os.IBinder;
 import org.xmlpull.v1.XmlPullParserException;
 
 public class ComputerManagerService extends Service {
-    private static final int SERVERINFO_POLLING_PERIOD_MS = 3000;
+    private static final int SERVERINFO_POLLING_PERIOD_MS = 1500;
     private static final int APPLIST_POLLING_PERIOD_MS = 30000;
+    private static final int APPLIST_FAILED_POLLING_RETRY_MS = 2000;
     private static final int MDNS_QUERY_PERIOD_MS = 1000;
     private static final int FAST_POLL_TIMEOUT = 500;
-    private static final int OFFLINE_POLL_TRIES = 3;
+    private static final int OFFLINE_POLL_TRIES = 5;
 
     private final ComputerManagerBinder binder = new ComputerManagerBinder();
 
@@ -119,7 +120,7 @@ public class ComputerManagerService extends Service {
         return true;
     }
 
-    private Thread createPollingThread(final ComputerDetails details) {
+    private Thread createPollingThread(final PollingTuple tuple) {
         Thread t = new Thread() {
             @Override
             public void run() {
@@ -127,24 +128,26 @@ public class ComputerManagerService extends Service {
                 int offlineCount = 0;
                 while (!isInterrupted() && pollingActive) {
                     try {
-                        // Check if this poll has modified the details
-                        if (!runPoll(details, false, offlineCount)) {
-                            LimeLog.warning(details.name + " is offline (try " + offlineCount + ")");
-                            offlineCount++;
-                        }
-                        else {
-                            offlineCount = 0;
+                        // Only allow one request to the machine at a time
+                        synchronized (tuple.networkLock) {
+                            // Check if this poll has modified the details
+                            if (!runPoll(tuple.computer, false, offlineCount)) {
+                                LimeLog.warning(tuple.computer.name + " is offline (try " + offlineCount + ")");
+                                offlineCount++;
+                            } else {
+                                offlineCount = 0;
+                            }
                         }
 
                         // Wait until the next polling interval
-                        Thread.sleep(SERVERINFO_POLLING_PERIOD_MS / ((offlineCount > 0) ? 2 : 1));
+                        Thread.sleep(SERVERINFO_POLLING_PERIOD_MS);
                     } catch (InterruptedException e) {
                         break;
                     }
                 }
             }
         };
-        t.setName("Polling thread for "+details.localIp.getHostAddress());
+        t.setName("Polling thread for " + tuple.computer.localIp.getHostAddress());
         return t;
     }
 
@@ -166,7 +169,7 @@ public class ComputerManagerService extends Service {
                         // Report this computer initially
                         listener.notifyComputerUpdated(tuple.computer);
 
-                        tuple.thread = createPollingThread(tuple.computer);
+                        tuple.thread = createPollingThread(tuple);
                         tuple.thread.start();
                     }
                 }
@@ -283,7 +286,7 @@ public class ComputerManagerService extends Service {
 
                     // Start a polling thread if polling is active
                     if (pollingActive && tuple.thread == null) {
-                        tuple.thread = createPollingThread(details);
+                        tuple.thread = createPollingThread(tuple);
                         tuple.thread.start();
                     }
 
@@ -293,7 +296,10 @@ public class ComputerManagerService extends Service {
             }
 
             // If we got here, we didn't find an entry
-            PollingTuple tuple = new PollingTuple(details, pollingActive ? createPollingThread(details) : null);
+            PollingTuple tuple = new PollingTuple(details, null);
+            if (pollingActive) {
+                tuple.thread = createPollingThread(tuple);
+            }
             pollingTuples.add(tuple);
             if (tuple.thread != null) {
                 tuple.thread.start();
@@ -368,6 +374,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));
@@ -393,7 +404,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) {
@@ -451,7 +462,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;
 
@@ -465,11 +476,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);
@@ -481,6 +492,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) {
@@ -490,27 +502,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) {
@@ -569,6 +613,7 @@ public class ComputerManagerService extends Service {
         private Thread thread;
         private final ComputerDetails computer;
         private final Object pollEvent = new Object();
+        private boolean receivedAppList = false;
 
         public ApplistPoller(ComputerDetails computer) {
             this.computer = computer;
@@ -583,7 +628,15 @@ public class ComputerManagerService extends Service {
         private boolean waitPollingDelay() {
             try {
                 synchronized (pollEvent) {
-                    pollEvent.wait(APPLIST_POLLING_PERIOD_MS);
+                    if (receivedAppList) {
+                        // If we've already reported an app list successfully,
+                        // wait the full polling period
+                        pollEvent.wait(APPLIST_POLLING_PERIOD_MS);
+                    }
+                    else {
+                        // If we've failed to get an app list so far, retry much earlier
+                        pollEvent.wait(APPLIST_FAILED_POLLING_RETRY_MS);
+                    }
                 }
             } catch (InterruptedException e) {
                 return false;
@@ -592,6 +645,18 @@ public class ComputerManagerService extends Service {
             return thread != null && !thread.isInterrupted();
         }
 
+        private PollingTuple getPollingTuple(ComputerDetails details) {
+            synchronized (pollingTuples) {
+                for (PollingTuple tuple : pollingTuples) {
+                    if (details.uuid.equals(tuple.computer.uuid)) {
+                        return tuple;
+                    }
+                }
+            }
+
+            return null;
+        }
+
         public void start() {
             thread = new Thread() {
                 @Override
@@ -622,9 +687,23 @@ public class ComputerManagerService extends Service {
                         NvHTTP http = new NvHTTP(selectedAddr, idManager.getUniqueId(),
                                 null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
 
+                        PollingTuple tuple = getPollingTuple(computer);
+
                         try {
-                            // Query the app list from the server
-                            String appList = http.getAppListRaw();
+                            String appList;
+                            if (tuple != null) {
+                                // If we're polling this machine too, grab the network lock
+                                // while doing the app list request to prevent other requests
+                                // from being issued in the meantime.
+                                synchronized (tuple.networkLock) {
+                                    appList = http.getAppListRaw();
+                                }
+                            }
+                            else {
+                                // No polling is happening now, so we just call it directly
+                                appList = http.getAppListRaw();
+                            }
+
                             List<NvApp> list = NvHTTP.getAppListByReader(new StringReader(appList));
                             if (appList != null && !appList.isEmpty() && !list.isEmpty()) {
                                 // Open the cache file
@@ -639,11 +718,12 @@ public class ComputerManagerService extends Service {
                                         if (cacheOut != null) {
                                             cacheOut.close();
                                         }
-                                    } catch (IOException e) {}
+                                    } catch (IOException ignored) {}
                                 }
 
                                 // Update the computer
                                 computer.rawAppList = appList;
+                                receivedAppList = true;
 
                                 // Notify that the app list has been updated
                                 // and ensure that the thread is still active
@@ -680,9 +760,21 @@ public class ComputerManagerService extends Service {
 class PollingTuple {
     public Thread thread;
     public final ComputerDetails computer;
+    public final Object networkLock;
 
     public PollingTuple(ComputerDetails computer, Thread thread) {
         this.computer = computer;
         this.thread = thread;
+        this.networkLock = new Object();
+    }
+}
+
+class ReachabilityTuple {
+    public final InetAddress reachableAddress;
+    public final ComputerDetails computer;
+
+    public ReachabilityTuple(ComputerDetails computer, InetAddress reachableAddress) {
+        this.computer = computer;
+        this.reachableAddress = reachableAddress;
     }
 }

app/src/main/java/com/limelight/grid/AppGridAdapter.java

@@ -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;

app/src/main/java/com/limelight/grid/assets/CachedAppAssetLoader.java

@@ -105,7 +105,11 @@ public class CachedAppAssetLoader {
 
                 // 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

app/src/main/java/com/limelight/grid/assets/DiskAssetLoader.java

@@ -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");
+            }
         }
     }
 }

app/src/main/java/com/limelight/grid/assets/NetworkAssetLoader.java

@@ -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);

app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java

@@ -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) {

app/src/main/java/com/limelight/preferences/StreamSettings.java

@@ -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 {

app/src/main/java/com/limelight/utils/CacheHelper.java

@@ -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);
         }
     }

app/src/main/jni/nv_opus_dec/nv_opus_dec.c

@@ -1,17 +1,21 @@
 #include <stdlib.h>
-#include <opus.h>
+#include <opus_multistream.h>
 #include "nv_opus_dec.h"
 
-OpusDecoder* decoder;
+OpusMSDecoder* decoder;
 
 // This function must be called before
 // any other decoding functions
-int nv_opus_init(void) {
+int nv_opus_init(int sampleRate, int channelCount, int streams,
+				 int coupledStreams, const unsigned char *mapping) {
 	int err;
-	decoder = opus_decoder_create(
-		nv_opus_get_sample_rate(),
-		nv_opus_get_channel_count(),
-		&err);
+	decoder = opus_multistream_decoder_create(
+			sampleRate,
+			channelCount,
+			streams,
+			coupledStreams,
+			mapping,
+			&err);
 	return err;
 }
 
@@ -19,36 +23,20 @@ int nv_opus_init(void) {
 // decoding is finished
 void nv_opus_destroy(void) {
 	if (decoder != NULL) {
-		opus_decoder_destroy(decoder);
+		opus_multistream_decoder_destroy(decoder);
 	}
 }
 
-// The Opus stream is stereo
-int nv_opus_get_channel_count(void) {
-	return 2;
-}
-
-// This number assumes 16-bit samples at 48 KHz with 2.5 ms frames
-int nv_opus_get_max_out_shorts(void) {
-	return 240*nv_opus_get_channel_count();
-}
-
-// The Opus stream is 48 KHz
-int nv_opus_get_sample_rate(void) {
-	return 48000;
-}
-
-// outpcmdata must be 5760*2 shorts in length
 // packets must be decoded in order
 // a packet loss must call this function with NULL indata and 0 inlen
 // returns the number of decoded samples
-int nv_opus_decode(unsigned char* indata, int inlen, short* outpcmdata) {
+int nv_opus_decode(unsigned char* indata, int inlen, short* outpcmdata, int framesize) {
 	int err;
 
 	// Decoding to 16-bit PCM with FEC off
 	// Maximum length assuming 48KHz sample rate
-	err = opus_decode(decoder, indata, inlen,
-		outpcmdata, 512, 0);
+	err = opus_multistream_decode(decoder, indata, inlen,
+		outpcmdata, framesize, 0);
 
 	return err;
 }

app/src/main/jni/nv_opus_dec/nv_opus_dec.h

@@ -1,6 +1,4 @@
-int nv_opus_init(void);
+int nv_opus_init(int sampleRate, int channelCount, int streams,
+                 int coupledStreams, const unsigned char *mapping);
 void nv_opus_destroy(void);
-int nv_opus_get_channel_count(void);
-int nv_opus_get_max_out_shorts(void);
-int nv_opus_get_sample_rate(void);
-int nv_opus_decode(unsigned char* indata, int inlen, short* outpcmdata);
+int nv_opus_decode(unsigned char* indata, int inlen, short* outpcmdata, int framesize);

app/src/main/jni/nv_opus_dec/nv_opus_dec_jni.c

@@ -3,11 +3,26 @@
 #include <stdlib.h>
 #include <jni.h>
 
+static int SamplesPerChannel;
+static int ChannelCount;
+
 // This function must be called before
 // any other decoding functions
 JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_av_audio_OpusDecoder_init(JNIEnv *env, jobject this) {
-	return nv_opus_init();
+Java_com_limelight_nvstream_av_audio_OpusDecoder_init(JNIEnv *env, jobject this, int sampleRate,
+													  int samplesPerChannel, int channelCount, int streams,
+													  int coupledStreams, jbyteArray mapping) {
+	jbyte* jni_mapping_data;
+	jint ret;
+
+	SamplesPerChannel = samplesPerChannel;
+	ChannelCount = channelCount;
+
+	jni_mapping_data = (*env)->GetByteArrayElements(env, mapping, 0);
+	ret =  nv_opus_init(sampleRate, channelCount, streams, coupledStreams, jni_mapping_data);
+	(*env)->ReleaseByteArrayElements(env, mapping, jni_mapping_data, JNI_ABORT);
+
+	return ret;
 }
 
 // This function must be called after
@@ -17,28 +32,9 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_destroy(JNIEnv *env, jobject th
 	nv_opus_destroy();
 }
 
-// The Opus stream is stereo
-JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_av_audio_OpusDecoder_getChannelCount(JNIEnv *env, jobject this) {
-	return nv_opus_get_channel_count();
-}
-
-// This number assumes 2 channels at 48 KHz
-JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_av_audio_OpusDecoder_getMaxOutputShorts(JNIEnv *env, jobject this) {
-	return nv_opus_get_max_out_shorts();
-}
-
-// The Opus stream is 48 KHz
-JNIEXPORT jint JNICALL
-Java_com_limelight_nvstream_av_audio_OpusDecoder_getSampleRate(JNIEnv *env, jobject this) {
-	return nv_opus_get_sample_rate();
-}
-
-// outpcmdata must be 5760*2 shorts in length
 // packets must be decoded in order
 // a packet loss must call this function with NULL indata and 0 inlen
-// returns the number of decoded samples
+// returns the number of decoded bytes
 JNIEXPORT jint JNICALL
 Java_com_limelight_nvstream_av_audio_OpusDecoder_decode(
 	JNIEnv *env, jobject this, // JNI parameters
@@ -53,13 +49,18 @@ Java_com_limelight_nvstream_av_audio_OpusDecoder_decode(
 	if (indata != NULL) {
 		jni_input_data = (*env)->GetByteArrayElements(env, indata, 0);
 
-		ret = nv_opus_decode(&jni_input_data[inoff], inlen, (jshort*)jni_pcm_data);
+		ret = nv_opus_decode(&jni_input_data[inoff], inlen, (jshort*)jni_pcm_data, SamplesPerChannel);
 
 		// The input data isn't changed so it can be safely aborted
 		(*env)->ReleaseByteArrayElements(env, indata, jni_input_data, JNI_ABORT);
 	}
 	else {
-		ret = nv_opus_decode(NULL, 0, (jshort*)jni_pcm_data);
+		ret = nv_opus_decode(NULL, 0, (jshort*)jni_pcm_data, SamplesPerChannel);
+	}
+
+	// Convert samples (2 bytes) per channel to total bytes returned
+	if (ret > 0) {
+		ret *= ChannelCount * 2;
 	}
 
 	(*env)->ReleaseByteArrayElements(env, outpcmdata, jni_pcm_data, 0);

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.2.2'
+        classpath 'com.android.tools.build:gradle:1.3.0'
     }
 }
 

decoder-errata.txt

@@ -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

moonlight-android.iml

@@ -8,7 +8,7 @@
       </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" />