Version 9.9.1

Update moonlight-common-c with RTSP handshake retry logic
Version 9.9
2021-04-29 18:32:08 -05:00 · 2021-04-29 18:23:41 -05:00 · 2021-04-27 18:20:00 -05:00 · 2021-04-27 17:46:37 -05:00 · 2021-04-27 17:44:14 -05:00 · 2021-04-27 17:43:19 -05:00
329 changed files with 46105 additions and 2379 deletions
@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Follow the troubleshooting guide before reporting a bug
+
+---
+**READ ME FIRST!**
+If you're here because something basic is not working (like gamepad input, video, or similar), it's probably something specific to your setup, so make sure you've gone through the Troubleshooting Guide first: https://github.com/moonlight-stream/moonlight-docs/wiki/Troubleshooting
+
+If you still have trouble with basic functionality after following the guide, join our Discord server where there are many other volunteers who can help (or direct you back here if it looks like a Moonlight bug after all). https://moonlight-stream.org/discord
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**Steps to reproduce**
+Any special steps that are required for the bug to appear.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem. If the issue is related to video glitching or poor quality, please include screenshots.
+
+**Affected games**
+List the games you've tried that exhibit the issue. To see if the issue is game-specific, try streaming Steam Big Picture with Moonlight and see if the issue persists there.
+
+**Other Moonlight clients**
+- Does the issue occur when using Moonlight on PC or iOS?
+
+**Moonlight settings (please complete the following information)**
+- Have any settings been adjusted from defaults?
+- If so, which settings have been changed?
+- Does the problem still occur after reverting settings back to default?
+
+**Gamepad-related issues (please complete if problem is gamepad-related)**
+- Do you have any gamepads connected to your host PC directly?
+- If gamepad input is not working, does it work if you use Moonlight's on-screen controls?
+- Does the problem still remain if you stream the desktop and use https://html5gamepad.com to test your gamepad?
+  - Instructions for streaming the desktop can be found here: https://github.com/moonlight-stream/moonlight-docs/wiki/Setup-Guide
+
+**Device details (please complete the following information)**
+ - Android version: [e.g. Android 10]
+ - Device model: [e.g. Samsung Galaxy S21]
+
+**Server PC details (please complete the following information)**
+ - OS: [e.g. Windows 10 1809]
+ - GeForce Experience version: [e.g. 3.16.0.140]
+ - Nvidia GPU driver: [e.g. 417.35]
+ - Antivirus and firewall software: [e.g. Windows Defender and Windows Firewall]
+
+**Additional context**
+Anything else you think may be relevant to the issue or special about your specific setup.
@@ -0,0 +1 @@
+blank_issues_enabled: false
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
@@ -0,0 +1,4 @@
+issuesOpened: >
+  If this is a question about Moonlight or you need help troubleshooting a streaming problem, please use the help channels on our [Discord server](https://moonlight-stream.org/discord) instead of GitHub issues. There are many more people available on Discord to help you and answer your questions.<br /><br />
+  This issue tracker should only be used for specific bugs or feature requests.<br /><br />
+  Thank you, and happy streaming!
@@ -3,6 +3,7 @@
 *.ap_
 *.aab
 output.json
+output-metadata.json
 out/

 # files for the dex VM
@@ -38,3 +39,6 @@ build/
 # Compiled JNI libraries folder
 **/jniLibs
 app/.externalNativeBuild/
+
+# NDK stuff
+.cxx/
@@ -1,3 +1,3 @@
-[submodule "moonlight-common"]
-	path = moonlight-common
-	url = https://github.com/moonlight-stream/moonlight-common.git
+[submodule "app/src/main/jni/moonlight-core/moonlight-common-c"]
+	path = app/src/main/jni/moonlight-core/moonlight-common-c
+	url = https://github.com/moonlight-stream/moonlight-common-c.git
@@ -1,54 +1,28 @@
 # Moonlight Android

-[Moonlight](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
-We reverse engineered the Shield streaming software and created a version that can be run on any Android device.
+[![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/232a8tadrrn8jv0k/branch/master?svg=true)](https://ci.appveyor.com/project/cgutman/moonlight-android/branch/master)
+[![Translation Status](https://hosted.weblate.org/widgets/moonlight/-/moonlight-android/svg-badge.svg)](https://hosted.weblate.org/projects/moonlight/moonlight-android/)

-Moonlight will allow you to stream your full collection of games from your Windows PC to your Android device,
+[Moonlight for Android](https://moonlight-stream.org) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield.
+
+Moonlight for Android will allow you to stream your full collection of games from your Windows PC to your Android device,
 whether in your own home or over the internet.

-Check our [wiki](https://github.com/moonlight-stream/moonlight-docs/wiki) for more detailed information or a troubleshooting guide. 
+Moonlight also has a [PC client](https://github.com/moonlight-stream/moonlight-qt) and [iOS/tvOS client](https://github.com/moonlight-stream/moonlight-ios).

-## Features
+You can follow development on our [Discord server](https://moonlight-stream.org/discord) and help translate Moonlight into your language on [Weblate](https://hosted.weblate.org/projects/moonlight/moonlight-android/).

-* Streams any of your games from your PC to your Android device
-* Full gamepad support for MOGA, Xbox 360, PS3, OUYA, and Shield
-* Automatically finds GameStream-compatible PCs on your network
-
-## Installation
-
-* Download and install Moonlight for Android from
-[Google Play](https://play.google.com/store/apps/details?id=com.limelight), [Amazon App Store](http://www.amazon.com/gp/product/B00JK4MFN2), or directly from the [releases page](https://github.com/moonlight-stream/moonlight-android/releases)
-* Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC
-
-## Requirements
-
-* [GameStream compatible](http://shield.nvidia.com/play-pc-games/) computer with an NVIDIA GeForce GTX 600 series or higher desktop or mobile GPU (GT-series and AMD GPUs not supported)
-* Android device running 4.1 (Jelly Bean) or higher
-* High-end wireless router (802.11n dual-band recommended)
-
-## Usage
-
-* Turn on GameStream in the GFE settings
-* If you are connecting from outside the same network, turn on internet
-  streaming
-* When on the same network as your PC, open Moonlight and tap on your PC in the list
-* Accept the pairing confirmation on your PC and add the PIN if needed
-* Tap your PC again to view the list of apps to stream
-* Play games!
-
-## Contribute
-
-This project is being actively developed at [XDA Developers](http://forum.xda-developers.com/showthread.php?t=2505510)
-
-1. Fork us
-2. Write code
-3. Send Pull Requests
+## Downloads
+* [Google Play Store](https://play.google.com/store/apps/details?id=com.limelight)
+* [Amazon App Store](https://www.amazon.com/gp/product/B00JK4MFN2)
+* [F-Droid](https://f-droid.org/packages/com.limelight)
+* [APK](https://github.com/moonlight-stream/moonlight-android/releases)

 ## Building
 * Install Android Studio and the Android NDK
 * Run ‘git submodule update --init --recursive’ from within moonlight-android/
 * In moonlight-android/, create a file called ‘local.properties’. Add an ‘ndk.dir=’ property to the local.properties file and set it equal to your NDK directory.
-* Build the APK using Android Studio
+* Build the APK using Android Studio or gradle

 ## Authors

@@ -1,15 +1,16 @@
 apply plugin: 'com.android.application'

 android {
-    buildToolsVersion '28.0.3'
-    compileSdkVersion 28
+    ndkVersion "22.1.7171670"
+
+    compileSdkVersion 30

    defaultConfig {
        minSdkVersion 16
-        targetSdkVersion 28
+        targetSdkVersion 30

-        versionName "7.2.1"
-        versionCode = 192
+        versionName "9.9.1"
+        versionCode = 261
    }

    flavorDimensions "root"
@@ -44,6 +45,7 @@ android {

    lintOptions {
        disable 'MissingTranslation'
+        lintConfig file("lint.xml")
    }

    bundle {
@@ -65,7 +67,6 @@ android {
            applicationIdSuffix ".debug"

            minifyEnabled true
-            useProguard false
            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
        }
        release {
@@ -114,9 +115,10 @@ android {
 }

 dependencies {
-    implementation 'org.bouncycastle:bcprov-jdk15on:1.59'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.59'
+    implementation 'org.bouncycastle:bcprov-jdk15on:1.66'
+    implementation 'org.bouncycastle:bcpkix-jdk15on:1.66'
    implementation 'org.jcodec:jcodec:0.2.3'
-
-    implementation project(':moonlight-common')
+    implementation 'com.squareup.okhttp3:okhttp:3.12.12'
+    implementation 'com.squareup.okio:okio:1.17.5'
+    implementation 'org.jmdns:jmdns:3.5.5'
 }
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+    <issue id="InvalidPackage">
+        <ignore path="**/bcpkix-jdk15on-*.jar"/>
+    </issue>
+</lint>
@@ -8,6 +8,8 @@
    <uses-permission android:name="android.permission.WAKE_LOCK" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+    <uses-permission android:name="com.android.providers.tv.permission.READ_EPG_DATA"/>
+    <uses-permission android:name="com.android.providers.tv.permission.WRITE_EPG_DATA"/>

    <uses-feature
        android:name="android.hardware.touchscreen"
@@ -39,8 +41,15 @@
        android:appCategory="game"
        android:icon="@mipmap/ic_launcher"
        android:roundIcon="@mipmap/ic_launcher"
+        android:installLocation="auto"
+        android:gwpAsanMode="always"
        android:theme="@style/AppTheme">
-
+        <provider
+            android:name=".PosterContentProvider"
+            android:authorities="poster.${applicationId}"
+            android:enabled="true"
+            android:exported="true">
+        </provider>
        <!-- Samsung multi-window support -->
        <uses-library
            android:name="com.sec.android.app.multiwindow"
@@ -55,6 +64,7 @@

        <activity
            android:name=".PcView"
+            android:exported="true"
            android:resizeableActivity="true"
            android:configChanges="mcc|mnc|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
            <intent-filter>
@@ -96,6 +106,7 @@
        <activity
            android:name=".preferences.AddComputerManually"
            android:resizeableActivity="true"
+            android:windowSoftInputMode="stateVisible"
            android:label="Add Computer Manually">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
@@ -111,10 +122,20 @@
            android:resizeableActivity="true"
            android:launchMode="singleTask"
            android:excludeFromRecents="true"
-            android:theme="@style/StreamTheme">
+            android:theme="@style/StreamTheme"
+            android:preferMinimalPostProcessing="true">
            <meta-data
                android:name="android.support.PARENT_ACTIVITY"
                android:value="com.limelight.AppView" />
+
+            <!-- Special metadata for NVIDIA Shield devices to prevent input buffering
+                 and most importantly, opt out of mouse acceleration while streaming -->
+            <meta-data
+                android:name="com.nvidia.immediateInput"
+                android:value="true" />
+            <meta-data
+                android:name="com.nvidia.rawCursorInput"
+                android:value="true" />
        </activity>

        <service
@@ -2,6 +2,7 @@ package com.limelight;

 import java.io.IOException;
 import java.io.StringReader;
+import java.util.HashSet;
 import java.util.List;

 import com.limelight.computers.ComputerManagerListener;
@@ -26,6 +27,8 @@ import android.app.Service;
 import android.content.ComponentName;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
@@ -58,16 +61,22 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    private int lastRunningAppId;
    private boolean suspendGridUpdates;
    private boolean inForeground;
+    private boolean showHiddenApps;
+    private HashSet<Integer> hiddenAppIds = new HashSet<>();

    private final static int START_OR_RESUME_ID = 1;
    private final static int QUIT_ID = 2;
-    private final static int CANCEL_ID = 3;
    private final static int START_WITH_QUIT = 4;
    private final static int VIEW_DETAILS_ID = 5;
    private final static int CREATE_SHORTCUT_ID = 6;
+    private final static int HIDE_APP_ID = 7;
+
+    public final static String HIDDEN_APPS_PREF_FILENAME = "HiddenApps";

    public final static String NAME_EXTRA = "Name";
    public final static String UUID_EXTRA = "UUID";
+    public final static String NEW_PAIR_EXTRA = "NewPair";
+    public final static String SHOW_HIDDEN_APPS_EXTRA = "ShowHiddenApps";

    private ComputerManagerService.ComputerManagerBinder managerBinder;
    private final ServiceConnection serviceConnection = new ServiceConnection() {
@@ -89,17 +98,23 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                        return;
                    }

+                    // Add a launcher shortcut for this PC (forced, since this is user interaction)
+                    shortcutHelper.createAppViewShortcut(computer, true, getIntent().getBooleanExtra(NEW_PAIR_EXTRA, false));
+                    shortcutHelper.reportComputerShortcutUsed(computer);
+
                    try {
                        appGridAdapter = new AppGridAdapter(AppView.this,
-                                PreferenceConfiguration.readPreferences(AppView.this).listMode,
-                                PreferenceConfiguration.readPreferences(AppView.this).smallIconMode,
-                                computer, localBinder.getUniqueId());
+                                PreferenceConfiguration.readPreferences(AppView.this),
+                                computer, localBinder.getUniqueId(),
+                                showHiddenApps);
                    } catch (Exception e) {
                        e.printStackTrace();
                        finish();
                        return;
                    }

+                    appGridAdapter.updateHiddenApps(hiddenAppIds, true);
+
                    // Now make the binder visible. We must do this after appGridAdapter
                    // is set to prevent us from reaching updateUiWithServerinfo() and
                    // touching the appGridAdapter prior to initialization.
@@ -142,6 +157,27 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
        }
    };

+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+
+        // If appGridAdapter is initialized, let it know about the configuration change.
+        // If not, it will pick it up when it initializes.
+        if (appGridAdapter != null) {
+            // Update the app grid adapter to create grid items with the correct layout
+            appGridAdapter.updateLayoutWithPreferences(this, PreferenceConfiguration.readPreferences(this));
+
+            try {
+                // Reinflate the app grid itself to pick up the layout change
+                getFragmentManager().beginTransaction()
+                        .replace(R.id.appFragmentContainer, new AdapterFragment())
+                        .commitAllowingStateLoss();
+            } catch (IllegalStateException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
    private void startComputerUpdates() {
        // Don't start polling if we're not bound or in the foreground
        if (managerBinder == null || !inForeground) {
@@ -181,7 +217,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                        @Override
                        public void run() {
                            // Disable shortcuts referencing this PC for now
-                            shortcutHelper.disableShortcut(details.uuid,
+                            shortcutHelper.disableComputerShortcut(details,
                                    getResources().getString(R.string.scut_not_paired));

                            // Display a toast to the user and quit the activity
@@ -259,23 +295,40 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {

        UiHelper.notifyNewRootView(this);

+        showHiddenApps = getIntent().getBooleanExtra(SHOW_HIDDEN_APPS_EXTRA, false);
        uuidString = getIntent().getStringExtra(UUID_EXTRA);

+        SharedPreferences hiddenAppsPrefs = getSharedPreferences(HIDDEN_APPS_PREF_FILENAME, MODE_PRIVATE);
+        for (String hiddenAppIdStr : hiddenAppsPrefs.getStringSet(uuidString, new HashSet<String>())) {
+            hiddenAppIds.add(Integer.parseInt(hiddenAppIdStr));
+        }
+
        String computerName = getIntent().getStringExtra(NAME_EXTRA);

        TextView label = findViewById(R.id.appListText);
        setTitle(computerName);
        label.setText(computerName);

-        // Add a launcher shortcut for this PC (forced, since this is user interaction)
-        shortcutHelper.createAppViewShortcut(uuidString, computerName, uuidString, true);
-        shortcutHelper.reportShortcutUsed(uuidString);
-
        // Bind to the computer manager service
        bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
                Service.BIND_AUTO_CREATE);
    }

+    private void updateHiddenApps(boolean hideImmediately) {
+        HashSet<String> hiddenAppIdStringSet = new HashSet<>();
+
+        for (Integer hiddenAppId : hiddenAppIds) {
+            hiddenAppIdStringSet.add(hiddenAppId.toString());
+        }
+
+        getSharedPreferences(HIDDEN_APPS_PREF_FILENAME, MODE_PRIVATE)
+                .edit()
+                .putStringSet(uuidString, hiddenAppIdStringSet)
+                .apply();
+
+        appGridAdapter.updateHiddenApps(hiddenAppIds, hideImmediately);
+    }
+
    private void populateAppGridWithCache() {
        try {
            // Try to load from cache
@@ -333,9 +386,12 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
    @Override
    public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
        super.onCreateContextMenu(menu, v, menuInfo);
-        
+
        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
        AppObject selectedApp = (AppObject) appGridAdapter.getItem(info.position);
+
+        menu.setHeaderTitle(selectedApp.app.getAppName());
+
        if (lastRunningAppId != 0) {
            if (lastRunningAppId == selectedApp.app.getAppId()) {
                menu.add(Menu.NONE, START_OR_RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
@@ -343,10 +399,17 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
            }
            else {
                menu.add(Menu.NONE, START_WITH_QUIT, 1, getResources().getString(R.string.applist_menu_quit_and_start));
-                menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
            }
        }
-        menu.add(Menu.NONE, VIEW_DETAILS_ID, 3, getResources().getString(R.string.applist_menu_details));
+
+        // Only show the hide checkbox if this is not the currently running app or it's already hidden
+        if (lastRunningAppId != selectedApp.app.getAppId() || selectedApp.isHidden) {
+            MenuItem hideAppItem = menu.add(Menu.NONE, HIDE_APP_ID, 3, getResources().getString(R.string.applist_menu_hide_app));
+            hideAppItem.setCheckable(true);
+            hideAppItem.setChecked(selectedApp.isHidden);
+        }
+
+        menu.add(Menu.NONE, VIEW_DETAILS_ID, 4, getResources().getString(R.string.applist_menu_details));

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
            // Only add an option to create shortcut if box art is loaded
@@ -357,7 +420,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                BitmapDrawable drawable = (BitmapDrawable)appImageView.getDrawable();
                if (drawable != null && drawable.getBitmap() != null) {
                    // We have a bitmap loaded too
-                    menu.add(Menu.NONE, CREATE_SHORTCUT_ID, 4, getResources().getString(R.string.applist_menu_scut));
+                    menu.add(Menu.NONE, CREATE_SHORTCUT_ID, 5, getResources().getString(R.string.applist_menu_scut));
                }
            }
        }
@@ -408,18 +471,26 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                }, null);
                return true;

-            case CANCEL_ID:
+            case VIEW_DETAILS_ID:
+                Dialog.displayDialog(AppView.this, getResources().getString(R.string.title_details), app.app.toString(), false);
                return true;

-            case VIEW_DETAILS_ID:
-                Dialog.displayDialog(AppView.this, getResources().getString(R.string.title_details),
-                        getResources().getString(R.string.applist_details_id) + " " + app.app.getAppId(), false);
+            case HIDE_APP_ID:
+                if (item.isChecked()) {
+                    // Transitioning hidden to shown
+                    hiddenAppIds.remove(app.app.getAppId());
+                }
+                else {
+                    // Transitioning shown to hidden
+                    hiddenAppIds.add(app.app.getAppId());
+                }
+                updateHiddenApps(false);
                return true;

            case CREATE_SHORTCUT_ID:
                ImageView appImageView = info.targetView.findViewById(R.id.grid_image);
                Bitmap appBits = ((BitmapDrawable)appImageView.getDrawable()).getBitmap();
-                if (!shortcutHelper.createPinnedGameShortcut(uuidString + Integer.valueOf(app.app.getAppId()).toString(), appBits, computer, app.app)) {
+                if (!shortcutHelper.createPinnedGameShortcut(computer, app.app, appBits)) {
                    Toast.makeText(AppView.this, getResources().getString(R.string.unable_to_pin_shortcut), Toast.LENGTH_LONG).show();
                }
                return true;
@@ -495,6 +566,12 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                    if (!foundExistingApp) {
                        // This app must be new
                        appGridAdapter.addApp(new AppObject(app));
+
+                        // We could have a leftover shortcut from last time this PC was paired
+                        // or if this app was removed then added again. Enable those shortcuts
+                        // again if present.
+                        shortcutHelper.enableAppShortcut(computer, app);
+
                        updated = true;
                    }
                }
@@ -515,6 +592,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {

                    // This app was removed in the latest app list
                    if (!foundExistingApp) {
+                        shortcutHelper.disableAppShortcut(computer, existingApp.app, "App removed from PC");
                        appGridAdapter.removeApp(existingApp);
                        updated = true;

@@ -536,9 +614,8 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {

    @Override
    public int getAdapterFragmentLayoutId() {
-        return PreferenceConfiguration.readPreferences(this).listMode ?
-                R.layout.list_view : (PreferenceConfiguration.readPreferences(AppView.this).smallIconMode ?
-                    R.layout.app_grid_view_small : R.layout.app_grid_view);
+        return PreferenceConfiguration.readPreferences(AppView.this).smallIconMode ?
+                    R.layout.app_grid_view_small : R.layout.app_grid_view;
    }

    @Override
@@ -558,13 +635,15 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                }
            }
        });
+        UiHelper.applyStatusBarPadding(listView);
        registerForContextMenu(listView);
        listView.requestFocus();
    }

-    public class AppObject {
+    public static class AppObject {
        public final NvApp app;
        public boolean isRunning;
+        public boolean isHidden;

        public AppObject(NvApp app) {
            if (app == null) {
@@ -0,0 +1,25 @@
+package com.limelight;
+
+import java.io.IOException;
+import java.util.logging.FileHandler;
+import java.util.logging.Logger;
+
+public class LimeLog {
+    private static final Logger LOGGER = Logger.getLogger(LimeLog.class.getName());
+
+    public static void info(String msg) {
+        LOGGER.info(msg);
+    }
+    
+    public static void warning(String msg) {
+        LOGGER.warning(msg);
+    }
+    
+    public static void severe(String msg) {
+        LOGGER.severe(msg);
+    }
+    
+    public static void setFileHandler(String fileName) throws IOException {
+        LOGGER.addHandler(new FileHandler(fileName));
+    }
+}
@@ -9,6 +9,7 @@ import com.limelight.binding.crypto.AndroidCryptoProvider;
 import com.limelight.computers.ComputerManagerListener;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.grid.PcGridAdapter;
+import com.limelight.grid.assets.DiskAssetLoader;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
@@ -108,7 +109,6 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        }
    }

-    private final static int APP_LIST_ID = 1;
    private final static int PAIR_ID = 2;
    private final static int UNPAIR_ID = 3;
    private final static int WOL_ID = 4;
@@ -116,6 +116,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
    private final static int RESUME_ID = 6;
    private final static int QUIT_ID = 7;
    private final static int VIEW_DETAILS_ID = 8;
+    private final static int FULL_APP_LIST_ID = 9;
+    private final static int TEST_NETWORK_ID = 10;

    private void initializeViews() {
        setContentView(R.layout.activity_pc_view);
@@ -125,6 +127,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        // Set default preferences if we've never been run
        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);

+        // Set the correct layout for the PC grid
+        pcGridAdapter.updateLayoutWithPreferences(this, PreferenceConfiguration.readPreferences(this));
+
        // Setup the list view
        ImageButton settingsButton = findViewById(R.id.settingsButton);
        ImageButton addComputerButton = findViewById(R.id.manuallyAddPc);
@@ -222,9 +227,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
                Service.BIND_AUTO_CREATE);

-        pcGridAdapter = new PcGridAdapter(this,
-                PreferenceConfiguration.readPreferences(this).listMode,
-                PreferenceConfiguration.readPreferences(this).smallIconMode);
+        pcGridAdapter = new PcGridAdapter(this, PreferenceConfiguration.readPreferences(this));

        initializeViews();
    }
@@ -314,15 +317,32 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);

+        // Add a header with PC status details
+        menu.clearHeader();
+        String headerTitle = computer.details.name + " - ";
+        switch (computer.details.state)
+        {
+            case ONLINE:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_online);
+                break;
+            case OFFLINE:
+                menu.setHeaderIcon(R.drawable.ic_pc_offline);
+                headerTitle += getResources().getString(R.string.pcview_menu_header_offline);
+                break;
+            case UNKNOWN:
+                headerTitle += getResources().getString(R.string.pcview_menu_header_unknown);
+                break;
+        }
+
+        menu.setHeaderTitle(headerTitle);
+
        // Inflate the context menu
        if (computer.details.state == ComputerDetails.State.OFFLINE ||
            computer.details.state == ComputerDetails.State.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));
        }
        else if (computer.details.pairState != PairState.PAIRED) {
            menu.add(Menu.NONE, PAIR_ID, 1, getResources().getString(R.string.pcview_menu_pair_pc));
-            menu.add(Menu.NONE, DELETE_ID, 2, getResources().getString(R.string.pcview_menu_delete_pc));
        }
        else {
            if (computer.details.runningGameId != 0) {
@@ -330,13 +350,12 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
            }

-            menu.add(Menu.NONE, APP_LIST_ID, 3, getResources().getString(R.string.pcview_menu_app_list));
-
-            // FIXME: We used to be able to unpair here but it's been broken since GFE 2.1.x, so I've replaced
-            // it with delete which actually work
-            menu.add(Menu.NONE, DELETE_ID, 4, getResources().getString(R.string.pcview_menu_delete_pc));
+            menu.add(Menu.NONE, FULL_APP_LIST_ID, 4, getResources().getString(R.string.pcview_menu_app_list));
        }
-        menu.add(Menu.NONE, VIEW_DETAILS_ID, 5,  getResources().getString(R.string.pcview_menu_details));
+
+        menu.add(Menu.NONE, TEST_NETWORK_ID, 5, getResources().getString(R.string.pcview_menu_test_network));
+        menu.add(Menu.NONE, DELETE_ID, 6, getResources().getString(R.string.pcview_menu_delete_pc));
+        menu.add(Menu.NONE, VIEW_DETAILS_ID, 7,  getResources().getString(R.string.pcview_menu_details));
    }

    @Override
@@ -440,7 +459,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {

                        if (toastSuccess) {
                            // Open the app list after a successful pairing attempt
-                            doAppList(computer);
+                            doAppList(computer, true, false);
                        }
                        else {
                            // Start polling again if we're still in the foreground
@@ -539,7 +558,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        }).start();
    }

-    private void doAppList(ComputerDetails computer) {
+    private void doAppList(ComputerDetails computer, boolean newlyPaired, boolean showHiddenGames) {
        if (computer.state == ComputerDetails.State.OFFLINE) {
            Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
            return;
@@ -552,6 +571,8 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
        Intent i = new Intent(this, AppView.class);
        i.putExtra(AppView.NAME_EXTRA, computer.name);
        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
+        i.putExtra(AppView.NEW_PAIR_EXTRA, newlyPaired);
+        i.putExtra(AppView.SHOW_HIDDEN_APPS_EXTRA, showHiddenGames);
        startActivity(i);
    }

@@ -584,14 +605,13 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                            Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
                            return;
                        }
-                        managerBinder.removeComputer(computer.details.name);
                        removeComputer(computer.details);
                    }
                }, null);
                return true;

-            case APP_LIST_ID:
-                doAppList(computer.details);
+            case FULL_APP_LIST_ID:
+                doAppList(computer.details, false, true);
                return true;

            case RESUME_ID:
@@ -623,18 +643,32 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                Dialog.displayDialog(PcView.this, getResources().getString(R.string.title_details), computer.details.toString(), false);
                return true;

+            case TEST_NETWORK_ID:
+                ServerHelper.doNetworkTest(PcView.this);
+                return true;
+
            default:
                return super.onContextItemSelected(item);
        }
    }
    
    private void removeComputer(ComputerDetails details) {
+        managerBinder.removeComputer(details);
+
+        new DiskAssetLoader(this).deleteAssetsForComputer(details.uuid);
+
+        // Delete hidden games preference value
+        getSharedPreferences(AppView.HIDDEN_APPS_PREF_FILENAME, MODE_PRIVATE)
+                .edit()
+                .remove(details.uuid)
+                .apply();
+
        for (int i = 0; i < pcGridAdapter.getCount(); i++) {
            ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);

            if (details.equals(computer.details)) {
                // Disable or delete shortcuts referencing this PC
-                shortcutHelper.disableShortcut(details.uuid,
+                shortcutHelper.disableComputerShortcut(details,
                        getResources().getString(R.string.scut_deleted_pc));

                pcGridAdapter.removeComputer(computer);
@@ -665,7 +699,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {

        // Add a launcher shortcut for this PC
        if (details.pairState == PairState.PAIRED) {
-            shortcutHelper.createAppViewShortcut(details.uuid, details, false);
+            shortcutHelper.createAppViewShortcutForOnlineHost(details);
        }

        if (existingEntry != null) {
@@ -686,9 +720,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {

    @Override
    public int getAdapterFragmentLayoutId() {
-        return PreferenceConfiguration.readPreferences(this).listMode ?
-                R.layout.list_view : (PreferenceConfiguration.readPreferences(this).smallIconMode ?
-                R.layout.pc_grid_view_small : R.layout.pc_grid_view);
+        return R.layout.pc_grid_view;
    }

    @Override
@@ -707,14 +739,15 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                    // Pair an unpaired machine by default
                    doPair(computer.details);
                } else {
-                    doAppList(computer.details);
+                    doAppList(computer.details, false, false);
                }
            }
        });
+        UiHelper.applyStatusBarPadding(listView);
        registerForContextMenu(listView);
    }

-    public class ComputerObject {
+    public static class ComputerObject {
        public ComputerDetails details;

        public ComputerObject(ComputerDetails details) {
@@ -0,0 +1,107 @@
+package com.limelight;
+
+import android.content.ContentProvider;
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.UriMatcher;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.ParcelFileDescriptor;
+
+import com.limelight.grid.assets.DiskAssetLoader;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.util.List;
+
+public class PosterContentProvider extends ContentProvider {
+
+
+    public static final String AUTHORITY = "poster." + BuildConfig.APPLICATION_ID;
+    public static final String PNG_MIME_TYPE = "image/png";
+    public static final int APP_ID_PATH_INDEX = 2;
+    public static final int COMPUTER_UUID_PATH_INDEX = 1;
+    private DiskAssetLoader mDiskAssetLoader;
+
+    private static final UriMatcher sUriMatcher;
+    private static final String BOXART_PATH = "boxart";
+    private static final int BOXART_URI_ID = 1;
+
+    static {
+        sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+        sUriMatcher.addURI(AUTHORITY, BOXART_PATH, BOXART_URI_ID);
+    }
+
+    @Override
+    public ParcelFileDescriptor openFile(Uri uri, String mode) throws FileNotFoundException {
+        int match = sUriMatcher.match(uri);
+        if (match == BOXART_URI_ID) {
+            return openBoxArtFile(uri, mode);
+        }
+        return openBoxArtFile(uri, mode);
+
+    }
+
+    public ParcelFileDescriptor openBoxArtFile(Uri uri, String mode) throws FileNotFoundException {
+        if (!"r".equals(mode)) {
+            throw new UnsupportedOperationException("This provider is only for read mode");
+        }
+
+        List<String> segments = uri.getPathSegments();
+        if (segments.size() != 3) {
+            throw new FileNotFoundException();
+        }
+        String appId = segments.get(APP_ID_PATH_INDEX);
+        String uuid = segments.get(COMPUTER_UUID_PATH_INDEX);
+        File file = mDiskAssetLoader.getFile(uuid, Integer.parseInt(appId));
+        if (file.exists()) {
+            return ParcelFileDescriptor.open(file, ParcelFileDescriptor.MODE_READ_ONLY);
+        }
+        throw new FileNotFoundException();
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        throw new UnsupportedOperationException("This provider is only for read mode");
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return PNG_MIME_TYPE;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        throw new UnsupportedOperationException("This provider is only for read mode");
+    }
+
+    @Override
+    public boolean onCreate() {
+        mDiskAssetLoader = new DiskAssetLoader(getContext());
+        return true;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection,
+                        String[] selectionArgs, String sortOrder) {
+        throw new UnsupportedOperationException("This provider doesn't support query");
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection,
+                      String[] selectionArgs) {
+        throw new UnsupportedOperationException("This provider is support read only");
+    }
+
+
+    public static Uri createBoxArtUri(String uuid, String appId) {
+        return new Uri.Builder()
+                .scheme(ContentResolver.SCHEME_CONTENT)
+                .authority(AUTHORITY)
+                .appendPath(BOXART_PATH)
+                .appendPath(uuid)
+                .appendPath(appId)
+                .build();
+    }
+
+}
@@ -23,14 +23,12 @@ import java.util.UUID;

 public class ShortcutTrampoline extends Activity {
    private String uuidString;
-    private String appIdString;
+    private NvApp app;
    private ArrayList<Intent> intentStack = new ArrayList<>();

    private ComputerDetails computer;
    private SpinnerDialog blockingLoadSpinner;

-    public final static String APP_ID_EXTRA = "AppId";
-
    private ComputerManagerService.ComputerManagerBinder managerBinder;
    private final ServiceConnection serviceConnection = new ServiceConnection() {
        public void onServiceConnected(ComponentName className, IBinder binder) {
@@ -101,10 +99,9 @@ public class ShortcutTrampoline extends Activity {
                                        if (details.state == ComputerDetails.State.ONLINE && details.pairState == PairingManager.PairState.PAIRED) {
                                            
                                            // Launch game if provided app ID, otherwise launch app view
-                                            if (appIdString != null && appIdString.length() > 0) {
-                                                if (details.runningGameId == 0 || details.runningGameId == Integer.parseInt(appIdString)) {
-                                                    intentStack.add(ServerHelper.createStartIntent(ShortcutTrampoline.this,
-                                                            new NvApp("app", Integer.parseInt(appIdString), false), details, managerBinder));
+                                            if (app != null) {
+                                                if (details.runningGameId == 0 || details.runningGameId == app.getAppId()) {
+                                                    intentStack.add(ServerHelper.createStartIntent(ShortcutTrampoline.this, app, details, managerBinder));

                                                    // Close this activity
                                                    finish();
@@ -114,8 +111,7 @@ public class ShortcutTrampoline extends Activity {
                                                } else {
                                                    // Create the start intent immediately, so we can safely unbind the managerBinder
                                                    // below before we return.
-                                                    final Intent startIntent = ServerHelper.createStartIntent(ShortcutTrampoline.this,
-                                                            new NvApp("app", Integer.parseInt(appIdString), false), details, managerBinder);
+                                                    final Intent startIntent = ServerHelper.createStartIntent(ShortcutTrampoline.this, app, details, managerBinder);

                                                    UiHelper.displayQuitConfirmationDialog(ShortcutTrampoline.this, new Runnable() {
                                                        @Override
@@ -155,7 +151,7 @@ public class ShortcutTrampoline extends Activity {
                                                // If a game is running, we'll make the stream the top level activity
                                                if (details.runningGameId != 0) {
                                                    intentStack.add(ServerHelper.createStartIntent(ShortcutTrampoline.this,
-                                                            new NvApp("app", details.runningGameId, false), details, managerBinder));
+                                                            new NvApp(null, details.runningGameId, false), details, managerBinder));
                                                }

                                                // Now start the activities
@@ -198,7 +194,7 @@ public class ShortcutTrampoline extends Activity {
        }
    };

-    protected boolean validateInput() {
+    protected boolean validateInput(String uuidString, String appIdString) {
        // Validate UUID
        if (uuidString == null) {
            Dialog.displayDialog(ShortcutTrampoline.this,
@@ -240,10 +236,16 @@ public class ShortcutTrampoline extends Activity {

        UiHelper.notifyNewRootView(this);

+        String appIdString = getIntent().getStringExtra(Game.EXTRA_APP_ID);
        uuidString = getIntent().getStringExtra(AppView.UUID_EXTRA);
-        appIdString = getIntent().getStringExtra(APP_ID_EXTRA);

-        if (validateInput()) {
+        if (validateInput(uuidString, appIdString)) {
+            if (appIdString != null && !appIdString.isEmpty()) {
+                app = new NvApp(getIntent().getStringExtra(Game.EXTRA_APP_NAME),
+                        Integer.parseInt(appIdString),
+                        getIntent().getBooleanExtra(Game.EXTRA_APP_HDR, false));
+            }
+
            // Bind to the computer manager service
            bindService(new Intent(this, ComputerManagerService.class), serviceConnection,
                    Service.BIND_AUTO_CREATE);
@@ -14,10 +14,10 @@ public class AndroidAudioRenderer implements AudioRenderer {

    private AudioTrack track;

-    private AudioTrack createAudioTrack(int channelConfig, int bufferSize, boolean lowLatency) {
+    private AudioTrack createAudioTrack(int channelConfig, int sampleRate, int bufferSize, boolean lowLatency) {
        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
            return new AudioTrack(AudioManager.STREAM_MUSIC,
-                    48000,
+                    sampleRate,
                    channelConfig,
                    AudioFormat.ENCODING_PCM_16BIT,
                    bufferSize,
@@ -28,7 +28,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
                    .setUsage(AudioAttributes.USAGE_GAME);
            AudioFormat format = new AudioFormat.Builder()
                    .setEncoding(AudioFormat.ENCODING_PCM_16BIT)
-                    .setSampleRate(48000)
+                    .setSampleRate(sampleRate)
                    .setChannelMask(channelConfig)
                    .build();

@@ -64,25 +64,46 @@ public class AndroidAudioRenderer implements AudioRenderer {
    }

    @Override
-    public int setup(int audioConfiguration) {
+    public int setup(MoonBridge.AudioConfiguration audioConfiguration, int sampleRate, int samplesPerFrame) {
        int channelConfig;
        int bytesPerFrame;

-        switch (audioConfiguration)
+        switch (audioConfiguration.channelCount)
        {
-            case MoonBridge.AUDIO_CONFIGURATION_STEREO:
+            case 2:
                channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
-                bytesPerFrame = 2 * 240 * 2;
                break;
-            case MoonBridge.AUDIO_CONFIGURATION_51_SURROUND:
+            case 4:
+                channelConfig = AudioFormat.CHANNEL_OUT_QUAD;
+                break;
+            case 6:
                channelConfig = AudioFormat.CHANNEL_OUT_5POINT1;
-                bytesPerFrame = 6 * 240 * 2;
+                break;
+            case 8:
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                    // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND isn't available until Android 6.0,
+                    // yet the CHANNEL_OUT_SIDE_LEFT and CHANNEL_OUT_SIDE_RIGHT constants were added
+                    // in 5.0, so just hardcode the constant so we can work on Lollipop.
+                    channelConfig = 0x000018fc; // AudioFormat.CHANNEL_OUT_7POINT1_SURROUND
+                }
+                else {
+                    // On KitKat and lower, creation of the AudioTrack will fail if we specify
+                    // CHANNEL_OUT_SIDE_LEFT or CHANNEL_OUT_SIDE_RIGHT. That leaves us with
+                    // the old CHANNEL_OUT_7POINT1 which uses left-of-center and right-of-center
+                    // speakers instead of side-left and side-right. This non-standard layout
+                    // is probably not what the user wants, but we don't really have a choice.
+                    channelConfig = AudioFormat.CHANNEL_OUT_7POINT1;
+                }
                break;
            default:
                LimeLog.severe("Decoder returned unhandled channel count");
                return -1;
        }

+        LimeLog.info("Audio channel config: "+String.format("0x%X", channelConfig));
+
+        bytesPerFrame = audioConfiguration.channelCount * samplesPerFrame * 2;
+
        // We're not supposed to request less than the minimum
        // buffer size for our buffer, but it appears that we can
        // do this on many devices and it lowers audio latency.
@@ -122,7 +143,7 @@ public class AndroidAudioRenderer implements AudioRenderer {
                case 1:
                case 3:
                    // Try the larger buffer size
-                    bufferSize = Math.max(AudioTrack.getMinBufferSize(48000,
+                    bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
                            channelConfig,
                            AudioFormat.ENCODING_PCM_16BIT),
                            bytesPerFrame * 2);
@@ -135,13 +156,13 @@ public class AndroidAudioRenderer implements AudioRenderer {
                    throw new IllegalStateException();
            }

-            // Skip low latency options if hardware sample rate isn't 48000Hz
-            if (AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC) != 48000 && lowLatency) {
+            // Skip low latency options if hardware sample rate doesn't match the content
+            if (AudioTrack.getNativeOutputSampleRate(AudioManager.STREAM_MUSIC) != sampleRate && lowLatency) {
                continue;
            }

            try {
-                track = createAudioTrack(channelConfig, bufferSize, lowLatency);
+                track = createAudioTrack(channelConfig, sampleRate, bufferSize, lowLatency);
                track.play();

                // Successfully created working AudioTrack. We're done here.
@@ -168,8 +189,17 @@ public class AndroidAudioRenderer implements AudioRenderer {
    }

    @Override
-    public void playDecodedAudio(byte[] audioData) {
-        track.write(audioData, 0, audioData.length);
+    public void playDecodedAudio(short[] audioData) {
+        // Only queue up to 40 ms of pending audio data in addition to what AudioTrack is buffering for us.
+        if (MoonBridge.getPendingAudioDuration() < 40) {
+            // This will block until the write is completed. That can cause a backlog
+            // of pending audio data, so we do the above check to be able to bound
+            // latency at 40 ms in that situation.
+            track.write(audioData, 0, audioData.length);
+        }
+        else {
+            LimeLog.info("Too much pending audio data: " + MoonBridge.getPendingAudioDuration() +" ms");
+        }
    }

    @Override
@@ -102,9 +102,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
            LimeLog.warning("Corrupted certificate");
            return false;
        } catch (NoSuchAlgorithmException e) {
-            // Should never happen
-            e.printStackTrace();
-            return false;
+            throw new RuntimeException(e);
        } catch (InvalidKeySpecException e) {
            // May happen if the key is corrupt
            LimeLog.warning("Corrupted key");
@@ -124,10 +122,8 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
            KeyPairGenerator keyPairGenerator = KeyPairGenerator.getInstance("RSA", bcProvider);
            keyPairGenerator.initialize(2048);
            keyPair = keyPairGenerator.generateKeyPair();
-        } catch (NoSuchAlgorithmException e1) {
-            // Should never happen
-            e1.printStackTrace();
-            return false;
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
        }

        Date now = new Date();
@@ -148,12 +144,10 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
            SubjectPublicKeyInfo.getInstance(keyPair.getPublic().getEncoded()));

        try {
-            ContentSigner sigGen = new JcaContentSignerBuilder("SHA1withRSA").setProvider(bcProvider).build(keyPair.getPrivate());
+            ContentSigner sigGen = new JcaContentSignerBuilder("SHA256withRSA").setProvider(bcProvider).build(keyPair.getPrivate());
            cert = new JcaX509CertificateConverter().setProvider(bcProvider).getCertificate(certBuilder.build(sigGen));
            key = (RSAPrivateKey) keyPair.getPrivate();
        } catch (Exception e) {
-            // Nothing should go wrong here
-            e.printStackTrace();
            throw new RuntimeException(e);
        }

@@ -1,5 +1,6 @@
 package com.limelight.binding.input;

+import android.app.Activity;
 import android.content.Context;
 import android.hardware.input.InputManager;
 import android.hardware.usb.UsbDevice;
@@ -51,7 +52,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    private final SparseArray<UsbDeviceContext> usbDeviceContexts = new SparseArray<>();

    private final NvConnection conn;
-    private final Context activityContext;
+    private final Activity activityContext;
    private final double stickDeadzone;
    private final InputDeviceContext defaultContext = new InputDeviceContext();
    private final GameGestures gestures;
@@ -61,7 +62,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    private final PreferenceConfiguration prefConfig;
    private short currentControllers, initialControllers;

-    public ControllerHandler(Context activityContext, NvConnection conn, GameGestures gestures, PreferenceConfiguration prefConfig) {
+    public ControllerHandler(Activity activityContext, NvConnection conn, GameGestures gestures, PreferenceConfiguration prefConfig) {
        this.activityContext = activityContext;
        this.conn = conn;
        this.gestures = gestures;
@@ -106,8 +107,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        defaultContext.rightStickDeadzoneRadius = (float) stickDeadzone;
        defaultContext.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
        defaultContext.rightTriggerAxis = MotionEvent.AXIS_GAS;
+        defaultContext.hatXAxis = MotionEvent.AXIS_HAT_X;
+        defaultContext.hatYAxis = MotionEvent.AXIS_HAT_Y;
        defaultContext.controllerNumber = (short) 0;
        defaultContext.assignedControllerNumber = true;
+        defaultContext.external = false;

        // Some devices (GPD XD) have a back button which sends input events
        // with device ID == 0. This hits the default context which would normally
@@ -146,6 +150,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        if (context != null) {
            LimeLog.info("Removed controller: "+context.name+" ("+deviceId+")");
            releaseControllerNumber(context);
+            context.destroy();
            inputDeviceContexts.remove(deviceId);
        }
    }
@@ -160,10 +165,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    public void stop() {
        for (int i = 0; i < inputDeviceContexts.size(); i++) {
            InputDeviceContext deviceContext = inputDeviceContexts.valueAt(i);
+            deviceContext.destroy();
+        }

-            if (deviceContext.vibrator != null) {
-                deviceContext.vibrator.cancel();
-            }
+        for (int i = 0; i < usbDeviceContexts.size(); i++) {
+            UsbDeviceContext deviceContext = usbDeviceContexts.valueAt(i);
+            deviceContext.destroy();
        }

        deviceVibrator.cancel();
@@ -189,6 +196,28 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            return true;
        }

+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (device.getId() == -1) {
+                // This "virtual" device could be input from any of the attached devices.
+                // Look to see if any gamepads are connected.
+                int[] ids = InputDevice.getDeviceIds();
+                for (int id : ids) {
+                    InputDevice dev = InputDevice.getDevice(id);
+                    if (dev == null) {
+                        // This device was removed during enumeration
+                        continue;
+                    }
+
+                    // If there are any gamepad devices connected, we'll
+                    // report that this virtual device is a gamepad.
+                    if (hasJoystickAxes(dev) || hasGamepadButtons(dev)) {
+                        return true;
+                    }
+                }
+            }
+        }
+
        // Otherwise, we'll try anything that claims to be a non-alphabetic keyboard
        return device.getKeyboardType() != InputDevice.KEYBOARD_TYPE_ALPHABETIC;
    }
@@ -215,9 +244,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        if (PreferenceConfiguration.readPreferences(context).usbDriver) {
            UsbManager usbManager = (UsbManager) context.getSystemService(Context.USB_SERVICE);
            for (UsbDevice dev : usbManager.getDeviceList().values()) {
-                // We explicitly ask not to claim devices that appear as InputDevices
+                // We explicitly check not to claim devices that appear as InputDevices
                // otherwise we will double count them.
-                if (UsbDriverService.shouldClaimDevice(dev, false)) {
+                if (UsbDriverService.shouldClaimDevice(dev, false) &&
+                        !UsbDriverService.isRecognizedInputDevice(dev)) {
                    LimeLog.info("Counting UsbDevice: "+dev.getDeviceName());
                    mask |= 1 << count++;
                }
@@ -263,9 +293,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            InputDeviceContext devContext = (InputDeviceContext) context;

            LimeLog.info(devContext.name+" ("+context.id+") needs a controller number assigned");
-            if (devContext.name != null &&
-                    (devContext.name.contains("gpio-keys") || // This is the back button on Shield portable consoles
-                            devContext.name.contains("joy_key"))) { // These are the gamepad buttons on the Archos Gamepad 2
+            if (!devContext.external) {
                LimeLog.info("Built-in buttons hardcoded as controller 0");
                context.controllerNumber = 0;
            }
@@ -326,6 +354,10 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD

        context.id = device.getControllerId();
        context.device = device;
+        context.external = true;
+
+        context.vendorId = device.getVendorId();
+        context.productId = device.getProductId();

        context.leftStickDeadzoneRadius = (float) stickDeadzone;
        context.rightStickDeadzoneRadius = (float) stickDeadzone;
@@ -335,17 +367,41 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
    }

    private static boolean isExternal(InputDevice dev) {
-        try {
-            // Landroid/view/InputDevice;->isExternal()Z is on the light graylist in Android P
-            return (Boolean)dev.getClass().getMethod("isExternal").invoke(dev);
-        } catch (NoSuchMethodException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InvocationTargetException e) {
-            e.printStackTrace();
-        } catch (ClassCastException e) {
-            e.printStackTrace();
+        // The ASUS Tinker Board inaccurately reports Bluetooth gamepads as internal,
+        // causing shouldIgnoreBack() to believe it should pass through back as a
+        // navigation event for any attached gamepads.
+        if (Build.MODEL.equals("Tinker Board")) {
+            return true;
+        }
+
+        String deviceName = dev.getName();
+        if (deviceName.contains("gpio") || // This is the back button on Shield portable consoles
+                deviceName.contains("joy_key") || // These are the gamepad buttons on the Archos Gamepad 2
+                deviceName.contains("keypad") || // These are gamepad buttons on the XPERIA Play
+                deviceName.equalsIgnoreCase("NVIDIA Corporation NVIDIA Controller v01.01") || // Gamepad on Shield Portable
+                deviceName.equalsIgnoreCase("NVIDIA Corporation NVIDIA Controller v01.02")) // Gamepad on Shield Portable (?)
+        {
+            LimeLog.info(dev.getName()+" is internal by hardcoded mapping");
+            return false;
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // Landroid/view/InputDevice;->isExternal()Z is officially public on Android Q
+            return dev.isExternal();
+        }
+        else {
+            try {
+                // Landroid/view/InputDevice;->isExternal()Z is on the light graylist in Android P
+                return (Boolean)dev.getClass().getMethod("isExternal").invoke(dev);
+            } catch (NoSuchMethodException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            } catch (ClassCastException e) {
+                e.printStackTrace();
+            }
        }

        // Answer true if we don't know
@@ -362,9 +418,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }

        // Classify this device as a remote by name if it has no joystick axes
-        if (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_X) == null &&
-                getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Y) == null &&
-                devName.toLowerCase().contains("remote")) {
+        if (!hasJoystickAxes(dev) && devName.toLowerCase().contains("remote")) {
            return true;
        }

@@ -387,11 +441,14 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD

                // Note that we are explicitly NOT excluding the current device we're examining here,
                // since the other gamepad buttons may be on our current device and that's fine.
-                boolean[] keys = currentDev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BUTTON_A);
-                if (keys[0]) {
+                if (currentDev.hasKeys(KeyEvent.KEYCODE_BUTTON_SELECT)[0]) {
                    foundInternalSelect = true;
                }
-                if (keys[1]) {
+
+                // We don't check KEYCODE_BUTTON_A here, since the Shield Android TV has a
+                // virtual mouse device that claims to have KEYCODE_BUTTON_A. Instead, we rely
+                // on the SOURCE_GAMEPAD flag to be set on gamepad devices.
+                if (hasGamepadButtons(currentDev)) {
                    foundInternalGamepad = true;
                }
            }
@@ -403,8 +460,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            // c) have an internal gamepad but no internal select button (NVIDIA SHIELD Portable)
            return !foundInternalGamepad || foundInternalSelect;
        }
-
-        return false;
+        else {
+            // For external devices, we want to pass through the back button if the device
+            // has no gamepad axes or gamepad buttons.
+            return !hasJoystickAxes(dev) && !hasGamepadButtons(dev);
+        }
    }

    private InputDeviceContext createInputDeviceContextForDevice(InputDevice dev) {
@@ -412,15 +472,33 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        String devName = dev.getName();

        LimeLog.info("Creating controller context for device: "+devName);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            LimeLog.info("Vendor ID: "+dev.getVendorId());
+            LimeLog.info("Product ID: "+dev.getProductId());
+        }
        LimeLog.info(dev.toString());

        context.name = devName;
        context.id = dev.getId();
+        context.external = isExternal(dev);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            context.vendorId = dev.getVendorId();
+            context.productId = dev.getProductId();
+        }

        if (dev.getVibrator().hasVibrator()) {
            context.vibrator = dev.getVibrator();
        }

+        // Detect if the gamepad has Mode and Select buttons according to the Android key layouts.
+        // We do this first because other codepaths below may override these defaults.
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            boolean[] buttons = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_MODE, KeyEvent.KEYCODE_BUTTON_SELECT, KeyEvent.KEYCODE_BACK, 0);
+            context.hasMode = buttons[0];
+            context.hasSelect = buttons[1] || buttons[2];
+        }
+
        context.leftStickXAxis = MotionEvent.AXIS_X;
        context.leftStickYAxis = MotionEvent.AXIS_Y;
        if (getMotionRangeForJoystickAxis(dev, context.leftStickXAxis) != null &&
@@ -458,25 +536,49 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
            InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
            if (rxRange != null && ryRange != null && devName != null) {
-                if (devName.contains("Xbox") || devName.contains("XBox") || devName.contains("X-Box")) {
-                    // Xbox controllers use RX and RY for right stick
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+                    if (dev.getVendorId() == 0x054c) { // Sony
+                        if (dev.hasKeys(KeyEvent.KEYCODE_BUTTON_C)[0]) {
+                            LimeLog.info("Detected non-standard DualShock 4 mapping");
+                            context.isNonStandardDualShock4 = true;
+                        }
+                        else {
+                            LimeLog.info("Detected DualShock 4 (Linux standard mapping)");
+                            context.usesLinuxGamepadStandardFaceButtons = true;
+                        }
+                    }
+                }
+                else if (!devName.contains("Xbox") && !devName.contains("XBox") && !devName.contains("X-Box")) {
+                    LimeLog.info("Assuming non-standard DualShock 4 mapping on < 4.4");
+                    context.isNonStandardDualShock4 = true;
+                }
+
+                if (context.isNonStandardDualShock4) {
+                    // The old DS4 driver uses RX and RY for triggers
+                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
+                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
+
+                    // DS4 has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasSelect = true;
+                    context.hasMode = true;
+                }
+                else {
+                    // If it's not a non-standard DS4 controller, it's probably an Xbox controller or
+                    // other sane controller that uses RX and RY for right stick and Z and RZ for triggers.
                    context.rightStickXAxis = MotionEvent.AXIS_RX;
                    context.rightStickYAxis = MotionEvent.AXIS_RY;

-                    // Xbox controllers use Z and RZ for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_Z;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RZ;
-                    context.triggersIdleNegative = true;
-                    context.isXboxController = true;
+                    // While it's likely that Z and RZ are triggers, we may have digital trigger buttons
+                    // instead. We must check that we actually have Z and RZ axes before assigning them.
+                    if (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z) != null &&
+                            getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ) != null) {
+                        context.leftTriggerAxis = MotionEvent.AXIS_Z;
+                        context.rightTriggerAxis = MotionEvent.AXIS_RZ;
+                    }
                }
-                else {
-                    // DS4 controller uses RX and RY for triggers
-                    context.leftTriggerAxis = MotionEvent.AXIS_RX;
-                    context.rightTriggerAxis = MotionEvent.AXIS_RY;
-                    context.triggersIdleNegative = true;

-                    context.isDualShock4 = true;
-                }
+                // Triggers always idle negative on axes that are centered at zero
+                context.triggersIdleNegative = true;
            }
        }

@@ -533,13 +635,15 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }

        // The ADT-1 controller needs a similar fixup to the ASUS Gamepad
-        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
            // The device name provided is just "Gamepad" which is pretty useless, so we
            // use VID/PID instead
            if (dev.getVendorId() == 0x18d1 && dev.getProductId() == 0x2c40) {
                context.backIsStart = true;
                context.modeIsSelect = true;
                context.triggerDeadzone = 0.30f;
+                context.hasSelect = true;
+                context.hasMode = false;
            }
        }

@@ -552,11 +656,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            if (devName.contains("ASUS Gamepad")) {
                // We can only do this check on KitKat or higher, but it doesn't matter since ATV
                // is Android 5.0 anyway
-                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
                    boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0);
                    if (!hasStartKey[0] && !hasStartKey[1]) {
                        context.backIsStart = true;
                        context.modeIsSelect = true;
+                        context.hasSelect = true;
+                        context.hasMode = false;
                    }
                }

@@ -565,14 +671,26 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                context.triggerDeadzone = 0.30f;
            }
            // SHIELD controllers will use small stick deadzones
-            else if (devName.contains("SHIELD")) {
+            else if (devName.contains("SHIELD") || devName.contains("NVIDIA Controller")) {
                context.leftStickDeadzoneRadius = 0.07f;
                context.rightStickDeadzoneRadius = 0.07f;
+
+                // The big Nvidia button on the Shield controllers acts like a Search button. It
+                // summons the Google Assistant on the Shield TV. On my Pixel 4, it seems to do
+                // nothing, so we can hijack it to act like a mode button.
+                if (devName.contains("NVIDIA Controller v01.03") || devName.contains("NVIDIA Controller v01.04")) {
+                    context.searchIsMode = true;
+                    context.hasMode = 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;
+
+                // Serval has Select and Mode buttons (possibly mapped non-standard)
+                context.hasMode = true;
+                context.hasSelect = true;
            }
            // The Xbox One S Bluetooth controller has some mappings that need fixing up.
            // However, Microsoft released a firmware update with no change to VID/PID
@@ -582,7 +700,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            // required fixup is ignoring the select button.
            else if (devName.equals("Xbox Wireless Controller")) {
                if (gasRange == null) {
-                    context.isXboxBtController = true;
+                    context.isNonStandardXboxBtController = true;
+
+                    // Xbox One S has Select and Mode buttons (possibly mapped non-standard)
+                    context.hasMode = true;
+                    context.hasSelect = true;
                }
            }
        }
@@ -605,6 +727,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            return null;
        }

+        // HACK for https://issuetracker.google.com/issues/163120692
+        if (Build.VERSION.SDK_INT == Build.VERSION_CODES.R) {
+            if (event.getDeviceId() == -1) {
+                return defaultContext;
+            }
+        }
+
        // Return the existing context if it exists
        InputDeviceContext context = inputDeviceContexts.get(event.getDeviceId());
        if (context != null) {
@@ -761,7 +890,61 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            }
        }

-        if (context.isDualShock4) {
+        // Override mode button for 8BitDo controllers
+        if (context.vendorId == 0x2dc8 && event.getScanCode() == 306) {
+            return KeyEvent.KEYCODE_BUTTON_MODE;
+        }
+
+        // This mapping was adding in Android 10, then changed based on
+        // kernel changes (adding hid-nintendo) in Android 11. If we're
+        // on anything newer than Pie, just use the built-in mapping.
+        if ((context.vendorId == 0x057e && context.productId == 0x2009 && Build.VERSION.SDK_INT < Build.VERSION_CODES.Q) || // Switch Pro controller
+                (context.vendorId == 0x0f0d && context.productId == 0x00c1)) { // HORIPAD for Switch
+            switch (event.getScanCode()) {
+                case 0x130:
+                    return KeyEvent.KEYCODE_BUTTON_A;
+                case 0x131:
+                    return KeyEvent.KEYCODE_BUTTON_B;
+                case 0x132:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+                case 0x133:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 0x134:
+                    return KeyEvent.KEYCODE_BUTTON_L1;
+                case 0x135:
+                    return KeyEvent.KEYCODE_BUTTON_R1;
+                case 0x136:
+                    return KeyEvent.KEYCODE_BUTTON_L2;
+                case 0x137:
+                    return KeyEvent.KEYCODE_BUTTON_R2;
+                case 0x138:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
+                case 0x139:
+                    return KeyEvent.KEYCODE_BUTTON_START;
+                case 0x13A:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBL;
+                case 0x13B:
+                    return KeyEvent.KEYCODE_BUTTON_THUMBR;
+                case 0x13D:
+                    return KeyEvent.KEYCODE_BUTTON_MODE;
+            }
+        }
+
+        if (context.usesLinuxGamepadStandardFaceButtons) {
+            // Android's Generic.kl swaps BTN_NORTH and BTN_WEST
+            switch (event.getScanCode()) {
+                case 304:
+                    return KeyEvent.KEYCODE_BUTTON_A;
+                case 305:
+                    return KeyEvent.KEYCODE_BUTTON_B;
+                case 307:
+                    return KeyEvent.KEYCODE_BUTTON_Y;
+                case 308:
+                    return KeyEvent.KEYCODE_BUTTON_X;
+            }
+        }
+
+        if (context.isNonStandardDualShock4) {
            switch (event.getScanCode()) {
                case 304:
                    return KeyEvent.KEYCODE_BUTTON_X;
@@ -806,7 +989,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                    return KeyEvent.KEYCODE_BUTTON_START;
            }
        }
-        else if (context.isXboxBtController) {
+        else if (context.isNonStandardXboxBtController) {
            switch (event.getScanCode()) {
                case 306:
                    return KeyEvent.KEYCODE_BUTTON_X;
@@ -835,19 +1018,25 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
                return KeyEvent.KEYCODE_BUTTON_MODE;
            }
        }
+        else if (context.vendorId == 0x0b05 && // ASUS
+                     (context.productId == 0x7900 || // Kunai - USB
+                      context.productId == 0x7902)) // Kunai - Bluetooth
+        {
+            // ROG Kunai has special M1-M4 buttons that are accessible via the
+            // joycon-style detachable controllers that we should map to Start
+            // and Select.
+            switch (event.getScanCode()) {
+                case 264:
+                case 266:
+                    return KeyEvent.KEYCODE_BUTTON_START;

-        if (context.hatXAxis != -1 && context.hatYAxis != -1) {
-            switch (event.getKeyCode()) {
-            // These are duplicate dpad events for hat input
-            case KeyEvent.KEYCODE_DPAD_LEFT:
-            case KeyEvent.KEYCODE_DPAD_RIGHT:
-            case KeyEvent.KEYCODE_DPAD_CENTER:
-            case KeyEvent.KEYCODE_DPAD_UP:
-            case KeyEvent.KEYCODE_DPAD_DOWN:
-                return 0;
+                case 265:
+                case 267:
+                    return KeyEvent.KEYCODE_BUTTON_SELECT;
            }
        }
-        else if (context.hatXAxis == -1 &&
+
+        if (context.hatXAxis == -1 &&
                 context.hatYAxis == -1 &&
                 /* FIXME: There's no good way to know for sure if xpad is bound
                    to this device, so we won't use the name to validate if these
@@ -901,10 +1090,29 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            // Emulate the select button with mode
            return KeyEvent.KEYCODE_BUTTON_SELECT;
        }
+        else if (context.searchIsMode && keyCode == KeyEvent.KEYCODE_SEARCH) {
+            // Emulate the mode button with search
+            return KeyEvent.KEYCODE_BUTTON_MODE;
+        }

        return keyCode;
    }

+    private int handleFlipFaceButtons(int keyCode) {
+        switch (keyCode) {
+            case KeyEvent.KEYCODE_BUTTON_A:
+                return KeyEvent.KEYCODE_BUTTON_B;
+            case KeyEvent.KEYCODE_BUTTON_B:
+                return KeyEvent.KEYCODE_BUTTON_A;
+            case KeyEvent.KEYCODE_BUTTON_X:
+                return KeyEvent.KEYCODE_BUTTON_Y;
+            case KeyEvent.KEYCODE_BUTTON_Y:
+                return KeyEvent.KEYCODE_BUTTON_X;
+            default:
+                return keyCode;
+        }
+    }
+
    private Vector2d populateCachedVector(float x, float y) {
        // Reinitialize our cached Vector2d object
        inputVector.initialize(x, y);
@@ -978,17 +1186,21 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            context.inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
            if (hatX < -0.5) {
                context.inputMap |= ControllerPacket.LEFT_FLAG;
+                context.hatXAxisUsed = true;
            }
            else if (hatX > 0.5) {
                context.inputMap |= ControllerPacket.RIGHT_FLAG;
+                context.hatXAxisUsed = true;
            }

            context.inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
            if (hatY < -0.5) {
                context.inputMap |= ControllerPacket.UP_FLAG;
+                context.hatYAxisUsed = true;
            }
            else if (hatY > 0.5) {
                context.inputMap |= ControllerPacket.DOWN_FLAG;
+                context.hatYAxisUsed = true;
            }
        }

@@ -1166,6 +1378,11 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }

        int keyCode = handleRemapping(context, event);
+
+        if (prefConfig.flipFaceButtons) {
+            keyCode = handleFlipFaceButtons(keyCode);
+        }
+
        if (keyCode == 0) {
            return true;
        }
@@ -1203,15 +1420,31 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            context.inputMap &= ~ControllerPacket.BACK_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_LEFT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap &= ~ControllerPacket.LEFT_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_RIGHT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap &= ~ControllerPacket.RIGHT_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_UP:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap &= ~ControllerPacket.UP_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_DOWN:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap &= ~ControllerPacket.DOWN_FLAG;
            break;
        case KeyEvent.KEYCODE_BUTTON_B:
@@ -1295,6 +1528,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }

        sendControllerInputPacket(context);
+
+        if (context.pendingExit && context.inputMap == 0) {
+            // All buttons from the quit combo are lifted. Finish the activity now.
+            activityContext.finish();
+        }
+
        return true;
    }

@@ -1305,12 +1544,18 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        }

        int keyCode = handleRemapping(context, event);
+
+        if (prefConfig.flipFaceButtons) {
+            keyCode = handleFlipFaceButtons(keyCode);
+        }
+
        if (keyCode == 0) {
            return true;
        }

        switch (keyCode) {
        case KeyEvent.KEYCODE_BUTTON_MODE:
+            context.hasMode = true;
            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
            break;
        case KeyEvent.KEYCODE_BUTTON_START:
@@ -1322,18 +1567,35 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            break;
        case KeyEvent.KEYCODE_BACK:
        case KeyEvent.KEYCODE_BUTTON_SELECT:
+            context.hasSelect = true;
            context.inputMap |= ControllerPacket.BACK_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_LEFT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap |= ControllerPacket.LEFT_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_RIGHT:
+            if (context.hatXAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap |= ControllerPacket.RIGHT_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_UP:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap |= ControllerPacket.UP_FLAG;
            break;
        case KeyEvent.KEYCODE_DPAD_DOWN:
+            if (context.hatYAxisUsed) {
+                // Suppress this duplicate event if we have a hat
+                return true;
+            }
            context.inputMap |= ControllerPacket.DOWN_FLAG;
            break;
        case KeyEvent.KEYCODE_BUTTON_B:
@@ -1379,30 +1641,50 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
            return false;
        }

+        // Start+Back+LB+RB is the quit combo
+        if (context.inputMap == (ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG |
+                                 ControllerPacket.LB_FLAG | ControllerPacket.RB_FLAG)) {
+            // Wait for the combo to lift and then finish the activity
+            context.pendingExit = true;
+        }
+
        // Start+LB acts like select for controllers with one button
-        if ((context.inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-            ((context.inputMap & ControllerPacket.LB_FLAG) != 0 ||
-              SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
-        {
-            context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
-            context.inputMap |= ControllerPacket.BACK_FLAG;
+        if (!context.hasSelect) {
+            if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG) ||
+                    (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                            SystemClock.uptimeMillis() - context.lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+            {
+                context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
+                context.inputMap |= ControllerPacket.BACK_FLAG;

-            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+                context.emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
+            }
        }

-        // We detect select+start or start+RB as the special button combo
-        if (((context.inputMap & ControllerPacket.RB_FLAG) != 0 ||
-             (SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
-             (context.inputMap & ControllerPacket.BACK_FLAG) != 0) &&
-            (context.inputMap & ControllerPacket.PLAY_FLAG) != 0)
-        {
-            context.inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
-            context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+        // If there is a physical select button, we'll use Start+Select as the special button combo
+        // otherwise we'll use Start+RB.
+        if (!context.hasMode) {
+            if (context.hasSelect) {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG)) {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.BACK_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;

-            context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
+            else {
+                if (context.inputMap == (ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG) ||
+                        (context.inputMap == ControllerPacket.PLAY_FLAG &&
+                                SystemClock.uptimeMillis() - context.lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
+                {
+                    context.inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
+                    context.inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
+
+                    context.emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
+                }
+            }
        }

-
        // We don't need to send repeat key down events, but the platform
        // sends us events that claim to be repeats but they're from different
        // devices, so we just send them all and deal with some duplicates.
@@ -1473,6 +1755,7 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        if (context != null) {
            LimeLog.info("Removed controller: "+controller.getControllerId());
            releaseControllerNumber(context);
+            context.destroy();
            usbDeviceContexts.remove(controller.getControllerId());
        }
    }
@@ -1483,8 +1766,12 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        usbDeviceContexts.put(controller.getControllerId(), context);
    }

-    class GenericControllerContext {
+    static class GenericControllerContext {
        public int id;
+        public boolean external;
+
+        public int vendorId;
+        public int productId;

        public float leftStickDeadzoneRadius;
        public float rightStickDeadzoneRadius;
@@ -1505,6 +1792,13 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        public boolean mouseEmulationActive;
        public Timer mouseEmulationTimer;
        public short mouseEmulationLastInputMap;
+
+        public void destroy() {
+            if (mouseEmulationTimer != null) {
+                mouseEmulationTimer.cancel();
+                mouseEmulationTimer = null;
+            }
+        }
    }

    class InputDeviceContext extends GenericControllerContext {
@@ -1524,17 +1818,22 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD

        public int hatXAxis = -1;
        public int hatYAxis = -1;
+        public boolean hatXAxisUsed, hatYAxisUsed;

-        public boolean isDualShock4;
-        public boolean isXboxController;
-        public boolean isXboxBtController;
+        public boolean isNonStandardDualShock4;
+        public boolean usesLinuxGamepadStandardFaceButtons;
+        public boolean isNonStandardXboxBtController;
        public boolean isServal;
        public boolean backIsStart;
        public boolean modeIsSelect;
+        public boolean searchIsMode;
        public boolean ignoreBack;
        public boolean hasJoystickAxes;
+        public boolean pendingExit;

        public int emulatingButtonFlags = 0;
+        public boolean hasSelect;
+        public boolean hasMode;

        // Used for OUYA bumper state tracking since they force all buttons
        // up when the OUYA button goes down. We watch the last time we get
@@ -1545,9 +1844,25 @@ public class ControllerHandler implements InputManager.InputDeviceListener, UsbD
        public long lastRbUpTime = 0;

        public long startDownTime = 0;
+
+        @Override
+        public void destroy() {
+            super.destroy();
+
+            if (vibrator != null) {
+                vibrator.cancel();
+            }
+        }
    }

    class UsbDeviceContext extends GenericControllerContext {
        public AbstractController device;
+
+        @Override
+        public void destroy() {
+            super.destroy();
+
+            // Nothing for now
+        }
    }
 }
@@ -8,290 +8,290 @@ import android.view.KeyEvent;
 * @author Cameron Gutman
 */
 public class KeyboardTranslator {
-	
-	/**
-	 * GFE's prefix for every key code
-	 */
-	private static final short KEY_PREFIX = (short) 0x80;
-	
-	public static final int VK_0 = 48;
-	public static final int VK_9 = 57;
-	public static final int VK_A = 65;
-	public static final int VK_Z = 90;
-	public static final int VK_NUMPAD0 = 96;
+    
+    /**
+     * GFE's prefix for every key code
+     */
+    private static final short KEY_PREFIX = (short) 0x80;
+    
+    public static final int VK_0 = 48;
+    public static final int VK_9 = 57;
+    public static final int VK_A = 65;
+    public static final int VK_Z = 90;
+    public static final int VK_NUMPAD0 = 96;
    public static final int VK_BACK_SLASH = 92;
    public static final int VK_CAPS_LOCK = 20;
-	public static final int VK_CLEAR = 12;
-	public static final int VK_COMMA = 44;
-	public static final int VK_BACK_SPACE = 8;
-	public static final int VK_EQUALS = 61;
-	public static final int VK_ESCAPE = 27;
-	public static final int VK_F1 = 112;
-	public static final int VK_END = 35;
-	public static final int VK_HOME = 36;
-	public static final int VK_NUM_LOCK = 144;
-	public static final int VK_PAGE_UP = 33;
-	public static final int VK_PAGE_DOWN = 34;
-	public static final int VK_PLUS = 521;
-	public static final int VK_CLOSE_BRACKET = 93;
-	public static final int VK_SCROLL_LOCK = 145;
-	public static final int VK_SEMICOLON = 59;
-	public static final int VK_SLASH = 47;
-	public static final int VK_SPACE = 32;
-	public static final int VK_PRINTSCREEN = 154;
-	public static final int VK_TAB = 9;
-	public static final int VK_LEFT = 37;
-	public static final int VK_RIGHT = 39;
-	public static final int VK_UP = 38;
-	public static final int VK_DOWN = 40;
-	public static final int VK_BACK_QUOTE = 192;
-	public static final int VK_QUOTE = 222;
-	public static final int VK_PAUSE = 19;
+    public static final int VK_CLEAR = 12;
+    public static final int VK_COMMA = 44;
+    public static final int VK_BACK_SPACE = 8;
+    public static final int VK_EQUALS = 61;
+    public static final int VK_ESCAPE = 27;
+    public static final int VK_F1 = 112;
+    public static final int VK_END = 35;
+    public static final int VK_HOME = 36;
+    public static final int VK_NUM_LOCK = 144;
+    public static final int VK_PAGE_UP = 33;
+    public static final int VK_PAGE_DOWN = 34;
+    public static final int VK_PLUS = 521;
+    public static final int VK_CLOSE_BRACKET = 93;
+    public static final int VK_SCROLL_LOCK = 145;
+    public static final int VK_SEMICOLON = 59;
+    public static final int VK_SLASH = 47;
+    public static final int VK_SPACE = 32;
+    public static final int VK_PRINTSCREEN = 154;
+    public static final int VK_TAB = 9;
+    public static final int VK_LEFT = 37;
+    public static final int VK_RIGHT = 39;
+    public static final int VK_UP = 38;
+    public static final int VK_DOWN = 40;
+    public static final int VK_BACK_QUOTE = 192;
+    public static final int VK_QUOTE = 222;
+    public static final int VK_PAUSE = 19;

-	public static boolean needsShift(int keycode) {
-		switch (keycode)
-		{
-			case KeyEvent.KEYCODE_AT:
-			case KeyEvent.KEYCODE_POUND:
-			case KeyEvent.KEYCODE_PLUS:
-			case KeyEvent.KEYCODE_STAR:
-				return true;
+    public static boolean needsShift(int keycode) {
+        switch (keycode)
+        {
+            case KeyEvent.KEYCODE_AT:
+            case KeyEvent.KEYCODE_POUND:
+            case KeyEvent.KEYCODE_PLUS:
+            case KeyEvent.KEYCODE_STAR:
+                return true;

-			default:
-				return false;
-		}
-	}
+            default:
+                return false;
+        }
+    }

-	/**
-	 * Translates the given keycode and returns the GFE keycode
-	 * @param keycode the code to be translated
-	 * @return a GFE keycode for the given keycode
-	 */
-	public static short translate(int keycode) {
-		int translated;
-		
-		// This is a poor man's mapping between Android key codes
-		// and Windows VK_* codes. For all defined VK_ codes, see:
-		// https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
-		if (keycode >= KeyEvent.KEYCODE_0 &&
-			keycode <= KeyEvent.KEYCODE_9) {
-			translated = (keycode - KeyEvent.KEYCODE_0) + VK_0;
-		}
-		else if (keycode >= KeyEvent.KEYCODE_A &&
-				 keycode <= KeyEvent.KEYCODE_Z) {
-			translated = (keycode - KeyEvent.KEYCODE_A) + VK_A;
-		}
-		else if (keycode >= KeyEvent.KEYCODE_NUMPAD_0 &&
-				 keycode <= KeyEvent.KEYCODE_NUMPAD_9) {
-			translated = (keycode - KeyEvent.KEYCODE_NUMPAD_0) + VK_NUMPAD0;
-		}
-		else if (keycode >= KeyEvent.KEYCODE_F1 &&
-				 keycode <= KeyEvent.KEYCODE_F12) {
-			translated = (keycode - KeyEvent.KEYCODE_F1) + VK_F1;
-		}
-		else {
-			switch (keycode) {
-			case KeyEvent.KEYCODE_ALT_LEFT:
-				translated = 0xA4;
-				break;
+    /**
+     * Translates the given keycode and returns the GFE keycode
+     * @param keycode the code to be translated
+     * @return a GFE keycode for the given keycode
+     */
+    public static short translate(int keycode) {
+        int translated;
+        
+        // This is a poor man's mapping between Android key codes
+        // and Windows VK_* codes. For all defined VK_ codes, see:
+        // https://msdn.microsoft.com/en-us/library/windows/desktop/dd375731(v=vs.85).aspx
+        if (keycode >= KeyEvent.KEYCODE_0 &&
+            keycode <= KeyEvent.KEYCODE_9) {
+            translated = (keycode - KeyEvent.KEYCODE_0) + VK_0;
+        }
+        else if (keycode >= KeyEvent.KEYCODE_A &&
+                 keycode <= KeyEvent.KEYCODE_Z) {
+            translated = (keycode - KeyEvent.KEYCODE_A) + VK_A;
+        }
+        else if (keycode >= KeyEvent.KEYCODE_NUMPAD_0 &&
+                 keycode <= KeyEvent.KEYCODE_NUMPAD_9) {
+            translated = (keycode - KeyEvent.KEYCODE_NUMPAD_0) + VK_NUMPAD0;
+        }
+        else if (keycode >= KeyEvent.KEYCODE_F1 &&
+                 keycode <= KeyEvent.KEYCODE_F12) {
+            translated = (keycode - KeyEvent.KEYCODE_F1) + VK_F1;
+        }
+        else {
+            switch (keycode) {
+            case KeyEvent.KEYCODE_ALT_LEFT:
+                translated = 0xA4;
+                break;

-			case KeyEvent.KEYCODE_ALT_RIGHT:
-				translated = 0xA5;
-				break;
-				
-			case KeyEvent.KEYCODE_BACKSLASH:
-				translated = 0xdc;
-				break;
-				
-			case KeyEvent.KEYCODE_CAPS_LOCK:
-				translated = VK_CAPS_LOCK;
-				break;
-				
-			case KeyEvent.KEYCODE_CLEAR:
-				translated = VK_CLEAR;
-				break;
-				
-			case KeyEvent.KEYCODE_COMMA:
-				translated = 0xbc;
-				break;
-				
-			case KeyEvent.KEYCODE_CTRL_LEFT:
-				translated = 0xA2;
-				break;
+            case KeyEvent.KEYCODE_ALT_RIGHT:
+                translated = 0xA5;
+                break;
+                
+            case KeyEvent.KEYCODE_BACKSLASH:
+                translated = 0xdc;
+                break;
+                
+            case KeyEvent.KEYCODE_CAPS_LOCK:
+                translated = VK_CAPS_LOCK;
+                break;
+                
+            case KeyEvent.KEYCODE_CLEAR:
+                translated = VK_CLEAR;
+                break;
+                
+            case KeyEvent.KEYCODE_COMMA:
+                translated = 0xbc;
+                break;
+                
+            case KeyEvent.KEYCODE_CTRL_LEFT:
+                translated = 0xA2;
+                break;

-			case KeyEvent.KEYCODE_CTRL_RIGHT:
-				translated = 0xA3;
-				break;
-				
-			case KeyEvent.KEYCODE_DEL:
-				translated = VK_BACK_SPACE;
-				break;
-				
-			case KeyEvent.KEYCODE_ENTER:
-				translated = 0x0d;
-				break;
+            case KeyEvent.KEYCODE_CTRL_RIGHT:
+                translated = 0xA3;
+                break;
+                
+            case KeyEvent.KEYCODE_DEL:
+                translated = VK_BACK_SPACE;
+                break;
+                
+            case KeyEvent.KEYCODE_ENTER:
+                translated = 0x0d;
+                break;

-			case KeyEvent.KEYCODE_PLUS:
-			case KeyEvent.KEYCODE_EQUALS:
-				translated = 0xbb;
-				break;
-				
-			case KeyEvent.KEYCODE_ESCAPE:
-				translated = VK_ESCAPE;
-				break;
-				
-			case KeyEvent.KEYCODE_FORWARD_DEL:
-				translated = 0x2e;
-				break;
-				
-			case KeyEvent.KEYCODE_INSERT:
-				translated = 0x2d;
-				break;
-				
-			case KeyEvent.KEYCODE_LEFT_BRACKET:
-				translated = 0xdb;
-				break;
+            case KeyEvent.KEYCODE_PLUS:
+            case KeyEvent.KEYCODE_EQUALS:
+                translated = 0xbb;
+                break;
+                
+            case KeyEvent.KEYCODE_ESCAPE:
+                translated = VK_ESCAPE;
+                break;
+                
+            case KeyEvent.KEYCODE_FORWARD_DEL:
+                translated = 0x2e;
+                break;
+                
+            case KeyEvent.KEYCODE_INSERT:
+                translated = 0x2d;
+                break;
+                
+            case KeyEvent.KEYCODE_LEFT_BRACKET:
+                translated = 0xdb;
+                break;

-			case KeyEvent.KEYCODE_META_LEFT:
-				translated = 0x5b;
-				break;
+            case KeyEvent.KEYCODE_META_LEFT:
+                translated = 0x5b;
+                break;

-			case KeyEvent.KEYCODE_META_RIGHT:
-				translated = 0x5c;
-				break;
+            case KeyEvent.KEYCODE_META_RIGHT:
+                translated = 0x5c;
+                break;

-			case KeyEvent.KEYCODE_MINUS:
-				translated = 0xbd;
-				break;
-				
-			case KeyEvent.KEYCODE_MOVE_END:
-				translated = VK_END;
-				break;
-				
-			case KeyEvent.KEYCODE_MOVE_HOME:
-				translated = VK_HOME;
-				break;
-				
-			case KeyEvent.KEYCODE_NUM_LOCK:
-				translated = VK_NUM_LOCK;
-				break;
-				
-			case KeyEvent.KEYCODE_PAGE_DOWN:
-				translated = VK_PAGE_DOWN;
-				break;
-				
-			case KeyEvent.KEYCODE_PAGE_UP:
-				translated = VK_PAGE_UP;
-				break;
-				
-			case KeyEvent.KEYCODE_PERIOD:
-				translated = 0xbe;
-				break;
-				
-			case KeyEvent.KEYCODE_RIGHT_BRACKET:
-				translated = 0xdd;
-				break;
-				
-			case KeyEvent.KEYCODE_SCROLL_LOCK:
-				translated = VK_SCROLL_LOCK;
-				break;
-				
-			case KeyEvent.KEYCODE_SEMICOLON:
-				translated = 0xba;
-				break;
-				
-			case KeyEvent.KEYCODE_SHIFT_LEFT:
-				translated = 0xA0;
-				break;
+            case KeyEvent.KEYCODE_MINUS:
+                translated = 0xbd;
+                break;
+                
+            case KeyEvent.KEYCODE_MOVE_END:
+                translated = VK_END;
+                break;
+                
+            case KeyEvent.KEYCODE_MOVE_HOME:
+                translated = VK_HOME;
+                break;
+                
+            case KeyEvent.KEYCODE_NUM_LOCK:
+                translated = VK_NUM_LOCK;
+                break;
+                
+            case KeyEvent.KEYCODE_PAGE_DOWN:
+                translated = VK_PAGE_DOWN;
+                break;
+                
+            case KeyEvent.KEYCODE_PAGE_UP:
+                translated = VK_PAGE_UP;
+                break;
+                
+            case KeyEvent.KEYCODE_PERIOD:
+                translated = 0xbe;
+                break;
+                
+            case KeyEvent.KEYCODE_RIGHT_BRACKET:
+                translated = 0xdd;
+                break;
+                
+            case KeyEvent.KEYCODE_SCROLL_LOCK:
+                translated = VK_SCROLL_LOCK;
+                break;
+                
+            case KeyEvent.KEYCODE_SEMICOLON:
+                translated = 0xba;
+                break;
+                
+            case KeyEvent.KEYCODE_SHIFT_LEFT:
+                translated = 0xA0;
+                break;

-			case KeyEvent.KEYCODE_SHIFT_RIGHT:
-				translated = 0xA1;
-				break;
-				
-			case KeyEvent.KEYCODE_SLASH:
-				translated = 0xbf;
-				break;
-				
-			case KeyEvent.KEYCODE_SPACE:
-				translated = VK_SPACE;
-				break;
-				
-			case KeyEvent.KEYCODE_SYSRQ:
-				// Android defines this as SysRq/PrntScrn
-				translated = VK_PRINTSCREEN;
-				break;
-				
-			case KeyEvent.KEYCODE_TAB:
-				translated = VK_TAB;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_LEFT:
-				translated = VK_LEFT;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_RIGHT:
-				translated = VK_RIGHT;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_UP:
-				translated = VK_UP;
-				break;
-				
-			case KeyEvent.KEYCODE_DPAD_DOWN:
-				translated = VK_DOWN;
-				break;
-				
-			case KeyEvent.KEYCODE_GRAVE:
-				translated = VK_BACK_QUOTE;
-				break;
-				
-			case KeyEvent.KEYCODE_APOSTROPHE:
-				translated = 0xde;
-				break;
-				
-			case KeyEvent.KEYCODE_BREAK:
-				translated = VK_PAUSE;
-				break;
+            case KeyEvent.KEYCODE_SHIFT_RIGHT:
+                translated = 0xA1;
+                break;
+                
+            case KeyEvent.KEYCODE_SLASH:
+                translated = 0xbf;
+                break;
+                
+            case KeyEvent.KEYCODE_SPACE:
+                translated = VK_SPACE;
+                break;
+                
+            case KeyEvent.KEYCODE_SYSRQ:
+                // Android defines this as SysRq/PrntScrn
+                translated = VK_PRINTSCREEN;
+                break;
+                
+            case KeyEvent.KEYCODE_TAB:
+                translated = VK_TAB;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_LEFT:
+                translated = VK_LEFT;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_RIGHT:
+                translated = VK_RIGHT;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_UP:
+                translated = VK_UP;
+                break;
+                
+            case KeyEvent.KEYCODE_DPAD_DOWN:
+                translated = VK_DOWN;
+                break;
+                
+            case KeyEvent.KEYCODE_GRAVE:
+                translated = VK_BACK_QUOTE;
+                break;
+                
+            case KeyEvent.KEYCODE_APOSTROPHE:
+                translated = 0xde;
+                break;
+                
+            case KeyEvent.KEYCODE_BREAK:
+                translated = VK_PAUSE;
+                break;

-			case KeyEvent.KEYCODE_NUMPAD_DIVIDE:
-				translated = 0x6F;
-				break;
+            case KeyEvent.KEYCODE_NUMPAD_DIVIDE:
+                translated = 0x6F;
+                break;

-			case KeyEvent.KEYCODE_NUMPAD_MULTIPLY:
-				translated = 0x6A;
-				break;
+            case KeyEvent.KEYCODE_NUMPAD_MULTIPLY:
+                translated = 0x6A;
+                break;

-			case KeyEvent.KEYCODE_NUMPAD_SUBTRACT:
-				translated = 0x6D;
-				break;
+            case KeyEvent.KEYCODE_NUMPAD_SUBTRACT:
+                translated = 0x6D;
+                break;

-			case KeyEvent.KEYCODE_NUMPAD_ADD:
-				translated = 0x6B;
-				break;
+            case KeyEvent.KEYCODE_NUMPAD_ADD:
+                translated = 0x6B;
+                break;

-			case KeyEvent.KEYCODE_NUMPAD_DOT:
-				translated = 0x6E;
-				break;
+            case KeyEvent.KEYCODE_NUMPAD_DOT:
+                translated = 0x6E;
+                break;

-			case KeyEvent.KEYCODE_AT:
-				translated = 2 + VK_0;
-				break;
+            case KeyEvent.KEYCODE_AT:
+                translated = 2 + VK_0;
+                break;

-			case KeyEvent.KEYCODE_POUND:
-				translated = 3 + VK_0;
-				break;
+            case KeyEvent.KEYCODE_POUND:
+                translated = 3 + VK_0;
+                break;

-			case KeyEvent.KEYCODE_STAR:
-				translated = 8 + VK_0;
-				break;
+            case KeyEvent.KEYCODE_STAR:
+                translated = 8 + VK_0;
+                break;

-			default:
-				System.out.println("No key for "+keycode);
-				return 0;
-			}
-		}
-		
-		return (short) ((KEY_PREFIX << 8) | translated);
-	}
+            default:
+                System.out.println("No key for "+keycode);
+                return 0;
+            }
+        }
+        
+        return (short) ((KEY_PREFIX << 8) | translated);
+    }

 }
@@ -1,17 +1,22 @@
 package com.limelight.binding.input.capture;

 import android.annotation.TargetApi;
+import android.app.Activity;
 import android.os.Build;
 import android.view.InputDevice;
 import android.view.MotionEvent;
 import android.view.View;

-@TargetApi(Build.VERSION_CODES.O)
-public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {

+// We extend AndroidPointerIconCaptureProvider because we want to also get the
+// pointer icon hiding behavior over our stream view just in case pointer capture
+// is unavailable on this system (ex: DeX, ChromeOS)
+@TargetApi(Build.VERSION_CODES.O)
+public class AndroidNativePointerCaptureProvider extends AndroidPointerIconCaptureProvider {
    private View targetView;

-    public AndroidNativePointerCaptureProvider(View targetView) {
+    public AndroidNativePointerCaptureProvider(Activity activity, View targetView) {
+        super(activity, targetView);
        this.targetView = targetView;
    }

@@ -31,30 +36,33 @@ public class AndroidNativePointerCaptureProvider extends InputCaptureProvider {
        targetView.releasePointerCapture();
    }

-    @Override
-    public boolean isCapturingActive() {
-        return targetView.hasPointerCapture();
-    }
-
    @Override
    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE;
+        // SOURCE_MOUSE_RELATIVE is how SOURCE_MOUSE appears when our view has pointer capture.
+        // SOURCE_TOUCHPAD will have relative axes populated iff our view has pointer capture.
+        // See https://developer.android.com/reference/android/view/View#requestPointerCapture()
+        return event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE ||
+                (event.getSource() == InputDevice.SOURCE_TOUCHPAD && targetView.hasPointerCapture());
    }

    @Override
    public float getRelativeAxisX(MotionEvent event) {
-        float x = event.getX();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_X : MotionEvent.AXIS_RELATIVE_X;
+        float x = event.getAxisValue(axis);
        for (int i = 0; i < event.getHistorySize(); i++) {
-            x += event.getHistoricalX(i);
+            x += event.getHistoricalAxisValue(axis, i);
        }
        return x;
    }

    @Override
    public float getRelativeAxisY(MotionEvent event) {
-        float y = event.getY();
+        int axis = (event.getSource() == InputDevice.SOURCE_MOUSE_RELATIVE) ?
+                MotionEvent.AXIS_Y : MotionEvent.AXIS_RELATIVE_Y;
+        float y = event.getAxisValue(axis);
        for (int i = 0; i < event.getHistorySize(); i++) {
-            y += event.getHistoricalY(i);
+            y += event.getHistoricalAxisValue(axis, i);
        }
        return y;
    }
@@ -7,55 +7,30 @@ import android.os.Build;
 import android.view.MotionEvent;
 import android.view.PointerIcon;
 import android.view.View;
-import android.view.ViewGroup;

@TargetApi(Build.VERSION_CODES.N)
 public class AndroidPointerIconCaptureProvider extends InputCaptureProvider {
-    private ViewGroup rootViewGroup;
+    private View targetView;
    private Context context;

-    public AndroidPointerIconCaptureProvider(Activity activity) {
+    public AndroidPointerIconCaptureProvider(Activity activity, View targetView) {
        this.context = activity;
-        this.rootViewGroup = (ViewGroup) activity.getWindow().getDecorView();
+        this.targetView = targetView;
    }

    public static boolean isCaptureProviderSupported() {
        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N;
    }

-    private void setPointerIconOnAllViews(PointerIcon icon) {
-        for (int i = 0; i < rootViewGroup.getChildCount(); i++) {
-            View view = rootViewGroup.getChildAt(i);
-            view.setPointerIcon(icon);
-        }
-        rootViewGroup.setPointerIcon(icon);
-    }
-
    @Override
    public void enableCapture() {
        super.enableCapture();
-        setPointerIconOnAllViews(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
+        targetView.setPointerIcon(PointerIcon.getSystemIcon(context, PointerIcon.TYPE_NULL));
    }

    @Override
    public void disableCapture() {
        super.disableCapture();
-        setPointerIconOnAllViews(null);
-    }
-
-    @Override
-    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X) != 0 ||
-                event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y) != 0;
-    }
-
-    @Override
-    public float getRelativeAxisX(MotionEvent event) {
-        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_X);
-    }
-
-    @Override
-    public float getRelativeAxisY(MotionEvent event) {
-        return event.getAxisValue(MotionEvent.AXIS_RELATIVE_Y);
+        targetView.setPointerIcon(null);
    }
 }
@@ -12,7 +12,7 @@ public class InputCaptureManager {
    public static InputCaptureProvider getInputCaptureProvider(Activity activity, EvdevListener rootListener) {
        if (AndroidNativePointerCaptureProvider.isCaptureProviderSupported()) {
            LimeLog.info("Using Android O+ native mouse capture");
-            return new AndroidNativePointerCaptureProvider(activity.findViewById(R.id.surfaceView));
+            return new AndroidNativePointerCaptureProvider(activity, activity.findViewById(R.id.surfaceView));
        }
        // LineageOS implemented broken NVIDIA capture extensions, so avoid using them on root builds.
        // See https://github.com/LineageOS/android_frameworks_base/commit/d304f478a023430f4712dbdc3ee69d9ad02cebd3
@@ -28,7 +28,7 @@ public class InputCaptureManager {
            // Android N's native capture can't capture over system UI elements
            // so we want to only use it if there's no other option.
            LimeLog.info("Using Android N+ pointer hiding");
-            return new AndroidPointerIconCaptureProvider(activity);
+            return new AndroidPointerIconCaptureProvider(activity, activity.findViewById(R.id.surfaceView));
        }
        else {
            LimeLog.info("Mouse capture not available");
@@ -75,8 +75,10 @@ public class ShieldCaptureProvider extends InputCaptureProvider {

    @Override
    public boolean eventHasRelativeMouseAxes(MotionEvent event) {
-        return event.getAxisValue(AXIS_RELATIVE_X) != 0 ||
-                event.getAxisValue(AXIS_RELATIVE_Y) != 0;
+        // All mouse events should use relative axes, even if they are zero. This avoids triggering
+        // cursor jumps if we get an event with no associated motion, like ACTION_DOWN or ACTION_UP.
+        return event.getPointerCount() == 1 && event.getActionIndex() == 0 &&
+                event.getToolType(0) == MotionEvent.TOOL_TYPE_MOUSE;
    }

    @Override
@@ -3,6 +3,8 @@ package com.limelight.binding.input.driver;
 public abstract class AbstractController {

    private final int deviceId;
+    private final int vendorId;
+    private final int productId;

    private UsbDriverListener listener;

@@ -15,6 +17,14 @@ public abstract class AbstractController {
        return deviceId;
    }

+    public int getVendorId() {
+        return vendorId;
+    }
+
+    public int getProductId() {
+        return productId;
+    }
+
    protected void setButtonFlag(int buttonFlag, int data) {
        if (data != 0) {
            buttonFlags |= buttonFlag;
@@ -32,9 +42,11 @@ public abstract class AbstractController {
    public abstract boolean start();
    public abstract void stop();

-    public AbstractController(int deviceId, UsbDriverListener listener) {
+    public AbstractController(int deviceId, UsbDriverListener listener, int vendorId, int productId) {
        this.deviceId = deviceId;
        this.listener = listener;
+        this.vendorId = vendorId;
+        this.productId = productId;
    }

    public abstract void rumble(short lowFreqMotor, short highFreqMotor);
@@ -22,7 +22,7 @@ public abstract class AbstractXboxController extends AbstractController {
    protected UsbEndpoint inEndpt, outEndpt;

    public AbstractXboxController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
-        super(deviceId, listener);
+        super(deviceId, listener, device.getVendorId(), device.getProductId());
        this.device = device;
        this.connection = connection;
    }
@@ -30,6 +30,18 @@ public abstract class AbstractXboxController extends AbstractController {
    private Thread createInputThread() {
        return new Thread() {
            public void run() {
+                try {
+                    // Delay for a moment before reporting the new gamepad and
+                    // accepting new input. This allows time for the old InputDevice
+                    // to go away before we reclaim its spot. If the old device is still
+                    // around when we call notifyDeviceAdded(), we won't be able to claim
+                    // the controller number used by the original InputDevice.
+                    Thread.sleep(1000);
+                } catch (InterruptedException e) {}
+
+                // Report that we're added _before_ reporting input
+                notifyDeviceAdded();
+
                while (!isInterrupted() && !stopped) {
                    byte[] buffer = new byte[64];

@@ -114,9 +126,6 @@ public abstract class AbstractXboxController extends AbstractController {
            return false;
        }

-        // Report that we're added _before_ starting the input thread
-        notifyDeviceAdded();
-
        // Start listening for controller input
        inputThread = createInputThread();
        inputThread.start();
@@ -166,7 +166,7 @@ public class UsbDriverService extends Service implements UsbDriverListener {
        }
    }

-    private static boolean isRecognizedInputDevice(UsbDevice device) {
+    public static boolean isRecognizedInputDevice(UsbDevice device) {
        // On KitKat and later, we can determine if this VID and PID combo
        // matches an existing input device and defer to the built-in controller
        // support in that case. Prior to KitKat, we'll always return true to be safe.
@@ -191,10 +191,32 @@ public class UsbDriverService extends Service implements UsbDriverListener {
        }
    }

+    public static boolean kernelSupportsXboxOne() {
+        String kernelVersion = System.getProperty("os.version");
+        LimeLog.info("Kernel Version: "+kernelVersion);
+
+        if (kernelVersion == null) {
+            // We'll assume this is some newer version of Android
+            // that doesn't let you read the kernel version this way.
+            return true;
+        }
+        else if (kernelVersion.startsWith("2.") || kernelVersion.startsWith("3.")) {
+            // These are old kernels that definitely don't support Xbox One controllers properly
+            return false;
+        }
+        else if (kernelVersion.startsWith("4.4.") || kernelVersion.startsWith("4.9.")) {
+            // These aren't guaranteed to have backported kernel patches for proper Xbox One
+            // support (though some devices will).
+            return false;
+        }
+        else {
+            // The next AOSP common kernel is 4.14 which has working Xbox One controller support
+            return true;
+        }
+    }
+
    public static boolean shouldClaimDevice(UsbDevice device, boolean claimAllAvailable) {
-        // We always bind to XB1 controllers but only bind to XB360 controllers
-        // if we know the kernel isn't already driving this device.
-        return XboxOneController.canClaimDevice(device) ||
+        return ((!kernelSupportsXboxOne() || !isRecognizedInputDevice(device) || claimAllAvailable) && XboxOneController.canClaimDevice(device)) ||
                ((!isRecognizedInputDevice(device) || claimAllAvailable) && Xbox360Controller.canClaimDevice(device));
    }

@@ -26,6 +26,7 @@ public class Xbox360Controller extends AbstractXboxController {
            0x0f0d, // Hori
            0x1038, // SteelSeries
            0x11c9, // Nacon
+            0x1209, // Ardwiino
            0x12ab, // Unknown
            0x1430, // RedOctane
            0x146b, // BigBen
@@ -33,8 +34,11 @@ public class Xbox360Controller extends AbstractXboxController {
            0x15e4, // Numark
            0x162e, // Joytech
            0x1689, // Razer Onza
+            0x1949, // Lab126 (Amazon Luna)
            0x1bad, // Harmonix
+            0x20d6, // PowerA
            0x24c6, // PowerA
+            0x2f24, // GameSir
    };

    public static boolean canClaimDevice(UsbDevice device) {
@@ -66,8 +70,8 @@ public class Xbox360Controller extends AbstractXboxController {

    @Override
    protected boolean handleRead(ByteBuffer buffer) {
-        if (buffer.limit() < 14) {
-            LimeLog.severe("Read too small: "+buffer.limit());
+        if (buffer.remaining() < 14) {
+            LimeLog.severe("Read too small: "+buffer.remaining());
            return false;
        }

@@ -21,10 +21,13 @@ public class XboxOneController extends AbstractXboxController {
            0x0e6f, // Unknown
            0x0f0d, // Hori
            0x1532, // Razer Wildcat
+            0x20d6, // PowerA
            0x24c6, // PowerA
+            0x2e24, // Hyperkin
    };

    private static final byte[] FW2015_INIT = {0x05, 0x20, 0x00, 0x01, 0x00};
+    private static final byte[] ONE_S_INIT = {0x05, 0x20, 0x00, 0x0f, 0x06};
    private static final byte[] HORI_INIT = {0x01, 0x20, 0x00, 0x09, 0x00, 0x04, 0x20, 0x3a,
            0x00, 0x00, 0x00, (byte)0x80, 0x00};
    private static final byte[] PDP_INIT1 = {0x0a, 0x20, 0x00, 0x03, 0x00, 0x01, 0x14};
@@ -38,6 +41,8 @@ public class XboxOneController extends AbstractXboxController {
            new InitPacket(0x0e6f, 0x0165, HORI_INIT),
            new InitPacket(0x0f0d, 0x0067, HORI_INIT),
            new InitPacket(0x0000, 0x0000, FW2015_INIT),
+            new InitPacket(0x045e, 0x02ea, ONE_S_INIT),
+            new InitPacket(0x045e, 0x0b00, ONE_S_INIT),
            new InitPacket(0x0e6f, 0x0000, PDP_INIT1),
            new InitPacket(0x0e6f, 0x0000, PDP_INIT2),
            new InitPacket(0x24c6, 0x541a, RUMBLE_INIT1),
@@ -98,11 +103,21 @@ public class XboxOneController extends AbstractXboxController {
        switch (buffer.get())
        {
            case 0x20:
+                if (buffer.remaining() < 17) {
+                    LimeLog.severe("XBone button/axis read too small: "+buffer.remaining());
+                    return false;
+                }
+
                buffer.position(buffer.position()+3);
                processButtons(buffer);
                return true;

            case 0x07:
+                if (buffer.remaining() < 4) {
+                    LimeLog.severe("XBone mode read too small: "+buffer.remaining());
+                    return false;
+                }
+
                // The Xbox One S controller needs acks for mode reports otherwise
                // it retransmits them forever.
                if (buffer.get() == 0x30) {
@@ -0,0 +1,272 @@
+package com.limelight.binding.input.touch;
+
+import android.os.SystemClock;
+import android.view.View;
+
+import com.limelight.nvstream.NvConnection;
+import com.limelight.nvstream.input.MouseButtonPacket;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+public class AbsoluteTouchContext implements TouchContext {
+    private int lastTouchDownX = 0;
+    private int lastTouchDownY = 0;
+    private long lastTouchDownTime = 0;
+    private int lastTouchUpX = 0;
+    private int lastTouchUpY = 0;
+    private long lastTouchUpTime = 0;
+    private int lastTouchLocationX = 0;
+    private int lastTouchLocationY = 0;
+    private boolean cancelled;
+    private boolean confirmedLongPress;
+    private boolean confirmedTap;
+    private Timer longPressTimer;
+    private Timer tapDownTimer;
+    private float accumulatedScrollDelta;
+
+    private final NvConnection conn;
+    private final int actionIndex;
+    private final View targetView;
+
+    private static final int SCROLL_SPEED_DIVISOR = 20;
+
+    private static final int LONG_PRESS_TIME_THRESHOLD = 650;
+    private static final int LONG_PRESS_DISTANCE_THRESHOLD = 30;
+
+    private static final int DOUBLE_TAP_TIME_THRESHOLD = 250;
+    private static final int DOUBLE_TAP_DISTANCE_THRESHOLD = 60;
+
+    private static final int TOUCH_DOWN_DEAD_ZONE_TIME_THRESHOLD = 100;
+    private static final int TOUCH_DOWN_DEAD_ZONE_DISTANCE_THRESHOLD = 20;
+
+    public AbsoluteTouchContext(NvConnection conn, int actionIndex, View view)
+    {
+        this.conn = conn;
+        this.actionIndex = actionIndex;
+        this.targetView = view;
+    }
+
+    @Override
+    public int getActionIndex()
+    {
+        return actionIndex;
+    }
+
+    @Override
+    public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
+    {
+        if (!isNewFinger) {
+            // We don't handle finger transitions for absolute mode
+            return true;
+        }
+
+        lastTouchLocationX = lastTouchDownX = eventX;
+        lastTouchLocationY = lastTouchDownY = eventY;
+        lastTouchDownTime = SystemClock.uptimeMillis();
+        cancelled = confirmedTap = confirmedLongPress = false;
+        accumulatedScrollDelta = 0;
+
+        if (actionIndex == 0) {
+            // Start the timers
+            startTapDownTimer();
+            startLongPressTimer();
+        }
+
+        return true;
+    }
+
+    private boolean distanceExceeds(int deltaX, int deltaY, double limit) {
+        return Math.sqrt(Math.pow(deltaX, 2) + Math.pow(deltaY, 2)) > limit;
+    }
+
+    private void updatePosition(int eventX, int eventY) {
+        // We may get values slightly outside our view region on ACTION_HOVER_ENTER and ACTION_HOVER_EXIT.
+        // Normalize these to the view size. We can't just drop them because we won't always get an event
+        // right at the boundary of the view, so dropping them would result in our cursor never really
+        // reaching the sides of the screen.
+        eventX = Math.min(Math.max(eventX, 0), targetView.getWidth());
+        eventY = Math.min(Math.max(eventY, 0), targetView.getHeight());
+
+        conn.sendMousePosition((short)eventX, (short)eventY, (short)targetView.getWidth(), (short)targetView.getHeight());
+    }
+
+    @Override
+    public void touchUpEvent(int eventX, int eventY)
+    {
+        if (cancelled) {
+            return;
+        }
+
+        if (actionIndex == 0) {
+            // Cancel the timers
+            cancelLongPressTimer();
+            cancelTapDownTimer();
+
+            // Raise the mouse buttons that we currently have down
+            if (confirmedLongPress) {
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+            }
+            else if (confirmedTap) {
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+            }
+            else {
+                // If we get here, this means that the tap completed within the touch down
+                // deadzone time. We'll need to send the touch down and up events now at the
+                // original touch down position.
+                tapConfirmed();
+                try {
+                    // FIXME: Sleeping on the main thread sucks
+                    Thread.sleep(50);
+                } catch (InterruptedException ignored) {}
+                conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+            }
+        }
+
+        lastTouchLocationX = lastTouchUpX = eventX;
+        lastTouchLocationY = lastTouchUpY = eventY;
+        lastTouchUpTime = SystemClock.uptimeMillis();
+    }
+
+    private synchronized void startLongPressTimer() {
+        longPressTimer = new Timer(true);
+        longPressTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (AbsoluteTouchContext.this) {
+                    // Check if someone cancelled us
+                    if (longPressTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    longPressTimer = null;
+
+                    // This timer should have already expired, but cancel it just in case
+                    cancelTapDownTimer();
+
+                    // Switch from a left click to a right click after a long press
+                    confirmedLongPress = true;
+                    if (confirmedTap) {
+                        conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+                    }
+                    conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
+                }
+            }
+        }, LONG_PRESS_TIME_THRESHOLD);
+    }
+
+    private synchronized void cancelLongPressTimer() {
+        if (longPressTimer != null) {
+            longPressTimer.cancel();
+            longPressTimer = null;
+        }
+    }
+
+    private synchronized void startTapDownTimer() {
+        tapDownTimer = new Timer(true);
+        tapDownTimer.schedule(new TimerTask() {
+            @Override
+            public void run() {
+                synchronized (AbsoluteTouchContext.this) {
+                    // Check if someone cancelled us
+                    if (tapDownTimer == null) {
+                        return;
+                    }
+
+                    // Uncancellable now
+                    tapDownTimer = null;
+
+                    // Start our tap
+                    tapConfirmed();
+                }
+            }
+        }, TOUCH_DOWN_DEAD_ZONE_TIME_THRESHOLD);
+    }
+
+    private synchronized void cancelTapDownTimer() {
+        if (tapDownTimer != null) {
+            tapDownTimer.cancel();
+            tapDownTimer = null;
+        }
+    }
+
+    private void tapConfirmed() {
+        if (confirmedTap || confirmedLongPress) {
+            return;
+        }
+
+        confirmedTap = true;
+        cancelTapDownTimer();
+
+        // Left button down at original position
+        if (lastTouchDownTime - lastTouchUpTime > DOUBLE_TAP_TIME_THRESHOLD ||
+                distanceExceeds(lastTouchDownX - lastTouchUpX, lastTouchDownY - lastTouchUpY, DOUBLE_TAP_DISTANCE_THRESHOLD)) {
+            // Don't reposition for finger down events within the deadzone. This makes double-clicking easier.
+            updatePosition(lastTouchDownX, lastTouchDownY);
+        }
+        conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
+    }
+
+    @Override
+    public boolean touchMoveEvent(int eventX, int eventY)
+    {
+        if (cancelled) {
+            return true;
+        }
+
+        if (actionIndex == 0) {
+            if (distanceExceeds(eventX - lastTouchDownX, eventY - lastTouchDownY, LONG_PRESS_DISTANCE_THRESHOLD)) {
+                // Moved too far since touch down. Cancel the long press timer.
+                cancelLongPressTimer();
+            }
+
+            // Ignore motion within the deadzone period after touch down
+            if (confirmedTap || distanceExceeds(eventX - lastTouchDownX, eventY - lastTouchDownY, TOUCH_DOWN_DEAD_ZONE_DISTANCE_THRESHOLD)) {
+                tapConfirmed();
+                updatePosition(eventX, eventY);
+            }
+        }
+        else if (actionIndex == 1) {
+            accumulatedScrollDelta += (eventY - lastTouchLocationY) / (float)SCROLL_SPEED_DIVISOR;
+            if ((short)accumulatedScrollDelta != 0) {
+                conn.sendMouseHighResScroll((short)accumulatedScrollDelta);
+                accumulatedScrollDelta -= (short)accumulatedScrollDelta;
+            }
+        }
+
+        lastTouchLocationX = eventX;
+        lastTouchLocationY = eventY;
+
+        return true;
+    }
+
+    @Override
+    public void cancelTouch() {
+        cancelled = true;
+
+        // Cancel the timers
+        cancelLongPressTimer();
+        cancelTapDownTimer();
+
+        // Raise the mouse buttons
+        if (confirmedLongPress) {
+            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
+        }
+        else if (confirmedTap) {
+            conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
+        }
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setPointerCount(int pointerCount) {
+        if (actionIndex == 0 && pointerCount > 1) {
+            cancelTouch();
+        }
+    }
+}
@@ -1,5 +1,6 @@
-package com.limelight.binding.input;
+package com.limelight.binding.input.touch;

+import android.os.SystemClock;
 import android.view.View;

 import com.limelight.nvstream.NvConnection;
@@ -8,7 +9,7 @@ import com.limelight.nvstream.input.MouseButtonPacket;
 import java.util.Timer;
 import java.util.TimerTask;

-public class TouchContext {
+public class RelativeTouchContext implements TouchContext {
    private int lastTouchX = 0;
    private int lastTouchY = 0;
    private int originalTouchX = 0;
@@ -17,9 +18,12 @@ public class TouchContext {
    private boolean cancelled;
    private boolean confirmedMove;
    private boolean confirmedDrag;
+    private boolean confirmedScroll;
    private Timer dragTimer;
    private double distanceMoved;
    private double xFactor, yFactor;
+    private int pointerCount;
+    private int maxPointerCountInGesture;

    private final NvConnection conn;
    private final int actionIndex;
@@ -32,8 +36,10 @@ public class TouchContext {
    private static final int TAP_TIME_THRESHOLD = 250;
    private static final int DRAG_TIME_THRESHOLD = 650;

-    public TouchContext(NvConnection conn, int actionIndex,
-                        int referenceWidth, int referenceHeight, View view)
+    private static final int SCROLL_SPEED_DIVISOR = 20;
+
+    public RelativeTouchContext(NvConnection conn, int actionIndex,
+                                int referenceWidth, int referenceHeight, View view)
    {
        this.conn = conn;
        this.actionIndex = actionIndex;
@@ -42,6 +48,7 @@ public class TouchContext {
        this.targetView = view;
    }

+    @Override
    public int getActionIndex()
    {
        return actionIndex;
@@ -57,8 +64,18 @@ public class TouchContext {

    private boolean isTap()
    {
-        long timeDelta = System.currentTimeMillis() - originalTouchTime;
+        if (confirmedDrag || confirmedMove || confirmedScroll) {
+            return false;
+        }

+        // If this input wasn't the last finger down, do not report
+        // a tap. This ensures we don't report duplicate taps for each
+        // finger on a multi-finger tap gesture
+        if (actionIndex + 1 != maxPointerCountInGesture) {
+            return false;
+        }
+
+        long timeDelta = SystemClock.uptimeMillis() - originalTouchTime;
        return isWithinTapBounds(lastTouchX, lastTouchY) && timeDelta <= TAP_TIME_THRESHOLD;
    }

@@ -72,7 +89,8 @@ public class TouchContext {
        }
    }

-    public boolean touchDownEvent(int eventX, int eventY)
+    @Override
+    public boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger)
    {
        // Get the view dimensions to scale inputs on this touch
        xFactor = referenceWidth / (double)targetView.getWidth();
@@ -80,18 +98,23 @@ public class TouchContext {

        originalTouchX = lastTouchX = eventX;
        originalTouchY = lastTouchY = eventY;
-        originalTouchTime = System.currentTimeMillis();
-        cancelled = confirmedDrag = confirmedMove = false;
-        distanceMoved = 0;

-        if (actionIndex == 0) {
-            // Start the timer for engaging a drag
-            startDragTimer();
+        if (isNewFinger) {
+            maxPointerCountInGesture = pointerCount;
+            originalTouchTime = SystemClock.uptimeMillis();
+            cancelled = confirmedDrag = confirmedMove = confirmedScroll = false;
+            distanceMoved = 0;
+
+            if (actionIndex == 0) {
+                // Start the timer for engaging a drag
+                startDragTimer();
+            }
        }

        return true;
    }

+    @Override
    public void touchUpEvent(int eventX, int eventY)
    {
        if (cancelled) {
@@ -124,11 +147,14 @@ public class TouchContext {
    }

    private synchronized void startDragTimer() {
+        // Cancel any existing drag timers
+        cancelDragTimer();
+
        dragTimer = new Timer(true);
        dragTimer.schedule(new TimerTask() {
            @Override
            public void run() {
-                synchronized (TouchContext.this) {
+                synchronized (RelativeTouchContext.this) {
                    // Check if someone already set move
                    if (confirmedMove) {
                        return;
@@ -179,20 +205,33 @@ public class TouchContext {
        }
    }

+    private void checkForConfirmedScroll() {
+        // Enter scrolling mode if we've already left the tap zone
+        // and we have 2 fingers on screen. Leave scroll mode if
+        // we no longer have 2 fingers on screen
+        confirmedScroll = (actionIndex == 0 && pointerCount == 2 && confirmedMove);
+    }
+
+    @Override
    public boolean touchMoveEvent(int eventX, int eventY)
    {
+        if (cancelled) {
+            return true;
+        }
+
        if (eventX != lastTouchX || eventY != lastTouchY)
        {
+            checkForConfirmedMove(eventX, eventY);
+            checkForConfirmedScroll();
+
            // 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)Math.abs(deltaX) * xFactor);
-                deltaY = (int)Math.round((double)Math.abs(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) {
@@ -202,6 +241,16 @@ public class TouchContext {
                    deltaY = -deltaY;
                }

+                if (pointerCount == 2) {
+                    if (confirmedScroll) {
+                        deltaY /= SCROLL_SPEED_DIVISOR;
+
+                        conn.sendMouseHighResScroll((short) deltaY);
+                    }
+                } else {
+                    conn.sendMouseMove((short) deltaX, (short) 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
@@ -211,8 +260,6 @@ public class TouchContext {
                if (deltaY != 0) {
                    lastTouchY = eventY;
                }
-
-                conn.sendMouseMove((short)deltaX, (short)deltaY);
            }
            else {
                lastTouchX = eventX;
@@ -223,6 +270,7 @@ public class TouchContext {
        return true;
    }

+    @Override
    public void cancelTouch() {
        cancelled = true;

@@ -235,7 +283,17 @@ public class TouchContext {
        }
    }

+    @Override
    public boolean isCancelled() {
        return cancelled;
    }
+
+    @Override
+    public void setPointerCount(int pointerCount) {
+        this.pointerCount = pointerCount;
+
+        if (pointerCount > maxPointerCountInGesture) {
+            maxPointerCountInGesture = pointerCount;
+        }
+    }
 }
@@ -0,0 +1,11 @@
+package com.limelight.binding.input.touch;
+
+public interface TouchContext {
+    int getActionIndex();
+    void setPointerCount(int pointerCount);
+    boolean touchDownEvent(int eventX, int eventY, boolean isNewFinger);
+    boolean touchMoveEvent(int eventX, int eventY);
+    void touchUpEvent(int eventX, int eventY);
+    void cancelTouch();
+    boolean isCancelled();
+}
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.os.SystemClock;
 import android.view.MotionEvent;

 import java.util.ArrayList;
@@ -210,7 +211,7 @@ public class AnalogStick extends VirtualControllerElement {
    @Override
    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
        // calculate new radius sizes depending
-        radius_complete = getPercent(getCorrectWidth() / 2, 100);
+        radius_complete = getPercent(getCorrectWidth() / 2, 100) - 2 * getDefaultStrokeWidth();
        radius_dead_zone = getPercent(getCorrectWidth() / 2, 30);
        radius_analog_stick = getPercent(getCorrectWidth() / 2, 20);

@@ -270,7 +271,7 @@ public class AnalogStick extends VirtualControllerElement {
        // We also release the deadzone if the user keeps the stick pressed for a bit to allow
        // them to make precise movements.
        stick_state = (stick_state == STICK_STATE.MOVED_ACTIVE ||
-                System.currentTimeMillis() - timeLastClick > timeoutDeadzone ||
+                SystemClock.uptimeMillis() - timeLastClick > timeoutDeadzone ||
                movement_radius > radius_dead_zone) ?
                STICK_STATE.MOVED_ACTIVE : STICK_STATE.MOVED_IN_DEAD_ZONE;

@@ -293,12 +294,12 @@ public class AnalogStick extends VirtualControllerElement {
        movement_radius = getMovementRadius(relative_x, relative_y);
        movement_angle = getAngle(relative_x, relative_y);

-        // chop radius if out of outer circle and already pressed
+        // pass touch event to parent if out of outer circle
+        if (movement_radius > radius_complete && !isPressed())
+            return false;
+
+        // chop radius if out of outer circle or near the edge
        if (movement_radius > (radius_complete - radius_analog_stick)) {
-            // not pressed already, so ignore event from outer circle
-            if (!isPressed()) {
-                return false;
-            }
            movement_radius = radius_complete - radius_analog_stick;
        }

@@ -311,7 +312,7 @@ public class AnalogStick extends VirtualControllerElement {
                stick_state = STICK_STATE.MOVED_IN_DEAD_ZONE;
                // check for double click
                if (lastClickState == CLICK_STATE.SINGLE &&
-                        timeLastClick + timeoutDoubleClick > System.currentTimeMillis()) {
+                        timeLastClick + timeoutDoubleClick > SystemClock.uptimeMillis()) {
                    click_state = CLICK_STATE.DOUBLE;
                    notifyOnDoubleClick();
                } else {
@@ -319,7 +320,7 @@ public class AnalogStick extends VirtualControllerElement {
                    notifyOnClick();
                }
                // reset last click timestamp
-                timeLastClick = System.currentTimeMillis();
+                timeLastClick = SystemClock.uptimeMillis();
                // set item pressed and update
                setPressed(true);
                break;
@@ -8,6 +8,7 @@ import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
+import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.view.MotionEvent;

@@ -60,6 +61,7 @@ public class DigitalButton extends VirtualControllerElement {
    private TimerLongClickTimerTask longClickTimerTask = null;

    private final Paint paint = new Paint();
+    private final RectF rect = new RectF();

    private int layer;
    private DigitalButton movingButton = null;
@@ -144,14 +146,18 @@ public class DigitalButton extends VirtualControllerElement {
        // set transparent background
        canvas.drawColor(Color.TRANSPARENT);

-        paint.setTextSize(getPercent(getWidth(), 30));
+        paint.setTextSize(getPercent(getWidth(), 25));
        paint.setTextAlign(Paint.Align.CENTER);
        paint.setStrokeWidth(getDefaultStrokeWidth());

        paint.setColor(isPressed() ? pressedColor : getDefaultColor());
        paint.setStyle(Paint.Style.STROKE);
-        canvas.drawRect(paint.getStrokeWidth(), paint.getStrokeWidth(),
-                getWidth() - paint.getStrokeWidth(), getHeight() - paint.getStrokeWidth(), paint);
+
+        rect.left = rect.top = paint.getStrokeWidth();
+        rect.right = getWidth() - rect.left;
+        rect.bottom = getHeight() - rect.top;
+
+        canvas.drawOval(rect, paint);

        if (icon != -1) {
            Drawable d = getResources().getDrawable(icon);
@@ -171,6 +177,15 @@ public class DigitalButton extends VirtualControllerElement {
            listener.onClick();
        }

+        if (timerLongClick != null) {
+            timerLongClick.cancel();
+            timerLongClick = null;
+        }
+        if (longClickTimerTask != null) {
+            longClickTimerTask.cancel();
+            longClickTimerTask = null;
+        }
+
        timerLongClick = new Timer();
        longClickTimerTask = new TimerLongClickTimerTask();
        timerLongClick.schedule(longClickTimerTask, timerLongClickTimeout);
@@ -194,9 +209,11 @@ public class DigitalButton extends VirtualControllerElement {
        // We may be called for a release without a prior click
        if (timerLongClick != null) {
            timerLongClick.cancel();
+            timerLongClick = null;
        }
        if (longClickTimerTask != null) {
            longClickTimerTask.cancel();
+            longClickTimerTask = null;
        }
    }

@@ -22,7 +22,7 @@ import java.util.Timer;
 import java.util.TimerTask;

 public class VirtualController {
-    public class ControllerInputContext {
+    public static class ControllerInputContext {
        public short inputMap = 0x0000;
        public byte leftTrigger = 0x00;
        public byte rightTrigger = 0x00;
@@ -34,7 +34,8 @@ public class VirtualController {

    public enum ControllerMode {
        Active,
-        Configuration
+        MoveButtons,
+        ResizeButtons
    }

    private static final boolean _PRINT_DEBUG_INFORMATION = false;
@@ -72,13 +73,16 @@ public class VirtualController {
            public void onClick(View v) {
                String message;

-                if (currentMode == ControllerMode.Configuration) {
+                if (currentMode == ControllerMode.Active){
+                    currentMode = ControllerMode.MoveButtons;
+                    message = "Entering configuration mode (Move buttons)";
+                } else if (currentMode == ControllerMode.MoveButtons) {
+                    currentMode = ControllerMode.ResizeButtons;
+                    message = "Entering configuration mode (Resize buttons)";
+                } else {
                    currentMode = ControllerMode.Active;
                    VirtualControllerConfigurationLoader.saveProfile(VirtualController.this, context);
                    message = "Exiting configuration mode";
-                } else {
-                    currentMode = ControllerMode.Configuration;
-                    message = "Entering configuration mode";
                }

                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
@@ -90,6 +94,7 @@ public class VirtualController {
                }
            }
        });
+
    }

    public void hide() {
@@ -120,6 +125,13 @@ public class VirtualController {
        elements.clear();
    }

+    public void setOpacity(int opacity) {
+        for (VirtualControllerElement element : elements) {
+            element.setOpacity(opacity);
+        }
+    }
+
+
    public void addElement(VirtualControllerElement element, int x, int y, int width, int height) {
        elements.add(element);
        RelativeLayout.LayoutParams layoutParams = new RelativeLayout.LayoutParams(width, height);
@@ -24,6 +24,11 @@ public class VirtualControllerConfigurationLoader {
        return (int) (((float) total / (float) 100) * (float) percent);
    }

+    // The default controls are specified using a grid of 128*72 cells at 16:9
+    private static int screenScale(int units, int height) {
+        return (int) (((float) height / (float) 72) * (float) units);
+    }
+
    private static DigitalPad createDigitalPad(
            final VirtualController controller,
            final Context context) {
@@ -145,149 +150,186 @@ public class VirtualControllerConfigurationLoader {
        return new RightAnalogStick(controller, context);
    }

-    private static final int BUTTON_BASE_X = 65;
-    private static final int BUTTON_BASE_Y = 5;
-    private static final int BUTTON_WIDTH = getPercent(30, 33);
-    private static final int BUTTON_HEIGHT = getPercent(40, 33);
+
+    private static final int TRIGGER_L_BASE_X = 1;
+    private static final int TRIGGER_R_BASE_X = 92;
+    private static final int TRIGGER_DISTANCE = 23;
+    private static final int TRIGGER_BASE_Y = 31;
+    private static final int TRIGGER_WIDTH = 12;
+    private static final int TRIGGER_HEIGHT = 9;
+
+    // Face buttons are defined based on the Y button (button number 9)
+    private static final int BUTTON_BASE_X = 106;
+    private static final int BUTTON_BASE_Y = 1;
+    private static final int BUTTON_SIZE = 10;
+
+    private static final int DPAD_BASE_X = 4;
+    private static final int DPAD_BASE_Y = 41;
+    private static final int DPAD_SIZE = 30;
+
+    private static final int ANALOG_L_BASE_X = 6;
+    private static final int ANALOG_L_BASE_Y = 4;
+    private static final int ANALOG_R_BASE_X = 98;
+    private static final int ANALOG_R_BASE_Y = 42;
+    private static final int ANALOG_SIZE = 26;
+
+    private static final int L3_R3_BASE_Y = 60;
+
+    private static final int START_X = 83;
+    private static final int BACK_X = 34;
+    private static final int START_BACK_Y = 64;
+    private static final int START_BACK_WIDTH = 12;
+    private static final int START_BACK_HEIGHT = 7;

    public static void createDefaultLayout(final VirtualController controller, final Context context) {

        DisplayMetrics screen = context.getResources().getDisplayMetrics();
        PreferenceConfiguration config = PreferenceConfiguration.readPreferences(context);

+        // Displace controls on the right by this amount of pixels to account for different aspect ratios
+        int rightDisplacement = screen.widthPixels - screen.heightPixels * 16 / 9;
+
+        int height = screen.heightPixels;
+
        // NOTE: Some of these getPercent() expressions seem like they can be combined
        // into a single call. Due to floating point rounding, this isn't actually possible.

        if (!config.onlyL3R3)
        {
            controller.addElement(createDigitalPad(controller, context),
-                    getPercent(5, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                    getPercent(30, screen.widthPixels),
-                    getPercent(40, screen.heightPixels)
+                    screenScale(DPAD_BASE_X, height),
+                    screenScale(DPAD_BASE_Y, height),
+                    screenScale(DPAD_SIZE, height),
+                    screenScale(DPAD_SIZE, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_A,
-                    ControllerPacket.A_FLAG, 0, 1, "A", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels) + getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels) + 2 * getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    !config.flipFaceButtons ? ControllerPacket.A_FLAG : ControllerPacket.B_FLAG, 0, 1,
+                    !config.flipFaceButtons ? "A" : "B", -1, controller, context),
+                    screenScale(BUTTON_BASE_X, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + 2 * BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_B,
-                    ControllerPacket.B_FLAG, 0, 1, "B", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels) + 2 * getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels) + getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    config.flipFaceButtons ? ControllerPacket.A_FLAG : ControllerPacket.B_FLAG, 0, 1,
+                    config.flipFaceButtons ? "A" : "B", -1, controller, context),
+                    screenScale(BUTTON_BASE_X + BUTTON_SIZE, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_X,
-                    ControllerPacket.X_FLAG, 0, 1, "X", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels) + getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    !config.flipFaceButtons ? ControllerPacket.X_FLAG : ControllerPacket.Y_FLAG, 0, 1,
+                    !config.flipFaceButtons ? "X" : "Y", -1, controller, context),
+                    screenScale(BUTTON_BASE_X - BUTTON_SIZE, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y + BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_Y,
-                    ControllerPacket.Y_FLAG, 0, 1, "Y", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels) + getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    config.flipFaceButtons ? ControllerPacket.X_FLAG : ControllerPacket.Y_FLAG, 0, 1,
+                    config.flipFaceButtons ? "X" : "Y", -1, controller, context),
+                    screenScale(BUTTON_BASE_X, height) + rightDisplacement,
+                    screenScale(BUTTON_BASE_Y, height),
+                    screenScale(BUTTON_SIZE, height),
+                    screenScale(BUTTON_SIZE, height)
            );

            controller.addElement(createLeftTrigger(
-                    0, "LT", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    1, "LT", -1, controller, context),
+                    screenScale(TRIGGER_L_BASE_X, height),
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
            );

            controller.addElement(createRightTrigger(
-                    0, "RT", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels) + 2 * getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    1, "RT", -1, controller, context),
+                    screenScale(TRIGGER_R_BASE_X + TRIGGER_DISTANCE, height) + rightDisplacement,
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_LB,
                    ControllerPacket.LB_FLAG, 0, 1, "LB", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels) + 2 * getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    screenScale(TRIGGER_L_BASE_X + TRIGGER_DISTANCE, height),
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_RB,
                    ControllerPacket.RB_FLAG, 0, 1, "RB", -1, controller, context),
-                    getPercent(BUTTON_BASE_X, screen.widthPixels) + 2 * getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_BASE_Y, screen.heightPixels) + 2 * getPercent(BUTTON_HEIGHT, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    screenScale(TRIGGER_R_BASE_X, height) + rightDisplacement,
+                    screenScale(TRIGGER_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
            );

            controller.addElement(createLeftStick(controller, context),
-                    getPercent(5, screen.widthPixels),
-                    getPercent(50, screen.heightPixels),
-                    getPercent(40, screen.widthPixels),
-                    getPercent(50, screen.heightPixels)
+                    screenScale(ANALOG_L_BASE_X, height),
+                    screenScale(ANALOG_L_BASE_Y, height),
+                    screenScale(ANALOG_SIZE, height),
+                    screenScale(ANALOG_SIZE, height)
            );

            controller.addElement(createRightStick(controller, context),
-                    getPercent(55, screen.widthPixels),
-                    getPercent(50, screen.heightPixels),
-                    getPercent(40, screen.widthPixels),
-                    getPercent(50, screen.heightPixels)
+                    screenScale(ANALOG_R_BASE_X, height) + rightDisplacement,
+                    screenScale(ANALOG_R_BASE_Y, height),
+                    screenScale(ANALOG_SIZE, height),
+                    screenScale(ANALOG_SIZE, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_BACK,
                    ControllerPacket.BACK_FLAG, 0, 2, "BACK", -1, controller, context),
-                    getPercent(40, screen.widthPixels),
-                    getPercent(90, screen.heightPixels),
-                    getPercent(10, screen.widthPixels),
-                    getPercent(10, screen.heightPixels)
+                    screenScale(BACK_X, height),
+                    screenScale(START_BACK_Y, height),
+                    screenScale(START_BACK_WIDTH, height),
+                    screenScale(START_BACK_HEIGHT, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_START,
                    ControllerPacket.PLAY_FLAG, 0, 3, "START", -1, controller, context),
-                    getPercent(40, screen.widthPixels) + getPercent(10, screen.widthPixels),
-                    getPercent(90, screen.heightPixels),
-                    getPercent(10, screen.widthPixels),
-                    getPercent(10, screen.heightPixels)
+                    screenScale(START_X, height) + rightDisplacement,
+                    screenScale(START_BACK_Y, height),
+                    screenScale(START_BACK_WIDTH, height),
+                    screenScale(START_BACK_HEIGHT, height)
            );
        }
        else {
            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_LSB,
                    ControllerPacket.LS_CLK_FLAG, 0, 1, "L3", -1, controller, context),
-                    getPercent(2, screen.widthPixels),
-                    getPercent(80, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    screenScale(TRIGGER_L_BASE_X, height),
+                    screenScale(L3_R3_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
            );

            controller.addElement(createDigitalButton(
                    VirtualControllerElement.EID_RSB,
                    ControllerPacket.RS_CLK_FLAG, 0, 1, "R3", -1, controller, context),
-                    getPercent(89, screen.widthPixels),
-                    getPercent(80, screen.heightPixels),
-                    getPercent(BUTTON_WIDTH, screen.widthPixels),
-                    getPercent(BUTTON_HEIGHT, screen.heightPixels)
+                    screenScale(TRIGGER_R_BASE_X + TRIGGER_DISTANCE, height) + rightDisplacement,
+                    screenScale(L3_R3_BASE_Y, height),
+                    screenScale(TRIGGER_WIDTH, height),
+                    screenScale(TRIGGER_HEIGHT, height)
            );
        }
+
+        controller.setOpacity(config.oscOpacity);
    }

    public static void saveProfile(final VirtualController controller,
@@ -306,7 +348,7 @@ public class VirtualControllerConfigurationLoader {
        prefEditor.apply();
    }

-	public static void loadFromPreferences(final VirtualController controller, final Context context) {
+    public static void loadFromPreferences(final VirtualController controller, final Context context) {
        SharedPreferences pref = context.getSharedPreferences(OSC_PREFERENCE, Activity.MODE_PRIVATE);

        for (VirtualControllerElement element : controller.getElements()) {
@@ -324,5 +366,5 @@ public class VirtualControllerConfigurationLoader {
                }
            }
        }
-	}
-}
+    }
+}
@@ -43,7 +43,8 @@ public abstract class VirtualControllerElement extends View {

    private int normalColor = 0xF0888888;
    protected int pressedColor = 0xF00000FF;
-    private int configNormalColor = 0xF0FF0000;
+    private int configMoveColor = 0xF0FF0000;
+    private int configResizeColor = 0xF0FF00FF;
    private int configSelectedColor = 0xF000FF00;

    protected int startSize_x;
@@ -112,34 +113,34 @@ public abstract class VirtualControllerElement extends View {

    /*
    protected void actionShowNormalColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog)
-			{}
+        AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+            @Override
+            public void onCancel(AmbilWarnaDialog dialog)
+            {}

-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				normalColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
+            @Override
+            public void onOk(AmbilWarnaDialog dialog, int color) {
+                normalColor = color;
+                invalidate();
+            }
+        });
+        colorDialog.show();
+    }

-	protected void actionShowPressedColorChooser() {
-		AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
-			@Override
-			public void onCancel(AmbilWarnaDialog dialog) {
-			}
+    protected void actionShowPressedColorChooser() {
+        AmbilWarnaDialog colorDialog = new AmbilWarnaDialog(getContext(), normalColor, true, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+            @Override
+            public void onCancel(AmbilWarnaDialog dialog) {
+            }

-			@Override
-			public void onOk(AmbilWarnaDialog dialog, int color) {
-				pressedColor = color;
-				invalidate();
-			}
-		});
-		colorDialog.show();
-	}
+            @Override
+            public void onOk(AmbilWarnaDialog dialog, int color) {
+                pressedColor = color;
+                invalidate();
+            }
+        });
+        colorDialog.show();
+    }
    */

    protected void actionEnableMove() {
@@ -156,8 +157,12 @@ public abstract class VirtualControllerElement extends View {
    }

    protected int getDefaultColor() {
-        return (virtualController.getControllerMode() == VirtualController.ControllerMode.Configuration) ?
-                configNormalColor : normalColor;
+        if (virtualController.getControllerMode() == VirtualController.ControllerMode.MoveButtons)
+            return configMoveColor;
+        else if (virtualController.getControllerMode() == VirtualController.ControllerMode.ResizeButtons)
+            return configResizeColor;
+        else
+            return normalColor;
    }

    protected int getDefaultStrokeWidth() {
@@ -195,11 +200,11 @@ public abstract class VirtualControllerElement extends View {
                        break;
                    }
                /*
-                case 2:	{ // set default color
+                case 2: { // set default color
                    actionShowNormalColorChooser();
                    break;
                }
-                case 3:	{ // set pressed color
+                case 3: { // set pressed color
                    actionShowPressedColorChooser();
                    break;
                }
@@ -230,7 +235,10 @@ public abstract class VirtualControllerElement extends View {
                startSize_x = getWidth();
                startSize_y = getHeight();

-                actionEnableMove();
+                if (virtualController.getControllerMode() == VirtualController.ControllerMode.MoveButtons)
+                    actionEnableMove();
+                else if (virtualController.getControllerMode() == VirtualController.ControllerMode.ResizeButtons)
+                    actionEnableResize();

                return true;
            }
@@ -287,6 +295,15 @@ public abstract class VirtualControllerElement extends View {
        invalidate();
    }

+
+    public void setOpacity(int opacity) {
+        int hexOpacity = opacity * 255 / 100;
+        this.normalColor = (hexOpacity << 24) | (normalColor & 0x00FFFFFF);
+        this.pressedColor = (hexOpacity << 24) | (pressedColor & 0x00FFFFFF);
+
+        invalidate();
+    }
+
    protected final float getPercent(float value, float percent) {
        return value / 100 * percent;
    }
@@ -8,16 +8,19 @@ import org.jcodec.codecs.h264.io.model.SeqParameterSet;
 import org.jcodec.codecs.h264.io.model.VUIParameters;

 import com.limelight.LimeLog;
+import com.limelight.R;
 import com.limelight.nvstream.av.video.VideoDecoderRenderer;
 import com.limelight.nvstream.jni.MoonBridge;
 import com.limelight.preferences.PreferenceConfiguration;

+import android.content.Context;
 import android.media.MediaCodec;
 import android.media.MediaCodecInfo;
 import android.media.MediaFormat;
 import android.media.MediaCodec.BufferInfo;
 import android.media.MediaCodec.CodecException;
 import android.os.Build;
+import android.os.SystemClock;
 import android.util.Range;
 import android.view.SurfaceHolder;

@@ -38,6 +41,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
    private boolean submittedCsd;
    private boolean submitCsdNextCall;

+    private Context context;
    private MediaCodec videoDecoder;
    private Thread rendererThread;
    private boolean needsSpsBitstreamFixup, isExynos4;
@@ -55,6 +59,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
    private String glRenderer;
    private boolean foreground = true;
    private boolean legacyFrameDropRendering = false;
+    private PerfOverlayListener perfListener;
+
+    private MediaFormat inputFormat;
+    private MediaFormat outputFormat;
+    private MediaFormat configuredFormat;

    private boolean needsBaselineSpsHack;
    private SeqParameterSet savedSps;
@@ -63,13 +72,11 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
    private long initialExceptionTimestamp;
    private static final int EXCEPTION_REPORT_DELAY_MS = 3000;

+    private VideoStats activeWindowVideoStats;
+    private VideoStats lastWindowVideoStats;
+    private VideoStats globalVideoStats;
+
    private long lastTimestampUs;
-    private long decoderTimeMs;
-    private long totalTimeMs;
-    private int totalFramesReceived;
-    private int totalFramesRendered;
-    private int frameLossEvents;
-    private int framesLost;
    private int lastFrameNumber;
    private int refreshRate;
    private PreferenceConfiguration prefs;
@@ -77,6 +84,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
    private int numSpsIn;
    private int numPpsIn;
    private int numVpsIn;
+    private int numFramesIn;
+    private int numFramesOut;

    private MediaCodecInfo findAvcDecoder() {
        MediaCodecInfo decoder = MediaCodecHelper.findProbableSafeDecoder("video/avc", MediaCodecInfo.CodecProfileLevel.AVCProfileHigh);
@@ -102,8 +111,10 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            if (!MediaCodecHelper.decoderIsWhitelistedForHevc(decoderInfo.getName(), meteredNetwork)) {
                LimeLog.info("Found HEVC decoder, but it's not whitelisted - "+decoderInfo.getName());

-                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR
-                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr) {
+                // HDR implies HEVC forced on, since HEVCMain10HDR10 is required for HDR.
+                // > 4K streaming also requires HEVC, so force it on there too.
+                if (prefs.videoFormat == PreferenceConfiguration.FORCE_H265_ON || requestedHdr ||
+                        prefs.width > 4096 || prefs.height > 4096) {
                    LimeLog.info("Forcing H265 enabled despite non-whitelisted decoder");
                }
                else {
@@ -119,16 +130,22 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
        this.renderTarget = renderTarget;
    }

-    public MediaCodecDecoderRenderer(PreferenceConfiguration prefs,
+    public MediaCodecDecoderRenderer(Context context, PreferenceConfiguration prefs,
                                     CrashListener crashListener, int consecutiveCrashCount,
                                     boolean meteredData, boolean requestedHdr,
-                                     String glRenderer) {
+                                     String glRenderer, PerfOverlayListener perfListener) {
        //dumpDecoders();

+        this.context = context;
        this.prefs = prefs;
        this.crashListener = crashListener;
        this.consecutiveCrashCount = consecutiveCrashCount;
        this.glRenderer = glRenderer;
+        this.perfListener = perfListener;
+
+        this.activeWindowVideoStats = new VideoStats();
+        this.lastWindowVideoStats = new VideoStats();
+        this.globalVideoStats = new VideoStats();

        avcDecoder = findAvcDecoder();
        if (avcDecoder != null) {
@@ -153,7 +170,6 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
        // shared between AVC and HEVC decoders on the same device.
        if (avcDecoder != null) {
            directSubmit = MediaCodecHelper.decoderCanDirectSubmit(avcDecoder.getName());
-            adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(avcDecoder);
            refFrameInvalidationAvc = MediaCodecHelper.decoderSupportsRefFrameInvalidationAvc(avcDecoder.getName(), prefs.height);
            refFrameInvalidationHevc = MediaCodecHelper.decoderSupportsRefFrameInvalidationHevc(avcDecoder.getName());

@@ -182,8 +198,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
        return avcDecoder != null;
    }

-    public boolean is49FpsBlacklisted() {
-        return avcDecoder != null && MediaCodecHelper.decoderBlacklistedFor49Fps(avcDecoder.getName());
+    public boolean isBlacklistedForFrameRate(int frameRate) {
+        return avcDecoder != null && MediaCodecHelper.decoderBlacklistedForFrameRate(avcDecoder.getName(), frameRate);
    }

    public void enableLegacyFrameDropRendering() {
@@ -226,40 +242,45 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
        this.refreshRate = redrawRate;

        String mimeType;
-        String selectedDecoderName;
+        MediaCodecInfo selectedDecoderInfo;

        if ((videoFormat & MoonBridge.VIDEO_FORMAT_MASK_H264) != 0) {
            mimeType = "video/avc";
-            selectedDecoderName = avcDecoder.getName();
+            selectedDecoderInfo = avcDecoder;

            if (avcDecoder == null) {
                LimeLog.severe("No available AVC decoder!");
                return -1;
            }

+            if (width > 4096 || height > 4096) {
+                LimeLog.severe("> 4K streaming only supported on HEVC");
+                return -1;
+            }
+
            // These fixups only apply to H264 decoders
-            needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(selectedDecoderName);
-            needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(selectedDecoderName);
-            constrainedHighProfile = MediaCodecHelper.decoderNeedsConstrainedHighProfile(selectedDecoderName);
+            needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(selectedDecoderInfo.getName());
+            needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(selectedDecoderInfo.getName());
+            constrainedHighProfile = MediaCodecHelper.decoderNeedsConstrainedHighProfile(selectedDecoderInfo.getName());
            isExynos4 = MediaCodecHelper.isExynos4Device();
            if (needsSpsBitstreamFixup) {
-                LimeLog.info("Decoder "+selectedDecoderName+" needs SPS bitstream restrictions fixup");
+                LimeLog.info("Decoder "+selectedDecoderInfo.getName()+" needs SPS bitstream restrictions fixup");
            }
            if (needsBaselineSpsHack) {
-                LimeLog.info("Decoder "+selectedDecoderName+" needs baseline SPS hack");
+                LimeLog.info("Decoder "+selectedDecoderInfo.getName()+" needs baseline SPS hack");
            }
            if (constrainedHighProfile) {
-                LimeLog.info("Decoder "+selectedDecoderName+" needs constrained high profile");
+                LimeLog.info("Decoder "+selectedDecoderInfo.getName()+" needs constrained high profile");
            }
            if (isExynos4) {
-                LimeLog.info("Decoder "+selectedDecoderName+" is on Exynos 4");
+                LimeLog.info("Decoder "+selectedDecoderInfo.getName()+" is on Exynos 4");
            }

            refFrameInvalidationActive = refFrameInvalidationAvc;
        }
        else if ((videoFormat & MoonBridge.VIDEO_FORMAT_MASK_H265) != 0) {
            mimeType = "video/hevc";
-            selectedDecoderName = hevcDecoder.getName();
+            selectedDecoderInfo = hevcDecoder;

            if (hevcDecoder == null) {
                LimeLog.severe("No available HEVC decoder!");
@@ -274,10 +295,12 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            return -3;
        }

+        adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(selectedDecoderInfo, mimeType);
+
        // Codecs have been known to throw all sorts of crazy runtime exceptions
        // due to implementation problems
        try {
-            videoDecoder = MediaCodec.createByCodecName(selectedDecoderName);
+            videoDecoder = MediaCodec.createByCodecName(selectedDecoderInfo.getName());
        } catch (Exception e) {
            e.printStackTrace();
            return -4;
@@ -285,6 +308,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {

        MediaFormat videoFormat = MediaFormat.createVideoFormat(mimeType, width, height);

+        // Avoid setting KEY_FRAME_RATE on Lollipop and earlier to reduce compatibility risk
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            // We use prefs.fps instead of redrawRate here because the low latency hack in Game.java
+            // may leave us with an odd redrawRate value like 59 or 49 which might cause the decoder
+            // to puke. To be safe, we'll use the unmodified value.
+            videoFormat.setInteger(MediaFormat.KEY_FRAME_RATE, prefs.fps);
+        }
+
        // Adaptive playback can also be enabled by the whitelist on pre-KitKat devices
        // so we don't fill these pre-KitKat
        if (adaptivePlayback && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -292,16 +323,20 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            videoFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, height);
        }

-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            // Operate at maximum rate to lower latency as much as possible on
-            // some Qualcomm platforms. We could also set KEY_PRIORITY to 0 (realtime)
-            // but that will actually result in the decoder crashing if it can't satisfy
-            // our (ludicrous) operating rate requirement.
-            videoFormat.setInteger(MediaFormat.KEY_OPERATING_RATE, Short.MAX_VALUE);
-        }
+        MediaCodecHelper.setDecoderLowLatencyOptions(videoFormat, selectedDecoderInfo, mimeType);
+
+        configuredFormat = videoFormat;
+        LimeLog.info("Configuring with format: "+configuredFormat);

        try {
            videoDecoder.configure(videoFormat, renderTarget.getSurface(), null, 0);
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                // This will contain the actual accepted input format attributes
+                inputFormat = videoDecoder.getInputFormat();
+                LimeLog.info("Input format: "+inputFormat);
+            }
+
            videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);

            if (USE_FRAME_RENDER_TIME && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
@@ -311,14 +346,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                        long delta = (renderTimeNanos / 1000000L) - (presentationTimeUs / 1000);
                        if (delta >= 0 && delta < 1000) {
                            if (USE_FRAME_RENDER_TIME) {
-                                totalTimeMs += delta;
+                                activeWindowVideoStats.totalTimeMs += delta;
                            }
                        }
                    }
                }, null);
            }

-            LimeLog.info("Using codec "+selectedDecoderName+" for hardware decoding "+mimeType);
+            LimeLog.info("Using codec "+selectedDecoderInfo.getName()+" for hardware decoding "+mimeType);

            // Start the decoder
            videoDecoder.start();
@@ -326,6 +361,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                legacyInputBuffers = videoDecoder.getInputBuffers();
            }
+
        } catch (Exception e) {
            e.printStackTrace();
            return -5;
@@ -360,7 +396,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            //
            if (initialException != null) {
                // This isn't the first time we've had an exception processing video
-                if (System.currentTimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
+                if (SystemClock.uptimeMillis() - initialExceptionTimestamp >= EXCEPTION_REPORT_DELAY_MS) {
                    // It's been over 3 seconds and we're still getting exceptions. Throw the original now.
                    if (!reportedCrash) {
                        reportedCrash = true;
@@ -377,7 +413,7 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                else {
                    initialException = new RendererException(this, e);
                }
-                initialExceptionTimestamp = System.currentTimeMillis();
+                initialExceptionTimestamp = SystemClock.uptimeMillis();
            }
        }
    }
@@ -396,10 +432,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                            long presentationTimeUs = info.presentationTimeUs;
                            int lastIndex = outIndex;

+                            numFramesOut++;
+
                            // Get the last output buffer in the queue
                            while ((outIndex = videoDecoder.dequeueOutputBuffer(info, 0)) >= 0) {
                                videoDecoder.releaseOutputBuffer(lastIndex, false);

+                                numFramesOut++;
+
                                lastIndex = outIndex;
                                presentationTimeUs = info.presentationTimeUs;
                            }
@@ -421,14 +461,14 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                                videoDecoder.releaseOutputBuffer(lastIndex, true);
                            }

-                            totalFramesRendered++;
+                            activeWindowVideoStats.totalFramesRendered++;

                            // Add delta time to the totals (excluding probable outliers)
                            long delta = MediaCodecHelper.getMonotonicMillis() - (presentationTimeUs / 1000);
                            if (delta >= 0 && delta < 1000) {
-                                decoderTimeMs += delta;
+                                activeWindowVideoStats.decoderTimeMs += delta;
                                if (!USE_FRAME_RENDER_TIME) {
-                                    totalTimeMs += delta;
+                                    activeWindowVideoStats.totalTimeMs += delta;
                                }
                            }
                        } else {
@@ -437,7 +477,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
                                    break;
                                case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
                                    LimeLog.info("Output format changed");
-                                    LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
+                                    outputFormat = videoDecoder.getOutputFormat();
+                                    LimeLog.info("New output format: " + outputFormat);
                                    break;
                                default:
                                    break;
@@ -579,31 +620,74 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
    @SuppressWarnings("deprecation")
    @Override
    public int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
-                                int frameNumber, long receiveTimeMs) {
+                                int frameNumber, long receiveTimeMs, long enqueueTimeMs) {
        if (stopping) {
            // Don't bother if we're stopping
            return MoonBridge.DR_OK;
        }

-        totalFramesReceived++;
-
-        // We can receive the same "frame" multiple times if it's an IDR frame.
-        // In that case, each frame start NALU is submitted independently.
-        if (frameNumber != lastFrameNumber && frameNumber != lastFrameNumber + 1) {
-            framesLost += frameNumber - lastFrameNumber - 1;
-            frameLossEvents++;
+        if (lastFrameNumber == 0) {
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
+        } else if (frameNumber != lastFrameNumber && frameNumber != lastFrameNumber + 1) {
+            // We can receive the same "frame" multiple times if it's an IDR frame.
+            // In that case, each frame start NALU is submitted independently.
+            activeWindowVideoStats.framesLost += frameNumber - lastFrameNumber - 1;
+            activeWindowVideoStats.totalFrames += frameNumber - lastFrameNumber - 1;
+            activeWindowVideoStats.frameLossEvents++;
        }

        lastFrameNumber = frameNumber;

+        // Flip stats windows roughly every second
+        if (SystemClock.uptimeMillis() >= activeWindowVideoStats.measurementStartTimestamp + 1000) {
+            if (prefs.enablePerfOverlay) {
+                VideoStats lastTwo = new VideoStats();
+                lastTwo.add(lastWindowVideoStats);
+                lastTwo.add(activeWindowVideoStats);
+                VideoStatsFps fps = lastTwo.getFps();
+                String decoder;
+
+                if ((videoFormat & MoonBridge.VIDEO_FORMAT_MASK_H264) != 0) {
+                    decoder = avcDecoder.getName();
+                } else if ((videoFormat & MoonBridge.VIDEO_FORMAT_MASK_H265) != 0) {
+                    decoder = hevcDecoder.getName();
+                } else {
+                    decoder = "(unknown)";
+                }
+
+                float decodeTimeMs = (float)lastTwo.decoderTimeMs / lastTwo.totalFramesReceived;
+                String perfText = context.getString(
+                        R.string.perf_overlay_text,
+                        initialWidth + "x" + initialHeight,
+                        decoder,
+                        fps.totalFps,
+                        fps.receivedFps,
+                        fps.renderedFps,
+                        (float)lastTwo.framesLost / lastTwo.totalFrames * 100,
+                        ((float)lastTwo.totalTimeMs / lastTwo.totalFramesReceived) - decodeTimeMs,
+                        decodeTimeMs);
+                perfListener.onPerfUpdate(perfText);
+            }
+
+            globalVideoStats.add(activeWindowVideoStats);
+            lastWindowVideoStats.copy(activeWindowVideoStats);
+            activeWindowVideoStats.clear();
+            activeWindowVideoStats.measurementStartTimestamp = SystemClock.uptimeMillis();
+        }
+
+        activeWindowVideoStats.totalFramesReceived++;
+        activeWindowVideoStats.totalFrames++;
+
        int inputBufferIndex;
        ByteBuffer buf;

-        long timestampUs = System.nanoTime() / 1000;
+        long timestampUs = enqueueTimeMs * 1000;

        if (!FRAME_RENDER_TIME_ONLY) {
-            // Count time from first packet received to decode start
-            totalTimeMs += (timestampUs / 1000) - receiveTimeMs;
+            // Count time from first packet received to enqueue time as receive time
+            // We will count DU queue time as part of decoding, because it is directly
+            // caused by a slow decoder.
+            activeWindowVideoStats.totalTimeMs += enqueueTimeMs - receiveTimeMs;
        }

        if (timestampUs <= lastTimestampUs) {
@@ -634,17 +718,17 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            // for known resolution combinations. Reference frame invalidation may need
            // these, so leave them be for those decoders.
            if (!refFrameInvalidationActive) {
-                if (initialWidth <= 720 && initialHeight <= 480) {
+                if (initialWidth <= 720 && initialHeight <= 480 && refreshRate <= 60) {
                    // Max 5 buffered frames at 720x480x60
                    LimeLog.info("Patching level_idc to 31");
                    sps.levelIdc = 31;
                }
-                else if (initialWidth <= 1280 && initialHeight <= 720) {
+                else if (initialWidth <= 1280 && initialHeight <= 720 && refreshRate <= 60) {
                    // Max 5 buffered frames at 1280x720x60
                    LimeLog.info("Patching level_idc to 32");
                    sps.levelIdc = 32;
                }
-                else if (initialWidth <= 1920 && initialHeight <= 1080) {
+                else if (initialWidth <= 1920 && initialHeight <= 1080 && refreshRate <= 60) {
                    // Max 4 buffered frames at 1920x1080x64
                    LimeLog.info("Patching level_idc to 42");
                    sps.levelIdc = 42;
@@ -669,12 +753,16 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
            }

            // GFE 2.5.11 changed the SPS to add additional extensions
-            // Some devices don't like these so we remove them here.
-            sps.vuiParams.videoSignalTypePresentFlag = false;
-            sps.vuiParams.colourDescriptionPresentFlag = false;
-            sps.vuiParams.chromaLocInfoPresentFlag = false;
+            // Some devices don't like these so we remove them here on old devices.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                sps.vuiParams.videoSignalTypePresentFlag = false;
+                sps.vuiParams.colourDescriptionPresentFlag = false;
+                sps.vuiParams.chromaLocInfoPresentFlag = false;
+            }

-            if ((needsSpsBitstreamFixup || isExynos4) && !refFrameInvalidationActive) {
+            // Some older devices used to choke on a bitstream restrictions, so we won't provide them
+            // unless explicitly whitelisted. For newer devices, leave the bitstream restrictions present.
+            if (needsSpsBitstreamFixup || isExynos4 || Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                // 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.

@@ -813,6 +901,8 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {

                submitCsdNextCall = false;
            }
+
+            numFramesIn++;
        }

        if (decodeUnitLength > buf.limit() - buf.position()) {
@@ -910,17 +1000,17 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
    }

    public int getAverageEndToEndLatency() {
-        if (totalFramesReceived == 0) {
+        if (globalVideoStats.totalFramesReceived == 0) {
            return 0;
        }
-        return (int)(totalTimeMs / totalFramesReceived);
+        return (int)(globalVideoStats.totalTimeMs / globalVideoStats.totalFramesReceived);
    }

    public int getAverageDecoderLatency() {
-        if (totalFramesReceived == 0) {
+        if (globalVideoStats.totalFramesReceived == 0) {
            return 0;
        }
-        return (int)(decoderTimeMs / totalFramesReceived);
+        return (int)(globalVideoStats.decoderTimeMs / globalVideoStats.totalFramesReceived);
    }

    static class DecoderHungException extends RuntimeException {
@@ -958,32 +1048,76 @@ public class MediaCodecDecoderRenderer extends VideoDecoderRenderer {
        }

        private String generateText(MediaCodecDecoderRenderer renderer, Exception originalException, ByteBuffer currentBuffer, int currentCodecFlags) {
-            String str = "";
+            String str;

+            if (renderer.numVpsIn == 0 && renderer.numSpsIn == 0 && renderer.numPpsIn == 0) {
+                str = "PreSPSError";
+            }
+            else if (renderer.numSpsIn > 0 && renderer.numPpsIn == 0) {
+                str = "PrePPSError";
+            }
+            else if (renderer.numPpsIn > 0 && renderer.numFramesIn == 0) {
+                str = "PreIFrameError";
+            }
+            else if (renderer.numFramesIn > 0 && renderer.outputFormat == null) {
+                str = "PreOutputConfigError";
+            }
+            else if (renderer.outputFormat != null && renderer.numFramesOut == 0) {
+                str = "PreOutputError";
+            }
+            else if (renderer.numFramesOut <= renderer.refreshRate * 30) {
+                str = "EarlyOutputError";
+            }
+            else {
+                str = "ErrorWhileStreaming";
+            }
+
+            str += ": 1\n";
            str += "Format: "+String.format("%x", renderer.videoFormat)+"\n";
            str += "AVC Decoder: "+((renderer.avcDecoder != null) ? renderer.avcDecoder.getName():"(none)")+"\n";
            str += "HEVC Decoder: "+((renderer.hevcDecoder != null) ? renderer.hevcDecoder.getName():"(none)")+"\n";
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && renderer.avcDecoder != null) {
                Range<Integer> avcWidthRange = renderer.avcDecoder.getCapabilitiesForType("video/avc").getVideoCapabilities().getSupportedWidths();
-                str += "AVC supported width range: "+avcWidthRange.getLower()+" - "+avcWidthRange.getUpper()+"\n";
+                str += "AVC supported width range: "+avcWidthRange+"\n";
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    try {
+                        Range<Double> avcFpsRange = renderer.avcDecoder.getCapabilitiesForType("video/avc").getVideoCapabilities().getAchievableFrameRatesFor(renderer.initialWidth, renderer.initialHeight);
+                        str += "AVC achievable FPS range: "+avcFpsRange+"\n";
+                    } catch (IllegalArgumentException e) {
+                        str += "AVC achievable FPS range: UNSUPPORTED!\n";
+                    }
+                }
            }
            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && renderer.hevcDecoder != null) {
                Range<Integer> hevcWidthRange = renderer.hevcDecoder.getCapabilitiesForType("video/hevc").getVideoCapabilities().getSupportedWidths();
-                str += "HEVC supported width range: "+hevcWidthRange.getLower()+" - "+hevcWidthRange.getUpper()+"\n";
+                str += "HEVC supported width range: "+hevcWidthRange+"\n";
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    try {
+                        Range<Double> hevcFpsRange = renderer.hevcDecoder.getCapabilitiesForType("video/hevc").getVideoCapabilities().getAchievableFrameRatesFor(renderer.initialWidth, renderer.initialHeight);
+                        str += "HEVC achievable FPS range: " + hevcFpsRange + "\n";
+                    } catch (IllegalArgumentException e) {
+                        str += "HEVC achievable FPS range: UNSUPPORTED!\n";
+                    }
+                }
            }
+            str += "Configured format: "+renderer.configuredFormat+"\n";
+            str += "Input format: "+renderer.inputFormat+"\n";
+            str += "Output format: "+renderer.outputFormat+"\n";
            str += "Adaptive playback: "+renderer.adaptivePlayback+"\n";
            str += "GL Renderer: "+renderer.glRenderer+"\n";
            str += "Build fingerprint: "+Build.FINGERPRINT+"\n";
            str += "Foreground: "+renderer.foreground+"\n";
            str += "Consecutive crashes: "+renderer.consecutiveCrashCount+"\n";
            str += "RFI active: "+renderer.refFrameInvalidationActive+"\n";
+            str += "Using modern SPS patching: "+(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)+"\n";
            str += "Video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
            str += "FPS target: "+renderer.refreshRate+"\n";
            str += "Bitrate: "+renderer.prefs.bitrate+" Kbps \n";
-            str += "In stats: "+renderer.numVpsIn+", "+renderer.numSpsIn+", "+renderer.numPpsIn+"\n";
-            str += "Total frames received: "+renderer.totalFramesReceived+"\n";
-            str += "Total frames rendered: "+renderer.totalFramesRendered+"\n";
-            str += "Frame losses: "+renderer.framesLost+" in "+renderer.frameLossEvents+" loss events\n";
+            str += "CSD stats: "+renderer.numVpsIn+", "+renderer.numSpsIn+", "+renderer.numPpsIn+"\n";
+            str += "Frames in-out: "+renderer.numFramesIn+", "+renderer.numFramesOut+"\n";
+            str += "Total frames received: "+renderer.globalVideoStats.totalFramesReceived+"\n";
+            str += "Total frames rendered: "+renderer.globalVideoStats.totalFramesRendered+"\n";
+            str += "Frame losses: "+renderer.globalVideoStats.framesLost+" in "+renderer.globalVideoStats.frameLossEvents+" loss events\n";
            str += "Average end-to-end client latency: "+renderer.getAverageEndToEndLatency()+"ms\n";
            str += "Average hardware decoder latency: "+renderer.getAverageDecoderLatency()+"ms\n";

@@ -0,0 +1,5 @@
+package com.limelight.binding.video;
+
+public interface PerfOverlayListener {
+    void onPerfUpdate(final String text);
+}
@@ -0,0 +1,72 @@
+package com.limelight.binding.video;
+
+import android.os.SystemClock;
+
+class VideoStats {
+
+    long decoderTimeMs;
+    long totalTimeMs;
+    int totalFrames;
+    int totalFramesReceived;
+    int totalFramesRendered;
+    int frameLossEvents;
+    int framesLost;
+    long measurementStartTimestamp;
+
+    void add(VideoStats other) {
+        this.decoderTimeMs += other.decoderTimeMs;
+        this.totalTimeMs += other.totalTimeMs;
+        this.totalFrames += other.totalFrames;
+        this.totalFramesReceived += other.totalFramesReceived;
+        this.totalFramesRendered += other.totalFramesRendered;
+        this.frameLossEvents += other.frameLossEvents;
+        this.framesLost += other.framesLost;
+
+        if (this.measurementStartTimestamp == 0) {
+            this.measurementStartTimestamp = other.measurementStartTimestamp;
+        }
+
+        assert other.measurementStartTimestamp >= this.measurementStartTimestamp;
+    }
+
+    void copy(VideoStats other) {
+        this.decoderTimeMs = other.decoderTimeMs;
+        this.totalTimeMs = other.totalTimeMs;
+        this.totalFrames = other.totalFrames;
+        this.totalFramesReceived = other.totalFramesReceived;
+        this.totalFramesRendered = other.totalFramesRendered;
+        this.frameLossEvents = other.frameLossEvents;
+        this.framesLost = other.framesLost;
+        this.measurementStartTimestamp = other.measurementStartTimestamp;
+    }
+
+    void clear() {
+        this.decoderTimeMs = 0;
+        this.totalTimeMs = 0;
+        this.totalFrames = 0;
+        this.totalFramesReceived = 0;
+        this.totalFramesRendered = 0;
+        this.frameLossEvents = 0;
+        this.framesLost = 0;
+        this.measurementStartTimestamp = 0;
+    }
+
+    VideoStatsFps getFps() {
+        float elapsed = (SystemClock.uptimeMillis() - this.measurementStartTimestamp) / (float) 1000;
+
+        VideoStatsFps fps = new VideoStatsFps();
+        if (elapsed > 0) {
+            fps.totalFps = this.totalFrames / elapsed;
+            fps.receivedFps = this.totalFramesReceived / elapsed;
+            fps.renderedFps = this.totalFramesRendered / elapsed;
+        }
+        return fps;
+    }
+}
+
+class VideoStatsFps {
+
+    float totalFps;
+    float receivedFps;
+    float renderedFps;
+}
@@ -18,16 +18,16 @@ import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteException;

 public class ComputerDatabaseManager {
-    private static final String COMPUTER_DB_NAME = "computers2.db";
+    private static final String COMPUTER_DB_NAME = "computers3.db";
    private static final String COMPUTER_TABLE_NAME = "Computers";
    private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
    private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
-    private static final String LOCAL_ADDRESS_COLUMN_NAME = "LocalAddress";
-    private static final String REMOTE_ADDRESS_COLUMN_NAME = "RemoteAddress";
-    private static final String MANUAL_ADDRESS_COLUMN_NAME = "ManualAddress";
+    private static final String ADDRESSES_COLUMN_NAME = "Addresses";
    private static final String MAC_ADDRESS_COLUMN_NAME = "MacAddress";
    private static final String SERVER_CERT_COLUMN_NAME = "ServerCert";

+    private static final char ADDRESS_DELIMITER = ';';
+
    private SQLiteDatabase computerDb;

    public ComputerDatabaseManager(Context c) {
@@ -47,40 +47,39 @@ public class ComputerDatabaseManager {
    }

    private void initializeDb(Context c) {
-        // Add cert column to the table if not present
-        try {
-            computerDb.execSQL(String.format((Locale)null,
-                    "ALTER TABLE %s ADD COLUMN %s TEXT",
-                    COMPUTER_TABLE_NAME, SERVER_CERT_COLUMN_NAME));
-        } catch (SQLiteException e) {}
-
-
        // Create tables if they aren't already there
        computerDb.execSQL(String.format((Locale)null,
-                "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY, %s TEXT NOT NULL, %s TEXT, %s TEXT, %s TEXT, %s TEXT, %s TEXT)",
-                COMPUTER_TABLE_NAME,
-                COMPUTER_UUID_COLUMN_NAME, COMPUTER_NAME_COLUMN_NAME,
-                LOCAL_ADDRESS_COLUMN_NAME, REMOTE_ADDRESS_COLUMN_NAME, MANUAL_ADDRESS_COLUMN_NAME,
-                MAC_ADDRESS_COLUMN_NAME, SERVER_CERT_COLUMN_NAME));
+                "CREATE TABLE IF NOT EXISTS %s(%s TEXT PRIMARY KEY, %s TEXT NOT NULL, %s TEXT NOT NULL, %s TEXT, %s TEXT)",
+                COMPUTER_TABLE_NAME, COMPUTER_UUID_COLUMN_NAME, COMPUTER_NAME_COLUMN_NAME,
+                ADDRESSES_COLUMN_NAME, MAC_ADDRESS_COLUMN_NAME, SERVER_CERT_COLUMN_NAME));

        // Move all computers from the old DB (if any) to the new one
        List<ComputerDetails> oldComputers = LegacyDatabaseReader.migrateAllComputers(c);
        for (ComputerDetails computer : oldComputers) {
            updateComputer(computer);
        }
+        oldComputers = LegacyDatabaseReader2.migrateAllComputers(c);
+        for (ComputerDetails computer : oldComputers) {
+            updateComputer(computer);
+        }
    }

-    public void deleteComputer(String name) {
-        computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_NAME_COLUMN_NAME+"=?", new String[]{name});
+    public void deleteComputer(ComputerDetails details) {
+        computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_UUID_COLUMN_NAME+"=?", new String[]{details.uuid});
    }

    public boolean updateComputer(ComputerDetails details) {
        ContentValues values = new ContentValues();
        values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid);
        values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
-        values.put(LOCAL_ADDRESS_COLUMN_NAME, details.localAddress);
-        values.put(REMOTE_ADDRESS_COLUMN_NAME, details.remoteAddress);
-        values.put(MANUAL_ADDRESS_COLUMN_NAME, details.manualAddress);
+
+        StringBuilder addresses = new StringBuilder();
+        addresses.append(details.localAddress != null ? details.localAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.remoteAddress != null ? details.remoteAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.manualAddress != null ? details.manualAddress : "");
+        addresses.append(ADDRESS_DELIMITER).append(details.ipv6Address != null ? details.ipv6Address : "");
+
+        values.put(ADDRESSES_COLUMN_NAME, addresses.toString());
        values.put(MAC_ADDRESS_COLUMN_NAME, details.macAddress);
        try {
            if (details.serverCert != null) {
@@ -96,18 +95,31 @@ public class ComputerDatabaseManager {
        return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
    }

+    private static String readNonEmptyString(String input) {
+        if (input.isEmpty()) {
+            return null;
+        }
+
+        return input;
+    }
+
    private ComputerDetails getComputerFromCursor(Cursor c) {
        ComputerDetails details = new ComputerDetails();

        details.uuid = c.getString(0);
        details.name = c.getString(1);
-        details.localAddress = c.getString(2);
-        details.remoteAddress = c.getString(3);
-        details.manualAddress = c.getString(4);
-        details.macAddress = c.getString(5);
+
+        String[] addresses = c.getString(2).split(""+ADDRESS_DELIMITER, -1);
+
+        details.localAddress = readNonEmptyString(addresses[0]);
+        details.remoteAddress = readNonEmptyString(addresses[1]);
+        details.manualAddress = readNonEmptyString(addresses[2]);
+        details.ipv6Address = readNonEmptyString(addresses[3]);
+
+        details.macAddress = c.getString(3);

        try {
-            byte[] derCertData = c.getBlob(6);
+            byte[] derCertData = c.getBlob(4);

            if (derCertData != null) {
                details.serverCert = (X509Certificate) CertificateFactory.getInstance("X.509")
@@ -127,14 +139,7 @@ public class ComputerDatabaseManager {
        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
        LinkedList<ComputerDetails> computerList = new LinkedList<>();
        while (c.moveToNext()) {
-            ComputerDetails details = getComputerFromCursor(c);
-
-            // If a critical field is corrupt or missing, skip the database entry
-            if (details.uuid == null) {
-                continue;
-            }
-
-            computerList.add(details);
+            computerList.add(getComputerFromCursor(c));
        }

        c.close();
@@ -153,12 +158,6 @@ public class ComputerDatabaseManager {
        ComputerDetails details = getComputerFromCursor(c);
        c.close();

-        // If a critical field is corrupt or missing, delete the database entry
-        if (details.uuid == null) {
-            deleteComputer(details.name);
-            return null;
-        }
-
        return details;
    }
 }
@@ -3,12 +3,17 @@ package com.limelight.computers;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringReader;
+import java.net.Inet4Address;
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.UnknownHostException;
 import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;

 import com.limelight.LimeLog;
 import com.limelight.binding.PlatformBinding;
@@ -21,14 +26,21 @@ import com.limelight.nvstream.http.PairingManager;
 import com.limelight.nvstream.mdns.MdnsComputer;
 import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
 import com.limelight.utils.CacheHelper;
+import com.limelight.utils.NetHelper;
 import com.limelight.utils.ServerHelper;

 import android.app.Service;
 import android.content.ComponentName;
+import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
 import android.os.Binder;
+import android.os.Build;
 import android.os.IBinder;
+import android.os.SystemClock;

 import org.xmlpull.v1.XmlPullParserException;

@@ -53,6 +65,7 @@ public class ComputerManagerService extends Service {
    private ComputerManagerListener listener = null;
    private final AtomicInteger activePolls = new AtomicInteger(0);
    private boolean pollingActive = false;
+    private final Lock defaultNetworkLock = new ReentrantLock();

    private DiscoveryService.DiscoveryBinder discoveryBinder;
    private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
@@ -124,6 +137,18 @@ public class ComputerManagerService extends Service {
                dbManager.updateComputer(existingComputer);
            }
            else {
+                try {
+                    // If the active address is a site-local address (RFC 1918),
+                    // then use STUN to populate the external address field if
+                    // it's not set already.
+                    if (details.remoteAddress == null) {
+                        InetAddress addr = InetAddress.getByName(details.activeAddress);
+                        if (addr.isSiteLocalAddress()) {
+                            populateExternalAddress(details);
+                        }
+                    }
+                } catch (UnknownHostException ignored) {}
+
                dbManager.updateComputer(details);
            }
        }
@@ -152,7 +177,7 @@ public class ComputerManagerService extends Service {
                                LimeLog.warning(tuple.computer.name + " is offline (try " + offlineCount + ")");
                                offlineCount++;
                            } else {
-                                tuple.lastSuccessfulPollMs = System.currentTimeMillis();
+                                tuple.lastSuccessfulPollMs = SystemClock.elapsedRealtime();
                                offlineCount = 0;
                            }
                        }
@@ -183,7 +208,7 @@ public class ComputerManagerService extends Service {
            synchronized (pollingTuples) {
                for (PollingTuple tuple : pollingTuples) {
                    // Enforce the poll data TTL
-                    if (System.currentTimeMillis() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
+                    if (SystemClock.elapsedRealtime() - tuple.lastSuccessfulPollMs > POLL_DATA_TTL_MS) {
                        LimeLog.info("Timing out polled state for "+tuple.computer.name);
                        tuple.computer.state = ComputerDetails.State.UNKNOWN;
                    }
@@ -220,12 +245,12 @@ public class ComputerManagerService extends Service {
            }
        }

-        public boolean addComputerBlocking(String addr, boolean manuallyAdded) {
-            return ComputerManagerService.this.addComputerBlocking(addr, manuallyAdded);
+        public boolean addComputerBlocking(ComputerDetails fakeDetails) {
+            return ComputerManagerService.this.addComputerBlocking(fakeDetails);
        }

-        public void removeComputer(String name) {
-            ComputerManagerService.this.removeComputer(name);
+        public void removeComputer(ComputerDetails computer) {
+            ComputerManagerService.this.removeComputer(computer);
        }

        public void stopPolling() {
@@ -293,12 +318,91 @@ public class ComputerManagerService extends Service {
        return false;
    }

+    private void populateExternalAddress(ComputerDetails details) {
+        boolean boundToNetwork = false;
+        boolean activeNetworkIsVpn = NetHelper.isActiveNetworkVpn(this);
+        ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        // Check if we're currently connected to a VPN which may send our
+        // STUN request from an unexpected interface
+        if (activeNetworkIsVpn) {
+            // Acquire the default network lock since we could be changing global process state
+            defaultNetworkLock.lock();
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                // On Lollipop or later, we can bind our process to the underlying interface
+                // to ensure our STUN request goes out on that interface or not at all (which is
+                // preferable to getting a VPN endpoint address back).
+                Network[] networks = connMgr.getAllNetworks();
+                for (Network net : networks) {
+                    NetworkCapabilities netCaps = connMgr.getNetworkCapabilities(net);
+                    if (netCaps != null) {
+                        if (!netCaps.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) &&
+                                !netCaps.hasTransport(NetworkCapabilities.TRANSPORT_VPN)) {
+                            // This network looks like an underlying multicast-capable transport,
+                            // so let's guess that it's probably where our mDNS response came from.
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                                if (connMgr.bindProcessToNetwork(net)) {
+                                    boundToNetwork = true;
+                                    break;
+                                }
+                            }
+                            else if (ConnectivityManager.setProcessDefaultNetwork(net)) {
+                                boundToNetwork = true;
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        // Perform the STUN request if we're not on a VPN or if we bound to a network
+        if (!activeNetworkIsVpn || boundToNetwork) {
+            details.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
+        }
+
+        // Unbind from the network
+        if (boundToNetwork) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                connMgr.bindProcessToNetwork(null);
+            }
+            else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                ConnectivityManager.setProcessDefaultNetwork(null);
+            }
+        }
+
+        // Unlock the network state
+        if (activeNetworkIsVpn) {
+            defaultNetworkLock.unlock();
+        }
+    }
+
    private MdnsDiscoveryListener createDiscoveryListener() {
        return new MdnsDiscoveryListener() {
            @Override
            public void notifyComputerAdded(MdnsComputer computer) {
+                ComputerDetails details = new ComputerDetails();
+
+                // Populate the computer template with mDNS info
+                if (computer.getLocalAddress() != null) {
+                    details.localAddress = computer.getLocalAddress().getHostAddress();
+
+                    // Since we're on the same network, we can use STUN to find
+                    // our WAN address, which is also very likely the WAN address
+                    // of the PC. We can use this later to connect remotely.
+                    if (computer.getLocalAddress() instanceof Inet4Address) {
+                        populateExternalAddress(details);
+                    }
+                }
+                if (computer.getIpv6Address() != null) {
+                    details.ipv6Address = computer.getIpv6Address().getHostAddress();
+                }
+
                // Kick off a serverinfo poll on this machine
-                addComputerBlocking(computer.getAddress().getHostAddress(), false);
+                if (!addComputerBlocking(details)) {
+                    LimeLog.warning("Auto-discovered PC failed to respond: "+details);
+                }
            }

            @Override
@@ -345,24 +449,7 @@ public class ComputerManagerService extends Service {
        }
    }

-    public boolean addComputerBlocking(String addr, boolean manuallyAdded) {
-        // Setup a placeholder
-        ComputerDetails fakeDetails = new ComputerDetails();
-
-        if (manuallyAdded) {
-            // Add PC UI
-            fakeDetails.manualAddress = addr;
-        }
-        else {
-            // mDNS
-            fakeDetails.localAddress = addr;
-
-            // Since we're on the same network, we can use STUN to find
-            // our WAN address, which is also very likely the WAN address
-            // of the PC. We can use this later to connect remotely.
-            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
-        }
-
+    public boolean addComputerBlocking(ComputerDetails fakeDetails) {
        // Block while we try to fill the details
        try {
            // We cannot use runPoll() here because it will attempt to persist the state of the machine
@@ -395,26 +482,22 @@ public class ComputerManagerService extends Service {
            return true;
        }
        else {
-            if (!manuallyAdded) {
-                LimeLog.warning("Auto-discovered PC failed to respond: "+addr);
-            }
-
            return false;
        }
    }

-    public void removeComputer(String name) {
+    public void removeComputer(ComputerDetails computer) {
        if (!getLocalDatabaseReference()) {
            return;
        }

        // Remove it from the database
-        dbManager.deleteComputer(name);
+        dbManager.deleteComputer(computer);

        synchronized (pollingTuples) {
            // Remove the computer from the computer list
            for (PollingTuple tuple : pollingTuples) {
-                if (tuple.computer.name.equals(name)) {
+                if (tuple.computer.uuid.equals(computer.uuid)) {
                    if (tuple.thread != null) {
                        // Interrupt the thread on this entry
                        tuple.thread.interrupt();
@@ -514,14 +597,16 @@ public class ComputerManagerService extends Service {
        t.start();
    }

-    private String fastPollPc(final String localAddress, final String remoteAddress, final String manualAddress) throws InterruptedException {
+    private String fastPollPc(final String localAddress, final String remoteAddress, final String manualAddress, final String ipv6Address) throws InterruptedException {
        final boolean[] remoteInfo = new boolean[2];
        final boolean[] localInfo = new boolean[2];
        final boolean[] manualInfo = new boolean[2];
+        final boolean[] ipv6Info = new boolean[2];

        startFastPollThread(localAddress, localInfo);
        startFastPollThread(remoteAddress, remoteInfo);
        startFastPollThread(manualAddress, manualInfo);
+        startFastPollThread(ipv6Address, ipv6Info);

        // Check local first
        synchronized (localInfo) {
@@ -545,7 +630,7 @@ public class ComputerManagerService extends Service {
            }
        }

-        // And finally, remote
+        // Now remote IPv4
        synchronized (remoteInfo) {
            while (!remoteInfo[0]) {
                remoteInfo.wait(500);
@@ -556,6 +641,17 @@ public class ComputerManagerService extends Service {
            }
        }

+        // Now global IPv6
+        synchronized (ipv6Info) {
+            while (!ipv6Info[0]) {
+                ipv6Info.wait(500);
+            }
+
+            if (ipv6Info[1]) {
+                return ipv6Address;
+            }
+        }
+
        return null;
    }

@@ -566,8 +662,8 @@ public class ComputerManagerService extends Service {
        // Do not write this address to details.activeAddress because:
        // a) it's only a candidate and may be wrong (multiple PCs behind a single router)
        // b) if it's null, it will be unexpectedly nulling the activeAddress of a possibly online PC
-        LimeLog.info("Starting fast poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +", "+details.manualAddress +")");
-        String candidateAddress = fastPollPc(details.localAddress, details.remoteAddress, details.manualAddress);
+        LimeLog.info("Starting fast poll for "+details.name+" ("+details.localAddress +", "+details.remoteAddress +", "+details.manualAddress+", "+details.ipv6Address+")");
+        String candidateAddress = fastPollPc(details.localAddress, details.remoteAddress, details.manualAddress, details.ipv6Address);
        LimeLog.info("Fast poll for "+details.name+" returned candidate address: "+candidateAddress);

        // If no connection could be established to either IP address, there's nothing we can do
@@ -582,8 +678,9 @@ public class ComputerManagerService extends Service {
            // already tried
            HashSet<String> uniqueAddresses = new HashSet<>();
            uniqueAddresses.add(details.localAddress);
-            uniqueAddresses.add(details.remoteAddress);
            uniqueAddresses.add(details.manualAddress);
+            uniqueAddresses.add(details.remoteAddress);
+            uniqueAddresses.add(details.ipv6Address);
            for (String addr : uniqueAddresses) {
                if (addr == null || addr.equals(candidateAddress)) {
                    continue;
@@ -0,0 +1,86 @@
+package com.limelight.computers;
+
+import android.content.Context;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteDatabase;
+import android.database.sqlite.SQLiteException;
+
+import com.limelight.nvstream.http.ComputerDetails;
+
+import java.io.ByteArrayInputStream;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.X509Certificate;
+import java.util.LinkedList;
+import java.util.List;
+
+public class LegacyDatabaseReader2 {
+    private static final String COMPUTER_DB_NAME = "computers2.db";
+    private static final String COMPUTER_TABLE_NAME = "Computers";
+
+    private static ComputerDetails getComputerFromCursor(Cursor c) {
+        ComputerDetails details = new ComputerDetails();
+
+        details.uuid = c.getString(0);
+        details.name = c.getString(1);
+        details.localAddress = c.getString(2);
+        details.remoteAddress = c.getString(3);
+        details.manualAddress = c.getString(4);
+        details.macAddress = c.getString(5);
+
+        // This column wasn't always present in the old schema
+        if (c.getColumnCount() >= 7) {
+            try {
+                byte[] derCertData = c.getBlob(6);
+
+                if (derCertData != null) {
+                    details.serverCert = (X509Certificate) CertificateFactory.getInstance("X.509")
+                            .generateCertificate(new ByteArrayInputStream(derCertData));
+                }
+            } catch (CertificateException e) {
+                e.printStackTrace();
+            }
+        }
+
+        // This signifies we don't have dynamic state (like pair state)
+        details.state = ComputerDetails.State.UNKNOWN;
+
+        return details;
+    }
+
+    public static List<ComputerDetails> getAllComputers(SQLiteDatabase computerDb) {
+        Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
+        LinkedList<ComputerDetails> computerList = new LinkedList<>();
+        while (c.moveToNext()) {
+            ComputerDetails details = getComputerFromCursor(c);
+
+            // If a critical field is corrupt or missing, skip the database entry
+            if (details.uuid == null) {
+                continue;
+            }
+
+            computerList.add(details);
+        }
+
+        c.close();
+
+        return computerList;
+    }
+
+    public static List<ComputerDetails> migrateAllComputers(Context c) {
+        SQLiteDatabase computerDb = null;
+        try {
+            // Open the existing database
+            computerDb = SQLiteDatabase.openDatabase(c.getDatabasePath(COMPUTER_DB_NAME).getPath(), null, SQLiteDatabase.OPEN_READONLY);
+            return getAllComputers(computerDb);
+        } catch (SQLiteException e) {
+            return new LinkedList<ComputerDetails>();
+        } finally {
+            // Close and delete the old DB
+            if (computerDb != null) {
+                computerDb.close();
+            }
+            c.deleteDatabase(COMPUTER_DB_NAME);
+        }
+    }
+}
@@ -1,6 +1,8 @@
 package com.limelight.grid;

-import android.app.Activity;
+import android.content.Context;
+import android.graphics.BitmapFactory;
+import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
@@ -13,9 +15,14 @@ import com.limelight.grid.assets.DiskAssetLoader;
 import com.limelight.grid.assets.MemoryAssetLoader;
 import com.limelight.grid.assets.NetworkAssetLoader;
 import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.preferences.PreferenceConfiguration;

+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;

@SuppressWarnings("unchecked")
 public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
@@ -23,15 +30,63 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
    private static final int SMALL_WIDTH_DP = 100;
    private static final int LARGE_WIDTH_DP = 150;

-    private final CachedAppAssetLoader loader;
+    private final ComputerDetails computer;
+    private final String uniqueId;
+    private final boolean showHiddenApps;

-    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));
+    private CachedAppAssetLoader loader;
+    private Set<Integer> hiddenAppIds = new HashSet<>();
+    private ArrayList<AppView.AppObject> allApps = new ArrayList<>();

-        int dpi = activity.getResources().getDisplayMetrics().densityDpi;
+    public AppGridAdapter(Context context, PreferenceConfiguration prefs, ComputerDetails computer, String uniqueId, boolean showHiddenApps) {
+        super(context, getLayoutIdForPreferences(prefs));
+
+        this.computer = computer;
+        this.uniqueId = uniqueId;
+        this.showHiddenApps = showHiddenApps;
+
+        updateLayoutWithPreferences(context, prefs);
+    }
+
+    public void updateHiddenApps(Set<Integer> newHiddenAppIds, boolean hideImmediately) {
+        this.hiddenAppIds.clear();
+        this.hiddenAppIds.addAll(newHiddenAppIds);
+
+        if (hideImmediately) {
+            // Reconstruct the itemList with the new hidden app set
+            itemList.clear();
+            for (AppView.AppObject app : allApps) {
+                app.isHidden = hiddenAppIds.contains(app.app.getAppId());
+
+                if (!app.isHidden || showHiddenApps) {
+                    itemList.add(app);
+                }
+            }
+        }
+        else {
+            // Just update the isHidden state to show the correct UI indication
+            for (AppView.AppObject app : allApps) {
+                app.isHidden = hiddenAppIds.contains(app.app.getAppId());
+            }
+        }
+
+        notifyDataSetChanged();
+    }
+
+    private static int getLayoutIdForPreferences(PreferenceConfiguration prefs) {
+        if (prefs.smallIconMode) {
+            return R.layout.app_grid_item_small;
+        }
+        else {
+            return R.layout.app_grid_item;
+        }
+    }
+
+    public void updateLayoutWithPreferences(Context context, PreferenceConfiguration prefs) {
+        int dpi = context.getResources().getDisplayMetrics().densityDpi;
        int dp;

-        if (small) {
+        if (prefs.smallIconMode) {
            dp = SMALL_WIDTH_DP;
        }
        else {
@@ -45,10 +100,19 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
        }
        LimeLog.info("Art scaling divisor: " + scalingDivisor);

+        if (loader != null) {
+            // Cancel operations on the old loader
+            cancelQueuedOperations();
+        }
+
        this.loader = new CachedAppAssetLoader(computer, scalingDivisor,
                new NetworkAssetLoader(context, uniqueId),
                new MemoryAssetLoader(),
-                new DiskAssetLoader(context));
+                new DiskAssetLoader(context),
+                BitmapFactory.decodeResource(context.getResources(), R.drawable.no_app_image));
+
+        // This will trigger the view to reload with the new layout
+        setLayoutId(getLayoutIdForPreferences(prefs));
    }

    public void cancelQueuedOperations() {
@@ -57,8 +121,8 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
        loader.freeCacheMemory();
    }

-    private void sortList() {
-        Collections.sort(itemList, new Comparator<AppView.AppObject>() {
+    private static void sortList(List<AppView.AppObject> list) {
+        Collections.sort(list, new Comparator<AppView.AppObject>() {
            @Override
            public int compare(AppView.AppObject lhs, AppView.AppObject rhs) {
                return lhs.app.getAppName().toLowerCase().compareTo(rhs.app.getAppName().toLowerCase());
@@ -67,43 +131,54 @@ public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
    }

    public void addApp(AppView.AppObject app) {
-        // Queue a request to fetch this bitmap into cache
-        loader.queueCacheLoad(app.app);
+        // Update hidden state
+        app.isHidden = hiddenAppIds.contains(app.app.getAppId());

-        // Add the app to our sorted list
-        itemList.add(app);
-        sortList();
+        // Always add the app to the all apps list
+        allApps.add(app);
+        sortList(allApps);
+
+        // Add the app to the adapter data if it's not hidden
+        if (showHiddenApps || !app.isHidden) {
+            // Queue a request to fetch this bitmap into cache
+            loader.queueCacheLoad(app.app);
+
+            // Add the app to our sorted list
+            itemList.add(app);
+            sortList(itemList);
+        }
    }

    public void removeApp(AppView.AppObject app) {
        itemList.remove(app);
+        allApps.remove(app);
    }

    @Override
-    public boolean populateImageView(ImageView imgView, ProgressBar prgView, AppView.AppObject obj) {
+    public void clear() {
+        super.clear();
+        allApps.clear();
+    }
+
+    @Override
+    public void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, AppView.AppObject obj) {
        // Let the cached asset loader handle it
-        loader.populateImageView(obj.app, imgView, prgView);
-        return true;
-    }
+        loader.populateImageView(obj.app, imgView, txtView);

-    @Override
-    public boolean populateTextView(TextView txtView, AppView.AppObject obj) {
-        // Select the text view so it starts marquee mode
-        txtView.setSelected(true);
-
-        // Return false to use the app's toString method
-        return false;
-    }
-
-    @Override
-    public boolean populateOverlayView(ImageView overlayView, AppView.AppObject obj) {
        if (obj.isRunning) {
            // Show the play button overlay
            overlayView.setImageResource(R.drawable.ic_play);
-            return true;
+            overlayView.setVisibility(View.VISIBLE);
+        }
+        else {
+            overlayView.setVisibility(View.GONE);
        }

-        // No overlay
-        return false;
+        if (obj.isHidden) {
+            parentView.setAlpha(0.40f);
+        }
+        else {
+            parentView.setAlpha(1.0f);
+        }
    }
 }
@@ -15,17 +15,26 @@ import java.util.ArrayList;

 public abstract class GenericGridAdapter<T> extends BaseAdapter {
    protected final Context context;
-    protected final int layoutId;
-    protected final ArrayList<T> itemList = new ArrayList<>();
-    protected final LayoutInflater inflater;
+    private int layoutId;
+    final ArrayList<T> itemList = new ArrayList<>();
+    private final LayoutInflater inflater;

-    public GenericGridAdapter(Context context, int layoutId) {
+    GenericGridAdapter(Context context, int layoutId) {
        this.context = context;
        this.layoutId = layoutId;

        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
    }

+    void setLayoutId(int layoutId) {
+        if (layoutId != this.layoutId) {
+            this.layoutId = layoutId;
+
+            // Force the view to be redrawn with the new layout
+            notifyDataSetInvalidated();
+        }
+    }
+
    public void clear() {
        itemList.clear();
    }
@@ -45,9 +54,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
        return i;
    }

-    public abstract boolean populateImageView(ImageView imgView, ProgressBar prgView, T obj);
-    public abstract boolean populateTextView(TextView txtView, T obj);
-    public abstract boolean populateOverlayView(ImageView overlayView, T obj);
+    public abstract void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, T obj);

    @Override
    public View getView(int i, View convertView, ViewGroup viewGroup) {
@@ -60,22 +67,7 @@ public abstract class GenericGridAdapter<T> extends BaseAdapter {
        TextView txtView = convertView.findViewById(R.id.grid_text);
        ProgressBar prgView = convertView.findViewById(R.id.grid_spinner);

-        if (imgView != null) {
-            if (!populateImageView(imgView, prgView, itemList.get(i))) {
-                imgView.setImageBitmap(null);
-            }
-        }
-        if (!populateTextView(txtView, itemList.get(i))) {
-            txtView.setText(itemList.get(i).toString());
-        }
-        if (overlayView != null) {
-            if (!populateOverlayView(overlayView, itemList.get(i))) {
-                overlayView.setVisibility(View.INVISIBLE);
-            }
-            else {
-                overlayView.setVisibility(View.VISIBLE);
-            }
-        }
+        populateView(convertView, imgView, prgView, txtView, overlayView, itemList.get(i));

        return convertView;
    }
@@ -10,14 +10,24 @@ import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.PairingManager;
+import com.limelight.preferences.PreferenceConfiguration;

 import java.util.Collections;
 import java.util.Comparator;

 public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {

-    public PcGridAdapter(Context context, boolean listMode, boolean small) {
-        super(context, listMode ? R.layout.simple_row : (small ? R.layout.pc_grid_item_small : R.layout.pc_grid_item));
+    public PcGridAdapter(Context context, PreferenceConfiguration prefs) {
+        super(context, getLayoutIdForPreferences(prefs));
+    }
+
+    private static int getLayoutIdForPreferences(PreferenceConfiguration prefs) {
+        return R.layout.pc_grid_item;
+    }
+
+    public void updateLayoutWithPreferences(Context context, PreferenceConfiguration prefs) {
+        // This will trigger the view to reload with the new layout
+        setLayoutId(getLayoutIdForPreferences(prefs));
    }

    public void addComputer(PcView.ComputerObject computer) {
@@ -39,7 +49,8 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
    }

    @Override
-    public boolean populateImageView(ImageView imgView, ProgressBar prgView, PcView.ComputerObject obj) {
+    public void populateView(View parentView, ImageView imgView, ProgressBar prgView, TextView txtView, ImageView overlayView, PcView.ComputerObject obj) {
+        imgView.setImageResource(R.drawable.ic_computer);
        if (obj.details.state == ComputerDetails.State.ONLINE) {
            imgView.setAlpha(1.0f);
        }
@@ -54,12 +65,7 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
            prgView.setVisibility(View.INVISIBLE);
        }

-        imgView.setImageResource(R.drawable.ic_computer);
-        return true;
-    }
-
-    @Override
-    public boolean populateTextView(TextView txtView, PcView.ComputerObject obj) {
+        txtView.setText(obj.details.name);
        if (obj.details.state == ComputerDetails.State.ONLINE) {
            txtView.setAlpha(1.0f);
        }
@@ -67,16 +73,10 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
            txtView.setAlpha(0.4f);
        }

-        // Return false to use the computer's toString method
-        return false;
-    }
-
-    @Override
-    public boolean populateOverlayView(ImageView overlayView, PcView.ComputerObject obj) {
        if (obj.details.state == ComputerDetails.State.OFFLINE) {
            overlayView.setImageResource(R.drawable.ic_pc_offline);
            overlayView.setAlpha(0.4f);
-            return true;
+            overlayView.setVisibility(View.VISIBLE);
        }
        // We must check if the status is exactly online and unpaired
        // to avoid colliding with the loading spinner when status is unknown
@@ -84,8 +84,10 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
                obj.details.pairState == PairingManager.PairState.NOT_PAIRED) {
            overlayView.setImageResource(R.drawable.ic_lock);
            overlayView.setAlpha(1.0f);
-            return true;
+            overlayView.setVisibility(View.VISIBLE);
+        }
+        else {
+            overlayView.setVisibility(View.GONE);
        }
-        return false;
    }
 }
@@ -6,9 +6,12 @@ import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
 import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
-import android.widget.ProgressBar;
+import android.widget.TextView;

+import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
 import com.limelight.nvstream.http.NvApp;

@@ -52,15 +55,17 @@ public class CachedAppAssetLoader {
    private final MemoryAssetLoader memoryLoader;
    private final DiskAssetLoader diskLoader;
    private final Bitmap placeholderBitmap;
+    private final Bitmap noAppImageBitmap;

    public CachedAppAssetLoader(ComputerDetails computer, double scalingDivider,
                                NetworkAssetLoader networkLoader, MemoryAssetLoader memoryLoader,
-                                DiskAssetLoader diskLoader) {
+                                DiskAssetLoader diskLoader, Bitmap noAppImageBitmap) {
        this.computer = computer;
        this.scalingDivider = scalingDivider;
        this.networkLoader = networkLoader;
        this.memoryLoader = memoryLoader;
        this.diskLoader = diskLoader;
+        this.noAppImageBitmap = noAppImageBitmap;
        this.placeholderBitmap = Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
    }

@@ -87,7 +92,7 @@ public class CachedAppAssetLoader {
        memoryLoader.clearCache();
    }

-    private Bitmap doNetworkAssetLoad(LoaderTuple tuple, LoaderTask task) {
+    private ScaledBitmap doNetworkAssetLoad(LoaderTuple tuple, LoaderTask task) {
        // Try 3 times
        for (int i = 0; i < 3; i++) {
            // Check again whether we've been cancelled or the image view is gone
@@ -108,7 +113,7 @@ public class CachedAppAssetLoader {
                // If there's a task associated with this load, we should return the bitmap
                if (task != null) {
                    // If the cached bitmap is valid, return it. Otherwise, we'll try the load again
-                    Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+                    ScaledBitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
                    if (bmp != null) {
                        return bmp;
                    }
@@ -130,29 +135,29 @@ public class CachedAppAssetLoader {
        return null;
    }

-    private class LoaderTask extends AsyncTask<LoaderTuple, Void, Bitmap> {
+    private class LoaderTask extends AsyncTask<LoaderTuple, Void, ScaledBitmap> {
        private final WeakReference<ImageView> imageViewRef;
-        private final WeakReference<ProgressBar> progressViewRef;
+        private final WeakReference<TextView> textViewRef;
        private final boolean diskOnly;

        private LoaderTuple tuple;

-        public LoaderTask(ImageView imageView, ProgressBar prgView, boolean diskOnly) {
+        public LoaderTask(ImageView imageView, TextView textView, boolean diskOnly) {
            this.imageViewRef = new WeakReference<>(imageView);
-            this.progressViewRef = new WeakReference<>(prgView);
+            this.textViewRef = new WeakReference<>(textView);
            this.diskOnly = diskOnly;
        }

        @Override
-        protected Bitmap doInBackground(LoaderTuple... params) {
+        protected ScaledBitmap doInBackground(LoaderTuple... params) {
            tuple = params[0];

            // Check whether it has been cancelled or the views are gone
-            if (isCancelled() || imageViewRef.get() == null || progressViewRef.get() == null) {
+            if (isCancelled() || imageViewRef.get() == null || textViewRef.get() == null) {
                return null;
            }

-            Bitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
+            ScaledBitmap bmp = diskLoader.loadBitmapFromCache(tuple, (int) scalingDivider);
            if (bmp == null) {
                if (!diskOnly) {
                    // Try to load the asset from the network
@@ -181,44 +186,61 @@ public class CachedAppAssetLoader {

            // If the current loader task for this view isn't us, do nothing
            final ImageView imageView = imageViewRef.get();
-            final ProgressBar prgView = progressViewRef.get();
+            final TextView textView = textViewRef.get();
            if (getLoaderTask(imageView) == this) {
-                // Now display the progress bar since we have to hit the network
-                if (prgView != null) {
-                    prgView.setVisibility(View.VISIBLE);
-                }
-
-                // Set off another loader task on the network executor
-                LoaderTask task = new LoaderTask(imageView, prgView, false);
-                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), placeholderBitmap, task);
-                imageView.setVisibility(View.VISIBLE);
+                // Set off another loader task on the network executor. This time our AsyncDrawable
+                // will use the app image placeholder bitmap, rather than an empty bitmap.
+                LoaderTask task = new LoaderTask(imageView, textView, false);
+                AsyncDrawable asyncDrawable = new AsyncDrawable(imageView.getResources(), noAppImageBitmap, task);
                imageView.setImageDrawable(asyncDrawable);
+                imageView.startAnimation(AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadein));
+                imageView.setVisibility(View.VISIBLE);
+                textView.setVisibility(View.VISIBLE);
                task.executeOnExecutor(networkExecutor, tuple);
            }
        }

        @Override
-        protected void onPostExecute(Bitmap bitmap) {
+        protected void onPostExecute(final ScaledBitmap bitmap) {
            // Do nothing if cancelled
            if (isCancelled()) {
                return;
            }

            final ImageView imageView = imageViewRef.get();
-            final ProgressBar prgView = progressViewRef.get();
+            final TextView textView = textViewRef.get();
            if (getLoaderTask(imageView) == this) {
-                // Set the bitmap
+                // Fade in the box art
                if (bitmap != null) {
-                    imageView.setImageBitmap(bitmap);
-                }
+                    // Show the text if it's a placeholder
+                    textView.setVisibility(isBitmapPlaceholder(bitmap) ? View.VISIBLE : View.GONE);

-                // Hide the progress bar
-                if (prgView != null) {
-                    prgView.setVisibility(View.INVISIBLE);
-                }
+                    if (imageView.getVisibility() == View.VISIBLE) {
+                        // Fade out the placeholder first
+                        Animation fadeOutAnimation = AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadeout);
+                        fadeOutAnimation.setAnimationListener(new Animation.AnimationListener() {
+                            @Override
+                            public void onAnimationStart(Animation animation) {}

-                // Show the view
-                imageView.setVisibility(View.VISIBLE);
+                            @Override
+                            public void onAnimationEnd(Animation animation) {
+                                // Fade in the new box art
+                                imageView.setImageBitmap(bitmap.bitmap);
+                                imageView.startAnimation(AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadein));
+                            }
+
+                            @Override
+                            public void onAnimationRepeat(Animation animation) {}
+                        });
+                        imageView.startAnimation(fadeOutAnimation);
+                    }
+                    else {
+                        // View is invisible already, so just fade in the new art
+                        imageView.setImageBitmap(bitmap.bitmap);
+                        imageView.startAnimation(AnimationUtils.loadAnimation(imageView.getContext(), R.anim.boxart_fadein));
+                        imageView.setVisibility(View.VISIBLE);
+                    }
+                }
            }
        }
    }
@@ -296,7 +318,13 @@ public class CachedAppAssetLoader {
        });
    }

-    public boolean populateImageView(NvApp app, ImageView imgView, ProgressBar prgView) {
+    private boolean isBitmapPlaceholder(ScaledBitmap bitmap) {
+        return (bitmap == null) ||
+                (bitmap.originalWidth == 130 && bitmap.originalHeight == 180) || // GFE 2.0
+                (bitmap.originalWidth == 628 && bitmap.originalHeight == 888); // GFE 3.0
+    }
+
+    public boolean populateImageView(NvApp app, ImageView imgView, TextView textView) {
        LoaderTuple tuple = new LoaderTuple(computer, app);

        // If there's already a task in progress for this view,
@@ -306,22 +334,26 @@ public class CachedAppAssetLoader {
            return true;
        }

-        // Hide the progress bar always on initial load
-        prgView.setVisibility(View.INVISIBLE);
+        // Always set the name text so we have it if needed later
+        textView.setText(app.getAppName());

        // First, try the memory cache in the current context
-        Bitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
+        ScaledBitmap bmp = memoryLoader.loadBitmapFromCache(tuple);
        if (bmp != null) {
            // Show the bitmap immediately
            imgView.setVisibility(View.VISIBLE);
-            imgView.setImageBitmap(bmp);
+            imgView.setImageBitmap(bmp.bitmap);
+
+            // Show the text if it's a placeholder bitmap
+            textView.setVisibility(isBitmapPlaceholder(bmp) ? View.VISIBLE : View.GONE);
            return true;
        }

        // If it's not in memory, create an async task to load it. This task will be attached
        // via AsyncDrawable to this view.
-        final LoaderTask task = new LoaderTask(imgView, prgView, true);
+        final LoaderTask task = new LoaderTask(imgView, textView, true);
        final AsyncDrawable asyncDrawable = new AsyncDrawable(imgView.getResources(), placeholderBitmap, task);
+        textView.setVisibility(View.INVISIBLE);
        imgView.setVisibility(View.INVISIBLE);
        imgView.setImageDrawable(asyncDrawable);

@@ -330,7 +362,7 @@ public class CachedAppAssetLoader {
        return false;
    }

-    public class LoaderTuple {
+    public static class LoaderTuple {
        public final ComputerDetails computer;
        public final NvApp app;

@@ -64,8 +64,8 @@ public class DiskAssetLoader {
        return inSampleSize;
    }

-    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
-        File file = CacheHelper.openPath(false, cacheDir, "boxart", tuple.computer.uuid, tuple.app.getAppId() + ".png");
+    public ScaledBitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple, int sampleSize) {
+        File file = getFile(tuple.computer.uuid, tuple.app.getAppId());

        // Don't bother with anything if it doesn't exist
        if (!file.exists()) {
@@ -110,27 +110,47 @@ public class DiskAssetLoader {
            bmp = BitmapFactory.decodeFile(file.getAbsolutePath(), options);
            if (bmp != null) {
                LimeLog.info("Tuple "+tuple+" decoded from disk cache with sample size: "+options.inSampleSize);
+                return new ScaledBitmap(decodeOnlyOptions.outWidth, decodeOnlyOptions.outHeight, bmp);
            }
        }
        else {
            // On P, we can get a bitmap back in one step with ImageDecoder
+            final ScaledBitmap scaledBitmap = new ScaledBitmap();
            try {
-                bmp = ImageDecoder.decodeBitmap(ImageDecoder.createSource(file), new ImageDecoder.OnHeaderDecodedListener() {
+                scaledBitmap.bitmap = ImageDecoder.decodeBitmap(ImageDecoder.createSource(file), new ImageDecoder.OnHeaderDecodedListener() {
                    @Override
                    public void onHeaderDecoded(ImageDecoder imageDecoder, ImageDecoder.ImageInfo imageInfo, ImageDecoder.Source source) {
+                        scaledBitmap.originalWidth = imageInfo.getSize().getWidth();
+                        scaledBitmap.originalHeight = imageInfo.getSize().getHeight();
+
                        imageDecoder.setTargetSize(STANDARD_ASSET_WIDTH, STANDARD_ASSET_HEIGHT);
                        if (isLowRamDevice) {
                            imageDecoder.setMemorySizePolicy(ImageDecoder.MEMORY_POLICY_LOW_RAM);
                        }
                    }
                });
+                return scaledBitmap;
            } catch (IOException e) {
                e.printStackTrace();
                return null;
            }
        }

-        return bmp;
+        return null;
+    }
+
+    public File getFile(String computerUuid, int appId) {
+        return CacheHelper.openPath(false, cacheDir, "boxart", computerUuid, appId + ".png");
+    }
+
+    public void deleteAssetsForComputer(String computerUuid) {
+        File dir = CacheHelper.openPath(false, cacheDir, "boxart", computerUuid);
+        File[] files = dir.listFiles();
+        if (files != null) {
+            for (File f : files) {
+                f.delete();
+            }
+        }
    }

    public void populateCacheWithStream(CachedAppAssetLoader.LoaderTuple tuple, InputStream input) {
@@ -1,37 +1,74 @@
 package com.limelight.grid.assets;

-import android.graphics.Bitmap;
 import android.util.LruCache;

 import com.limelight.LimeLog;

+import java.lang.ref.SoftReference;
+import java.util.HashMap;
+
 public class MemoryAssetLoader {
    private static final int maxMemory = (int) (Runtime.getRuntime().maxMemory() / 1024);
-    private static final LruCache<String, Bitmap> memoryCache = new LruCache<String, Bitmap>(maxMemory / 16) {
+    private static final LruCache<String, ScaledBitmap> memoryCache = new LruCache<String, ScaledBitmap>(maxMemory / 16) {
        @Override
-        protected int sizeOf(String key, Bitmap bitmap) {
+        protected int sizeOf(String key, ScaledBitmap bitmap) {
            // Sizeof returns kilobytes
-            return bitmap.getByteCount() / 1024;
+            return bitmap.bitmap.getByteCount() / 1024;
+        }
+
+        @Override
+        protected void entryRemoved(boolean evicted, String key, ScaledBitmap oldValue, ScaledBitmap newValue) {
+            super.entryRemoved(evicted, key, oldValue, newValue);
+
+            if (evicted) {
+                // Keep a soft reference around to the bitmap as long as we can
+                evictionCache.put(key, new SoftReference<>(oldValue));
+            }
        }
    };
+    private static final HashMap<String, SoftReference<ScaledBitmap>> evictionCache = new HashMap<>();

    private static String constructKey(CachedAppAssetLoader.LoaderTuple tuple) {
        return tuple.computer.uuid+"-"+tuple.app.getAppId();
    }

-    public Bitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {
-        Bitmap bmp = memoryCache.get(constructKey(tuple));
+    public ScaledBitmap loadBitmapFromCache(CachedAppAssetLoader.LoaderTuple tuple) {
+        final String key = constructKey(tuple);
+
+        ScaledBitmap bmp = memoryCache.get(key);
        if (bmp != null) {
-            LimeLog.info("Memory cache hit for tuple: "+tuple);
+            LimeLog.info("LRU cache hit for tuple: "+tuple);
+            return bmp;
        }
-        return bmp;
+
+        SoftReference<ScaledBitmap> bmpRef = evictionCache.get(key);
+        if (bmpRef != null) {
+            bmp = bmpRef.get();
+            if (bmp != null) {
+                LimeLog.info("Eviction cache hit for tuple: "+tuple);
+
+                // Put this entry back into the LRU cache
+                evictionCache.remove(key);
+                memoryCache.put(key, bmp);
+
+                return bmp;
+            }
+            else {
+                // The data is gone, so remove the dangling SoftReference now
+                evictionCache.remove(key);
+            }
+        }
+
+        return null;
    }

-    public void populateCache(CachedAppAssetLoader.LoaderTuple tuple, Bitmap bitmap) {
+    public void populateCache(CachedAppAssetLoader.LoaderTuple tuple, ScaledBitmap bitmap) {
        memoryCache.put(constructKey(tuple), bitmap);
    }

    public void clearCache() {
+        // We must evict first because that will push all items into the eviction cache
        memoryCache.evictAll();
+        evictionCache.clear();
    }
 }
@@ -0,0 +1,18 @@
+package com.limelight.grid.assets;
+
+import android.graphics.Bitmap;
+
+public class ScaledBitmap {
+    public int originalWidth;
+    public int originalHeight;
+
+    public Bitmap bitmap;
+
+    public ScaledBitmap() {}
+
+    public ScaledBitmap(int originalWidth, int originalHeight, Bitmap bitmap) {
+        this.originalWidth = originalWidth;
+        this.originalHeight = originalHeight;
+        this.bitmap = bitmap;
+    }
+}
@@ -0,0 +1,23 @@
+package com.limelight.nvstream;
+
+import java.security.cert.X509Certificate;
+
+import javax.crypto.SecretKey;
+
+public class ConnectionContext {
+    public String serverAddress;
+    public X509Certificate serverCert;
+    public StreamConfiguration streamConfig;
+    public NvConnectionListener connListener;
+    public SecretKey riKey;
+    public int riKeyId;
+    
+    // This is the version quad from the appversion tag of /serverinfo
+    public String serverAppVersion;
+    public String serverGfeVersion;
+    
+    public int negotiatedWidth, negotiatedHeight;
+    public boolean negotiatedHdr;
+
+    public int videoCapabilities;
+}
@@ -0,0 +1,373 @@
+package com.limelight.nvstream;
+
+import android.app.ActivityManager;
+
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.cert.X509Certificate;
+import java.util.concurrent.Semaphore;
+
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.av.audio.AudioRenderer;
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+import com.limelight.nvstream.http.GfeHttpResponseException;
+import com.limelight.nvstream.http.LimelightCryptoProvider;
+import com.limelight.nvstream.http.NvApp;
+import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.http.PairingManager;
+import com.limelight.nvstream.input.MouseButtonPacket;
+import com.limelight.nvstream.jni.MoonBridge;
+
+public class NvConnection {
+    // Context parameters
+    private String host;
+    private LimelightCryptoProvider cryptoProvider;
+    private String uniqueId;
+    private ConnectionContext context;
+    private static Semaphore connectionAllowed = new Semaphore(1);
+    private final boolean isMonkey;
+    
+    public NvConnection(String host, String uniqueId, StreamConfiguration config, LimelightCryptoProvider cryptoProvider, X509Certificate serverCert)
+    {       
+        this.host = host;
+        this.cryptoProvider = cryptoProvider;
+        this.uniqueId = uniqueId;
+
+        this.context = new ConnectionContext();
+        this.context.streamConfig = config;
+        this.context.serverCert = serverCert;
+
+        // This is unique per connection
+        this.context.riKey = generateRiAesKey();
+        context.riKeyId = generateRiKeyId();
+
+        this.isMonkey = ActivityManager.isUserAMonkey();
+    }
+    
+    private static SecretKey generateRiAesKey() {
+        try {
+            KeyGenerator keyGen = KeyGenerator.getInstance("AES");
+
+            // RI keys are 128 bits
+            keyGen.init(128);
+
+            return keyGen.generateKey();
+        } catch (NoSuchAlgorithmException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static int generateRiKeyId() {
+        return new SecureRandom().nextInt();
+    }
+
+    public void stop() {
+        // Interrupt any pending connection. This is thread-safe.
+        MoonBridge.interruptConnection();
+
+        // Moonlight-core is not thread-safe with respect to connection start and stop, so
+        // we must not invoke that functionality in parallel.
+        synchronized (MoonBridge.class) {
+            MoonBridge.stopConnection();
+            MoonBridge.cleanupBridge();
+        }
+
+        // Now a pending connection can be processed
+        connectionAllowed.release();
+    }
+    
+    private boolean startApp() throws XmlPullParserException, IOException
+    {
+        NvHTTP h = new NvHTTP(context.serverAddress, uniqueId, context.serverCert, cryptoProvider);
+
+        String serverInfo = h.getServerInfo();
+        
+        context.serverAppVersion = h.getServerVersion(serverInfo);
+        if (context.serverAppVersion == null) {
+            context.connListener.displayMessage("Server version malformed");
+            return false;
+        }
+
+        // May be missing for older servers
+        context.serverGfeVersion = h.getGfeVersion(serverInfo);
+                
+        if (h.getPairState(serverInfo) != PairingManager.PairState.PAIRED) {
+            context.connListener.displayMessage("Device not paired with computer");
+            return false;
+        }
+
+        context.negotiatedHdr = context.streamConfig.getEnableHdr();
+        if ((h.getServerCodecModeSupport(serverInfo) & 0x200) == 0 && context.negotiatedHdr) {
+            context.connListener.displayTransientMessage("Your GPU does not support streaming HDR. The stream will be SDR.");
+            context.negotiatedHdr = false;
+        }
+        
+        //
+        // Decide on negotiated stream parameters now
+        //
+        
+        // Check for a supported stream resolution
+        if ((context.streamConfig.getWidth() > 4096 || context.streamConfig.getHeight() > 4096) &&
+                (h.getServerCodecModeSupport(serverInfo) & 0x200) == 0) {
+            context.connListener.displayMessage("Your host PC does not support streaming at resolutions above 4K.");
+            return false;
+        }
+        else if ((context.streamConfig.getWidth() > 4096 || context.streamConfig.getHeight() > 4096) &&
+                !context.streamConfig.getHevcSupported()) {
+            context.connListener.displayMessage("Your streaming device must support H.265 to stream at resolutions above 4K.");
+            return false;
+        }
+        else if (context.streamConfig.getHeight() >= 2160 && !h.supports4K(serverInfo)) {
+            // Client wants 4K but the server can't do it
+            context.connListener.displayTransientMessage("You must update GeForce Experience to stream in 4K. The stream will be 1080p.");
+            
+            // Lower resolution to 1080p
+            context.negotiatedWidth = 1920;
+            context.negotiatedHeight = 1080;
+        }
+        else {
+            // Take what the client wanted
+            context.negotiatedWidth = context.streamConfig.getWidth();
+            context.negotiatedHeight = context.streamConfig.getHeight();
+        }
+        
+        //
+        // Video stream format will be decided during the RTSP handshake
+        //
+        
+        NvApp app = context.streamConfig.getApp();
+        
+        // If the client did not provide an exact app ID, do a lookup with the applist
+        if (!context.streamConfig.getApp().isInitialized()) {
+            LimeLog.info("Using deprecated app lookup method - Please specify an app ID in your StreamConfiguration instead");
+            app = h.getAppByName(context.streamConfig.getApp().getAppName());
+            if (app == null) {
+                context.connListener.displayMessage("The app " + context.streamConfig.getApp().getAppName() + " is not in GFE app list");
+                return false;
+            }
+        }
+        
+        // If there's a game running, resume it
+        if (h.getCurrentGame(serverInfo) != 0) {
+            try {
+                if (h.getCurrentGame(serverInfo) == app.getAppId()) {
+                    if (!h.resumeApp(context)) {
+                        context.connListener.displayMessage("Failed to resume existing session");
+                        return false;
+                    }
+                } else {
+                    return quitAndLaunch(h, context);
+                }
+            } catch (GfeHttpResponseException e) {
+                if (e.getErrorCode() == 470) {
+                    // This is the error you get when you try to resume a session that's not yours.
+                    // Because this is fairly common, we'll display a more detailed message.
+                    context.connListener.displayMessage("This session wasn't started by this device," +
+                            " so it cannot be resumed. End streaming on the original " +
+                            "device or the PC itself and try again. (Error code: "+e.getErrorCode()+")");
+                    return false;
+                }
+                else if (e.getErrorCode() == 525) {
+                    context.connListener.displayMessage("The application is minimized. Resume it on the PC manually or " +
+                            "quit the session and start streaming again.");
+                    return false;
+                } else {
+                    throw e;
+                }
+            }
+            
+            LimeLog.info("Resumed existing game session");
+            return true;
+        }
+        else {
+            return launchNotRunningApp(h, context);
+        }
+    }
+
+    protected boolean quitAndLaunch(NvHTTP h, ConnectionContext context) throws IOException,
+            XmlPullParserException {
+        try {
+            if (!h.quitApp()) {
+                context.connListener.displayMessage("Failed to quit previous session! You must quit it manually");
+                return false;
+            } 
+        } catch (GfeHttpResponseException e) {
+            if (e.getErrorCode() == 599) {
+                context.connListener.displayMessage("This session wasn't started by this device," +
+                        " so it cannot be quit. End streaming on the original " +
+                        "device or the PC itself. (Error code: "+e.getErrorCode()+")");
+                return false;
+            }
+            else {
+                throw e;
+            }
+        }
+
+        return launchNotRunningApp(h, context);
+    }
+    
+    private boolean launchNotRunningApp(NvHTTP h, ConnectionContext context)
+            throws IOException, XmlPullParserException {
+        // Launch the app since it's not running
+        if (!h.launchApp(context, context.streamConfig.getApp().getAppId(), context.negotiatedHdr)) {
+            context.connListener.displayMessage("Failed to launch application");
+            return false;
+        }
+        
+        LimeLog.info("Launched new game session");
+        
+        return true;
+    }
+
+    public void start(final AudioRenderer audioRenderer, final VideoDecoderRenderer videoDecoderRenderer, final NvConnectionListener connectionListener)
+    {
+        new Thread(new Runnable() {
+            public void run() {
+                context.connListener = connectionListener;
+                context.videoCapabilities = videoDecoderRenderer.getCapabilities();
+
+                String appName = context.streamConfig.getApp().getAppName();
+
+                context.serverAddress = host;
+                context.connListener.stageStarting(appName);
+
+                try {
+                    if (!startApp()) {
+                        context.connListener.stageFailed(appName, 0, 0);
+                        return;
+                    }
+                    context.connListener.stageComplete(appName);
+                } catch (GfeHttpResponseException e) {
+                    e.printStackTrace();
+                    context.connListener.displayMessage(e.getMessage());
+                    context.connListener.stageFailed(appName, 0, e.getErrorCode());
+                    return;
+                } catch (XmlPullParserException | IOException e) {
+                    e.printStackTrace();
+                    context.connListener.displayMessage(e.getMessage());
+                    context.connListener.stageFailed(appName, MoonBridge.ML_PORT_FLAG_TCP_47984 | MoonBridge.ML_PORT_FLAG_TCP_47989, 0);
+                    return;
+                }
+
+                ByteBuffer ib = ByteBuffer.allocate(16);
+                ib.putInt(context.riKeyId);
+
+                // Acquire the connection semaphore to ensure we only have one
+                // connection going at once.
+                try {
+                    connectionAllowed.acquire();
+                } catch (InterruptedException e) {
+                    context.connListener.displayMessage(e.getMessage());
+                    context.connListener.stageFailed(appName, 0, 0);
+                    return;
+                }
+
+                // Moonlight-core is not thread-safe with respect to connection start and stop, so
+                // we must not invoke that functionality in parallel.
+                synchronized (MoonBridge.class) {
+                    MoonBridge.setupBridge(videoDecoderRenderer, audioRenderer, connectionListener);
+                    int ret = MoonBridge.startConnection(context.serverAddress,
+                            context.serverAppVersion, context.serverGfeVersion,
+                            context.negotiatedWidth, context.negotiatedHeight,
+                            context.streamConfig.getRefreshRate(), context.streamConfig.getBitrate(),
+                            context.streamConfig.getMaxPacketSize(),
+                            context.streamConfig.getRemote(), context.streamConfig.getAudioConfiguration().toInt(),
+                            context.streamConfig.getHevcSupported(),
+                            context.negotiatedHdr,
+                            context.streamConfig.getHevcBitratePercentageMultiplier(),
+                            context.streamConfig.getClientRefreshRateX100(),
+                            context.streamConfig.getEncryptionFlags(),
+                            context.riKey.getEncoded(), ib.array(),
+                            context.videoCapabilities);
+                    if (ret != 0) {
+                        // LiStartConnection() failed, so the caller is not expected
+                        // to stop the connection themselves. We need to release their
+                        // semaphore count for them.
+                        connectionAllowed.release();
+                    }
+                }
+            }
+        }).start();
+    }
+    
+    public void sendMouseMove(final short deltaX, final short deltaY)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMouseMove(deltaX, deltaY);
+        }
+    }
+
+    public void sendMousePosition(short x, short y, short referenceWidth, short referenceHeight)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMousePosition(x, y, referenceWidth, referenceHeight);
+        }
+    }
+    
+    public void sendMouseButtonDown(final byte mouseButton)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMouseButton(MouseButtonPacket.PRESS_EVENT, mouseButton);
+        }
+    }
+    
+    public void sendMouseButtonUp(final byte mouseButton)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMouseButton(MouseButtonPacket.RELEASE_EVENT, mouseButton);
+        }
+    }
+    
+    public void sendControllerInput(final short controllerNumber,
+            final short activeGamepadMask, final short buttonFlags,
+            final byte leftTrigger, final byte rightTrigger,
+            final short leftStickX, final short leftStickY,
+            final short rightStickX, final short rightStickY)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendMultiControllerInput(controllerNumber, activeGamepadMask, buttonFlags,
+                    leftTrigger, rightTrigger, leftStickX, leftStickY, rightStickX, rightStickY);
+        }
+    }
+    
+    public void sendControllerInput(final short buttonFlags,
+            final byte leftTrigger, final byte rightTrigger,
+            final short leftStickX, final short leftStickY,
+            final short rightStickX, final short rightStickY)
+    {
+        if (!isMonkey) {
+            MoonBridge.sendControllerInput(buttonFlags, leftTrigger, rightTrigger, leftStickX,
+                    leftStickY, rightStickX, rightStickY);
+        }
+    }
+    
+    public void sendKeyboardInput(final short keyMap, final byte keyDirection, final byte modifier) {
+        if (!isMonkey) {
+            MoonBridge.sendKeyboardInput(keyMap, keyDirection, modifier);
+        }
+    }
+    
+    public void sendMouseScroll(final byte scrollClicks) {
+        if (!isMonkey) {
+            MoonBridge.sendMouseScroll(scrollClicks);
+        }
+    }
+
+    public void sendMouseHighResScroll(final short scrollAmount) {
+        if (!isMonkey) {
+            MoonBridge.sendMouseHighResScroll(scrollAmount);
+        }
+    }
+
+    public static String findExternalAddressForMdns(String stunHostname, int stunPort) {
+        return MoonBridge.findExternalAddressIP4(stunHostname, stunPort);
+    }
+}
@@ -0,0 +1,16 @@
+package com.limelight.nvstream;
+
+public interface NvConnectionListener {
+    void stageStarting(String stage);
+    void stageComplete(String stage);
+    void stageFailed(String stage, int portFlags, int errorCode);
+    
+    void connectionStarted();
+    void connectionTerminated(int errorCode);
+    void connectionStatusUpdate(int connectionStatus);
+    
+    void displayMessage(String message);
+    void displayTransientMessage(String message);
+
+    void rumble(short controllerNumber, short lowFreqMotor, short highFreqMotor);
+}
@@ -0,0 +1,229 @@
+package com.limelight.nvstream;
+
+import com.limelight.nvstream.http.NvApp;
+import com.limelight.nvstream.jni.MoonBridge;
+
+public class StreamConfiguration {
+    public static final int INVALID_APP_ID = 0;
+
+    public static final int STREAM_CFG_LOCAL = 0;
+    public static final int STREAM_CFG_REMOTE = 1;
+    public static final int STREAM_CFG_AUTO = 2;
+    
+    private NvApp app;
+    private int width, height;
+    private int refreshRate;
+    private int launchRefreshRate;
+    private int clientRefreshRateX100;
+    private int bitrate;
+    private boolean sops;
+    private boolean enableAdaptiveResolution;
+    private boolean playLocalAudio;
+    private int maxPacketSize;
+    private int remote;
+    private MoonBridge.AudioConfiguration audioConfiguration;
+    private boolean supportsHevc;
+    private int hevcBitratePercentageMultiplier;
+    private boolean enableHdr;
+    private int attachedGamepadMask;
+    private int encryptionFlags;
+
+    public static class Builder {
+        private StreamConfiguration config = new StreamConfiguration();
+        
+        public StreamConfiguration.Builder setApp(NvApp app) {
+            config.app = app;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setRemoteConfiguration(int remote) {
+            config.remote = remote;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setResolution(int width, int height) {
+            config.width = width;
+            config.height = height;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setRefreshRate(int refreshRate) {
+            config.refreshRate = refreshRate;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setLaunchRefreshRate(int refreshRate) {
+            config.launchRefreshRate = refreshRate;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setBitrate(int bitrate) {
+            config.bitrate = bitrate;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setEnableSops(boolean enable) {
+            config.sops = enable;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder enableAdaptiveResolution(boolean enable) {
+            config.enableAdaptiveResolution = enable;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder enableLocalAudioPlayback(boolean enable) {
+            config.playLocalAudio = enable;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setMaxPacketSize(int maxPacketSize) {
+            config.maxPacketSize = maxPacketSize;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setHevcBitratePercentageMultiplier(int multiplier) {
+            config.hevcBitratePercentageMultiplier = multiplier;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setEnableHdr(boolean enableHdr) {
+            config.enableHdr = enableHdr;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setAttachedGamepadMask(int attachedGamepadMask) {
+            config.attachedGamepadMask = attachedGamepadMask;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setAttachedGamepadMaskByCount(int gamepadCount) {
+            config.attachedGamepadMask = 0;
+            for (int i = 0; i < 4; i++) {
+                if (gamepadCount > i) {
+                    config.attachedGamepadMask |= 1 << i;
+                }
+            }
+            return this;
+        }
+
+        public StreamConfiguration.Builder setClientRefreshRateX100(int refreshRateX100) {
+            config.clientRefreshRateX100 = refreshRateX100;
+            return this;
+        }
+
+        public StreamConfiguration.Builder setAudioEncryption(boolean enable) {
+            if (enable) {
+                config.encryptionFlags |= MoonBridge.ENCFLG_AUDIO;
+            }
+            else {
+                config.encryptionFlags &= ~MoonBridge.ENCFLG_AUDIO;
+            }
+            return this;
+        }
+
+        public StreamConfiguration.Builder setAudioConfiguration(MoonBridge.AudioConfiguration audioConfig) {
+            config.audioConfiguration = audioConfig;
+            return this;
+        }
+        
+        public StreamConfiguration.Builder setHevcSupported(boolean supportsHevc) {
+            config.supportsHevc = supportsHevc;
+            return this;
+        }
+        
+        public StreamConfiguration build() {
+            return config;
+        }
+    }
+    
+    private StreamConfiguration() {
+        // Set default attributes
+        this.app = new NvApp("Steam");
+        this.width = 1280;
+        this.height = 720;
+        this.refreshRate = 60;
+        this.launchRefreshRate = 60;
+        this.bitrate = 10000;
+        this.maxPacketSize = 1024;
+        this.remote = STREAM_CFG_AUTO;
+        this.sops = true;
+        this.enableAdaptiveResolution = false;
+        this.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
+        this.supportsHevc = false;
+        this.enableHdr = false;
+        this.attachedGamepadMask = 0;
+    }
+    
+    public int getWidth() {
+        return width;
+    }
+    
+    public int getHeight() {
+        return height;
+    }
+    
+    public int getRefreshRate() {
+        return refreshRate;
+    }
+
+    public int getLaunchRefreshRate() {
+        return launchRefreshRate;
+    }
+    
+    public int getBitrate() {
+        return bitrate;
+    }
+    
+    public int getMaxPacketSize() {
+        return maxPacketSize;
+    }
+
+    public NvApp getApp() {
+        return app;
+    }
+    
+    public boolean getSops() {
+        return sops;
+    }
+    
+    public boolean getAdaptiveResolutionEnabled() {
+        return enableAdaptiveResolution;
+    }
+    
+    public boolean getPlayLocalAudio() {
+        return playLocalAudio;
+    }
+    
+    public int getRemote() {
+        return remote;
+    }
+
+    public MoonBridge.AudioConfiguration getAudioConfiguration() {
+        return audioConfiguration;
+    }
+    
+    public boolean getHevcSupported() {
+        return supportsHevc;
+    }
+
+    public int getHevcBitratePercentageMultiplier() {
+        return hevcBitratePercentageMultiplier;
+    }
+
+    public boolean getEnableHdr() {
+        return enableHdr;
+    }
+
+    public int getAttachedGamepadMask() {
+        return attachedGamepadMask;
+    }
+
+    public int getClientRefreshRateX100() {
+        return clientRefreshRateX100;
+    }
+
+    public int getEncryptionFlags() {
+        return encryptionFlags;
+    }
+}
@@ -0,0 +1,57 @@
+package com.limelight.nvstream.av;
+
+public class ByteBufferDescriptor {
+    public byte[] data;
+    public int offset;
+    public int length;
+    
+    public ByteBufferDescriptor nextDescriptor;
+    
+    public ByteBufferDescriptor(byte[] data, int offset, int length)
+    {
+        this.data = data;
+        this.offset = offset;
+        this.length = length;
+    }
+    
+    public ByteBufferDescriptor(ByteBufferDescriptor desc)
+    {
+        this.data = desc.data;
+        this.offset = desc.offset;
+        this.length = desc.length;
+    }
+    
+    public void reinitialize(byte[] data, int offset, int length)
+    {
+        this.data = data;
+        this.offset = offset;
+        this.length = length;
+        this.nextDescriptor = null;
+    }
+    
+    public void print()
+    {
+        print(offset, length);
+    }
+    
+    public void print(int length)
+    {
+        print(this.offset, length);
+    }
+    
+    public void print(int offset, int length)
+    {
+        for (int i = offset; i < offset+length;) {
+            if (i + 8 <= offset+length) {
+                System.out.printf("%x: %02x %02x %02x %02x %02x %02x %02x %02x\n", i,
+                        data[i], data[i+1], data[i+2], data[i+3], data[i+4], data[i+5], data[i+6], data[i+7]);
+                i += 8;
+            }
+            else {
+                System.out.printf("%x: %02x \n", i, data[i]);
+                i++;
+            }
+        }
+        System.out.println();
+    }
+}
@@ -0,0 +1,15 @@
+package com.limelight.nvstream.av.audio;
+
+import com.limelight.nvstream.jni.MoonBridge;
+
+public interface AudioRenderer {
+    int setup(MoonBridge.AudioConfiguration audioConfiguration, int sampleRate, int samplesPerFrame);
+
+    void start();
+
+    void stop();
+    
+    void playDecodedAudio(short[] audioData);
+    
+    void cleanup();
+}
@@ -0,0 +1,18 @@
+package com.limelight.nvstream.av.video;
+
+public abstract class VideoDecoderRenderer {
+    public abstract int setup(int format, int width, int height, int redrawRate);
+
+    public abstract void start();
+
+    public abstract void stop();
+
+    // This is called once for each frame-start NALU. This means it will be called several times
+    // for an IDR frame which contains several parameter sets and the I-frame data.
+    public abstract int submitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength, int decodeUnitType,
+                                         int frameNumber, long receiveTimeMs, long enqueueTimeMs);
+    
+    public abstract void cleanup();
+
+    public abstract int getCapabilities();
+}
@@ -0,0 +1,85 @@
+package com.limelight.nvstream.http;
+
+import java.security.cert.X509Certificate;
+
+
+public class ComputerDetails {
+    public enum State {
+        ONLINE, OFFLINE, UNKNOWN
+    }
+
+    // Persistent attributes
+    public String uuid;
+    public String name;
+    public String localAddress;
+    public String remoteAddress;
+    public String manualAddress;
+    public String ipv6Address;
+    public String macAddress;
+    public X509Certificate serverCert;
+
+    // Transient attributes
+    public State state;
+    public String activeAddress;
+    public PairingManager.PairState pairState;
+    public int runningGameId;
+    public String rawAppList;
+
+    public ComputerDetails() {
+        // Use defaults
+        state = State.UNKNOWN;
+    }
+
+    public ComputerDetails(ComputerDetails details) {
+        // Copy details from the other computer
+        update(details);
+    }
+
+    public void update(ComputerDetails details) {
+        this.state = details.state;
+        this.name = details.name;
+        this.uuid = details.uuid;
+        if (details.activeAddress != null) {
+            this.activeAddress = details.activeAddress;
+        }
+        // We can get IPv4 loopback addresses with GS IPv6 Forwarder
+        if (details.localAddress != null && !details.localAddress.startsWith("127.")) {
+            this.localAddress = details.localAddress;
+        }
+        if (details.remoteAddress != null) {
+            this.remoteAddress = details.remoteAddress;
+        }
+        if (details.manualAddress != null) {
+            this.manualAddress = details.manualAddress;
+        }
+        if (details.ipv6Address != null) {
+            this.ipv6Address = details.ipv6Address;
+        }
+        if (details.macAddress != null && !details.macAddress.equals("00:00:00:00:00:00")) {
+            this.macAddress = details.macAddress;
+        }
+        if (details.serverCert != null) {
+            this.serverCert = details.serverCert;
+        }
+        this.pairState = details.pairState;
+        this.runningGameId = details.runningGameId;
+        this.rawAppList = details.rawAppList;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder str = new StringBuilder();
+        str.append("Name: ").append(name).append("\n");
+        str.append("State: ").append(state).append("\n");
+        str.append("Active Address: ").append(activeAddress).append("\n");
+        str.append("UUID: ").append(uuid).append("\n");
+        str.append("Local Address: ").append(localAddress).append("\n");
+        str.append("Remote Address: ").append(remoteAddress).append("\n");
+        str.append("IPv6 Address: ").append(ipv6Address).append("\n");
+        str.append("Manual Address: ").append(manualAddress).append("\n");
+        str.append("MAC Address: ").append(macAddress).append("\n");
+        str.append("Pair State: ").append(pairState).append("\n");
+        str.append("Running Game ID: ").append(runningGameId).append("\n");
+        return str.toString();
+    }
+}
@@ -0,0 +1,28 @@
+package com.limelight.nvstream.http;
+
+import java.io.IOException;
+
+public class GfeHttpResponseException extends IOException {
+    private static final long serialVersionUID = 1543508830807804222L;
+    
+    private int errorCode;
+    private String errorMsg;
+    
+    public GfeHttpResponseException(int errorCode, String errorMsg) {
+        this.errorCode = errorCode;
+        this.errorMsg = errorMsg;
+    }
+    
+    public int getErrorCode() {
+        return errorCode;
+    }
+    
+    public String getErrorMessage() {
+        return errorMsg;
+    }
+    
+    @Override
+    public String getMessage() {
+        return "GeForce Experience returned error: "+errorMsg+" (Error code: "+errorCode+")";
+    }
+}
@@ -0,0 +1,11 @@
+package com.limelight.nvstream.http;
+
+import java.security.cert.X509Certificate;
+import java.security.interfaces.RSAPrivateKey;
+
+public interface LimelightCryptoProvider {
+    X509Certificate getClientCertificate();
+    RSAPrivateKey getClientPrivateKey();
+    byte[] getPemEncodedClientCertificate();
+    String encodeBase64String(byte[] data);
+}
@@ -0,0 +1,70 @@
+package com.limelight.nvstream.http;
+
+import com.limelight.LimeLog;
+
+public class NvApp {
+    private String appName = "";
+    private int appId;
+    private boolean initialized;
+    private boolean hdrSupported;
+    
+    public NvApp() {}
+    
+    public NvApp(String appName) {
+        this.appName = appName;
+    }
+    
+    public NvApp(String appName, int appId, boolean hdrSupported) {
+        this.appName = appName;
+        this.appId = appId;
+        this.hdrSupported = hdrSupported;
+        this.initialized = true;
+    }
+    
+    public void setAppName(String appName) {
+        this.appName = appName;
+    }
+    
+    public void setAppId(String appId) {
+        try {
+            this.appId = Integer.parseInt(appId);
+            this.initialized = true;
+        } catch (NumberFormatException e) {
+            LimeLog.warning("Malformed app ID: "+appId);
+        }
+    }
+    
+    public void setAppId(int appId) {
+        this.appId = appId;
+        this.initialized = true;
+    }
+
+    public void setHdrSupported(boolean hdrSupported) {
+        this.hdrSupported = hdrSupported;
+    }
+    
+    public String getAppName() {
+        return this.appName;
+    }
+    
+    public int getAppId() {
+        return this.appId;
+    }
+
+    public boolean isHdrSupported() {
+        return this.hdrSupported;
+    }
+    
+    public boolean isInitialized() {
+        return this.initialized;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder str = new StringBuilder();
+        str.append("Name: ").append(appName).append("\n");
+        str.append("HDR: ").append(hdrSupported ? "Yes" : "No").append("\n");
+        str.append("ID: ").append(appId).append("\n");
+        return str.toString();
+    }
+}
@@ -0,0 +1,771 @@
+package com.limelight.nvstream.http;
+
+import android.os.Build;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.net.InetAddress;
+import java.net.MalformedURLException;
+import java.net.Socket;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.Principal;
+import java.security.PrivateKey;
+import java.security.SecureRandom;
+import java.security.cert.Certificate;
+import java.security.cert.CertificateException;
+import java.security.cert.X509Certificate;
+import java.util.LinkedList;
+import java.util.ListIterator;
+import java.util.Stack;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLHandshakeException;
+import javax.net.ssl.SSLPeerUnverifiedException;
+import javax.net.ssl.SSLSession;
+import javax.net.ssl.SSLSocket;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.net.ssl.X509KeyManager;
+import javax.net.ssl.X509TrustManager;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+import org.xmlpull.v1.XmlPullParserFactory;
+
+import com.limelight.BuildConfig;
+import com.limelight.LimeLog;
+import com.limelight.nvstream.ConnectionContext;
+import com.limelight.nvstream.http.PairingManager.PairState;
+
+import okhttp3.ConnectionPool;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+
+
+public class NvHTTP {
+    private String uniqueId;
+    private PairingManager pm;
+
+    public static final int HTTPS_PORT = 47984;
+    public static final int HTTP_PORT = 47989;
+    public static final int CONNECTION_TIMEOUT = 3000;
+    public static final int READ_TIMEOUT = 5000;
+
+    // Print URL and content to logcat on debug builds
+    private static boolean verbose = BuildConfig.DEBUG;
+
+    public String baseUrlHttps;
+    public String baseUrlHttp;
+    
+    private OkHttpClient httpClient;
+    private OkHttpClient httpClientWithReadTimeout;
+
+    private X509TrustManager defaultTrustManager;
+    private X509TrustManager trustManager;
+    private X509KeyManager keyManager;
+    private X509Certificate serverCert;
+
+    void setServerCert(X509Certificate serverCert) {
+        this.serverCert = serverCert;
+    }
+
+    private static X509TrustManager getDefaultTrustManager() {
+        try {
+            TrustManagerFactory tmf = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm());
+            tmf.init((KeyStore) null);
+
+            for (TrustManager tm : tmf.getTrustManagers()) {
+                if (tm instanceof X509TrustManager) {
+                    return (X509TrustManager) tm;
+                }
+            }
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException(e);
+        } catch (KeyStoreException e) {
+            throw new RuntimeException(e);
+        }
+
+        throw new IllegalStateException("No X509 trust manager found");
+    }
+
+    private void initializeHttpState(final LimelightCryptoProvider cryptoProvider) {
+        keyManager = new X509KeyManager() {
+            public String chooseClientAlias(String[] keyTypes,
+                    Principal[] issuers, Socket socket) { return "Limelight-RSA"; }
+            public String chooseServerAlias(String keyType, Principal[] issuers,
+                    Socket socket) { return null; }
+            public X509Certificate[] getCertificateChain(String alias) {
+                return new X509Certificate[] {cryptoProvider.getClientCertificate()};
+            }
+            public String[] getClientAliases(String keyType, Principal[] issuers) { return null; }
+            public PrivateKey getPrivateKey(String alias) {
+                return cryptoProvider.getClientPrivateKey();
+            }
+            public String[] getServerAliases(String keyType, Principal[] issuers) { return null; }
+        };
+
+        defaultTrustManager = getDefaultTrustManager();
+        trustManager = new X509TrustManager() {
+            public X509Certificate[] getAcceptedIssuers() {
+                return new X509Certificate[0];
+            }
+            public void checkClientTrusted(X509Certificate[] certs, String authType) {
+                throw new IllegalStateException("Should never be called");
+            }
+            public void checkServerTrusted(X509Certificate[] certs, String authType) throws CertificateException {
+                try {
+                    // Try the default trust manager first to allow pairing with certificates
+                    // that chain up to a trusted root CA. This will raise CertificateException
+                    // if the certificate is not trusted (expected for GFE's self-signed certs).
+                    defaultTrustManager.checkServerTrusted(certs, authType);
+                } catch (CertificateException e) {
+                    // Check the server certificate if we've paired to this host
+                    if (certs.length == 1 && NvHTTP.this.serverCert != null) {
+                        if (!certs[0].equals(NvHTTP.this.serverCert)) {
+                            throw new CertificateException("Certificate mismatch");
+                        }
+                    }
+                    else {
+                        // The cert chain doesn't look like a self-signed cert or we don't have
+                        // a certificate pinned, so re-throw the original validation error.
+                        throw e;
+                    }
+                }
+            }
+        };
+
+        HostnameVerifier hv = new HostnameVerifier() {
+            public boolean verify(String hostname, SSLSession session) {
+                try {
+                    Certificate[] certificates = session.getPeerCertificates();
+                    if (certificates.length == 1 && certificates[0].equals(NvHTTP.this.serverCert)) {
+                        // Allow any hostname if it's our pinned cert
+                        return true;
+                    }
+                } catch (SSLPeerUnverifiedException e) {
+                    e.printStackTrace();
+                }
+
+                // Fall back to default HostnameVerifier for validating CA-issued certs
+                return HttpsURLConnection.getDefaultHostnameVerifier().verify(hostname, session);
+            }
+        };
+
+        httpClient = new OkHttpClient.Builder()
+                .connectionPool(new ConnectionPool(0, 1, TimeUnit.MILLISECONDS))
+                .hostnameVerifier(hv)
+                .readTimeout(0, TimeUnit.MILLISECONDS)
+                .connectTimeout(CONNECTION_TIMEOUT, TimeUnit.MILLISECONDS)
+                .build();
+        
+        httpClientWithReadTimeout = httpClient.newBuilder()
+                .readTimeout(READ_TIMEOUT, TimeUnit.MILLISECONDS)
+                .build();
+    }
+    
+    public NvHTTP(String address, String uniqueId, X509Certificate serverCert, LimelightCryptoProvider cryptoProvider) throws IOException {
+        // Use the same UID for all Moonlight clients so we can quit games
+        // started by other Moonlight clients.
+        this.uniqueId = "0123456789ABCDEF";
+
+        this.serverCert = serverCert;
+
+        initializeHttpState(cryptoProvider);
+
+        try {
+            // The URI constructor takes care of escaping IPv6 literals
+            this.baseUrlHttps = new URI("https", null, address, HTTPS_PORT, null, null, null).toString();
+            this.baseUrlHttp = new URI("http", null, address, HTTP_PORT, null, null, null).toString();
+        } catch (URISyntaxException e) {
+            // Encapsulate URISyntaxException into IOException for callers to handle more easily
+            throw new IOException(e);
+        }
+
+        this.pm = new PairingManager(this, cryptoProvider);
+    }
+    
+    String buildUniqueIdUuidString() {
+        return "uniqueid="+uniqueId+"&uuid="+UUID.randomUUID();
+    }
+    
+    static String getXmlString(Reader r, String tagname) throws XmlPullParserException, IOException {
+        XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        XmlPullParser xpp = factory.newPullParser();
+
+        xpp.setInput(r);
+        int eventType = xpp.getEventType();
+        Stack<String> currentTag = new Stack<String>();
+        
+        while (eventType != XmlPullParser.END_DOCUMENT) {
+            switch (eventType) {
+            case (XmlPullParser.START_TAG):
+                if (xpp.getName().equals("root")) {
+                    verifyResponseStatus(xpp);
+                }
+                currentTag.push(xpp.getName());
+                break;
+            case (XmlPullParser.END_TAG):
+                currentTag.pop();
+                break;
+            case (XmlPullParser.TEXT):
+                if (currentTag.peek().equals(tagname)) {
+                    return xpp.getText();
+                }
+                break;
+            }
+            eventType = xpp.next();
+        }
+
+        return null;
+    }
+
+    static String getXmlString(String str, String tagname) throws XmlPullParserException, IOException {
+        return getXmlString(new StringReader(str), tagname);
+    }
+    
+    private static void verifyResponseStatus(XmlPullParser xpp) throws GfeHttpResponseException {
+        // We use Long.parseLong() because in rare cases GFE can send back a status code of
+        // 0xFFFFFFFF, which will cause Integer.parseInt() to throw a NumberFormatException due
+        // to exceeding Integer.MAX_VALUE. We'll get the desired error code of -1 by just casting
+        // the resulting long into an int.
+        int statusCode = (int)Long.parseLong(xpp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "status_code"));
+        if (statusCode != 200) {
+            String statusMsg = xpp.getAttributeValue(XmlPullParser.NO_NAMESPACE, "status_message");
+            if (statusCode == -1 && "Invalid".equals(statusMsg)) {
+                // Special case handling an audio capture error which GFE doesn't
+                // provide any useful status message for.
+                statusCode = 418;
+                statusMsg = "Missing audio capture device. Reinstall GeForce Experience.";
+            }
+            throw new GfeHttpResponseException(statusCode, statusMsg);
+        }
+    }
+    
+    public String getServerInfo() throws IOException, XmlPullParserException {
+        String resp;
+        
+        //
+        // TODO: Shield Hub uses HTTP for this and is able to get an accurate PairStatus with HTTP.
+        // For some reason, we always see PairStatus is 0 over HTTP and only 1 over HTTPS. It looks
+        // like there are extra request headers required to make this stuff work over HTTP.
+        //
+
+        // When we have a pinned cert, use HTTPS to fetch serverinfo and fall back on cert mismatch
+        if (serverCert != null) {
+            try {
+                try {
+                    resp = openHttpConnectionToString(baseUrlHttps + "/serverinfo?"+buildUniqueIdUuidString(), true);
+                } catch (SSLHandshakeException e) {
+                    // Detect if we failed due to a server cert mismatch
+                    if (e.getCause() instanceof CertificateException) {
+                        // Jump to the GfeHttpResponseException exception handler to retry
+                        // over HTTP which will allow us to pair again to update the cert
+                        throw new GfeHttpResponseException(401, "Server certificate mismatch");
+                    }
+                    else {
+                        throw e;
+                    }
+                }
+
+                // This will throw an exception if the request came back with a failure status.
+                // We want this because it will throw us into the HTTP case if the client is unpaired.
+                getServerVersion(resp);
+            }
+            catch (GfeHttpResponseException e) {
+                if (e.getErrorCode() == 401) {
+                    // Cert validation error - fall back to HTTP
+                    return openHttpConnectionToString(baseUrlHttp + "/serverinfo", true);
+                }
+
+                // If it's not a cert validation error, throw it
+                throw e;
+            }
+
+            return resp;
+        }
+        else {
+            // No pinned cert, so use HTTP
+            return openHttpConnectionToString(baseUrlHttp + "/serverinfo", true);
+        }
+    }
+    
+    public ComputerDetails getComputerDetails() throws IOException, XmlPullParserException {
+        ComputerDetails details = new ComputerDetails();
+        String serverInfo = getServerInfo();
+        
+        details.name = getXmlString(serverInfo, "hostname");
+        if (details.name == null || details.name.isEmpty()) {
+            details.name = "UNKNOWN";
+        }
+
+        details.uuid = getXmlString(serverInfo, "uniqueid");
+        details.macAddress = getXmlString(serverInfo, "mac");
+        details.localAddress = getXmlString(serverInfo, "LocalIP");
+
+        // This may be null, but that's okay
+        details.remoteAddress = getXmlString(serverInfo, "ExternalIP");
+
+        // This has some extra logic to always report unpaired if the pinned cert isn't there
+        details.pairState = getPairState(serverInfo);
+        
+        details.runningGameId = getCurrentGame(serverInfo);
+        
+        // We could reach it so it's online
+        details.state = ComputerDetails.State.ONLINE;
+        
+        return details;
+    }
+
+    // This hack is Android-specific but we do it on all platforms
+    // because it doesn't really matter
+    private OkHttpClient performAndroidTlsHack(OkHttpClient client) {
+        // Doing this each time we create a socket is required
+        // to avoid the SSLv3 fallback that causes connection failures
+        try {
+            SSLContext sc = SSLContext.getInstance("TLS");
+            sc.init(new KeyManager[] { keyManager }, new TrustManager[] { trustManager }, new SecureRandom());
+
+            // TLS 1.2 is not enabled by default prior to Android 5.0, so we'll need a custom
+            // SSLSocketFactory in order to connect to GFE 3.20.4 which requires TLSv1.2 or later.
+            // We don't just always use TLSv12SocketFactory because explicitly specifying TLS versions
+            // prevents later TLS versions from being negotiated even if client and server otherwise
+            // support them.
+            return client.newBuilder().sslSocketFactory(
+                    Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ?
+                            sc.getSocketFactory() : new TLSv12SocketFactory(sc),
+                    trustManager).build();
+        } catch (NoSuchAlgorithmException | KeyManagementException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    // Read timeout should be enabled for any HTTP query that requires no outside action
+    // on the GFE server. Examples of queries that DO require outside action are launch, resume, and quit.
+    // The initial pair query does require outside action (user entering a PIN) but subsequent pairing
+    // queries do not.
+    private ResponseBody openHttpConnection(String url, boolean enableReadTimeout) throws IOException {
+        Request request = new Request.Builder().url(url).get().build();
+        Response response;
+
+        if (enableReadTimeout) {
+            response = performAndroidTlsHack(httpClientWithReadTimeout).newCall(request).execute();
+        }
+        else {
+            response = performAndroidTlsHack(httpClient).newCall(request).execute();
+        }
+
+        ResponseBody body = response.body();
+        
+        if (response.isSuccessful()) {
+            return body;
+        }
+        
+        // Unsuccessful, so close the response body
+        if (body != null) {
+            body.close();
+        }
+        
+        if (response.code() == 404) {
+            throw new FileNotFoundException(url);
+        }
+        else {
+            throw new GfeHttpResponseException(response.code(), response.message());
+        }
+    }
+    
+    String openHttpConnectionToString(String url, boolean enableReadTimeout) throws IOException {
+        try {
+            if (verbose) {
+                LimeLog.info("Requesting URL: "+url);
+            }
+
+            ResponseBody resp = openHttpConnection(url, enableReadTimeout);
+            String respString = resp.string();
+            resp.close();
+
+            if (verbose) {
+                LimeLog.info(url+" -> "+respString);
+            }
+
+            return respString;
+        } catch (IOException e) {
+            if (verbose) {
+                e.printStackTrace();
+            }
+            
+            throw e;
+        }
+    }
+
+    public String getServerVersion(String serverInfo) throws XmlPullParserException, IOException {
+        return getXmlString(serverInfo, "appversion");
+    }
+
+    public PairingManager.PairState getPairState() throws IOException, XmlPullParserException {
+        return getPairState(getServerInfo());
+    }
+
+    public PairingManager.PairState getPairState(String serverInfo) throws IOException, XmlPullParserException {
+        if (!NvHTTP.getXmlString(serverInfo, "PairStatus").equals("1")) {
+            return PairState.NOT_PAIRED;
+        }
+
+        return PairState.PAIRED;
+    }
+    
+    public long getMaxLumaPixelsH264(String serverInfo) throws XmlPullParserException, IOException {
+        String str = getXmlString(serverInfo, "MaxLumaPixelsH264");
+        if (str != null) {
+            return Long.parseLong(str);
+        } else {
+            return 0;
+        }
+    }
+    
+    public long getMaxLumaPixelsHEVC(String serverInfo) throws XmlPullParserException, IOException {
+        String str = getXmlString(serverInfo, "MaxLumaPixelsHEVC");
+        if (str != null) {
+            return Long.parseLong(str);
+        } else {
+            return 0;
+        }
+    }
+
+    // Possible meaning of bits
+    // Bit 0: H.264 Baseline
+    // Bit 1: H.264 High
+    // ----
+    // Bit 8: HEVC Main
+    // Bit 9: HEVC Main10
+    // Bit 10: HEVC Main10 4:4:4
+    // Bit 11: ???
+    public long getServerCodecModeSupport(String serverInfo) throws XmlPullParserException, IOException {
+        String str = getXmlString(serverInfo, "ServerCodecModeSupport");
+        if (str != null) {
+            return Long.parseLong(str);
+        } else {
+            return 0;
+        }
+    }
+    
+    public String getGpuType(String serverInfo) throws XmlPullParserException, IOException {
+        return getXmlString(serverInfo, "gputype");
+    }
+
+    public String getGfeVersion(String serverInfo) throws XmlPullParserException, IOException {
+        return getXmlString(serverInfo, "GfeVersion");
+    }
+    
+    public boolean supports4K(String serverInfo) throws XmlPullParserException, IOException {
+        // Only allow 4K on GFE 3.x
+        String gfeVersionStr = getXmlString(serverInfo, "GfeVersion");
+        if (gfeVersionStr == null || gfeVersionStr.startsWith("2.")) {
+            return false;
+        }
+
+        return true;
+    }
+
+    public int getCurrentGame(String serverInfo) throws IOException, XmlPullParserException {
+        // GFE 2.8 started keeping currentgame set to the last game played. As a result, it no longer
+        // has the semantics that its name would indicate. To contain the effects of this change as much
+        // as possible, we'll force the current game to zero if the server isn't in a streaming session.
+        String serverState = getXmlString(serverInfo, "state");
+        if (serverState != null && serverState.endsWith("_SERVER_BUSY")) {
+            String game = getXmlString(serverInfo, "currentgame");
+            return Integer.parseInt(game);
+        }
+        else {
+            return 0;
+        }
+    }
+
+    public NvApp getAppById(int appId) throws IOException, XmlPullParserException {
+        LinkedList<NvApp> appList = getAppList();
+        for (NvApp appFromList : appList) {
+            if (appFromList.getAppId() == appId) {
+                return appFromList;
+            }
+        }
+        return null;
+    }
+    
+    /* NOTE: Only use this function if you know what you're doing.
+     * It's totally valid to have two apps named the same thing,
+     * or even nothing at all! Look apps up by ID if at all possible
+     * using the above function */
+    public NvApp getAppByName(String appName) throws IOException, XmlPullParserException {
+        LinkedList<NvApp> appList = getAppList();
+        for (NvApp appFromList : appList) {
+            if (appFromList.getAppName().equalsIgnoreCase(appName)) {
+                return appFromList;
+            }
+        }
+        return null;
+    }
+
+    public PairingManager getPairingManager() {
+        return pm;
+    }
+    
+    public static LinkedList<NvApp> getAppListByReader(Reader r) throws XmlPullParserException, IOException {
+        XmlPullParserFactory factory = XmlPullParserFactory.newInstance();
+        factory.setNamespaceAware(true);
+        XmlPullParser xpp = factory.newPullParser();
+
+        xpp.setInput(r);
+        int eventType = xpp.getEventType();
+        LinkedList<NvApp> appList = new LinkedList<NvApp>();
+        Stack<String> currentTag = new Stack<String>();
+        boolean rootTerminated = false;
+
+        while (eventType != XmlPullParser.END_DOCUMENT) {
+            switch (eventType) {
+            case (XmlPullParser.START_TAG):
+                if (xpp.getName().equals("root")) {
+                    verifyResponseStatus(xpp);
+                }
+                currentTag.push(xpp.getName());
+                if (xpp.getName().equals("App")) {
+                    appList.addLast(new NvApp());
+                }
+                break;
+            case (XmlPullParser.END_TAG):
+                currentTag.pop();
+                if (xpp.getName().equals("root")) {
+                    rootTerminated = true;
+                }
+                break;
+            case (XmlPullParser.TEXT):
+                NvApp app = appList.getLast();
+                if (currentTag.peek().equals("AppTitle")) {
+                    app.setAppName(xpp.getText());
+                } else if (currentTag.peek().equals("ID")) {
+                    app.setAppId(xpp.getText());
+                } else if (currentTag.peek().equals("IsHdrSupported")) {
+                    app.setHdrSupported(xpp.getText().equals("1"));
+                }
+                break;
+            }
+            eventType = xpp.next();
+        }
+        
+        // Throw a malformed XML exception if we've not seen the root tag ended
+        if (!rootTerminated) {
+            throw new XmlPullParserException("Malformed XML: Root tag was not terminated");
+        }
+        
+        // Ensure that all apps in the list are initialized
+        ListIterator<NvApp> i = appList.listIterator();
+        while (i.hasNext()) {
+            NvApp app = i.next();
+            
+            // Remove uninitialized apps
+            if (!app.isInitialized()) {
+                LimeLog.warning("GFE returned incomplete app: "+app.getAppId()+" "+app.getAppName());
+                i.remove();
+            }
+        }
+        
+        return appList;
+    }
+    
+    public String getAppListRaw() throws MalformedURLException, IOException {
+        return openHttpConnectionToString(baseUrlHttps + "/applist?"+buildUniqueIdUuidString(), true);
+    }
+    
+    public LinkedList<NvApp> getAppList() throws GfeHttpResponseException, IOException, XmlPullParserException {
+        if (verbose) {
+            // Use the raw function so the app list is printed
+            return getAppListByReader(new StringReader(getAppListRaw()));
+        }
+        else {
+            ResponseBody resp = openHttpConnection(baseUrlHttps + "/applist?" + buildUniqueIdUuidString(), true);
+            LinkedList<NvApp> appList = getAppListByReader(new InputStreamReader(resp.byteStream()));
+            resp.close();
+            return appList;
+        }
+    }
+    
+    public void unpair() throws IOException {
+        openHttpConnectionToString(baseUrlHttp + "/unpair?"+buildUniqueIdUuidString(), true);
+    }
+    
+    public InputStream getBoxArt(NvApp app) throws IOException {
+        ResponseBody resp = openHttpConnection(baseUrlHttps + "/appasset?"+ buildUniqueIdUuidString() +
+                "&appid=" + app.getAppId() + "&AssetType=2&AssetIdx=0", true);
+        return resp.byteStream();
+    }
+    
+    public int getServerMajorVersion(String serverInfo) throws XmlPullParserException, IOException {
+        return getServerAppVersionQuad(serverInfo)[0];
+    }
+    
+    public int[] getServerAppVersionQuad(String serverInfo) throws XmlPullParserException, IOException {
+        String serverVersion = getServerVersion(serverInfo);
+        if (serverVersion == null) {
+            throw new IllegalArgumentException("Missing server version field");
+        }
+        String[] serverVersionSplit = serverVersion.split("\\.");
+        if (serverVersionSplit.length != 4) {
+            throw new IllegalArgumentException("Malformed server version field: "+serverVersion);
+        }
+        int[] ret = new int[serverVersionSplit.length];
+        for (int i = 0; i < ret.length; i++) {
+            ret[i] = Integer.parseInt(serverVersionSplit[i]);
+        }
+        return ret;
+    }
+
+    final private static char[] hexArray = "0123456789ABCDEF".toCharArray();
+    private static String bytesToHex(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2];
+        for ( int j = 0; j < bytes.length; j++ ) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2] = hexArray[v >>> 4];
+            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+    
+    public boolean launchApp(ConnectionContext context, int appId, boolean enableHdr) throws IOException, XmlPullParserException {
+        // Using an FPS value over 60 causes SOPS to default to 720p60,
+        // so force it to 0 to ensure the correct resolution is set. We
+        // used to use 60 here but that locked the frame rate to 60 FPS
+        // on GFE 3.20.3.
+        int fps = context.streamConfig.getLaunchRefreshRate() > 60 ? 0 : context.streamConfig.getLaunchRefreshRate();
+
+        // Using an unsupported resolution (not 720p, 1080p, or 4K) causes
+        // GFE to force SOPS to 720p60. This is fine for < 720p resolutions like
+        // 360p or 480p, but it is not ideal for 1440p and other resolutions.
+        // When we detect an unsupported resolution, disable SOPS unless it's under 720p.
+        // FIXME: Detect support resolutions using the serverinfo response, not a hardcoded list
+        boolean enableSops = context.streamConfig.getSops();
+        if (context.negotiatedWidth * context.negotiatedHeight > 1280 * 720 &&
+                context.negotiatedWidth * context.negotiatedHeight != 1920 * 1080 &&
+                context.negotiatedWidth * context.negotiatedHeight != 3840 * 2160) {
+            LimeLog.info("Disabling SOPS due to non-standard resolution: "+context.negotiatedWidth+"x"+context.negotiatedHeight);
+            enableSops = false;
+        }
+
+        String xmlStr = openHttpConnectionToString(baseUrlHttps +
+            "/launch?" + buildUniqueIdUuidString() +
+            "&appid=" + appId +
+            "&mode=" + context.negotiatedWidth + "x" + context.negotiatedHeight + "x" + fps +
+            "&additionalStates=1&sops=" + (enableSops ? 1 : 0) +
+            "&rikey="+bytesToHex(context.riKey.getEncoded()) +
+            "&rikeyid="+context.riKeyId +
+            (!enableHdr ? "" : "&hdrMode=1&clientHdrCapVersion=0&clientHdrCapSupportedFlagsInUint32=0&clientHdrCapMetaDataId=NV_STATIC_METADATA_TYPE_1&clientHdrCapDisplayData=0x0x0x0x0x0x0x0x0x0x0") +
+            "&localAudioPlayMode=" + (context.streamConfig.getPlayLocalAudio() ? 1 : 0) +
+            "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo() +
+            (context.streamConfig.getAttachedGamepadMask() != 0 ? "&remoteControllersBitmap=" + context.streamConfig.getAttachedGamepadMask() : "") +
+            (context.streamConfig.getAttachedGamepadMask() != 0 ? "&gcmap=" + context.streamConfig.getAttachedGamepadMask() : ""),
+            false);
+        String gameSession = getXmlString(xmlStr, "gamesession");
+        return gameSession != null && !gameSession.equals("0");
+    }
+    
+    public boolean resumeApp(ConnectionContext context) throws IOException, XmlPullParserException {
+        String xmlStr = openHttpConnectionToString(baseUrlHttps + "/resume?" + buildUniqueIdUuidString() +
+                "&rikey="+bytesToHex(context.riKey.getEncoded()) +
+                "&rikeyid="+context.riKeyId +
+                "&surroundAudioInfo=" + context.streamConfig.getAudioConfiguration().getSurroundAudioInfo(),
+                false);
+        String resume = getXmlString(xmlStr, "resume");
+        return Integer.parseInt(resume) != 0;
+    }
+    
+    public boolean quitApp() throws IOException, XmlPullParserException {
+        String xmlStr = openHttpConnectionToString(baseUrlHttps + "/cancel?" + buildUniqueIdUuidString(), false);
+        String cancel = getXmlString(xmlStr, "cancel");
+        if (Integer.parseInt(cancel) == 0) {
+            return false;
+        }
+
+        // Newer GFE versions will just return success even if quitting fails
+        // if we're not the original requestor.
+        if (getCurrentGame(getServerInfo()) != 0) {
+            // Generate a synthetic GfeResponseException letting the caller know
+            // that they can't kill someone else's stream.
+            throw new GfeHttpResponseException(599, "");
+        }
+
+        return true;
+    }
+
+    // Based on example code from https://blog.dev-area.net/2015/08/13/android-4-1-enable-tls-1-1-and-tls-1-2/
+    private static class TLSv12SocketFactory extends SSLSocketFactory {
+        private SSLSocketFactory internalSSLSocketFactory;
+
+        public TLSv12SocketFactory(SSLContext context) {
+            internalSSLSocketFactory = context.getSocketFactory();
+        }
+
+        @Override
+        public String[] getDefaultCipherSuites() {
+            return internalSSLSocketFactory.getDefaultCipherSuites();
+        }
+
+        @Override
+        public String[] getSupportedCipherSuites() {
+            return internalSSLSocketFactory.getSupportedCipherSuites();
+        }
+
+        @Override
+        public Socket createSocket() throws IOException {
+            return enableTLSv12OnSocket(internalSSLSocketFactory.createSocket());
+        }
+
+        @Override
+        public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
+            return enableTLSv12OnSocket(internalSSLSocketFactory.createSocket(s, host, port, autoClose));
+        }
+
+        @Override
+        public Socket createSocket(String host, int port) throws IOException {
+            return enableTLSv12OnSocket(internalSSLSocketFactory.createSocket(host, port));
+        }
+
+        @Override
+        public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException {
+            return enableTLSv12OnSocket(internalSSLSocketFactory.createSocket(host, port, localHost, localPort));
+        }
+
+        @Override
+        public Socket createSocket(InetAddress host, int port) throws IOException {
+            return enableTLSv12OnSocket(internalSSLSocketFactory.createSocket(host, port));
+        }
+
+        @Override
+        public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException {
+            return enableTLSv12OnSocket(internalSSLSocketFactory.createSocket(address, port, localAddress, localPort));
+        }
+
+        private Socket enableTLSv12OnSocket(Socket socket) {
+            if (socket instanceof SSLSocket) {
+                // TLS 1.2 is not enabled by default prior to Android 5.0. We must enable it
+                // explicitly to ensure we can communicate with GFE 3.20.4 which blocks TLS 1.0.
+                ((SSLSocket)socket).setEnabledProtocols(new String[] {"TLSv1.2"});
+            }
+            return socket;
+        }
+    }
+}
@@ -0,0 +1,342 @@
+package com.limelight.nvstream.http;
+
+import javax.crypto.Cipher;
+import javax.crypto.SecretKey;
+import javax.crypto.spec.SecretKeySpec;
+
+import org.xmlpull.v1.XmlPullParserException;
+
+import com.limelight.LimeLog;
+
+import java.security.cert.Certificate;
+import java.io.*;
+import java.security.*;
+import java.security.cert.*;
+import java.util.Arrays;
+import java.util.Locale;
+
+public class PairingManager {
+
+    private NvHTTP http;
+    
+    private PrivateKey pk;
+    private X509Certificate cert;
+    private SecretKey aesKey;
+    private byte[] pemCertBytes;
+
+    private X509Certificate serverCert;
+    
+    public enum PairState {
+        NOT_PAIRED,
+        PAIRED,
+        PIN_WRONG,
+        FAILED,
+        ALREADY_IN_PROGRESS
+    }
+    
+    public PairingManager(NvHTTP http, LimelightCryptoProvider cryptoProvider) {
+        this.http = http;
+        this.cert = cryptoProvider.getClientCertificate();
+        this.pemCertBytes = cryptoProvider.getPemEncodedClientCertificate();
+        this.pk = cryptoProvider.getClientPrivateKey();
+    }
+    
+    final private static char[] hexArray = "0123456789ABCDEF".toCharArray();
+    private static String bytesToHex(byte[] bytes) {
+        char[] hexChars = new char[bytes.length * 2];
+        for ( int j = 0; j < bytes.length; j++ ) {
+            int v = bytes[j] & 0xFF;
+            hexChars[j * 2] = hexArray[v >>> 4];
+            hexChars[j * 2 + 1] = hexArray[v & 0x0F];
+        }
+        return new String(hexChars);
+    }
+    
+    private static byte[] hexToBytes(String s) {
+        int len = s.length();
+        if (len % 2 != 0) {
+            throw new IllegalArgumentException("Illegal string length: "+len);
+        }
+
+        byte[] data = new byte[len / 2];
+        for (int i = 0; i < len; i += 2) {
+            data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4)
+                                 + Character.digit(s.charAt(i+1), 16));
+        }
+        return data;
+    }
+    
+    private X509Certificate extractPlainCert(String text) throws XmlPullParserException, IOException
+    {
+        String certText = NvHTTP.getXmlString(text, "plaincert");
+        if (certText != null) {
+            byte[] certBytes = hexToBytes(certText);
+
+            try {
+                CertificateFactory cf = CertificateFactory.getInstance("X.509");
+                return (X509Certificate)cf.generateCertificate(new ByteArrayInputStream(certBytes));
+            } catch (CertificateException e) {
+                e.printStackTrace();
+                throw new RuntimeException(e);
+            }
+        }
+        else {
+            return null;
+        }
+    }
+    
+    private byte[] generateRandomBytes(int length)
+    {
+        byte[] rand = new byte[length];
+        new SecureRandom().nextBytes(rand);
+        return rand;
+    }
+    
+    private static byte[] saltPin(byte[] salt, String pin) throws UnsupportedEncodingException {
+        byte[] saltedPin = new byte[salt.length + pin.length()];
+        System.arraycopy(salt, 0, saltedPin, 0, salt.length);
+        System.arraycopy(pin.getBytes("UTF-8"), 0, saltedPin, salt.length, pin.length());
+        return saltedPin;
+    }
+    
+    private static boolean verifySignature(byte[] data, byte[] signature, Certificate cert) {
+        try {
+            Signature sig = Signature.getInstance("SHA256withRSA");
+            sig.initVerify(cert.getPublicKey());
+            sig.update(data);
+            return sig.verify(signature);
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static byte[] signData(byte[] data, PrivateKey key) {
+        try {
+            Signature sig = Signature.getInstance("SHA256withRSA");
+            sig.initSign(key);
+            sig.update(data);
+            byte[] signature = new byte[256];
+            sig.sign(signature, 0, signature.length);
+            return signature;
+        } catch (NoSuchAlgorithmException | SignatureException | InvalidKeyException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static byte[] decryptAes(byte[] encryptedData, SecretKey secretKey) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+        
+            int blockRoundedSize = ((encryptedData.length + 15) / 16) * 16;
+            byte[] blockRoundedEncrypted = Arrays.copyOf(encryptedData, blockRoundedSize);
+            byte[] fullDecrypted = new byte[blockRoundedSize];
+
+            cipher.init(Cipher.DECRYPT_MODE, secretKey);
+            cipher.doFinal(blockRoundedEncrypted, 0,
+                    blockRoundedSize, fullDecrypted);
+            return fullDecrypted;
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static byte[] encryptAes(byte[] data, SecretKey secretKey) {
+        try {
+            Cipher cipher = Cipher.getInstance("AES/ECB/NoPadding");
+        
+            int blockRoundedSize = ((data.length + 15) / 16) * 16;
+            byte[] blockRoundedData = Arrays.copyOf(data, blockRoundedSize);
+
+            cipher.init(Cipher.ENCRYPT_MODE, secretKey);
+            return cipher.doFinal(blockRoundedData);
+        } catch (GeneralSecurityException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+    }
+    
+    private static SecretKey generateAesKey(PairingHashAlgorithm hashAlgo, byte[] keyData) {
+        byte[] aesTruncated = Arrays.copyOf(hashAlgo.hashData(keyData), 16);
+        return new SecretKeySpec(aesTruncated, "AES");
+    }
+    
+    private static byte[] concatBytes(byte[] a, byte[] b) {
+        byte[] c = new byte[a.length + b.length];
+        System.arraycopy(a, 0, c, 0, a.length);
+        System.arraycopy(b, 0, c, a.length, b.length);
+        return c;
+    }
+    
+    public static String generatePinString() {
+        SecureRandom r = new SecureRandom();
+        return String.format((Locale)null, "%d%d%d%d",
+                r.nextInt(10), r.nextInt(10),
+                r.nextInt(10), r.nextInt(10));
+    }
+
+    public X509Certificate getPairedCert() {
+        return serverCert;
+    }
+    
+    public PairState pair(String serverInfo, String pin) throws IOException, XmlPullParserException {
+        PairingHashAlgorithm hashAlgo;
+
+        int serverMajorVersion = http.getServerMajorVersion(serverInfo);
+        LimeLog.info("Pairing with server generation: "+serverMajorVersion);
+        if (serverMajorVersion >= 7) {
+            // Gen 7+ uses SHA-256 hashing
+            hashAlgo = new Sha256PairingHash();
+        }
+        else {
+            // Prior to Gen 7, SHA-1 is used
+            hashAlgo = new Sha1PairingHash();
+        }
+        
+        // Generate a salt for hashing the PIN
+        byte[] salt = generateRandomBytes(16);
+
+        // Combine the salt and pin, then create an AES key from them
+        byte[] saltAndPin = saltPin(salt, pin);
+        aesKey = generateAesKey(hashAlgo, saltAndPin);
+        
+        // Send the salt and get the server cert. This doesn't have a read timeout
+        // because the user must enter the PIN before the server responds
+        String getCert = http.openHttpConnectionToString(http.baseUrlHttp +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&phrase=getservercert&salt="+
+                bytesToHex(salt)+"&clientcert="+bytesToHex(pemCertBytes),
+                false);
+        if (!NvHTTP.getXmlString(getCert, "paired").equals("1")) {
+            return PairState.FAILED;
+        }
+
+        // Save this cert for retrieval later
+        serverCert = extractPlainCert(getCert);
+        if (serverCert == null) {
+            // Attempting to pair while another device is pairing will cause GFE
+            // to give an empty cert in the response.
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.ALREADY_IN_PROGRESS;
+        }
+
+        // Require this cert for TLS to this host
+        http.setServerCert(serverCert);
+        
+        // Generate a random challenge and encrypt it with our AES key
+        byte[] randomChallenge = generateRandomBytes(16);
+        byte[] encryptedChallenge = encryptAes(randomChallenge, aesKey);
+        
+        // Send the encrypted challenge to the server
+        String challengeResp = http.openHttpConnectionToString(http.baseUrlHttp + 
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&clientchallenge="+bytesToHex(encryptedChallenge),
+                true);
+        if (!NvHTTP.getXmlString(challengeResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+        
+        // Decode the server's response and subsequent challenge
+        byte[] encServerChallengeResponse = hexToBytes(NvHTTP.getXmlString(challengeResp, "challengeresponse"));
+        byte[] decServerChallengeResponse = decryptAes(encServerChallengeResponse, aesKey);
+        
+        byte[] serverResponse = Arrays.copyOfRange(decServerChallengeResponse, 0, hashAlgo.getHashLength());
+        byte[] serverChallenge = Arrays.copyOfRange(decServerChallengeResponse, hashAlgo.getHashLength(), hashAlgo.getHashLength() + 16);
+        
+        // Using another 16 bytes secret, compute a challenge response hash using the secret, our cert sig, and the challenge
+        byte[] clientSecret = generateRandomBytes(16);
+        byte[] challengeRespHash = hashAlgo.hashData(concatBytes(concatBytes(serverChallenge, cert.getSignature()), clientSecret));
+        byte[] challengeRespEncrypted = encryptAes(challengeRespHash, aesKey);
+        String secretResp = http.openHttpConnectionToString(http.baseUrlHttp +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&serverchallengeresp="+bytesToHex(challengeRespEncrypted),
+                true);
+        if (!NvHTTP.getXmlString(secretResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+        
+        // Get the server's signed secret
+        byte[] serverSecretResp = hexToBytes(NvHTTP.getXmlString(secretResp, "pairingsecret"));
+        byte[] serverSecret = Arrays.copyOfRange(serverSecretResp, 0, 16);
+        byte[] serverSignature = Arrays.copyOfRange(serverSecretResp, 16, 272);
+
+        // Ensure the authenticity of the data
+        if (!verifySignature(serverSecret, serverSignature, serverCert)) {
+            // Cancel the pairing process
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            
+            // Looks like a MITM
+            return PairState.FAILED;
+        }
+        
+        // Ensure the server challenge matched what we expected (aka the PIN was correct)
+        byte[] serverChallengeRespHash = hashAlgo.hashData(concatBytes(concatBytes(randomChallenge, serverCert.getSignature()), serverSecret));
+        if (!Arrays.equals(serverChallengeRespHash, serverResponse)) {
+            // Cancel the pairing process
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            
+            // Probably got the wrong PIN
+            return PairState.PIN_WRONG;
+        }
+        
+        // Send the server our signed secret
+        byte[] clientPairingSecret = concatBytes(clientSecret, signData(clientSecret, pk));
+        String clientSecretResp = http.openHttpConnectionToString(http.baseUrlHttp + 
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&clientpairingsecret="+bytesToHex(clientPairingSecret),
+                true);
+        if (!NvHTTP.getXmlString(clientSecretResp, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+        
+        // Do the initial challenge (seems neccessary for us to show as paired)
+        String pairChallenge = http.openHttpConnectionToString(http.baseUrlHttps +
+                "/pair?"+http.buildUniqueIdUuidString()+"&devicename=roth&updateState=1&phrase=pairchallenge", true);
+        if (!NvHTTP.getXmlString(pairChallenge, "paired").equals("1")) {
+            http.openHttpConnectionToString(http.baseUrlHttp + "/unpair?"+http.buildUniqueIdUuidString(), true);
+            return PairState.FAILED;
+        }
+
+        return PairState.PAIRED;
+    }
+    
+    private interface PairingHashAlgorithm {
+        int getHashLength();
+        byte[] hashData(byte[] data);
+    }
+    
+    private static class Sha1PairingHash implements PairingHashAlgorithm {
+        public int getHashLength() {
+            return 20;
+        }
+        
+        public byte[] hashData(byte[] data) {
+            try {
+                MessageDigest md = MessageDigest.getInstance("SHA-1");
+                return md.digest(data);
+            }
+            catch (NoSuchAlgorithmException e) {
+                e.printStackTrace();
+                throw new RuntimeException(e);
+            }
+        }
+    }
+    
+    private static class Sha256PairingHash implements PairingHashAlgorithm {
+        public int getHashLength() {
+            return 32;
+        }
+        
+        public byte[] hashData(byte[] data) {
+            try {
+                MessageDigest md = MessageDigest.getInstance("SHA-256");
+                return md.digest(data);
+            }
+            catch (NoSuchAlgorithmException e) {
+                e.printStackTrace();
+                throw new RuntimeException(e);
+            }
+        }
+    }
+}
@@ -0,0 +1,19 @@
+package com.limelight.nvstream.input;
+
+public class ControllerPacket {
+    public static final short A_FLAG = 0x1000;
+    public static final short B_FLAG = 0x2000;
+    public static final short X_FLAG = 0x4000;
+    public static final short Y_FLAG = (short)0x8000;
+    public static final short UP_FLAG = 0x0001;
+    public static final short DOWN_FLAG = 0x0002;
+    public static final short LEFT_FLAG = 0x0004;
+    public static final short RIGHT_FLAG = 0x0008;
+    public static final short LB_FLAG = 0x0100;
+    public static final short RB_FLAG = 0x0200;
+    public static final short PLAY_FLAG = 0x0010;
+    public static final short BACK_FLAG = 0x0020;
+    public static final short LS_CLK_FLAG = 0x0040;
+    public static final short RS_CLK_FLAG = 0x0080;
+    public static final short SPECIAL_BUTTON_FLAG = 0x0400;
+}
@@ -0,0 +1,10 @@
+package com.limelight.nvstream.input;
+
+public class KeyboardPacket {
+    public static final byte KEY_DOWN = 0x03;
+    public static final byte KEY_UP = 0x04;
+
+    public static final byte MODIFIER_SHIFT = 0x01;
+    public static final byte MODIFIER_CTRL = 0x02;
+    public static final byte MODIFIER_ALT = 0x04;
+}
@@ -0,0 +1,12 @@
+package com.limelight.nvstream.input;
+
+public class MouseButtonPacket {
+    public static final byte PRESS_EVENT = 0x07;
+    public static final byte RELEASE_EVENT = 0x08;
+    
+    public static final byte BUTTON_LEFT = 0x01;
+    public static final byte BUTTON_MIDDLE = 0x02;
+    public static final byte BUTTON_RIGHT = 0x03;
+    public static final byte BUTTON_X1 = 0x04;
+    public static final byte BUTTON_X2 = 0x05;
+}
@@ -0,0 +1,310 @@
+package com.limelight.nvstream.jni;
+
+import com.limelight.nvstream.NvConnectionListener;
+import com.limelight.nvstream.av.audio.AudioRenderer;
+import com.limelight.nvstream.av.video.VideoDecoderRenderer;
+
+public class MoonBridge {
+    /* See documentation in Limelight.h for information about these functions and constants */
+
+    public static final AudioConfiguration AUDIO_CONFIGURATION_STEREO = new AudioConfiguration(2, 0x3);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_51_SURROUND = new AudioConfiguration(6, 0x3F);
+    public static final AudioConfiguration AUDIO_CONFIGURATION_71_SURROUND = new AudioConfiguration(8, 0x63F);
+
+    public static final int VIDEO_FORMAT_H264 = 0x0001;
+    public static final int VIDEO_FORMAT_H265 = 0x0100;
+    public static final int VIDEO_FORMAT_H265_MAIN10 = 0x0200;
+
+    public static final int VIDEO_FORMAT_MASK_H264 = 0x00FF;
+    public static final int VIDEO_FORMAT_MASK_H265 = 0xFF00;
+
+    public static final int ENCFLG_NONE = 0;
+    public static final int ENCFLG_AUDIO = 1;
+    public static final int ENCFLG_ALL = 0xFFFFFFFF;
+
+    public static final int BUFFER_TYPE_PICDATA = 0;
+    public static final int BUFFER_TYPE_SPS = 1;
+    public static final int BUFFER_TYPE_PPS = 2;
+    public static final int BUFFER_TYPE_VPS = 3;
+
+    public static final int CAPABILITY_DIRECT_SUBMIT = 1;
+    public static final int CAPABILITY_REFERENCE_FRAME_INVALIDATION_AVC = 2;
+    public static final int CAPABILITY_REFERENCE_FRAME_INVALIDATION_HEVC = 4;
+
+    public static final int DR_OK = 0;
+    public static final int DR_NEED_IDR = -1;
+
+    public static final int CONN_STATUS_OKAY = 0;
+    public static final int CONN_STATUS_POOR = 1;
+
+    public static final int ML_ERROR_GRACEFUL_TERMINATION = 0;
+    public static final int ML_ERROR_NO_VIDEO_TRAFFIC = -100;
+    public static final int ML_ERROR_NO_VIDEO_FRAME = -101;
+    public static final int ML_ERROR_UNEXPECTED_EARLY_TERMINATION = -102;
+    public static final int ML_ERROR_PROTECTED_CONTENT = -103;
+
+    public static final int ML_PORT_INDEX_TCP_47984 = 0;
+    public static final int ML_PORT_INDEX_TCP_47989 = 1;
+    public static final int ML_PORT_INDEX_TCP_48010 = 2;
+    public static final int ML_PORT_INDEX_UDP_47998 = 8;
+    public static final int ML_PORT_INDEX_UDP_47999 = 9;
+    public static final int ML_PORT_INDEX_UDP_48000 = 10;
+    public static final int ML_PORT_INDEX_UDP_48010 = 11;
+
+    public static final int ML_PORT_FLAG_ALL = 0xFFFFFFFF;
+    public static final int ML_PORT_FLAG_TCP_47984 = 0x0001;
+    public static final int ML_PORT_FLAG_TCP_47989 = 0x0002;
+    public static final int ML_PORT_FLAG_TCP_48010 = 0x0004;
+    public static final int ML_PORT_FLAG_UDP_47998 = 0x0100;
+    public static final int ML_PORT_FLAG_UDP_47999 = 0x0200;
+    public static final int ML_PORT_FLAG_UDP_48000 = 0x0400;
+    public static final int ML_PORT_FLAG_UDP_48010 = 0x0800;
+
+    public static final int ML_TEST_RESULT_INCONCLUSIVE = 0xFFFFFFFF;
+
+    private static AudioRenderer audioRenderer;
+    private static VideoDecoderRenderer videoRenderer;
+    private static NvConnectionListener connectionListener;
+
+    static {
+        System.loadLibrary("moonlight-core");
+        init();
+    }
+
+    public static int CAPABILITY_SLICES_PER_FRAME(byte slices) {
+        return slices << 24;
+    }
+
+    public static class AudioConfiguration {
+        public final int channelCount;
+        public final int channelMask;
+
+        public AudioConfiguration(int channelCount, int channelMask) {
+            this.channelCount = channelCount;
+            this.channelMask = channelMask;
+        }
+
+        // Creates an AudioConfiguration from the integer value returned by moonlight-common-c
+        // See CHANNEL_COUNT_FROM_AUDIO_CONFIGURATION() and CHANNEL_MASK_FROM_AUDIO_CONFIGURATION()
+        // in Limelight.h
+        private AudioConfiguration(int audioConfiguration) {
+            // Check the magic byte before decoding to make sure we got something that's actually
+            // a MAKE_AUDIO_CONFIGURATION()-based value and not something else like an older version
+            // hardcoded AUDIO_CONFIGURATION value from an earlier version of moonlight-common-c.
+            if ((audioConfiguration & 0xFF) != 0xCA) {
+                throw new IllegalArgumentException("Audio configuration has invalid magic byte!");
+            }
+
+            this.channelCount = (audioConfiguration >> 8) & 0xFF;
+            this.channelMask = (audioConfiguration >> 16) & 0xFFFF;
+        }
+
+        // See SURROUNDAUDIOINFO_FROM_AUDIO_CONFIGURATION() in Limelight.h
+        public int getSurroundAudioInfo() {
+            return channelMask << 16 | channelCount;
+        }
+
+        @Override
+        public boolean equals(Object obj) {
+            if (obj instanceof AudioConfiguration) {
+                AudioConfiguration that = (AudioConfiguration)obj;
+                return this.toInt() == that.toInt();
+            }
+
+            return false;
+        }
+
+        @Override
+        public int hashCode() {
+            return toInt();
+        }
+
+        // Returns the integer value expected by moonlight-common-c
+        // See MAKE_AUDIO_CONFIGURATION() in Limelight.h
+        public int toInt() {
+            return ((channelMask) << 16) | (channelCount << 8) | 0xCA;
+        }
+    }
+
+    public static int bridgeDrSetup(int videoFormat, int width, int height, int redrawRate) {
+        if (videoRenderer != null) {
+            return videoRenderer.setup(videoFormat, width, height, redrawRate);
+        }
+        else {
+            return -1;
+        }
+    }
+
+    public static void bridgeDrStart() {
+        if (videoRenderer != null) {
+            videoRenderer.start();
+        }
+    }
+
+    public static void bridgeDrStop() {
+        if (videoRenderer != null) {
+            videoRenderer.stop();
+        }
+    }
+
+    public static void bridgeDrCleanup() {
+        if (videoRenderer != null) {
+            videoRenderer.cleanup();
+        }
+    }
+
+    public static int bridgeDrSubmitDecodeUnit(byte[] decodeUnitData, int decodeUnitLength,
+                                               int decodeUnitType, int frameNumber,
+                                               long receiveTimeMs, long enqueueTimeMs) {
+        if (videoRenderer != null) {
+            return videoRenderer.submitDecodeUnit(decodeUnitData, decodeUnitLength,
+                    decodeUnitType, frameNumber, receiveTimeMs, enqueueTimeMs);
+        }
+        else {
+            return DR_OK;
+        }
+    }
+
+    public static int bridgeArInit(int audioConfiguration, int sampleRate, int samplesPerFrame) {
+        if (audioRenderer != null) {
+            return audioRenderer.setup(new AudioConfiguration(audioConfiguration), sampleRate, samplesPerFrame);
+        }
+        else {
+            return -1;
+        }
+    }
+
+    public static void bridgeArStart() {
+        if (audioRenderer != null) {
+            audioRenderer.start();
+        }
+    }
+
+    public static void bridgeArStop() {
+        if (audioRenderer != null) {
+            audioRenderer.stop();
+        }
+    }
+
+    public static void bridgeArCleanup() {
+        if (audioRenderer != null) {
+            audioRenderer.cleanup();
+        }
+    }
+
+    public static void bridgeArPlaySample(short[] pcmData) {
+        if (audioRenderer != null) {
+            audioRenderer.playDecodedAudio(pcmData);
+        }
+    }
+
+    public static void bridgeClStageStarting(int stage) {
+        if (connectionListener != null) {
+            connectionListener.stageStarting(getStageName(stage));
+        }
+    }
+
+    public static void bridgeClStageComplete(int stage) {
+        if (connectionListener != null) {
+            connectionListener.stageComplete(getStageName(stage));
+        }
+    }
+
+    public static void bridgeClStageFailed(int stage, int errorCode) {
+        if (connectionListener != null) {
+            connectionListener.stageFailed(getStageName(stage), getPortFlagsFromStage(stage), errorCode);
+        }
+    }
+
+    public static void bridgeClConnectionStarted() {
+        if (connectionListener != null) {
+            connectionListener.connectionStarted();
+        }
+    }
+
+    public static void bridgeClConnectionTerminated(int errorCode) {
+        if (connectionListener != null) {
+            connectionListener.connectionTerminated(errorCode);
+        }
+    }
+
+    public static void bridgeClRumble(short controllerNumber, short lowFreqMotor, short highFreqMotor) {
+        if (connectionListener != null) {
+            connectionListener.rumble(controllerNumber, lowFreqMotor, highFreqMotor);
+        }
+    }
+
+    public static void bridgeClConnectionStatusUpdate(int connectionStatus) {
+        if (connectionListener != null) {
+            connectionListener.connectionStatusUpdate(connectionStatus);
+        }
+    }
+
+    public static void setupBridge(VideoDecoderRenderer videoRenderer, AudioRenderer audioRenderer, NvConnectionListener connectionListener) {
+        MoonBridge.videoRenderer = videoRenderer;
+        MoonBridge.audioRenderer = audioRenderer;
+        MoonBridge.connectionListener = connectionListener;
+    }
+
+    public static void cleanupBridge() {
+        MoonBridge.videoRenderer = null;
+        MoonBridge.audioRenderer = null;
+        MoonBridge.connectionListener = null;
+    }
+
+    public static native int startConnection(String address, String appVersion, String gfeVersion,
+                                              int width, int height, int fps,
+                                              int bitrate, int packetSize, int streamingRemotely,
+                                              int audioConfiguration, boolean supportsHevc,
+                                              boolean enableHdr,
+                                              int hevcBitratePercentageMultiplier,
+                                              int clientRefreshRateX100,
+                                              int encryptionFlags,
+                                              byte[] riAesKey, byte[] riAesIv,
+                                              int videoCapabilities);
+
+    public static native void stopConnection();
+
+    public static native void interruptConnection();
+
+    public static native void sendMouseMove(short deltaX, short deltaY);
+
+    public static native void sendMousePosition(short x, short y, short referenceWidth, short referenceHeight);
+
+    public static native void sendMouseButton(byte buttonEvent, byte mouseButton);
+
+    public static native void sendMultiControllerInput(short controllerNumber,
+                                    short activeGamepadMask, short buttonFlags,
+                                    byte leftTrigger, byte rightTrigger,
+                                    short leftStickX, short leftStickY,
+                                    short rightStickX, short rightStickY);
+
+    public static native void sendControllerInput(short buttonFlags,
+                                    byte leftTrigger, byte rightTrigger,
+                                    short leftStickX, short leftStickY,
+                                    short rightStickX, short rightStickY);
+
+    public static native void sendKeyboardInput(short keyMap, byte keyDirection, byte modifier);
+
+    public static native void sendMouseScroll(byte scrollClicks);
+
+    public static native void sendMouseHighResScroll(short scrollAmount);
+
+    public static native String getStageName(int stage);
+
+    public static native String findExternalAddressIP4(String stunHostName, int stunPort);
+
+    public static native int getPendingAudioDuration();
+
+    public static native int getPendingVideoFrames();
+
+    public static native int testClientConnectivity(String testServerHostName, int referencePort, int testFlags);
+
+    public static native int getPortFlagsFromStage(int stage);
+
+    public static native int getPortFlagsFromTerminationErrorCode(int errorCode);
+
+    public static native String stringifyPortFlags(int portFlags, String separator);
+
+    public static native void init();
+}
@@ -0,0 +1,65 @@
+package com.limelight.nvstream.mdns;
+
+import java.net.Inet6Address;
+import java.net.InetAddress;
+
+public class MdnsComputer {
+    private InetAddress localAddr;
+    private Inet6Address v6Addr;
+    private String name;
+
+    public MdnsComputer(String name, InetAddress localAddress, Inet6Address v6Addr) {
+        this.name = name;
+        this.localAddr = localAddress;
+        this.v6Addr = v6Addr;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public InetAddress getLocalAddress() {
+        return localAddr;
+    }
+
+    public Inet6Address getIpv6Address() {
+        return v6Addr;
+    }
+
+    @Override
+    public int hashCode() {
+        return name.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o instanceof MdnsComputer) {
+            MdnsComputer other = (MdnsComputer)o;
+
+            if (!other.name.equals(name)) {
+                return false;
+            }
+
+            if ((other.localAddr != null && localAddr == null) ||
+                    (other.localAddr == null && localAddr != null) ||
+                    (other.localAddr != null && !other.localAddr.equals(localAddr))) {
+                return false;
+            }
+
+            if ((other.v6Addr != null && v6Addr == null) ||
+                    (other.v6Addr == null && v6Addr != null) ||
+                    (other.v6Addr != null && !other.v6Addr.equals(v6Addr))) {
+                return false;
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public String toString() {
+        return "["+name+" - "+localAddr+" - "+v6Addr+"]";
+    }
+}
@@ -0,0 +1,408 @@
+package com.limelight.nvstream.mdns;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+
+import javax.jmdns.JmmDNS;
+import javax.jmdns.NetworkTopologyDiscovery;
+import javax.jmdns.ServiceEvent;
+import javax.jmdns.ServiceInfo;
+import javax.jmdns.ServiceListener;
+import javax.jmdns.impl.NetworkTopologyDiscoveryImpl;
+
+import com.limelight.LimeLog;
+
+public class MdnsDiscoveryAgent implements ServiceListener {
+    public static final String SERVICE_TYPE = "_nvstream._tcp.local.";
+    
+    private MdnsDiscoveryListener listener;
+    private Thread discoveryThread;
+    private HashMap<InetAddress, MdnsComputer> computers = new HashMap<InetAddress, MdnsComputer>();
+    private HashSet<String> pendingResolution = new HashSet<String>();
+    
+    // The resolver factory's instance member has a static lifetime which
+    // means our ref count and listener must be static also.
+    private static int resolverRefCount = 0;
+    private static HashSet<ServiceListener> listeners = new HashSet<ServiceListener>();
+    private static ServiceListener nvstreamListener = new ServiceListener() {
+        @Override
+        public void serviceAdded(ServiceEvent event) {
+            HashSet<ServiceListener> localListeners;
+            
+            // Copy the listener set into a new set so we can invoke
+            // the callbacks without holding the listeners monitor the
+            // whole time.
+            synchronized (listeners) {
+                localListeners = new HashSet<ServiceListener>(listeners);
+            }
+            
+            for (ServiceListener listener : localListeners) {
+                listener.serviceAdded(event);
+            }
+        }
+
+        @Override
+        public void serviceRemoved(ServiceEvent event) {
+            HashSet<ServiceListener> localListeners;
+            
+            // Copy the listener set into a new set so we can invoke
+            // the callbacks without holding the listeners monitor the
+            // whole time.
+            synchronized (listeners) {
+                localListeners = new HashSet<ServiceListener>(listeners);
+            }
+            
+            for (ServiceListener listener : localListeners) {
+                listener.serviceRemoved(event);
+            }
+        }
+
+        @Override
+        public void serviceResolved(ServiceEvent event) {
+            HashSet<ServiceListener> localListeners;
+            
+            // Copy the listener set into a new set so we can invoke
+            // the callbacks without holding the listeners monitor the
+            // whole time.
+            synchronized (listeners) {
+                localListeners = new HashSet<ServiceListener>(listeners);
+            }
+            
+            for (ServiceListener listener : localListeners) {
+                listener.serviceResolved(event);
+            }
+        }
+    };
+
+    public static class MyNetworkTopologyDiscovery extends NetworkTopologyDiscoveryImpl {
+        @Override
+        public boolean useInetAddress(NetworkInterface networkInterface, InetAddress interfaceAddress) {
+            // This is an copy of jmDNS's implementation, except we omit the multicast check, since
+            // it seems at least some devices lie about interfaces not supporting multicast when they really do.
+            try {
+                if (!networkInterface.isUp()) {
+                    return false;
+                }
+
+                /*
+                if (!networkInterface.supportsMulticast()) {
+                    return false;
+                }
+                */
+
+                if (networkInterface.isLoopback()) {
+                    return false;
+                }
+
+                return true;
+            } catch (Exception exception) {
+                return false;
+            }
+        }
+    };
+
+    static {
+        // Override jmDNS's default topology discovery class with ours
+        NetworkTopologyDiscovery.Factory.setClassDelegate(new NetworkTopologyDiscovery.Factory.ClassDelegate() {
+            @Override
+            public NetworkTopologyDiscovery newNetworkTopologyDiscovery() {
+                return new MyNetworkTopologyDiscovery();
+            }
+        });
+    }
+
+    private static JmmDNS referenceResolver() {
+        synchronized (MdnsDiscoveryAgent.class) {
+            JmmDNS instance = JmmDNS.Factory.getInstance();
+            if (++resolverRefCount == 1) {
+                // This will cause the listener to be invoked for known hosts immediately.
+                // JmDNS only supports one listener per service, so we have to do this here
+                // with a static listener.
+                instance.addServiceListener(SERVICE_TYPE, nvstreamListener);
+            }
+            return instance;
+        }
+    }
+
+    private static void dereferenceResolver() {
+        synchronized (MdnsDiscoveryAgent.class) {
+            if (--resolverRefCount == 0) {
+                try {
+                    JmmDNS.Factory.close();
+                } catch (IOException e) {}
+            }
+        }
+    }
+
+    public MdnsDiscoveryAgent(MdnsDiscoveryListener listener) {
+        this.listener = listener;
+    }
+
+    private void handleResolvedServiceInfo(ServiceInfo info) {
+        synchronized (pendingResolution) {
+            pendingResolution.remove(info.getName());
+        }
+
+        try {
+            handleServiceInfo(info);
+        } catch (UnsupportedEncodingException e) {
+            // Invalid DNS response
+            LimeLog.info("mDNS: Invalid response for machine: "+info.getName());
+            return;
+        }
+    }
+
+    private Inet6Address getLocalAddress(Inet6Address[] addresses) {
+        for (Inet6Address addr : addresses) {
+            if (addr.isLinkLocalAddress() || addr.isSiteLocalAddress()) {
+                return addr;
+            }
+            // fc00::/7 - ULAs
+            else if ((addr.getAddress()[0] & 0xfe) == 0xfc) {
+                return addr;
+            }
+        }
+
+        return null;
+    }
+
+    private Inet6Address getLinkLocalAddress(Inet6Address[] addresses) {
+        for (Inet6Address addr : addresses) {
+            if (addr.isLinkLocalAddress()) {
+                LimeLog.info("Found link-local address: "+addr.getHostAddress());
+                return addr;
+            }
+        }
+
+        return null;
+    }
+
+    private Inet6Address getBestIpv6Address(Inet6Address[] addresses) {
+        // First try to find a link local address, so we can match the interface identifier
+        // with a global address (this will work for SLAAC but not DHCPv6).
+        Inet6Address linkLocalAddr = getLinkLocalAddress(addresses);
+
+        // We will try once to match a SLAAC interface suffix, then
+        // pick the first matching address
+        for (int tries = 0; tries < 2; tries++) {
+            // We assume the addresses are already sorted in descending order
+            // of preference from Bonjour.
+            for (Inet6Address addr : addresses) {
+                if (addr.isLinkLocalAddress() || addr.isSiteLocalAddress() || addr.isLoopbackAddress()) {
+                    // Link-local, site-local, and loopback aren't global
+                    LimeLog.info("Ignoring non-global address: "+addr.getHostAddress());
+                    continue;
+                }
+
+                byte[] addrBytes = addr.getAddress();
+
+                // 2002::/16
+                if (addrBytes[0] == 0x20 && addrBytes[1] == 0x02) {
+                    // 6to4 has horrible performance
+                    LimeLog.info("Ignoring 6to4 address: "+addr.getHostAddress());
+                    continue;
+                }
+                // 2001::/32
+                else if (addrBytes[0] == 0x20 && addrBytes[1] == 0x01 && addrBytes[2] == 0x00 && addrBytes[3] == 0x00) {
+                    // Teredo also has horrible performance
+                    LimeLog.info("Ignoring Teredo address: "+addr.getHostAddress());
+                    continue;
+                }
+                // fc00::/7
+                else if ((addrBytes[0] & 0xfe) == 0xfc) {
+                    // ULAs aren't global
+                    LimeLog.info("Ignoring ULA: "+addr.getHostAddress());
+                    continue;
+                }
+
+                // Compare the final 64-bit interface identifier and skip the address
+                // if it doesn't match our link-local address.
+                if (linkLocalAddr != null && tries == 0) {
+                    boolean matched = true;
+
+                    for (int i = 8; i < 16; i++) {
+                        if (linkLocalAddr.getAddress()[i] != addr.getAddress()[i]) {
+                            matched = false;
+                            break;
+                        }
+                    }
+
+                    if (!matched) {
+                        LimeLog.info("Ignoring non-matching global address: "+addr.getHostAddress());
+                        continue;
+                    }
+                }
+
+                return addr;
+            }
+        }
+
+        return null;
+    }
+
+    private void handleServiceInfo(ServiceInfo info) throws UnsupportedEncodingException {
+        Inet4Address v4Addrs[] = info.getInet4Addresses();
+        Inet6Address v6Addrs[] = info.getInet6Addresses();
+
+        LimeLog.info("mDNS: "+info.getName()+" has "+v4Addrs.length+" IPv4 addresses");
+        LimeLog.info("mDNS: "+info.getName()+" has "+v6Addrs.length+" IPv6 addresses");
+
+        Inet6Address v6GlobalAddr = getBestIpv6Address(v6Addrs);
+
+        // Add a computer object for each IPv4 address reported by the PC
+        for (Inet4Address v4Addr : v4Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = new MdnsComputer(info.getName(), v4Addr, v6GlobalAddr);
+                if (computers.put(computer.getLocalAddress(), computer) == null) {
+                    // This was a new entry
+                    listener.notifyComputerAdded(computer);
+                }
+            }
+        }
+
+        // If there were no IPv4 addresses, use IPv6 for registration
+        if (v4Addrs.length == 0) {
+            Inet6Address v6LocalAddr = getLocalAddress(v6Addrs);
+
+            if (v6LocalAddr != null || v6GlobalAddr != null) {
+                MdnsComputer computer = new MdnsComputer(info.getName(), v6LocalAddr, v6GlobalAddr);
+                if (computers.put(v6LocalAddr != null ?
+                        computer.getLocalAddress() : computer.getIpv6Address(), computer) == null) {
+                    // This was a new entry
+                    listener.notifyComputerAdded(computer);
+                }
+            }
+        }
+    }
+    
+    public void startDiscovery(final int discoveryIntervalMs) {
+        // Kill any existing discovery before starting a new one
+        stopDiscovery();
+        
+        // Add our listener to the set
+        synchronized (listeners) {
+            listeners.add(MdnsDiscoveryAgent.this);
+        }
+        
+        discoveryThread = new Thread() {
+            @Override
+            public void run() {
+                // This may result in listener callbacks so we must register
+                // our listener first.
+                JmmDNS resolver = referenceResolver();
+                
+                try {
+                    while (!Thread.interrupted()) {
+                        // Start an mDNS request
+                        resolver.requestServiceInfo(SERVICE_TYPE, null, discoveryIntervalMs);
+                        
+                        // Run service resolution again for pending machines
+                        ArrayList<String> pendingNames;
+                        synchronized (pendingResolution) {
+                            pendingNames = new ArrayList<String>(pendingResolution);
+                        }
+                        for (String name : pendingNames) {
+                            LimeLog.info("mDNS: Retrying service resolution for machine: "+name);
+                            ServiceInfo[] infos = resolver.getServiceInfos(SERVICE_TYPE, name, 500);
+                            if (infos != null && infos.length != 0) {
+                                LimeLog.info("mDNS: Resolved (retry) with "+infos.length+" service entries");
+                                for (ServiceInfo svcinfo : infos) {
+                                    handleResolvedServiceInfo(svcinfo);
+                                }
+                            }
+                        }
+                        
+                        // Wait for the next polling interval
+                        try {
+                            Thread.sleep(discoveryIntervalMs);
+                        } catch (InterruptedException e) {
+                            break;
+                        }
+                    }
+                }
+                finally {
+                    // Dereference the resolver
+                    dereferenceResolver();
+                }
+            }
+        };
+        discoveryThread.setName("mDNS Discovery Thread");
+        discoveryThread.start();
+    }
+    
+    public void stopDiscovery() {
+        // Remove our listener from the set
+        synchronized (listeners) {
+            listeners.remove(MdnsDiscoveryAgent.this);
+        }
+        
+        // If there's already a running thread, interrupt it
+        if (discoveryThread != null) {
+            discoveryThread.interrupt();
+            discoveryThread = null;
+        }
+    }
+    
+    public List<MdnsComputer> getComputerSet() {
+        synchronized (computers) {
+            return new ArrayList<MdnsComputer>(computers.values());
+        }
+    }
+
+    @Override
+    public void serviceAdded(ServiceEvent event) {
+        LimeLog.info("mDNS: Machine appeared: "+event.getInfo().getName());
+
+        ServiceInfo info = event.getDNS().getServiceInfo(SERVICE_TYPE, event.getInfo().getName(), 500);
+        if (info == null) {
+            // This machine is pending resolution
+            synchronized (pendingResolution) {
+                pendingResolution.add(event.getInfo().getName());
+            }
+            return;
+        }
+        
+        LimeLog.info("mDNS: Resolved (blocking)");
+        handleResolvedServiceInfo(info);
+    }
+
+    @Override
+    public void serviceRemoved(ServiceEvent event) {
+        LimeLog.info("mDNS: Machine disappeared: "+event.getInfo().getName());
+
+        Inet4Address v4Addrs[] = event.getInfo().getInet4Addresses();
+        for (Inet4Address addr : v4Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = computers.remove(addr);
+                if (computer != null) {
+                    listener.notifyComputerRemoved(computer);
+                    break;
+                }
+            }
+        }
+
+        Inet6Address v6Addrs[] = event.getInfo().getInet6Addresses();
+        for (Inet6Address addr : v6Addrs) {
+            synchronized (computers) {
+                MdnsComputer computer = computers.remove(addr);
+                if (computer != null) {
+                    listener.notifyComputerRemoved(computer);
+                    break;
+                }
+            }
+        }
+    }
+
+    @Override
+    public void serviceResolved(ServiceEvent event) {
+        // We handle this synchronously
+    }
+}
@@ -0,0 +1,7 @@
+package com.limelight.nvstream.mdns;
+
+public interface MdnsDiscoveryListener {
+    void notifyComputerAdded(MdnsComputer computer);
+    void notifyComputerRemoved(MdnsComputer computer);
+    void notifyDiscoveryFailure(Exception e);
+}
@@ -0,0 +1,100 @@
+package com.limelight.nvstream.wol;
+
+import java.io.IOException;
+import java.net.DatagramPacket;
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.util.Scanner;
+
+import com.limelight.LimeLog;
+import com.limelight.nvstream.http.ComputerDetails;
+
+public class WakeOnLanSender {
+    private static final int[] PORTS_TO_TRY = new int[] {
+        9, // Standard WOL port (privileged port)
+        47998, 47999, 48000, 48002, 48010, // Ports opened by GFE
+        47009, // Port opened by Moonlight Internet Hosting Tool for WoL (non-privileged port)
+    };
+    
+    public static void sendWolPacket(ComputerDetails computer) throws IOException {
+        DatagramSocket sock = new DatagramSocket(0);
+        byte[] payload = createWolPayload(computer);
+        IOException lastException = null;
+        boolean sentWolPacket = false;
+
+        try {
+            // Try all resolved remote and local addresses and IPv4 broadcast address.
+            // The broadcast address is required to avoid stale ARP cache entries
+            // making the sleeping machine unreachable.
+            for (String unresolvedAddress : new String[] {
+                    computer.localAddress, computer.remoteAddress, computer.manualAddress, computer.ipv6Address, "255.255.255.255"
+            }) {
+                if (unresolvedAddress == null) {
+                    continue;
+                }
+
+                try {
+                    for (InetAddress resolvedAddress : InetAddress.getAllByName(unresolvedAddress)) {
+                        // Try all the ports for each resolved address
+                        for (int port : PORTS_TO_TRY) {
+                            DatagramPacket dp = new DatagramPacket(payload, payload.length);
+                            dp.setAddress(resolvedAddress);
+                            dp.setPort(port);
+                            sock.send(dp);
+                            sentWolPacket = true;
+                        }
+                    }
+                } catch (IOException e) {
+                    // We may have addresses that don't resolve on this subnet,
+                    // but don't throw and exit the whole function if that happens.
+                    // We'll throw it at the end if we didn't send a single packet.
+                    e.printStackTrace();
+                    lastException = e;
+                }
+            }
+        } finally {
+            sock.close();
+        }
+
+        // Propagate the DNS resolution exception if we didn't
+        // manage to get a single packet out to the host.
+        if (!sentWolPacket && lastException != null) {
+            throw lastException;
+        }
+    }
+    
+    private static byte[] macStringToBytes(String macAddress) {
+        byte[] macBytes = new byte[6];
+        @SuppressWarnings("resource")
+        Scanner scan = new Scanner(macAddress).useDelimiter(":");
+        for (int i = 0; i < macBytes.length && scan.hasNext(); i++) {
+            try {
+                macBytes[i] = (byte) Integer.parseInt(scan.next(), 16);
+            } catch (NumberFormatException e) {
+                LimeLog.warning("Malformed MAC address: "+macAddress+" (index: "+i+")");
+                break;
+            }
+        }
+        scan.close();
+        return macBytes;
+    }
+    
+    private static byte[] createWolPayload(ComputerDetails computer) {
+        byte[] payload = new byte[102];
+        byte[] macAddress = macStringToBytes(computer.macAddress);
+        int i;
+        
+        // 6 bytes of FF
+        for (i = 0; i < 6; i++) {
+            payload[i] = (byte)0xFF;
+        }
+        
+        // 16 repetitions of the MAC address
+        for (int j = 0; j < 16; j++) {
+            System.arraycopy(macAddress, 0, payload, i, macAddress.length);
+            i += macAddress.length;
+        }
+        
+        return payload;
+    }
+}
@@ -1,5 +1,6 @@
 package com.limelight.preferences;

+import java.io.IOException;
 import java.net.Inet4Address;
 import java.net.InetAddress;
 import java.net.InterfaceAddress;
@@ -9,9 +10,14 @@ import java.net.UnknownHostException;
 import java.util.Collections;
 import java.util.concurrent.LinkedBlockingQueue;

+import com.limelight.binding.PlatformBinding;
 import com.limelight.computers.ComputerManagerService;
 import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvHTTP;
+import com.limelight.nvstream.jni.MoonBridge;
 import com.limelight.utils.Dialog;
+import com.limelight.utils.ServerHelper;
 import com.limelight.utils.SpinnerDialog;
 import com.limelight.utils.UiHelper;

@@ -93,12 +99,15 @@ public class AddComputerManually extends Activity {
    private void doAddPc(String host) {
        boolean wrongSiteLocal = false;
        boolean success;
+        int portTestResult;

        SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
            getResources().getString(R.string.msg_add_pc), false);

        try {
-            success = managerBinder.addComputerBlocking(host, true);
+            ComputerDetails details = new ComputerDetails();
+            details.manualAddress = host;
+            success = managerBinder.addComputerBlocking(details);
        } catch (IllegalArgumentException e) {
            // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
            // https://github.com/square/okhttp/blob/okhttp_27/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java#L705
@@ -108,6 +117,14 @@ public class AddComputerManually extends Activity {
        if (!success){
            wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
        }
+        if (!success && !wrongSiteLocal) {
+            // Run the test before dismissing the spinner because it can take a few seconds.
+            portTestResult = MoonBridge.testClientConnectivity(ServerHelper.CONNECTION_TEST_SERVER, 443,
+                    MoonBridge.ML_PORT_FLAG_TCP_47984 | MoonBridge.ML_PORT_FLAG_TCP_47989);
+        } else {
+            // Don't bother with the test if we succeeded or the IP address was bogus
+            portTestResult = MoonBridge.ML_TEST_RESULT_INCONCLUSIVE;
+        }

        dialog.dismiss();

@@ -115,7 +132,14 @@ public class AddComputerManually extends Activity {
            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), getResources().getString(R.string.addpc_wrong_sitelocal), false);
        }
        else if (!success) {
-            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), getResources().getString(R.string.addpc_fail), false);
+            String dialogText;
+            if (portTestResult != MoonBridge.ML_TEST_RESULT_INCONCLUSIVE && portTestResult != 0)  {
+                dialogText = getResources().getString(R.string.nettest_text_blocked);
+            }
+            else {
+                dialogText = getResources().getString(R.string.addpc_fail);
+            }
+            Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title), dialogText, false);
        }
        else {
            AddComputerManually.this.runOnUiThread(new Runnable() {
@@ -6,9 +6,11 @@ import android.content.pm.PackageManager;
 import android.os.Build;
 import android.preference.PreferenceManager;

+import com.limelight.nvstream.jni.MoonBridge;
+
 public class PreferenceConfiguration {
    private static final String LEGACY_RES_FPS_PREF_STRING = "list_resolution_fps";
-
+    private static final String LEGACY_ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";

    static final String RESOLUTION_PREF_STRING = "list_resolution";
    static final String FPS_PREF_STRING = "list_fps";
@@ -19,11 +21,11 @@ public class PreferenceConfiguration {
    private static final String DISABLE_TOASTS_PREF_STRING = "checkbox_disable_warnings";
    private static final String HOST_AUDIO_PREF_STRING = "checkbox_host_audio";
    private static final String DEADZONE_PREF_STRING = "seekbar_deadzone";
+    private static final String OSC_OPACITY_PREF_STRING = "seekbar_osc_opacity";
    private static final String LANGUAGE_PREF_STRING = "list_languages";
-    private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
    private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
    private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
-    private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
+    static final String AUDIO_CONFIG_PREF_STRING = "list_audio_config";
    private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
    private static final String VIDEO_FORMAT_PREF_STRING = "video_format";
    private static final String ONSCREEN_CONTROLLER_PREF_STRING = "checkbox_show_onscreen_controls";
@@ -31,24 +33,27 @@ public class PreferenceConfiguration {
    private static final String DISABLE_FRAME_DROP_PREF_STRING = "checkbox_disable_frame_drop";
    private static final String ENABLE_HDR_PREF_STRING = "checkbox_enable_hdr";
    private static final String ENABLE_PIP_PREF_STRING = "checkbox_enable_pip";
+    private static final String ENABLE_PERF_OVERLAY_STRING = "checkbox_enable_perf_overlay";
    private static final String BIND_ALL_USB_STRING = "checkbox_usb_bind_all";
    private static final String MOUSE_EMULATION_STRING = "checkbox_mouse_emulation";
    private static final String MOUSE_NAV_BUTTONS_STRING = "checkbox_mouse_nav_buttons";
    static final String UNLOCK_FPS_STRING = "checkbox_unlock_fps";
    private static final String VIBRATE_OSC_PREF_STRING = "checkbox_vibrate_osc";
    private static final String VIBRATE_FALLBACK_PREF_STRING = "checkbox_vibrate_fallback";
+    private static final String FLIP_FACE_BUTTONS_PREF_STRING = "checkbox_flip_face_buttons";
+    private static final String TOUCHSCREEN_TRACKPAD_PREF_STRING = "checkbox_touchscreen_trackpad";
+    private static final String LATENCY_TOAST_PREF_STRING = "checkbox_enable_post_stream_toast";

-    static final String DEFAULT_RESOLUTION = "720p";
+    static final String DEFAULT_RESOLUTION = "1280x720";
    static final String DEFAULT_FPS = "60";
    private static final boolean DEFAULT_STRETCH = false;
    private static final boolean DEFAULT_SOPS = true;
    private static final boolean DEFAULT_DISABLE_TOASTS = false;
    private static final boolean DEFAULT_HOST_AUDIO = false;
    private static final int DEFAULT_DEADZONE = 15;
+    private static final int DEFAULT_OPACITY = 90;
    public static final String DEFAULT_LANGUAGE = "default";
-    private static final boolean DEFAULT_LIST_MODE = false;
    private static final boolean DEFAULT_MULTI_CONTROLLER = true;
-    private static final boolean DEFAULT_ENABLE_51_SURROUND = false;
    private static final boolean DEFAULT_USB_DRIVER = true;
    private static final String DEFAULT_VIDEO_FORMAT = "auto";
    private static final boolean ONSCREEN_CONTROLLER_DEFAULT = false;
@@ -56,88 +61,126 @@ public class PreferenceConfiguration {
    private static final boolean DEFAULT_DISABLE_FRAME_DROP = false;
    private static final boolean DEFAULT_ENABLE_HDR = false;
    private static final boolean DEFAULT_ENABLE_PIP = false;
+    private static final boolean DEFAULT_ENABLE_PERF_OVERLAY = false;
    private static final boolean DEFAULT_BIND_ALL_USB = false;
    private static final boolean DEFAULT_MOUSE_EMULATION = true;
    private static final boolean DEFAULT_MOUSE_NAV_BUTTONS = false;
    private static final boolean DEFAULT_UNLOCK_FPS = false;
    private static final boolean DEFAULT_VIBRATE_OSC = true;
    private static final boolean DEFAULT_VIBRATE_FALLBACK = false;
+    private static final boolean DEFAULT_FLIP_FACE_BUTTONS = false;
+    private static final boolean DEFAULT_TOUCHSCREEN_TRACKPAD = true;
+    private static final String DEFAULT_AUDIO_CONFIG = "2"; // Stereo
+    private static final boolean DEFAULT_LATENCY_TOAST = false;

    public static final int FORCE_H265_ON = -1;
    public static final int AUTOSELECT_H265 = 0;
    public static final int FORCE_H265_OFF = 1;

+    public static final String RES_360P = "640x360";
+    public static final String RES_480P = "854x480";
+    public static final String RES_720P = "1280x720";
+    public static final String RES_1080P = "1920x1080";
+    public static final String RES_1440P = "2560x1440";
+    public static final String RES_4K = "3840x2160";
+    public static final String RES_NATIVE = "Native";
+
    public int width, height, fps;
    public int bitrate;
    public int videoFormat;
    public int deadzonePercentage;
+    public int oscOpacity;
    public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
    public String language;
-    public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
+    public boolean smallIconMode, multiController, usbDriver, flipFaceButtons;
    public boolean onscreenController;
    public boolean onlyL3R3;
    public boolean disableFrameDrop;
    public boolean enableHdr;
    public boolean enablePip;
+    public boolean enablePerfOverlay;
+    public boolean enableLatencyToast;
    public boolean bindAllUsb;
    public boolean mouseEmulation;
    public boolean mouseNavButtons;
    public boolean unlockFps;
    public boolean vibrateOsc;
    public boolean vibrateFallbackToDevice;
+    public boolean touchscreenTrackpad;
+    public MoonBridge.AudioConfiguration audioConfiguration;

-    private static int getHeightFromResolutionString(String resString) {
+    public static boolean isNativeResolution(int width, int height) {
+        // It's not a native resolution if it matches an existing resolution option
+        if (width == 640 && height == 360) {
+            return false;
+        }
+        else if (width == 854 && height == 480) {
+            return false;
+        }
+        else if (width == 1280 && height == 720) {
+            return false;
+        }
+        else if (width == 1920 && height == 1080) {
+            return false;
+        }
+        else if (width == 2560 && height == 1440) {
+            return false;
+        }
+        else if (width == 3840 && height == 2160) {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static String convertFromLegacyResolutionString(String resString) {
        if (resString.equalsIgnoreCase("360p")) {
-            return 360;
+            return RES_360P;
        }
        else if (resString.equalsIgnoreCase("480p")) {
-            return 480;
+            return RES_480P;
        }
        else if (resString.equalsIgnoreCase("720p")) {
-            return 720;
+            return RES_720P;
        }
        else if (resString.equalsIgnoreCase("1080p")) {
-            return 1080;
+            return RES_1080P;
        }
        else if (resString.equalsIgnoreCase("1440p")) {
-            return 1440;
+            return RES_1440P;
        }
        else if (resString.equalsIgnoreCase("4K")) {
-            return 2160;
+            return RES_4K;
        }
        else {
            // Should be unreachable
-            return 720;
+            return RES_720P;
        }
    }

    private static int getWidthFromResolutionString(String resString) {
-        int height = getHeightFromResolutionString(resString);
-        if (height == 480) {
-            // This isn't an exact 16:9 resolution
-            return 854;
-        }
-        else {
-            return (height * 16) / 9;
-        }
+        return Integer.parseInt(resString.split("x")[0]);
+    }
+
+    private static int getHeightFromResolutionString(String resString) {
+        return Integer.parseInt(resString.split("x")[1]);
    }

    private static String getResolutionString(int width, int height) {
        switch (height) {
            case 360:
-                return "360p";
+                return RES_360P;
            case 480:
-                return "480p";
+                return RES_480P;
            default:
            case 720:
-                return "720p";
+                return RES_720P;
            case 1080:
-                return "1080p";
+                return RES_1080P;
            case 1440:
-                return "1440p";
+                return RES_1440P;
            case 2160:
-                return "4K";
-
+                return RES_4K;
        }
    }

@@ -241,6 +284,15 @@ public class PreferenceConfiguration {
        PreferenceConfiguration config = new PreferenceConfiguration();

        // Migrate legacy preferences to the new locations
+        if (prefs.contains(LEGACY_ENABLE_51_SURROUND_PREF_STRING)) {
+            if (prefs.getBoolean(LEGACY_ENABLE_51_SURROUND_PREF_STRING, false)) {
+                prefs.edit()
+                        .remove(LEGACY_ENABLE_51_SURROUND_PREF_STRING)
+                        .putString(AUDIO_CONFIG_PREF_STRING, "51")
+                        .apply();
+            }
+        }
+
        String str = prefs.getString(LEGACY_RES_FPS_PREF_STRING, null);
        if (str != null) {
            if (str.equals("360p30")) {
@@ -299,21 +351,47 @@ public class PreferenceConfiguration {
        else {
            // Use the new preference location
            String resStr = prefs.getString(RESOLUTION_PREF_STRING, PreferenceConfiguration.DEFAULT_RESOLUTION);
+
+            // Convert legacy resolution strings to the new style
+            if (!resStr.contains("x")) {
+                resStr = PreferenceConfiguration.convertFromLegacyResolutionString(resStr);
+                prefs.edit().putString(RESOLUTION_PREF_STRING, resStr).apply();
+            }
+
            config.width = PreferenceConfiguration.getWidthFromResolutionString(resStr);
            config.height = PreferenceConfiguration.getHeightFromResolutionString(resStr);
            config.fps = Integer.parseInt(prefs.getString(FPS_PREF_STRING, PreferenceConfiguration.DEFAULT_FPS));
        }

+        if (!prefs.contains(SMALL_ICONS_PREF_STRING)) {
+            // We need to write small icon mode's default to disk for the settings page to display
+            // the current state of the option properly
+            prefs.edit().putBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context)).apply();
+        }
+
        // This must happen after the preferences migration to ensure the preferences are populated
        config.bitrate = prefs.getInt(BITRATE_PREF_STRING, prefs.getInt(BITRATE_PREF_OLD_STRING, 0) * 1000);
        if (config.bitrate == 0) {
            config.bitrate = getDefaultBitrate(context);
        }

+        String audioConfig = prefs.getString(AUDIO_CONFIG_PREF_STRING, DEFAULT_AUDIO_CONFIG);
+        if (audioConfig.equals("71")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_71_SURROUND;
+        }
+        else if (audioConfig.equals("51")) {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_51_SURROUND;
+        }
+        else /* if (audioConfig.equals("2")) */ {
+            config.audioConfiguration = MoonBridge.AUDIO_CONFIGURATION_STEREO;
+        }
+
        config.videoFormat = getVideoFormatValue(context);

        config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);

+        config.oscOpacity = prefs.getInt(OSC_OPACITY_PREF_STRING, DEFAULT_OPACITY);
+
        config.language = prefs.getString(LANGUAGE_PREF_STRING, DEFAULT_LANGUAGE);

        // Checkbox preferences
@@ -321,22 +399,24 @@ public class PreferenceConfiguration {
        config.enableSops = prefs.getBoolean(SOPS_PREF_STRING, DEFAULT_SOPS);
        config.stretchVideo = prefs.getBoolean(STRETCH_PREF_STRING, DEFAULT_STRETCH);
        config.playHostAudio = prefs.getBoolean(HOST_AUDIO_PREF_STRING, DEFAULT_HOST_AUDIO);
-        config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
        config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
        config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
-        config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
        config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
        config.onscreenController = prefs.getBoolean(ONSCREEN_CONTROLLER_PREF_STRING, ONSCREEN_CONTROLLER_DEFAULT);
        config.onlyL3R3 = prefs.getBoolean(ONLY_L3_R3_PREF_STRING, ONLY_L3_R3_DEFAULT);
        config.disableFrameDrop = prefs.getBoolean(DISABLE_FRAME_DROP_PREF_STRING, DEFAULT_DISABLE_FRAME_DROP);
        config.enableHdr = prefs.getBoolean(ENABLE_HDR_PREF_STRING, DEFAULT_ENABLE_HDR);
        config.enablePip = prefs.getBoolean(ENABLE_PIP_PREF_STRING, DEFAULT_ENABLE_PIP);
+        config.enablePerfOverlay = prefs.getBoolean(ENABLE_PERF_OVERLAY_STRING, DEFAULT_ENABLE_PERF_OVERLAY);
        config.bindAllUsb = prefs.getBoolean(BIND_ALL_USB_STRING, DEFAULT_BIND_ALL_USB);
        config.mouseEmulation = prefs.getBoolean(MOUSE_EMULATION_STRING, DEFAULT_MOUSE_EMULATION);
        config.mouseNavButtons = prefs.getBoolean(MOUSE_NAV_BUTTONS_STRING, DEFAULT_MOUSE_NAV_BUTTONS);
        config.unlockFps = prefs.getBoolean(UNLOCK_FPS_STRING, DEFAULT_UNLOCK_FPS);
        config.vibrateOsc = prefs.getBoolean(VIBRATE_OSC_PREF_STRING, DEFAULT_VIBRATE_OSC);
        config.vibrateFallbackToDevice = prefs.getBoolean(VIBRATE_FALLBACK_PREF_STRING, DEFAULT_VIBRATE_FALLBACK);
+        config.flipFaceButtons = prefs.getBoolean(FLIP_FACE_BUTTONS_PREF_STRING, DEFAULT_FLIP_FACE_BUTTONS);
+        config.touchscreenTrackpad = prefs.getBoolean(TOUCHSCREEN_TRACKPAD_PREF_STRING, DEFAULT_TOUCHSCREEN_TRACKPAD);
+        config.enableLatencyToast = prefs.getBoolean(LATENCY_TOAST_PREF_STRING, DEFAULT_LATENCY_TOAST);

        return config;
    }
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.preference.DialogPreference;
 import android.util.AttributeSet;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -13,6 +14,8 @@ import android.widget.LinearLayout;
 import android.widget.SeekBar;
 import android.widget.TextView;

+import java.util.Locale;
+
 // Based on a Stack Overflow example: http://stackoverflow.com/questions/1974193/slider-on-my-preferencescreen
 public class SeekBarPreference extends DialogPreference
 {
@@ -29,6 +32,8 @@ public class SeekBarPreference extends DialogPreference
    private final int maxValue;
    private final int minValue;
    private final int stepSize;
+    private final int keyStepSize;
+    private final int divisor;
    private int currentValue;

    public SeekBarPreference(Context context, AttributeSet attrs) {
@@ -58,6 +63,8 @@ public class SeekBarPreference extends DialogPreference
        maxValue = attrs.getAttributeIntValue(ANDROID_SCHEMA_URL, "max", 100);
        minValue = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "min", 1);
        stepSize = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "step", 1);
+        divisor = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "divisor", 1);
+        keyStepSize = attrs.getAttributeIntValue(SEEKBAR_SCHEMA_URL, "keyStep", 0);
    }

    @Override
@@ -78,6 +85,8 @@ public class SeekBarPreference extends DialogPreference
        valueText = new TextView(context);
        valueText.setGravity(Gravity.CENTER_HORIZONTAL);
        valueText.setTextSize(32);
+        // Default text for value; hides bug where OnSeekBarChangeListener isn't called when opacity is 0%
+        valueText.setText("0%");
        params = new LinearLayout.LayoutParams(
                LinearLayout.LayoutParams.MATCH_PARENT,
                LinearLayout.LayoutParams.WRAP_CONTENT);
@@ -98,7 +107,14 @@ public class SeekBarPreference extends DialogPreference
                    return;
                }

-                String t = String.valueOf(value);
+                String t;
+                if (divisor != 1) {
+                    float floatValue = roundedValue / (float)divisor;
+                    t = String.format((Locale)null, "%.1f", floatValue);
+                }
+                else {
+                    t = String.valueOf(value);
+                }
                valueText.setText(suffix == null ? t : t.concat(suffix.length() > 1 ? " "+suffix : suffix));
            }

@@ -116,6 +132,9 @@ public class SeekBarPreference extends DialogPreference
        }

        seekBar.setMax(maxValue);
+        if (keyStepSize != 0) {
+            seekBar.setKeyProgressIncrement(keyStepSize);
+        }
        seekBar.setProgress(currentValue);

        return layout;
@@ -125,6 +144,9 @@ public class SeekBarPreference extends DialogPreference
    protected void onBindDialogView(View v) {
        super.onBindDialogView(v);
        seekBar.setMax(maxValue);
+        if (keyStepSize != 0) {
+            seekBar.setKeyProgressIncrement(keyStepSize);
+        }
        seekBar.setProgress(currentValue);
    }

@@ -1,5 +1,6 @@
 package com.limelight.preferences;

+import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.media.MediaCodecInfo;
@@ -7,6 +8,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.app.Activity;
 import android.os.Handler;
+import android.os.Vibrator;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceCategory;
@@ -15,13 +17,19 @@ import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
 import android.util.Range;
 import android.view.Display;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;

 import com.limelight.LimeLog;
 import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.binding.video.MediaCodecHelper;
+import com.limelight.utils.Dialog;
 import com.limelight.utils.UiHelper;

+import java.util.Arrays;
+
 public class StreamSettings extends Activity {
    private PreferenceConfiguration previousPrefs;

@@ -51,9 +59,7 @@ public class StreamSettings extends Activity {

        // 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)) {
+        if (!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);
@@ -62,6 +68,7 @@ public class StreamSettings extends Activity {
    }

    public static class SettingsFragment extends PreferenceFragment {
+        private int nativeResolutionStartIndex = Integer.MAX_VALUE;

        private void setValue(String preferenceKey, String value) {
            ListPreference pref = (ListPreference) findPreference(preferenceKey);
@@ -69,6 +76,37 @@ public class StreamSettings extends Activity {
            pref.setValue(value);
        }

+        private void addNativeResolutionEntry(int nativeWidth, int nativeHeight) {
+            ListPreference pref = (ListPreference) findPreference(PreferenceConfiguration.RESOLUTION_PREF_STRING);
+
+            String newName = getResources().getString(R.string.resolution_prefix_native) + " ("+nativeWidth+"x"+nativeHeight+")";
+            String newValue = nativeWidth+"x"+nativeHeight;
+
+            CharSequence[] values = pref.getEntryValues();
+
+            // Check if the native resolution is already present
+            for (CharSequence value : values) {
+                if (newValue.equals(value.toString())) {
+                    // It is present in the default list, so don't add it again
+                    return;
+                }
+            }
+
+            CharSequence[] newEntries = Arrays.copyOf(pref.getEntries(), pref.getEntries().length + 1);
+            CharSequence[] newValues = Arrays.copyOf(values, values.length + 1);
+
+            // Add the new native option
+            newEntries[newEntries.length - 1] = newName;
+            newValues[newValues.length - 1] = newValue;
+
+            pref.setEntries(newEntries);
+            pref.setEntryValues(newValues);
+
+            if (newValues.length - 1 < nativeResolutionStartIndex) {
+                nativeResolutionStartIndex = newValues.length - 1;
+            }
+        }
+
        private void removeValue(String preferenceKey, String value, Runnable onMatched) {
            int matchingCount = 0;

@@ -105,8 +143,6 @@ public class StreamSettings extends Activity {
            pref.setEntryValues(entryValues);
        }

-
-
        private void resetBitrateToDefault(SharedPreferences prefs, String res, String fps) {
            if (res == null) {
                res = prefs.getString(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.DEFAULT_RESOLUTION);
@@ -121,27 +157,59 @@ public class StreamSettings extends Activity {
                    .apply();
        }

+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+            View view = super.onCreateView(inflater, container, savedInstanceState);
+            UiHelper.applyStatusBarPadding(view);
+            return view;
+        }
+
        @Override
        public void onCreate(Bundle savedInstanceState) {
            super.onCreate(savedInstanceState);
+
            addPreferencesFromResource(R.xml.preferences);
            PreferenceScreen screen = getPreferenceScreen();

            // hide on-screen controls category on non touch screen devices
            if (!getActivity().getPackageManager().
                    hasSystemFeature("android.hardware.touchscreen")) {
-                PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_onscreen_controls");
-                screen.removePreference(category);
+                {
+                    PreferenceCategory category =
+                            (PreferenceCategory) findPreference("category_onscreen_controls");
+                    screen.removePreference(category);
+                }
+
+                {
+                    PreferenceCategory category =
+                            (PreferenceCategory) findPreference("category_input_settings");
+                    category.removePreference(findPreference("checkbox_touchscreen_trackpad"));
+                }
            }

-            // Remove PiP mode on devices pre-Oreo
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            // Remove PiP mode on devices pre-Oreo, where the feature is not available (some low RAM devices),
+            // and on Fire OS where it violates the Amazon App Store guidelines for some reason.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O ||
+                    !getActivity().getPackageManager().hasSystemFeature("android.software.picture_in_picture") ||
+                    getActivity().getPackageManager().hasSystemFeature("com.amazon.software.fireos")) {
                PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_basic_settings");
+                        (PreferenceCategory) findPreference("category_ui_settings");
                category.removePreference(findPreference("checkbox_enable_pip"));
            }

+            // Remove the vibration options if the device can't vibrate
+            if (!((Vibrator)getActivity().getSystemService(Context.VIBRATOR_SERVICE)).hasVibrator()) {
+                PreferenceCategory category =
+                        (PreferenceCategory) findPreference("category_input_settings");
+                category.removePreference(findPreference("checkbox_vibrate_fallback"));
+
+                // The entire OSC category may have already been removed by the touchscreen check above
+                category = (PreferenceCategory) findPreference("category_onscreen_controls");
+                if (category != null) {
+                    category.removePreference(findPreference("checkbox_vibrate_osc"));
+                }
+            }
+
            int maxSupportedFps = 0;

            // Hide non-supported resolution/FPS combinations
@@ -165,6 +233,8 @@ public class StreamSettings extends Activity {
                    int width = Math.max(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());
                    int height = Math.min(candidate.getPhysicalWidth(), candidate.getPhysicalHeight());

+                    addNativeResolutionEntry(width, height);
+
                    if ((width >= 3840 || height >= 2160) && maxSupportedResW < 3840) {
                        maxSupportedResW = 3840;
                    }
@@ -230,33 +300,33 @@ public class StreamSettings extends Activity {
                if (maxSupportedResW != 0) {
                    if (maxSupportedResW < 3840) {
                        // 4K is unsupported
-                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "4K", new Runnable() {
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_4K, new Runnable() {
                            @Override
                            public void run() {
                                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
-                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1440p");
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1440P);
                                resetBitrateToDefault(prefs, null, null);
                            }
                        });
                    }
                    if (maxSupportedResW < 2560) {
                        // 1440p is unsupported
-                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1440p", new Runnable() {
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1440P, new Runnable() {
                            @Override
                            public void run() {
                                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
-                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1080p");
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1080P);
                                resetBitrateToDefault(prefs, null, null);
                            }
                        });
                    }
                    if (maxSupportedResW < 1920) {
                        // 1080p is unsupported
-                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "1080p", new Runnable() {
+                        removeValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_1080P, new Runnable() {
                            @Override
                            public void run() {
                                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
-                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, "720p");
+                                setValue(PreferenceConfiguration.RESOLUTION_PREF_STRING, PreferenceConfiguration.RES_720P);
                                resetBitrateToDefault(prefs, null, null);
                            }
                        });
@@ -264,6 +334,12 @@ public class StreamSettings extends Activity {
                    // Never remove 720p
                }
            }
+            else {
+                Display display = getActivity().getWindowManager().getDefaultDisplay();
+                int width = Math.max(display.getWidth(), display.getHeight());
+                int height = Math.min(display.getWidth(), display.getHeight());
+                addNativeResolutionEntry(width, height);
+            }

            if (!PreferenceConfiguration.readPreferences(this.getActivity()).unlockFps) {
                // We give some extra room in case the FPS is rounded down
@@ -291,12 +367,24 @@ public class StreamSettings extends Activity {
                // Never remove 30 FPS or 60 FPS
            }

+            // Android L introduces proper 7.1 surround sound support. Remove the 7.1 option
+            // for earlier versions of Android to prevent AudioTrack initialization issues.
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+                LimeLog.info("Excluding 7.1 surround sound option based on OS");
+                removeValue(PreferenceConfiguration.AUDIO_CONFIG_PREF_STRING, "71", new Runnable() {
+                    @Override
+                    public void run() {
+                        setValue(PreferenceConfiguration.AUDIO_CONFIG_PREF_STRING, "51");
+                    }
+                });
+            }
+
            // Android L introduces the drop duplicate behavior of releaseOutputBuffer()
            // that the unlock FPS option relies on to not massively increase latency.
            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
                LimeLog.info("Excluding unlock FPS toggle based on OS");
                PreferenceCategory category =
-                        (PreferenceCategory) findPreference("category_basic_settings");
+                        (PreferenceCategory) findPreference("category_advanced_settings");
                category.removePreference(findPreference("checkbox_unlock_fps"));
            }
            else {
@@ -361,6 +449,25 @@ public class StreamSettings extends Activity {
                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
                    String valueStr = (String) newValue;

+                    // Detect if this value is the native resolution option
+                    CharSequence[] values = ((ListPreference)preference).getEntryValues();
+                    boolean isNativeRes = true;
+                    for (int i = 0; i < values.length; i++) {
+                        // Look for a match prior to the start of the native resolution entries
+                        if (valueStr.equals(values[i].toString()) && i < nativeResolutionStartIndex) {
+                            isNativeRes = false;
+                            break;
+                        }
+                    }
+
+                    // If this is native resolution, show the warning dialog
+                    if (isNativeRes) {
+                        Dialog.displayDialog(getActivity(),
+                                getResources().getString(R.string.title_native_res_dialog),
+                                getResources().getString(R.string.text_native_res_dialog),
+                                false);
+                    }
+
                    // Write the new bitrate value
                    resetBitrateToDefault(prefs, valueStr, null);

@@ -3,41 +3,22 @@ package com.limelight.utils;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;

 import com.limelight.HelpActivity;

 public class HelpLauncher {
-
-    private static boolean isKnownBrowser(Context context, Intent i) {
-        ResolveInfo resolvedActivity = context.getPackageManager().resolveActivity(i, PackageManager.MATCH_DEFAULT_ONLY);
-        if (resolvedActivity == null) {
-            // No browser
-            return false;
-        }
-
-        String name = resolvedActivity.activityInfo.name;
-        if (name == null) {
-            return false;
-        }
-
-        name = name.toLowerCase();
-        return name.contains("chrome") || name.contains("firefox");
-    }
-
    private static void launchUrl(Context context, String url) {
        // Try to launch the default browser
        try {
            Intent i = new Intent(Intent.ACTION_VIEW);
            i.setData(Uri.parse(url));

-            // Several Android TV devices will lie and say they do have a browser
-            // even though the OS just shows an error dialog if we try to use it. We need to
-            // be a bit more clever on these devices and detect if the browser is a legitimate
-            // browser or just a fake error message activity.
-            if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK) ||
-                    isKnownBrowser(context, i)) {
+            // Several Android TV devices will lie and say they do have a browser even though the OS
+            // just shows an error dialog if we try to use it. We used to try to be clever and check
+            // the package name of the resolved intent, but it's not worth it anymore with Android 11's
+            // package visibility changes. We'll just always use the WebView on Android TV.
+            if (!context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK)) {
                context.startActivity(i);
                return;
            }
@@ -0,0 +1,32 @@
+package com.limelight.utils;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.Network;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.os.Build;
+
+public class NetHelper {
+    public static boolean isActiveNetworkVpn(Context context) {
+        ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            Network activeNetwork = connMgr.getActiveNetwork();
+            if (activeNetwork != null) {
+                NetworkCapabilities netCaps = connMgr.getNetworkCapabilities(activeNetwork);
+                if (netCaps != null) {
+                    return netCaps.hasTransport(NetworkCapabilities.TRANSPORT_VPN) ||
+                            !netCaps.hasCapability(NetworkCapabilities.NET_CAPABILITY_NOT_VPN);
+                }
+            }
+        }
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            NetworkInfo activeNetworkInfo = connMgr.getActiveNetworkInfo();
+            if (activeNetworkInfo != null) {
+                return activeNetworkInfo.getType() == ConnectivityManager.TYPE_VPN;
+            }
+        }
+
+        return false;
+    }
+}
@@ -4,14 +4,18 @@ import android.app.Activity;
 import android.content.Intent;
 import android.widget.Toast;

+import com.limelight.AppView;
 import com.limelight.Game;
+import com.limelight.PcView;
 import com.limelight.R;
+import com.limelight.ShortcutTrampoline;
 import com.limelight.binding.PlatformBinding;
 import com.limelight.computers.ComputerManagerService;
 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.nvstream.jni.MoonBridge;

 import org.xmlpull.v1.XmlPullParserException;

@@ -21,10 +25,31 @@ import java.net.UnknownHostException;
 import java.security.cert.CertificateEncodingException;

 public class ServerHelper {
+    public static final String CONNECTION_TEST_SERVER = "android.conntest.moonlight-stream.org";
+
    public static String getCurrentAddressFromComputer(ComputerDetails computer) {
        return computer.activeAddress;
    }

+    public static Intent createPcShortcutIntent(Activity parent, ComputerDetails computer) {
+        Intent i = new Intent(parent, ShortcutTrampoline.class);
+        i.putExtra(AppView.NAME_EXTRA, computer.name);
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
+        i.setAction(Intent.ACTION_DEFAULT);
+        return i;
+    }
+
+    public static Intent createAppShortcutIntent(Activity parent, ComputerDetails computer, NvApp app) {
+        Intent i = new Intent(parent, ShortcutTrampoline.class);
+        i.putExtra(AppView.NAME_EXTRA, computer.name);
+        i.putExtra(AppView.UUID_EXTRA, computer.uuid);
+        i.putExtra(Game.EXTRA_APP_NAME, app.getAppName());
+        i.putExtra(Game.EXTRA_APP_ID, ""+app.getAppId());
+        i.putExtra(Game.EXTRA_APP_HDR, app.isHdrSupported());
+        i.setAction(Intent.ACTION_DEFAULT);
+        return i;
+    }
+
    public static Intent createStartIntent(Activity parent, NvApp app, ComputerDetails computer,
                                           ComputerManagerService.ComputerManagerBinder managerBinder) {
        Intent intent = new Intent(parent, Game.class);
@@ -55,6 +80,38 @@ public class ServerHelper {
        parent.startActivity(createStartIntent(parent, app, computer, managerBinder));
    }

+    public static void doNetworkTest(final Activity parent) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                SpinnerDialog spinnerDialog = SpinnerDialog.displayDialog(parent,
+                        parent.getResources().getString(R.string.nettest_title_waiting),
+                        parent.getResources().getString(R.string.nettest_text_waiting),
+                        false);
+
+                int ret = MoonBridge.testClientConnectivity(CONNECTION_TEST_SERVER, 443, MoonBridge.ML_PORT_FLAG_ALL);
+                spinnerDialog.dismiss();
+
+                String dialogSummary;
+                if (ret == MoonBridge.ML_TEST_RESULT_INCONCLUSIVE) {
+                    dialogSummary = parent.getResources().getString(R.string.nettest_text_inconclusive);
+                }
+                else if (ret == 0) {
+                    dialogSummary = parent.getResources().getString(R.string.nettest_text_success);
+                }
+                else {
+                    dialogSummary = parent.getResources().getString(R.string.nettest_text_failure);
+                    dialogSummary += MoonBridge.stringifyPortFlags(ret, "\n");
+                }
+
+                Dialog.displayDialog(parent,
+                        parent.getResources().getString(R.string.nettest_title_done),
+                        dialogSummary,
+                        false);
+            }
+        }).start();
+    }
+
    public static void doQuit(final Activity parent,
                              final ComputerDetails computer,
                              final NvApp app,
@@ -1,7 +1,7 @@
 package com.limelight.utils;

 import android.annotation.TargetApi;
-import android.content.Context;
+import android.app.Activity;
 import android.content.Intent;
 import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
@@ -22,9 +22,10 @@ import java.util.List;
 public class ShortcutHelper {

    private final ShortcutManager sm;
-    private final Context context;
+    private final Activity context;
+    private final TvChannelHelper tvChannelHelper;

-    public ShortcutHelper(Context context) {
+    public ShortcutHelper(Activity context) {
        this.context = context;
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
            sm = context.getSystemService(ShortcutManager.class);
@@ -32,6 +33,7 @@ public class ShortcutHelper {
        else {
            sm = null;
        }
+        this.tvChannelHelper = new TvChannelHelper(context);
    }

    @TargetApi(Build.VERSION_CODES.N_MR1)
@@ -80,39 +82,39 @@ public class ShortcutHelper {
        return false;
    }

-    public void reportShortcutUsed(String id) {
+    public void reportComputerShortcutUsed(ComputerDetails computer) {
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            if (getInfoForId(id) != null) {
-                sm.reportShortcutUsed(id);
+            if (getInfoForId(computer.uuid) != null) {
+                sm.reportShortcutUsed(computer.uuid);
            }
        }
    }

-    public void createAppViewShortcut(String id, String computerName, String computerUuid, boolean forceAdd) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            Intent i = new Intent(context, ShortcutTrampoline.class);
-            i.putExtra(AppView.NAME_EXTRA, computerName);
-            i.putExtra(AppView.UUID_EXTRA, computerUuid);
-            i.setAction(Intent.ACTION_DEFAULT);
+    public void reportGameLaunched(ComputerDetails computer, NvApp app) {
+        tvChannelHelper.createTvChannel(computer);
+        tvChannelHelper.addGameToChannel(computer, app);
+    }

-            ShortcutInfo sinfo = new ShortcutInfo.Builder(context, id)
-                    .setIntent(i)
-                    .setShortLabel(computerName)
-                    .setLongLabel(computerName)
+    public void createAppViewShortcut(ComputerDetails computer, boolean forceAdd, boolean newlyPaired) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            ShortcutInfo sinfo = new ShortcutInfo.Builder(context, computer.uuid)
+                    .setIntent(ServerHelper.createPcShortcutIntent(context, computer))
+                    .setShortLabel(computer.name)
+                    .setLongLabel(computer.name)
                    .setIcon(Icon.createWithResource(context, R.mipmap.ic_pc_scut))
                    .build();

-            ShortcutInfo existingSinfo = getInfoForId(id);
+            ShortcutInfo existingSinfo = getInfoForId(computer.uuid);
            if (existingSinfo != null) {
                // Update in place
                sm.updateShortcuts(Collections.singletonList(sinfo));
-                sm.enableShortcuts(Collections.singletonList(id));
+                sm.enableShortcuts(Collections.singletonList(computer.uuid));
            }

            // Reap shortcuts to make space for this if it's new
            // NOTE: This CAN'T be an else on the above if, because it's
            // possible that we have an existing shortcut but it's not a dynamic one.
-            if (!isExistingDynamicShortcut(id)) {
+            if (!isExistingDynamicShortcut(computer.uuid)) {
                // To avoid a random carousel of shortcuts popping in and out based on polling status,
                // we only add shortcuts if it's not at the limit or the user made a conscious action
                // to interact with this PC.
@@ -122,22 +124,26 @@ public class ShortcutHelper {
                }
            }
        }
+
+        if (newlyPaired) {
+            // Avoid hammering the channel API for each computer poll because it will throttle us
+            tvChannelHelper.createTvChannel(computer);
+            tvChannelHelper.requestChannelOnHomeScreen(computer);
+        }
    }

-    public void createAppViewShortcut(String id, ComputerDetails details, boolean forceAdd) {
-        createAppViewShortcut(id, details.name, details.uuid, forceAdd);
+    public void createAppViewShortcutForOnlineHost(ComputerDetails details) {
+        createAppViewShortcut(details, false, false);
+    }
+
+    private String getShortcutIdForGame(ComputerDetails computer, NvApp app) {
+        return computer.uuid + app.getAppId();
    }

    @TargetApi(Build.VERSION_CODES.O)
-    public boolean createPinnedGameShortcut(String id, Bitmap iconBits, String computerName, String computerUuid, String appName, String appId) {
+    public boolean createPinnedGameShortcut(ComputerDetails computer, NvApp app, Bitmap iconBits) {
        if (sm.isRequestPinShortcutSupported()) {
            Icon appIcon;
-            Intent i = new Intent(context, ShortcutTrampoline.class);
-
-            i.putExtra(AppView.NAME_EXTRA, computerName);
-            i.putExtra(AppView.UUID_EXTRA, computerUuid);
-            i.putExtra(ShortcutTrampoline.APP_ID_EXTRA, appId);
-            i.setAction(Intent.ACTION_DEFAULT);

            if (iconBits != null) {
                appIcon = Icon.createWithAdaptiveBitmap(iconBits);
@@ -145,9 +151,9 @@ public class ShortcutHelper {
                appIcon = Icon.createWithResource(context, R.mipmap.ic_pc_scut);
            }

-            ShortcutInfo sInfo = new ShortcutInfo.Builder(context, id)
-                .setIntent(i)
-                .setShortLabel(appName + " (" + computerName + ")")
+            ShortcutInfo sInfo = new ShortcutInfo.Builder(context, getShortcutIdForGame(computer, app))
+                .setIntent(ServerHelper.createAppShortcutIntent(context, computer, app))
+                .setShortLabel(app.getAppName() + " (" + computer.name + ")")
                .setIcon(appIcon)
                .build();

@@ -157,15 +163,42 @@ public class ShortcutHelper {
        }
    }

-    public boolean createPinnedGameShortcut(String id, Bitmap iconBits, ComputerDetails cDetails, NvApp app) {
-        return createPinnedGameShortcut(id, iconBits, cDetails.name, cDetails.uuid, app.getAppName(), Integer.valueOf(app.getAppId()).toString());
+    public void disableComputerShortcut(ComputerDetails computer, CharSequence reason) {
+        tvChannelHelper.deleteChannel(computer);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            // Delete the computer shortcut itself
+            if (getInfoForId(computer.uuid) != null) {
+                sm.disableShortcuts(Collections.singletonList(computer.uuid), reason);
+            }
+
+            // Delete all associated app shortcuts too
+            List<ShortcutInfo> shortcuts = getAllShortcuts();
+            LinkedList<String> appShortcutIds = new LinkedList<>();
+            for (ShortcutInfo info : shortcuts) {
+                if (info.getId().startsWith(computer.uuid)) {
+                    appShortcutIds.add(info.getId());
+                }
+            }
+            sm.disableShortcuts(appShortcutIds, reason);
+        }
    }

-    public void disableShortcut(String id, CharSequence reason) {
+    public void disableAppShortcut(ComputerDetails computer, NvApp app, CharSequence reason) {
+        tvChannelHelper.deleteProgram(computer, app);
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            String id = getShortcutIdForGame(computer, app);
            if (getInfoForId(id) != null) {
                sm.disableShortcuts(Collections.singletonList(id), reason);
            }
        }
    }
+
+    public void enableAppShortcut(ComputerDetails computer, NvApp app) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            String id = getShortcutIdForGame(computer, app);
+            if (getInfoForId(id) != null) {
+                sm.enableShortcuts(Collections.singletonList(id));
+            }
+        }
+    }
 }
@@ -0,0 +1,362 @@
+package com.limelight.utils;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.database.Cursor;
+import android.database.sqlite.SQLiteException;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.media.tv.TvContract;
+import android.net.Uri;
+import android.os.Build;
+
+import com.limelight.LimeLog;
+import com.limelight.PosterContentProvider;
+import com.limelight.R;
+import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.NvApp;
+
+import java.io.IOException;
+import java.io.OutputStream;
+
+public class TvChannelHelper {
+
+    private static final int ASPECT_RATIO_MOVIE_POSTER = 5;
+    private static final int TYPE_GAME = 12;
+    private static final int INTERNAL_PROVIDER_ID_INDEX = 1;
+    private static final int PROGRAM_BROWSABLE_INDEX = 2;
+    private static final int ID_INDEX = 0;
+    private Activity context;
+
+    public TvChannelHelper(Activity context) {
+        this.context = context;
+    }
+
+    void requestChannelOnHomeScreen(ComputerDetails computer) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+            Intent intent = new Intent(TvContract.ACTION_REQUEST_CHANNEL_BROWSABLE);
+            intent.putExtra(TvContract.EXTRA_CHANNEL_ID, getChannelId(computer.uuid));
+            try {
+                context.startActivityForResult(intent, 0);
+            } catch (ActivityNotFoundException e) {
+            }
+        }
+    }
+
+    void createTvChannel(ComputerDetails computer) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            ChannelBuilder builder = new ChannelBuilder()
+                    .setType(TvContract.Channels.TYPE_PREVIEW)
+                    .setDisplayName(computer.name)
+                    .setInternalProviderId(computer.uuid)
+                    .setAppLinkIntent(ServerHelper.createPcShortcutIntent(context, computer));
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId != null) {
+                context.getContentResolver().update(TvContract.buildChannelUri(channelId),
+                        builder.toContentValues(), null, null);
+                return;
+            }
+
+            Uri channelUri;
+
+            try {
+                channelUri = context.getContentResolver().insert(
+                        TvContract.Channels.CONTENT_URI, builder.toContentValues());
+            } catch (IllegalArgumentException e) {
+                // This can happen on HarmonyOS devices which report to
+                // support Leanback APIs, yet don't implement this URI
+                e.printStackTrace();
+                return;
+            }
+
+            if (channelUri != null) {
+                long id = ContentUris.parseId(channelUri);
+                updateChannelIcon(id);
+            }
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private void updateChannelIcon(long channelId) {
+        Bitmap logo = drawableToBitmap(context.getResources().getDrawable(R.drawable.ic_channel));
+        try {
+            Uri localUri = TvContract.buildChannelLogoUri(channelId);
+            try (OutputStream outputStream = context.getContentResolver().openOutputStream(localUri)) {
+                logo.compress(Bitmap.CompressFormat.PNG, 100, outputStream);
+                outputStream.flush();
+            } catch (SQLiteException | IOException e) {
+                LimeLog.warning("Failed to store the logo to the system content provider.");
+                e.printStackTrace();
+            }
+        } finally {
+            logo.recycle();
+        }
+    }
+
+    private Bitmap drawableToBitmap(Drawable drawable) {
+        int width = context.getResources().getDimensionPixelSize(R.dimen.tv_channel_logo_width);
+        int height = context.getResources().getDimensionPixelSize(R.dimen.tv_channel_logo_width);
+
+        Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+        return bitmap;
+    }
+
+    void addGameToChannel(ComputerDetails computer, NvApp app) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+            PreviewProgramBuilder builder = new PreviewProgramBuilder()
+                    .setChannelId(channelId)
+                    .setType(TYPE_GAME)
+                    .setTitle(app.getAppName())
+                    .setPosterArtAspectRatio(ASPECT_RATIO_MOVIE_POSTER)
+                    .setPosterArtUri(PosterContentProvider.createBoxArtUri(computer.uuid, ""+app.getAppId()))
+                    .setIntent(ServerHelper.createAppShortcutIntent(context, computer, app))
+                    .setInternalProviderId(""+app.getAppId())
+                    // Weight should increase each time we run the game
+                    .setWeight((int)((System.currentTimeMillis() - 1500000000000L) / 1000));
+
+            Long programId = getProgramId(channelId, ""+app.getAppId());
+            if (programId != null) {
+                context.getContentResolver().update(TvContract.buildPreviewProgramUri(programId),
+                        builder.toContentValues(), null, null);
+                return;
+            }
+
+            try {
+                context.getContentResolver().insert(TvContract.PreviewPrograms.CONTENT_URI,
+                        builder.toContentValues());
+            } catch (IllegalArgumentException e) {
+                // This can happen on HarmonyOS devices which report to
+                // support Leanback APIs, yet don't implement this URI
+                e.printStackTrace();
+                return;
+            }
+
+            TvContract.requestChannelBrowsable(context, channelId);
+        }
+    }
+
+    void deleteChannel(ComputerDetails computer) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+            context.getContentResolver().delete(TvContract.buildChannelUri(channelId), null, null);
+        }
+    }
+
+    void deleteProgram(ComputerDetails computer, NvApp app) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            if (!isAndroidTV()) {
+                return;
+            }
+
+            Long channelId = getChannelId(computer.uuid);
+            if (channelId == null) {
+                return;
+            }
+
+
+            Long programId = getProgramId(channelId, ""+app.getAppId());
+            if (programId == null) {
+                return;
+            }
+
+            context.getContentResolver().delete(TvContract.buildPreviewProgramUri(programId), null, null);
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private Long getChannelId(String computerUuid) {
+        try (Cursor cursor = context.getContentResolver().query(
+                TvContract.Channels.CONTENT_URI,
+                new String[] {TvContract.Channels._ID, TvContract.Channels.COLUMN_INTERNAL_PROVIDER_ID},
+                null,
+                null,
+                null)) {
+            if (cursor == null || cursor.getCount() == 0) {
+                return null;
+            }
+            while (cursor.moveToNext()) {
+                String internalProviderId = cursor.getString(INTERNAL_PROVIDER_ID_INDEX);
+                if (computerUuid.equals(internalProviderId)) {
+                    return cursor.getLong(ID_INDEX);
+                }
+            }
+
+            return null;
+        }
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private Long getProgramId(long channelId, String appId) {
+        try (Cursor cursor = context.getContentResolver().query(
+                TvContract.buildPreviewProgramsUriForChannel(channelId),
+                new String[] {TvContract.PreviewPrograms._ID, TvContract.PreviewPrograms.COLUMN_INTERNAL_PROVIDER_ID, TvContract.PreviewPrograms.COLUMN_BROWSABLE},
+                null,
+                null,
+                null)) {
+            if (cursor == null || cursor.getCount() == 0) {
+                return null;
+            }
+            while (cursor.moveToNext()) {
+                String internalProviderId = cursor.getString(INTERNAL_PROVIDER_ID_INDEX);
+                if (appId.equals(internalProviderId)) {
+                    long id = cursor.getLong(ID_INDEX);
+                    int browsable = cursor.getInt(PROGRAM_BROWSABLE_INDEX);
+                    if (browsable != 0) {
+                        return id;
+                    } else {
+                        int countDeleted = context.getContentResolver().delete(TvContract.buildPreviewProgramUri(id), null, null);
+                        if (countDeleted > 0) {
+                            LimeLog.info("Preview program has been deleted");
+                        } else {
+                            LimeLog.warning("Preview program has not been deleted");
+                        }
+                    }
+                }
+            }
+
+            return null;
+        }
+    }
+
+    private static <T> String toValueString(T value) {
+        return value == null ? null : value.toString();
+    }
+
+    private static String toUriString(Intent intent) {
+        return intent == null ? null : intent.toUri(Intent.URI_INTENT_SCHEME);
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private boolean isAndroidTV() {
+        return context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_LEANBACK);
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private static class PreviewProgramBuilder {
+
+        private ContentValues mValues = new ContentValues();
+
+
+        public PreviewProgramBuilder setChannelId(Long channelId) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_CHANNEL_ID, channelId);
+            return this;
+        }
+
+        public PreviewProgramBuilder setType(int type) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_TYPE, type);
+            return this;
+        }
+
+        public PreviewProgramBuilder setTitle(String title) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_TITLE, title);
+            return this;
+        }
+
+        public PreviewProgramBuilder setPosterArtAspectRatio(int aspectRatio) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_POSTER_ART_ASPECT_RATIO, aspectRatio);
+            return this;
+        }
+
+        public PreviewProgramBuilder setIntent(Intent intent) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_INTENT_URI, toUriString(intent));
+            return this;
+        }
+
+        public PreviewProgramBuilder setIntentUri(Uri uri) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_INTENT_URI, toValueString(uri));
+            return this;
+        }
+
+        public PreviewProgramBuilder setInternalProviderId(String id) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_INTERNAL_PROVIDER_ID, id);
+            return this;
+        }
+
+        public PreviewProgramBuilder setPosterArtUri(Uri uri) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_POSTER_ART_URI, toValueString(uri));
+            return this;
+        }
+
+        public PreviewProgramBuilder setWeight(int weight) {
+            mValues.put(TvContract.PreviewPrograms.COLUMN_WEIGHT, weight);
+            return this;
+        }
+
+        public ContentValues toContentValues() {
+            return new ContentValues(mValues);
+        }
+
+    }
+
+    @TargetApi(Build.VERSION_CODES.O)
+    private static class ChannelBuilder {
+
+        private ContentValues mValues = new ContentValues();
+
+        public ChannelBuilder setType(String type) {
+            mValues.put(TvContract.Channels.COLUMN_TYPE, type);
+            return this;
+        }
+
+        public ChannelBuilder setDisplayName(String displayName) {
+            mValues.put(TvContract.Channels.COLUMN_DISPLAY_NAME, displayName);
+            return this;
+        }
+
+        public ChannelBuilder setInternalProviderId(String internalProviderId) {
+            mValues.put(TvContract.Channels.COLUMN_INTERNAL_PROVIDER_ID, internalProviderId);
+            return this;
+        }
+
+        public ChannelBuilder setAppLinkIntent(Intent intent) {
+            mValues.put(TvContract.Channels.COLUMN_APP_LINK_INTENT_URI, toUriString(intent));
+            return this;
+        }
+
+        public ContentValues toContentValues() {
+            return new ContentValues(mValues);
+        }
+
+    }
+}
@@ -7,8 +7,10 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
+import android.graphics.Insets;
 import android.os.Build;
 import android.view.View;
+import android.view.WindowInsets;
 import android.view.WindowManager;

 import com.limelight.R;
@@ -19,9 +21,8 @@ import java.util.Locale;

 public class UiHelper {

-    // Values from https://developer.android.com/training/tv/start/layouts.html
-    private static final int TV_VERTICAL_PADDING_DP = 27;
-    private static final int TV_HORIZONTAL_PADDING_DP = 48;
+    private static final int TV_VERTICAL_PADDING_DP = 15;
+    private static final int TV_HORIZONTAL_PADDING_DP = 15;

    public static void setLocale(Activity activity)
    {
@@ -45,22 +46,28 @@ public class UiHelper {
        }
    }

-    public static void notifyNewRootView(Activity activity)
+    public static void applyStatusBarPadding(View view) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // This applies the padding that we omitted in notifyNewRootView() on Q
+            view.setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
+                @Override
+                public WindowInsets onApplyWindowInsets(View view, WindowInsets windowInsets) {
+                    view.setPadding(view.getPaddingLeft(),
+                            view.getPaddingTop(),
+                            view.getPaddingRight(),
+                            windowInsets.getTappableElementInsets().bottom);
+                    return windowInsets;
+                }
+            });
+            view.requestApplyInsets();
+        }
+    }
+
+    public static void notifyNewRootView(final Activity activity)
    {
        View rootView = activity.findViewById(android.R.id.content);
        UiModeManager modeMgr = (UiModeManager) activity.getSystemService(Context.UI_MODE_SERVICE);

-        if (modeMgr.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION)
-        {
-            // Increase view padding on TVs
-            float scale = activity.getResources().getDisplayMetrics().density;
-            int verticalPaddingPixels = (int) (TV_VERTICAL_PADDING_DP*scale + 0.5f);
-            int horizontalPaddingPixels = (int) (TV_HORIZONTAL_PADDING_DP*scale + 0.5f);
-
-            rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
-                    horizontalPaddingPixels, verticalPaddingPixels);
-        }
-
        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
            // Allow this non-streaming activity to layout under notches.
            //
@@ -70,6 +77,44 @@ public class UiHelper {
            activity.getWindow().getAttributes().layoutInDisplayCutoutMode =
                    WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES;
        }
+
+        if (modeMgr.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
+            // Increase view padding on TVs
+            float scale = activity.getResources().getDisplayMetrics().density;
+            int verticalPaddingPixels = (int) (TV_VERTICAL_PADDING_DP*scale + 0.5f);
+            int horizontalPaddingPixels = (int) (TV_HORIZONTAL_PADDING_DP*scale + 0.5f);
+
+            rootView.setPadding(horizontalPaddingPixels, verticalPaddingPixels,
+                    horizontalPaddingPixels, verticalPaddingPixels);
+        }
+        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            // Draw under the status bar on Android Q devices
+
+            // Using getDecorView() here breaks the translucent status/navigation bar when gestures are disabled
+            activity.findViewById(android.R.id.content).setOnApplyWindowInsetsListener(new View.OnApplyWindowInsetsListener() {
+                @Override
+                public WindowInsets onApplyWindowInsets(View view, WindowInsets windowInsets) {
+                    // Use the tappable insets so we can draw under the status bar in gesture mode
+                    Insets tappableInsets = windowInsets.getTappableElementInsets();
+                    view.setPadding(tappableInsets.left,
+                            tappableInsets.top,
+                            tappableInsets.right,
+                            0);
+
+                    // Show a translucent navigation bar if we can't tap there
+                    if (tappableInsets.bottom != 0) {
+                        activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+                    }
+                    else {
+                        activity.getWindow().clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION);
+                    }
+
+                    return windowInsets;
+                }
+            });
+
+            activity.getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
+        }
    }

    public static void showDecoderCrashDialog(Activity activity) {
@@ -1,47 +1,47 @@
 package com.limelight.utils;

 public class Vector2d {
-	private float x;
-	private float y;
-	private double magnitude;
-	
-	public static final Vector2d ZERO = new Vector2d();
-	
-	public Vector2d() {
-		initialize(0, 0);
-	}
-	
-	public void initialize(float x, float y) {
-		this.x = x;
-		this.y = y;
-		this.magnitude = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
-	}
-	
-	public double getMagnitude() {
-		return magnitude;
-	}
-	
-	public void getNormalized(Vector2d vector) {
-		vector.initialize((float)(x / magnitude), (float)(y / magnitude));
-	}
-	
-	public void scalarMultiply(double factor) {
-		initialize((float)(x * factor), (float)(y * factor));
-	}
-	
-	public void setX(float x) {
-		initialize(x, this.y);
-	}
-	
-	public void setY(float y) {
-		initialize(this.x, y);
-	}
-	
-	public float getX() {
-		return x;
-	}
-	
-	public float getY() {
-		return y;
-	}
+    private float x;
+    private float y;
+    private double magnitude;
+    
+    public static final Vector2d ZERO = new Vector2d();
+    
+    public Vector2d() {
+        initialize(0, 0);
+    }
+    
+    public void initialize(float x, float y) {
+        this.x = x;
+        this.y = y;
+        this.magnitude = Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+    }
+    
+    public double getMagnitude() {
+        return magnitude;
+    }
+    
+    public void getNormalized(Vector2d vector) {
+        vector.initialize((float)(x / magnitude), (float)(y / magnitude));
+    }
+    
+    public void scalarMultiply(double factor) {
+        initialize((float)(x * factor), (float)(y * factor));
+    }
+    
+    public void setX(float x) {
+        initialize(x, this.y);
+    }
+    
+    public void setY(float y) {
+        initialize(this.x, y);
+    }
+    
+    public float getX() {
+        return x;
+    }
+    
+    public float getY() {
+        return y;
+    }
 }
@@ -0,0 +1,60 @@
+# Android.mk for moonlight-core and binding
+MY_LOCAL_PATH := $(call my-dir)
+
+include $(call all-subdir-makefiles)
+
+LOCAL_PATH := $(MY_LOCAL_PATH)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := moonlight-core
+
+LOCAL_SRC_FILES := moonlight-common-c/src/AudioStream.c \
+                   moonlight-common-c/src/ByteBuffer.c \
+                   moonlight-common-c/src/Connection.c \
+                   moonlight-common-c/src/ConnectionTester.c \
+                   moonlight-common-c/src/ControlStream.c \
+                   moonlight-common-c/src/FakeCallbacks.c \
+                   moonlight-common-c/src/InputStream.c \
+                   moonlight-common-c/src/LinkedBlockingQueue.c \
+                   moonlight-common-c/src/Misc.c \
+                   moonlight-common-c/src/Platform.c \
+                   moonlight-common-c/src/PlatformCrypto.c \
+                   moonlight-common-c/src/PlatformSockets.c \
+                   moonlight-common-c/src/RtpFecQueue.c \
+                   moonlight-common-c/src/RtpReorderQueue.c \
+                   moonlight-common-c/src/RtspConnection.c \
+                   moonlight-common-c/src/RtspParser.c \
+                   moonlight-common-c/src/SdpGenerator.c \
+                   moonlight-common-c/src/SimpleStun.c \
+                   moonlight-common-c/src/VideoDepacketizer.c \
+                   moonlight-common-c/src/VideoStream.c \
+                   moonlight-common-c/reedsolomon/rs.c \
+                   moonlight-common-c/enet/callbacks.c \
+                   moonlight-common-c/enet/compress.c \
+                   moonlight-common-c/enet/host.c \
+                   moonlight-common-c/enet/list.c \
+                   moonlight-common-c/enet/packet.c \
+                   moonlight-common-c/enet/peer.c \
+                   moonlight-common-c/enet/protocol.c \
+                   moonlight-common-c/enet/unix.c \
+                   moonlight-common-c/enet/win32.c \
+                   simplejni.c \
+                   callbacks.c \
+
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/moonlight-common-c/enet/include \
+                    $(LOCAL_PATH)/moonlight-common-c/reedsolomon \
+                    $(LOCAL_PATH)/moonlight-common-c/src \
+
+LOCAL_CFLAGS := -DHAS_SOCKLEN_T=1 -DLC_ANDROID -DHAVE_CLOCK_GETTIME=1
+
+ifeq ($(NDK_DEBUG),1)
+LOCAL_CFLAGS += -DLC_DEBUG
+endif
+
+LOCAL_LDLIBS := -llog
+
+LOCAL_STATIC_LIBRARIES := libopus libssl libcrypto
+LOCAL_LDFLAGS += -Wl,--exclude-libs,ALL
+
+include $(BUILD_SHARED_LIBRARY)
@@ -0,0 +1,27 @@
+PATH=$ANDROID_NDK_ROOT/toolchains/llvm/prebuilt/linux-x86_64/bin:$PATH
+OUTPUT_DIR=~/openssl
+
+BASE_ARGS="no-shared no-ssl3 no-stdio no-engine no-hw"
+
+set -e
+
+./Configure android-arm $BASE_ARGS -D__ANDROID_API__=16
+make clean
+make build_libs -j`nproc`
+cp lib*.a $OUTPUT_DIR/armeabi-v7a/
+
+./Configure android-arm64 $BASE_ARGS -D__ANDROID_API__=21
+make clean
+make build_libs -j`nproc`
+cp lib*.a $OUTPUT_DIR/arm64-v8a/
+
+./Configure android-x86 $BASE_ARGS -D__ANDROID_API__=16
+make clean
+make build_libs -j`nproc`
+cp lib*.a $OUTPUT_DIR/x86/
+
+./Configure android-x86_64 $BASE_ARGS -D__ANDROID_API__=21
+make clean
+make build_libs -j`nproc`
+cp lib*.a $OUTPUT_DIR/x86_64/
+cp -R include/ $OUTPUT_DIR/include
@@ -0,0 +1,421 @@
+#include <jni.h>
+
+#include <pthread.h>
+#include <string.h>
+
+#include <Limelight.h>
+
+#include <opus_multistream.h>
+#include <android/log.h>
+
+static OpusMSDecoder* Decoder;
+static OPUS_MULTISTREAM_CONFIGURATION OpusConfig;
+
+static JavaVM *JVM;
+static pthread_key_t JniEnvKey;
+static pthread_once_t JniEnvKeyInitOnce = PTHREAD_ONCE_INIT;
+static jclass GlobalBridgeClass;
+static jmethodID BridgeDrSetupMethod;
+static jmethodID BridgeDrStartMethod;
+static jmethodID BridgeDrStopMethod;
+static jmethodID BridgeDrCleanupMethod;
+static jmethodID BridgeDrSubmitDecodeUnitMethod;
+static jmethodID BridgeArInitMethod;
+static jmethodID BridgeArStartMethod;
+static jmethodID BridgeArStopMethod;
+static jmethodID BridgeArCleanupMethod;
+static jmethodID BridgeArPlaySampleMethod;
+static jmethodID BridgeClStageStartingMethod;
+static jmethodID BridgeClStageCompleteMethod;
+static jmethodID BridgeClStageFailedMethod;
+static jmethodID BridgeClConnectionStartedMethod;
+static jmethodID BridgeClConnectionTerminatedMethod;
+static jmethodID BridgeClRumbleMethod;
+static jmethodID BridgeClConnectionStatusUpdateMethod;
+static jbyteArray DecodedFrameBuffer;
+static jshortArray DecodedAudioBuffer;
+
+void DetachThread(void* context) {
+    (*JVM)->DetachCurrentThread(JVM);
+}
+
+void JniEnvKeyInit(void) {
+    // Create a TLS slot for the JNIEnv. We aren't in
+    // a pthread during init, so we must wait until we
+    // are to initialize this.
+    pthread_key_create(&JniEnvKey, DetachThread);
+}
+
+JNIEnv* GetThreadEnv(void) {
+    JNIEnv* env;
+
+    // First check if this is already attached to the JVM
+    if ((*JVM)->GetEnv(JVM, (void**)&env, JNI_VERSION_1_4) == JNI_OK) {
+        return env;
+    }
+
+    // Create the TLS slot now that we're safely in a pthread
+    pthread_once(&JniEnvKeyInitOnce, JniEnvKeyInit);
+
+    // Try the TLS to see if we already have a JNIEnv
+    env = pthread_getspecific(JniEnvKey);
+    if (env)
+        return env;
+
+    // This is the thread's first JNI call, so attach now
+    (*JVM)->AttachCurrentThread(JVM, &env, NULL);
+
+    // Write our JNIEnv to TLS, so we detach before dying
+    pthread_setspecific(JniEnvKey, env);
+
+    return env;
+}
+
+JNIEXPORT void JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_init(JNIEnv *env, jclass clazz) {
+    (*env)->GetJavaVM(env, &JVM);
+    GlobalBridgeClass = (*env)->NewGlobalRef(env, (*env)->FindClass(env, "com/limelight/nvstream/jni/MoonBridge"));
+    BridgeDrSetupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSetup", "(IIII)I");
+    BridgeDrStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStart", "()V");
+    BridgeDrStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrStop", "()V");
+    BridgeDrCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrCleanup", "()V");
+    BridgeDrSubmitDecodeUnitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeDrSubmitDecodeUnit", "([BIIIJJ)I");
+    BridgeArInitMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArInit", "(III)I");
+    BridgeArStartMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStart", "()V");
+    BridgeArStopMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArStop", "()V");
+    BridgeArCleanupMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArCleanup", "()V");
+    BridgeArPlaySampleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeArPlaySample", "([S)V");
+    BridgeClStageStartingMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageStarting", "(I)V");
+    BridgeClStageCompleteMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageComplete", "(I)V");
+    BridgeClStageFailedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClStageFailed", "(II)V");
+    BridgeClConnectionStartedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStarted", "()V");
+    BridgeClConnectionTerminatedMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionTerminated", "(I)V");
+    BridgeClRumbleMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClRumble", "(SSS)V");
+    BridgeClConnectionStatusUpdateMethod = (*env)->GetStaticMethodID(env, clazz, "bridgeClConnectionStatusUpdate", "(I)V");
+}
+
+int BridgeDrSetup(int videoFormat, int width, int height, int redrawRate, void* context, int drFlags) {
+    JNIEnv* env = GetThreadEnv();
+    int err;
+
+    err = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSetupMethod, videoFormat, width, height, redrawRate);
+    if ((*env)->ExceptionCheck(env)) {
+        // This is called on a Java thread, so it's safe to return
+        return -1;
+    }
+    else if (err != 0) {
+        return err;
+    }
+
+    // Use a 32K frame buffer that will increase if needed
+    DecodedFrameBuffer = (*env)->NewGlobalRef(env, (*env)->NewByteArray(env, 32768));
+
+    return 0;
+}
+
+void BridgeDrStart(void) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeDrStartMethod);
+}
+
+void BridgeDrStop(void) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeDrStopMethod);
+}
+
+void BridgeDrCleanup(void) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->DeleteGlobalRef(env, DecodedFrameBuffer);
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeDrCleanupMethod);
+}
+
+int BridgeDrSubmitDecodeUnit(PDECODE_UNIT decodeUnit) {
+    JNIEnv* env = GetThreadEnv();
+    int ret;
+
+    // Increase the size of our frame data buffer if our frame won't fit
+    if ((*env)->GetArrayLength(env, DecodedFrameBuffer) < decodeUnit->fullLength) {
+        (*env)->DeleteGlobalRef(env, DecodedFrameBuffer);
+        DecodedFrameBuffer = (*env)->NewGlobalRef(env, (*env)->NewByteArray(env, decodeUnit->fullLength));
+    }
+
+    PLENTRY currentEntry;
+    int offset;
+
+    currentEntry = decodeUnit->bufferList;
+    offset = 0;
+    while (currentEntry != NULL) {
+        // Submit parameter set NALUs separately from picture data
+        if (currentEntry->bufferType != BUFFER_TYPE_PICDATA) {
+            // Use the beginning of the buffer each time since this is a separate
+            // invocation of the decoder each time.
+            (*env)->SetByteArrayRegion(env, DecodedFrameBuffer, 0, currentEntry->length, (jbyte*)currentEntry->data);
+
+            ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
+                                              DecodedFrameBuffer, currentEntry->length, currentEntry->bufferType,
+                                              decodeUnit->frameNumber, (jlong)decodeUnit->receiveTimeMs,
+                                              (jlong)decodeUnit->enqueueTimeMs);
+            if ((*env)->ExceptionCheck(env)) {
+                // We will crash here
+                (*JVM)->DetachCurrentThread(JVM);
+                return DR_OK;
+            }
+            else if (ret != DR_OK) {
+                return ret;
+            }
+        }
+        else {
+            (*env)->SetByteArrayRegion(env, DecodedFrameBuffer, offset, currentEntry->length, (jbyte*)currentEntry->data);
+            offset += currentEntry->length;
+        }
+
+        currentEntry = currentEntry->next;
+    }
+
+    ret = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeDrSubmitDecodeUnitMethod,
+                                       DecodedFrameBuffer, offset, BUFFER_TYPE_PICDATA,
+                                       decodeUnit->frameNumber,
+                                       (jlong)decodeUnit->receiveTimeMs, (jlong)decodeUnit->enqueueTimeMs);
+    if ((*env)->ExceptionCheck(env)) {
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
+        return DR_OK;
+    }
+    else {
+        return ret;
+    }
+}
+
+int BridgeArInit(int audioConfiguration, POPUS_MULTISTREAM_CONFIGURATION opusConfig, void* context, int flags) {
+    JNIEnv* env = GetThreadEnv();
+    int err;
+
+    err = (*env)->CallStaticIntMethod(env, GlobalBridgeClass, BridgeArInitMethod, audioConfiguration, opusConfig->sampleRate, opusConfig->samplesPerFrame);
+    if ((*env)->ExceptionCheck(env)) {
+        // This is called on a Java thread, so it's safe to return
+        err = -1;
+    }
+    if (err == 0) {
+        memcpy(&OpusConfig, opusConfig, sizeof(*opusConfig));
+        Decoder = opus_multistream_decoder_create(opusConfig->sampleRate,
+                                                  opusConfig->channelCount,
+                                                  opusConfig->streams,
+                                                  opusConfig->coupledStreams,
+                                                  opusConfig->mapping,
+                                                  &err);
+        if (Decoder == NULL) {
+            (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArCleanupMethod);
+            return -1;
+        }
+
+        // We know ahead of time what the buffer size will be for decoded audio, so pre-allocate it
+        DecodedAudioBuffer = (*env)->NewGlobalRef(env, (*env)->NewShortArray(env, opusConfig->channelCount * opusConfig->samplesPerFrame));
+    }
+
+    return err;
+}
+
+void BridgeArStart(void) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArStartMethod);
+}
+
+void BridgeArStop(void) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArStopMethod);
+}
+
+void BridgeArCleanup() {
+    JNIEnv* env = GetThreadEnv();
+
+    opus_multistream_decoder_destroy(Decoder);
+
+    (*env)->DeleteGlobalRef(env, DecodedAudioBuffer);
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArCleanupMethod);
+}
+
+void BridgeArDecodeAndPlaySample(char* sampleData, int sampleLength) {
+    JNIEnv* env = GetThreadEnv();
+
+    jshort* decodedData = (*env)->GetPrimitiveArrayCritical(env, DecodedAudioBuffer, NULL);
+
+    int decodeLen = opus_multistream_decode(Decoder,
+                                            (const unsigned char*)sampleData,
+                                            sampleLength,
+                                            decodedData,
+                                            OpusConfig.samplesPerFrame,
+                                            0);
+    if (decodeLen > 0) {
+        // We must release the array elements before making further JNI calls
+        (*env)->ReleasePrimitiveArrayCritical(env, DecodedAudioBuffer, decodedData, 0);
+
+        (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeArPlaySampleMethod, DecodedAudioBuffer);
+        if ((*env)->ExceptionCheck(env)) {
+            // We will crash here
+            (*JVM)->DetachCurrentThread(JVM);
+        }
+    }
+    else {
+        // We can abort here to avoid the copy back since no data was modified
+        (*env)->ReleasePrimitiveArrayCritical(env, DecodedAudioBuffer, decodedData, JNI_ABORT);
+    }
+}
+
+void BridgeClStageStarting(int stage) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageStartingMethod, stage);
+}
+
+void BridgeClStageComplete(int stage) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageCompleteMethod, stage);
+}
+
+void BridgeClStageFailed(int stage, int errorCode) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClStageFailedMethod, stage, errorCode);
+}
+
+void BridgeClConnectionStarted(void) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStartedMethod);
+}
+
+void BridgeClConnectionTerminated(int errorCode) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionTerminatedMethod, errorCode);
+    if ((*env)->ExceptionCheck(env)) {
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
+    }
+}
+
+void BridgeClRumble(unsigned short controllerNumber, unsigned short lowFreqMotor, unsigned short highFreqMotor) {
+    JNIEnv* env = GetThreadEnv();
+
+    // The seemingly redundant short casts are required in order to convert the unsigned short to a signed short.
+    // If we leave it as an unsigned short, CheckJNI will fail when the value exceeds 32767. The cast itself is
+    // fine because the Java code treats the value as unsigned even though it's stored in a signed type.
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClRumbleMethod, controllerNumber, (short)lowFreqMotor, (short)highFreqMotor);
+    if ((*env)->ExceptionCheck(env)) {
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
+    }
+}
+
+void BridgeClConnectionStatusUpdate(int connectionStatus) {
+    JNIEnv* env = GetThreadEnv();
+
+    (*env)->CallStaticVoidMethod(env, GlobalBridgeClass, BridgeClConnectionStatusUpdateMethod, connectionStatus);
+    if ((*env)->ExceptionCheck(env)) {
+        // We will crash here
+        (*JVM)->DetachCurrentThread(JVM);
+        return;
+    }
+}
+
+void BridgeClLogMessage(const char* format, ...) {
+    va_list va;
+    va_start(va, format);
+    __android_log_vprint(ANDROID_LOG_INFO, "moonlight-common-c", format, va);
+    va_end(va);
+}
+
+static DECODER_RENDERER_CALLBACKS BridgeVideoRendererCallbacks = {
+        .setup = BridgeDrSetup,
+        .start = BridgeDrStart,
+        .stop = BridgeDrStop,
+        .cleanup = BridgeDrCleanup,
+        .submitDecodeUnit = BridgeDrSubmitDecodeUnit,
+};
+
+static AUDIO_RENDERER_CALLBACKS BridgeAudioRendererCallbacks = {
+        .init = BridgeArInit,
+        .start = BridgeArStart,
+        .stop = BridgeArStop,
+        .cleanup = BridgeArCleanup,
+        .decodeAndPlaySample = BridgeArDecodeAndPlaySample,
+        .capabilities = CAPABILITY_SUPPORTS_ARBITRARY_AUDIO_DURATION
+};
+
+static CONNECTION_LISTENER_CALLBACKS BridgeConnListenerCallbacks = {
+        .stageStarting = BridgeClStageStarting,
+        .stageComplete = BridgeClStageComplete,
+        .stageFailed = BridgeClStageFailed,
+        .connectionStarted = BridgeClConnectionStarted,
+        .connectionTerminated = BridgeClConnectionTerminated,
+        .logMessage = BridgeClLogMessage,
+        .rumble = BridgeClRumble,
+        .connectionStatusUpdate = BridgeClConnectionStatusUpdate,
+};
+
+JNIEXPORT jint JNICALL
+Java_com_limelight_nvstream_jni_MoonBridge_startConnection(JNIEnv *env, jclass clazz,
+                                                           jstring address, jstring appVersion, jstring gfeVersion,
+                                                           jint width, jint height, jint fps,
+                                                           jint bitrate, jint packetSize, jint streamingRemotely,
+                                                           jint audioConfiguration, jboolean supportsHevc,
+                                                           jboolean enableHdr,
+                                                           jint hevcBitratePercentageMultiplier,
+                                                           jint clientRefreshRateX100,
+                                                           jint encryptionFlags,
+                                                           jbyteArray riAesKey, jbyteArray riAesIv,
+                                                           jint videoCapabilities) {
+    SERVER_INFORMATION serverInfo = {
+            .address = (*env)->GetStringUTFChars(env, address, 0),
+            .serverInfoAppVersion = (*env)->GetStringUTFChars(env, appVersion, 0),
+            .serverInfoGfeVersion = gfeVersion ? (*env)->GetStringUTFChars(env, gfeVersion, 0) : NULL,
+    };
+    STREAM_CONFIGURATION streamConfig = {
+            .width = width,
+            .height = height,
+            .fps = fps,
+            .bitrate = bitrate,
+            .packetSize = packetSize,
+            .streamingRemotely = streamingRemotely,
+            .audioConfiguration = audioConfiguration,
+            .supportsHevc = supportsHevc,
+            .enableHdr = enableHdr,
+            .hevcBitratePercentageMultiplier = hevcBitratePercentageMultiplier,
+            .clientRefreshRateX100 = clientRefreshRateX100,
+            .encryptionFlags = encryptionFlags,
+    };
+
+    jbyte* riAesKeyBuf = (*env)->GetByteArrayElements(env, riAesKey, NULL);
+    memcpy(streamConfig.remoteInputAesKey, riAesKeyBuf, sizeof(streamConfig.remoteInputAesKey));
+    (*env)->ReleaseByteArrayElements(env, riAesKey, riAesKeyBuf, JNI_ABORT);
+
+    jbyte* riAesIvBuf = (*env)->GetByteArrayElements(env, riAesIv, NULL);
+    memcpy(streamConfig.remoteInputAesIv, riAesIvBuf, sizeof(streamConfig.remoteInputAesIv));
+    (*env)->ReleaseByteArrayElements(env, riAesIv, riAesIvBuf, JNI_ABORT);
+
+    BridgeVideoRendererCallbacks.capabilities = videoCapabilities;
+
+    int ret = LiStartConnection(&serverInfo,
+                                &streamConfig,
+                                &BridgeConnListenerCallbacks,
+                                &BridgeVideoRendererCallbacks,
+                                &BridgeAudioRendererCallbacks,
+                                NULL, 0,
+                                NULL, 0);
+
+    (*env)->ReleaseStringUTFChars(env, address, serverInfo.address);
+    (*env)->ReleaseStringUTFChars(env, appVersion, serverInfo.serverInfoAppVersion);
+    if (gfeVersion != NULL) {
+        (*env)->ReleaseStringUTFChars(env, gfeVersion, serverInfo.serverInfoGfeVersion);
+    }
+
+    return ret;
+}
@@ -0,0 +1,7 @@
+LOCAL_PATH:= $(call my-dir)
+ 
+include $(CLEAR_VARS)
+LOCAL_MODULE:= libopus
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/libopus.a
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+include $(PREBUILT_STATIC_LIBRARY)
@@ -0,0 +1,100 @@
+ANDROID_API_TARGET=21
+PARALLEL_JOBS=$(nproc)
+
+rm -r ./android
+mkdir android
+
+function build_one
+{
+PREFIX=$(pwd)/android/$CPU
+SYSROOT=$NDK/platforms/android-$ANDROID_API_TARGET/arch-$SYSROOT_CPU
+TOOLCHAIN_PATH=$NDK/toolchains/$TOOLCHAIN_DIR/prebuilt/linux-x86_64
+export PATH=$PATH:$TOOLCHAIN_PATH/bin
+./configure \
+    --build=x86_64-unknown-linux-gnu \
+    --host=$TOOLCHAIN_BIN_PREFIX \
+    --target=$TOOLCHAIN_BIN_PREFIX \
+    CFLAGS="--sysroot=$SYSROOT -O2 $ADDI_CFLAGS" \
+    $ADDI_CONFIGURE_FLAGS
+make clean
+make -j$PARALLEL_JOBS
+mkdir android/$CPU
+cp .libs/libopus.a android/$CPU
+}
+
+function build_mips
+{
+CPU=mips
+SYSROOT_CPU=mips
+TOOLCHAIN_BIN_PREFIX=mipsel-linux-android
+TOOLCHAIN_DIR=mipsel-linux-android-4.9
+ADDI_CFLAGS="-mips32 -mhard-float -EL -mno-dsp"
+ADDI_CONFIGURE_FLAGS="--enable-fixed-point" # fixed point
+build_one
+}
+
+function build_mips64
+{
+CPU=mips64
+SYSROOT_CPU=mips64
+TOOLCHAIN_BIN_PREFIX=mips64el-linux-android
+TOOLCHAIN_DIR=mips64el-linux-android-4.9
+ADDI_CFLAGS="-mips64r6"
+ADDI_CONFIGURE_FLAGS="--enable-fixed-point" # fixed point
+build_one
+}
+
+function build_x86
+{
+CPU=x86
+SYSROOT_CPU=x86
+TOOLCHAIN_BIN_PREFIX=i686-linux-android
+TOOLCHAIN_DIR=x86-4.9
+ADDI_CFLAGS="-march=i686 -mtune=atom -mstackrealign -msse -msse2 -msse3 -mssse3 -mfpmath=sse -m32"
+ADDI_CONFIGURE_FLAGS="" # floating point for SSE optimizations
+build_one
+}
+
+function build_x86_64
+{
+CPU=x86_64
+SYSROOT_CPU=x86_64
+TOOLCHAIN_BIN_PREFIX=x86_64-linux-android
+TOOLCHAIN_DIR=x86_64-4.9
+ADDI_CFLAGS="-msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2 -mpopcnt -m64"
+ADDI_CONFIGURE_FLAGS="" # floating point for SSE optimizations
+build_one
+}
+
+function build_armv7
+{
+CPU=arm
+SYSROOT_CPU=arm
+TOOLCHAIN_BIN_PREFIX=arm-linux-androideabi
+TOOLCHAIN_DIR=arm-linux-androideabi-4.9
+ADDI_CFLAGS="-marm -mfpu=vfpv3-d16"
+ADDI_LDFLAGS=""
+ADDI_CONFIGURE_FLAGS="--enable-fixed-point" # fixed point for NEON, EDSP, Media
+build_one
+}
+
+# ARMv8 doesn't currently have assembly in the opus project. We still use fixed point
+# anyway in the hopes that it will be more performant even without assembly.
+function build_armv8
+{
+CPU=aarch64
+SYSROOT_CPU=arm64
+TOOLCHAIN_BIN_PREFIX=aarch64-linux-android
+TOOLCHAIN_DIR=aarch64-linux-android-4.9
+ADDI_CFLAGS=""
+ADDI_LDFLAGS=""
+ADDI_CONFIGURE_FLAGS="--enable-fixed-point"
+build_one
+}
+
+build_mips
+build_mips64
+build_x86
+build_x86_64
+build_armv7
+build_armv8
@@ -0,0 +1,981 @@
+/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
+   Written by Jean-Marc Valin and Koen Vos */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus.h
+ * @brief Opus reference implementation API
+ */
+
+#ifndef OPUS_H
+#define OPUS_H
+
+#include "opus_types.h"
+#include "opus_defines.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/**
+ * @mainpage Opus
+ *
+ * The Opus codec is designed for interactive speech and audio transmission over the Internet.
+ * It is designed by the IETF Codec Working Group and incorporates technology from
+ * Skype's SILK codec and Xiph.Org's CELT codec.
+ *
+ * The Opus codec is designed to handle a wide range of interactive audio applications,
+ * including Voice over IP, videoconferencing, in-game chat, and even remote live music
+ * performances. It can scale from low bit-rate narrowband speech to very high quality
+ * stereo music. Its main features are:
+
+ * @li Sampling rates from 8 to 48 kHz
+ * @li Bit-rates from 6 kb/s to 510 kb/s
+ * @li Support for both constant bit-rate (CBR) and variable bit-rate (VBR)
+ * @li Audio bandwidth from narrowband to full-band
+ * @li Support for speech and music
+ * @li Support for mono and stereo
+ * @li Support for multichannel (up to 255 channels)
+ * @li Frame sizes from 2.5 ms to 60 ms
+ * @li Good loss robustness and packet loss concealment (PLC)
+ * @li Floating point and fixed-point implementation
+ *
+ * Documentation sections:
+ * @li @ref opus_encoder
+ * @li @ref opus_decoder
+ * @li @ref opus_repacketizer
+ * @li @ref opus_multistream
+ * @li @ref opus_libinfo
+ * @li @ref opus_custom
+ */
+
+/** @defgroup opus_encoder Opus Encoder
+  * @{
+  *
+  * @brief This page describes the process and functions used to encode Opus.
+  *
+  * Since Opus is a stateful codec, the encoding process starts with creating an encoder
+  * state. This can be done with:
+  *
+  * @code
+  * int          error;
+  * OpusEncoder *enc;
+  * enc = opus_encoder_create(Fs, channels, application, &error);
+  * @endcode
+  *
+  * From this point, @c enc can be used for encoding an audio stream. An encoder state
+  * @b must @b not be used for more than one stream at the same time. Similarly, the encoder
+  * state @b must @b not be re-initialized for each frame.
+  *
+  * While opus_encoder_create() allocates memory for the state, it's also possible
+  * to initialize pre-allocated memory:
+  *
+  * @code
+  * int          size;
+  * int          error;
+  * OpusEncoder *enc;
+  * size = opus_encoder_get_size(channels);
+  * enc = malloc(size);
+  * error = opus_encoder_init(enc, Fs, channels, application);
+  * @endcode
+  *
+  * where opus_encoder_get_size() returns the required size for the encoder state. Note that
+  * future versions of this code may change the size, so no assuptions should be made about it.
+  *
+  * The encoder state is always continuous in memory and only a shallow copy is sufficient
+  * to copy it (e.g. memcpy())
+  *
+  * It is possible to change some of the encoder's settings using the opus_encoder_ctl()
+  * interface. All these settings already default to the recommended value, so they should
+  * only be changed when necessary. The most common settings one may want to change are:
+  *
+  * @code
+  * opus_encoder_ctl(enc, OPUS_SET_BITRATE(bitrate));
+  * opus_encoder_ctl(enc, OPUS_SET_COMPLEXITY(complexity));
+  * opus_encoder_ctl(enc, OPUS_SET_SIGNAL(signal_type));
+  * @endcode
+  *
+  * where
+  *
+  * @arg bitrate is in bits per second (b/s)
+  * @arg complexity is a value from 1 to 10, where 1 is the lowest complexity and 10 is the highest
+  * @arg signal_type is either OPUS_AUTO (default), OPUS_SIGNAL_VOICE, or OPUS_SIGNAL_MUSIC
+  *
+  * See @ref opus_encoderctls and @ref opus_genericctls for a complete list of parameters that can be set or queried. Most parameters can be set or changed at any time during a stream.
+  *
+  * To encode a frame, opus_encode() or opus_encode_float() must be called with exactly one frame (2.5, 5, 10, 20, 40 or 60 ms) of audio data:
+  * @code
+  * len = opus_encode(enc, audio_frame, frame_size, packet, max_packet);
+  * @endcode
+  *
+  * where
+  * <ul>
+  * <li>audio_frame is the audio data in opus_int16 (or float for opus_encode_float())</li>
+  * <li>frame_size is the duration of the frame in samples (per channel)</li>
+  * <li>packet is the byte array to which the compressed data is written</li>
+  * <li>max_packet is the maximum number of bytes that can be written in the packet (4000 bytes is recommended).
+  *     Do not use max_packet to control VBR target bitrate, instead use the #OPUS_SET_BITRATE CTL.</li>
+  * </ul>
+  *
+  * opus_encode() and opus_encode_float() return the number of bytes actually written to the packet.
+  * The return value <b>can be negative</b>, which indicates that an error has occurred. If the return value
+  * is 2 bytes or less, then the packet does not need to be transmitted (DTX).
+  *
+  * Once the encoder state if no longer needed, it can be destroyed with
+  *
+  * @code
+  * opus_encoder_destroy(enc);
+  * @endcode
+  *
+  * If the encoder was created with opus_encoder_init() rather than opus_encoder_create(),
+  * then no action is required aside from potentially freeing the memory that was manually
+  * allocated for it (calling free(enc) for the example above)
+  *
+  */
+
+/** Opus encoder state.
+  * This contains the complete state of an Opus encoder.
+  * It is position independent and can be freely copied.
+  * @see opus_encoder_create,opus_encoder_init
+  */
+typedef struct OpusEncoder OpusEncoder;
+
+/** Gets the size of an <code>OpusEncoder</code> structure.
+  * @param[in] channels <tt>int</tt>: Number of channels.
+  *                                   This must be 1 or 2.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_encoder_get_size(int channels);
+
+/**
+ */
+
+/** Allocates and initializes an encoder state.
+ * There are three coding modes:
+ *
+ * @ref OPUS_APPLICATION_VOIP gives best quality at a given bitrate for voice
+ *    signals. It enhances the  input signal by high-pass filtering and
+ *    emphasizing formants and harmonics. Optionally  it includes in-band
+ *    forward error correction to protect against packet loss. Use this
+ *    mode for typical VoIP applications. Because of the enhancement,
+ *    even at high bitrates the output may sound different from the input.
+ *
+ * @ref OPUS_APPLICATION_AUDIO gives best quality at a given bitrate for most
+ *    non-voice signals like music. Use this mode for music and mixed
+ *    (music/voice) content, broadcast, and applications requiring less
+ *    than 15 ms of coding delay.
+ *
+ * @ref OPUS_APPLICATION_RESTRICTED_LOWDELAY configures low-delay mode that
+ *    disables the speech-optimized mode in exchange for slightly reduced delay.
+ *    This mode can only be set on an newly initialized or freshly reset encoder
+ *    because it changes the codec delay.
+ *
+ * This is useful when the caller knows that the speech-optimized modes will not be needed (use with caution).
+ * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
+ *                                     This must be one of 8000, 12000, 16000,
+ *                                     24000, or 48000.
+ * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
+ * @param [in] application <tt>int</tt>: Coding mode (@ref OPUS_APPLICATION_VOIP/@ref OPUS_APPLICATION_AUDIO/@ref OPUS_APPLICATION_RESTRICTED_LOWDELAY)
+ * @param [out] error <tt>int*</tt>: @ref opus_errorcodes
+ * @note Regardless of the sampling rate and number channels selected, the Opus encoder
+ * can switch to a lower audio bandwidth or number of channels if the bitrate
+ * selected is too low. This also means that it is safe to always use 48 kHz stereo input
+ * and let the encoder optimize the encoding.
+ */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusEncoder *opus_encoder_create(
+    opus_int32 Fs,
+    int channels,
+    int application,
+    int *error
+);
+
+/** Initializes a previously allocated encoder state
+  * The memory pointed to by st must be at least the size returned by opus_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of malloc.
+  * @see opus_encoder_create(),opus_encoder_get_size()
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate of input signal (Hz)
+ *                                      This must be one of 8000, 12000, 16000,
+ *                                      24000, or 48000.
+  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) in input signal
+  * @param [in] application <tt>int</tt>: Coding mode (OPUS_APPLICATION_VOIP/OPUS_APPLICATION_AUDIO/OPUS_APPLICATION_RESTRICTED_LOWDELAY)
+  * @retval #OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_encoder_init(
+    OpusEncoder *st,
+    opus_int32 Fs,
+    int channels,
+    int application
+) OPUS_ARG_NONNULL(1);
+
+/** Encodes an Opus frame.
+  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>opus_int16*</tt>: Input signal (interleaved if 2 channels). length is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+  *                                      input signal.
+  *                                      This must be an Opus frame size for
+  *                                      the encoder's sampling rate.
+  *                                      For example, at 48 kHz the permitted
+  *                                      values are 120, 240, 480, 960, 1920,
+  *                                      and 2880.
+  *                                      Passing in a duration of less than
+  *                                      10 ms (480 samples at 48 kHz) will
+  *                                      prevent the encoder from using the LPC
+  *                                      or hybrid modes.
+  * @param [out] data <tt>unsigned char*</tt>: Output payload.
+  *                                            This must contain storage for at
+  *                                            least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode(
+    OpusEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes an Opus frame from floating point input.
+  * @param [in] st <tt>OpusEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>float*</tt>: Input in float format (interleaved if 2 channels), with a normal range of +/-1.0.
+  *          Samples with a range beyond +/-1.0 are supported but will
+  *          be clipped by decoders using the integer API and should
+  *          only be used if it is known that the far end supports
+  *          extended dynamic range.
+  *          length is frame_size*channels*sizeof(float)
+  * @param [in] frame_size <tt>int</tt>: Number of samples per channel in the
+  *                                      input signal.
+  *                                      This must be an Opus frame size for
+  *                                      the encoder's sampling rate.
+  *                                      For example, at 48 kHz the permitted
+  *                                      values are 120, 240, 480, 960, 1920,
+  *                                      and 2880.
+  *                                      Passing in a duration of less than
+  *                                      10 ms (480 samples at 48 kHz) will
+  *                                      prevent the encoder from using the LPC
+  *                                      or hybrid modes.
+  * @param [out] data <tt>unsigned char*</tt>: Output payload.
+  *                                            This must contain storage for at
+  *                                            least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_encode_float(
+    OpusEncoder *st,
+    const float *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Frees an <code>OpusEncoder</code> allocated by opus_encoder_create().
+  * @param[in] st <tt>OpusEncoder*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_encoder_destroy(OpusEncoder *st);
+
+/** Perform a CTL function on an Opus encoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @param st <tt>OpusEncoder*</tt>: Encoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls or
+  *                @ref opus_encoderctls.
+  * @see opus_genericctls
+  * @see opus_encoderctls
+  */
+OPUS_EXPORT int opus_encoder_ctl(OpusEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+/**@}*/
+
+/** @defgroup opus_decoder Opus Decoder
+  * @{
+  *
+  * @brief This page describes the process and functions used to decode Opus.
+  *
+  * The decoding process also starts with creating a decoder
+  * state. This can be done with:
+  * @code
+  * int          error;
+  * OpusDecoder *dec;
+  * dec = opus_decoder_create(Fs, channels, &error);
+  * @endcode
+  * where
+  * @li Fs is the sampling rate and must be 8000, 12000, 16000, 24000, or 48000
+  * @li channels is the number of channels (1 or 2)
+  * @li error will hold the error code in case of failure (or #OPUS_OK on success)
+  * @li the return value is a newly created decoder state to be used for decoding
+  *
+  * While opus_decoder_create() allocates memory for the state, it's also possible
+  * to initialize pre-allocated memory:
+  * @code
+  * int          size;
+  * int          error;
+  * OpusDecoder *dec;
+  * size = opus_decoder_get_size(channels);
+  * dec = malloc(size);
+  * error = opus_decoder_init(dec, Fs, channels);
+  * @endcode
+  * where opus_decoder_get_size() returns the required size for the decoder state. Note that
+  * future versions of this code may change the size, so no assuptions should be made about it.
+  *
+  * The decoder state is always continuous in memory and only a shallow copy is sufficient
+  * to copy it (e.g. memcpy())
+  *
+  * To decode a frame, opus_decode() or opus_decode_float() must be called with a packet of compressed audio data:
+  * @code
+  * frame_size = opus_decode(dec, packet, len, decoded, max_size, 0);
+  * @endcode
+  * where
+  *
+  * @li packet is the byte array containing the compressed data
+  * @li len is the exact number of bytes contained in the packet
+  * @li decoded is the decoded audio data in opus_int16 (or float for opus_decode_float())
+  * @li max_size is the max duration of the frame in samples (per channel) that can fit into the decoded_frame array
+  *
+  * opus_decode() and opus_decode_float() return the number of samples (per channel) decoded from the packet.
+  * If that value is negative, then an error has occurred. This can occur if the packet is corrupted or if the audio
+  * buffer is too small to hold the decoded audio.
+  *
+  * Opus is a stateful codec with overlapping blocks and as a result Opus
+  * packets are not coded independently of each other. Packets must be
+  * passed into the decoder serially and in the correct order for a correct
+  * decode. Lost packets can be replaced with loss concealment by calling
+  * the decoder with a null pointer and zero length for the missing packet.
+  *
+  * A single codec state may only be accessed from a single thread at
+  * a time and any required locking must be performed by the caller. Separate
+  * streams must be decoded with separate decoder states and can be decoded
+  * in parallel unless the library was compiled with NONTHREADSAFE_PSEUDOSTACK
+  * defined.
+  *
+  */
+
+/** Opus decoder state.
+  * This contains the complete state of an Opus decoder.
+  * It is position independent and can be freely copied.
+  * @see opus_decoder_create,opus_decoder_init
+  */
+typedef struct OpusDecoder OpusDecoder;
+
+/** Gets the size of an <code>OpusDecoder</code> structure.
+  * @param [in] channels <tt>int</tt>: Number of channels.
+  *                                    This must be 1 or 2.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_size(int channels);
+
+/** Allocates and initializes a decoder state.
+  * @param [in] Fs <tt>opus_int32</tt>: Sample rate to decode at (Hz).
+  *                                     This must be one of 8000, 12000, 16000,
+  *                                     24000, or 48000.
+  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
+  * @param [out] error <tt>int*</tt>: #OPUS_OK Success or @ref opus_errorcodes
+  *
+  * Internally Opus stores data at 48000 Hz, so that should be the default
+  * value for Fs. However, the decoder can efficiently decode to buffers
+  * at 8, 12, 16, and 24 kHz so if for some reason the caller cannot use
+  * data at the full sample rate, or knows the compressed data doesn't
+  * use the full frequency range, it can request decoding at a reduced
+  * rate. Likewise, the decoder is capable of filling in either mono or
+  * interleaved stereo pcm buffers, at the caller's request.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusDecoder *opus_decoder_create(
+    opus_int32 Fs,
+    int channels,
+    int *error
+);
+
+/** Initializes a previously allocated decoder state.
+  * The state must be at least the size returned by opus_decoder_get_size().
+  * This is intended for applications which use their own allocator instead of malloc. @see opus_decoder_create,opus_decoder_get_size
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state.
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate to decode to (Hz).
+  *                                     This must be one of 8000, 12000, 16000,
+  *                                     24000, or 48000.
+  * @param [in] channels <tt>int</tt>: Number of channels (1 or 2) to decode
+  * @retval #OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_EXPORT int opus_decoder_init(
+    OpusDecoder *st,
+    opus_int32 Fs,
+    int channels
+) OPUS_ARG_NONNULL(1);
+
+/** Decode an Opus packet.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload*
+  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+  *  decoded. If no such data is available, the frame is decoded as if it were lost.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode(
+    OpusDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int16 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode an Opus packet with floating point output.
+  * @param [in] st <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>opus_int32</tt>: Number of bytes in payload
+  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(float)
+  * @param [in] frame_size Number of samples per channel of available space in \a pcm.
+  *  If this is less than the maximum packet duration (120ms; 5760 for 48kHz), this function will
+  *  not be capable of decoding some packets. In the case of PLC (data==NULL) or FEC (decode_fec=1),
+  *  then frame_size needs to be exactly the duration of audio that is missing, otherwise the
+  *  decoder will not be in the optimal state to decode the next incoming packet. For the PLC and
+  *  FEC cases, frame_size <b>must</b> be a multiple of 2.5 ms.
+  * @param [in] decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band forward error correction data be
+  *  decoded. If no such data is available the frame is decoded as if it were lost.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decode_float(
+    OpusDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    float *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on an Opus decoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @param st <tt>OpusDecoder*</tt>: Decoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls or
+  *                @ref opus_decoderctls.
+  * @see opus_genericctls
+  * @see opus_decoderctls
+  */
+OPUS_EXPORT int opus_decoder_ctl(OpusDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/** Frees an <code>OpusDecoder</code> allocated by opus_decoder_create().
+  * @param[in] st <tt>OpusDecoder*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_decoder_destroy(OpusDecoder *st);
+
+/** Parse an opus packet into one or more frames.
+  * Opus_decode will perform this operation internally so most applications do
+  * not need to use this function.
+  * This function does not copy the frames, the returned pointers are pointers into
+  * the input packet.
+  * @param [in] data <tt>char*</tt>: Opus packet to be parsed
+  * @param [in] len <tt>opus_int32</tt>: size of data
+  * @param [out] out_toc <tt>char*</tt>: TOC pointer
+  * @param [out] frames <tt>char*[48]</tt> encapsulated frames
+  * @param [out] size <tt>opus_int16[48]</tt> sizes of the encapsulated frames
+  * @param [out] payload_offset <tt>int*</tt>: returns the position of the payload within the packet (in bytes)
+  * @returns number of frames
+  */
+OPUS_EXPORT int opus_packet_parse(
+   const unsigned char *data,
+   opus_int32 len,
+   unsigned char *out_toc,
+   const unsigned char *frames[48],
+   opus_int16 size[48],
+   int *payload_offset
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5);
+
+/** Gets the bandwidth of an Opus packet.
+  * @param [in] data <tt>char*</tt>: Opus packet
+  * @retval OPUS_BANDWIDTH_NARROWBAND Narrowband (4kHz bandpass)
+  * @retval OPUS_BANDWIDTH_MEDIUMBAND Mediumband (6kHz bandpass)
+  * @retval OPUS_BANDWIDTH_WIDEBAND Wideband (8kHz bandpass)
+  * @retval OPUS_BANDWIDTH_SUPERWIDEBAND Superwideband (12kHz bandpass)
+  * @retval OPUS_BANDWIDTH_FULLBAND Fullband (20kHz bandpass)
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_bandwidth(const unsigned char *data) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of samples per frame from an Opus packet.
+  * @param [in] data <tt>char*</tt>: Opus packet.
+  *                                  This must contain at least one byte of
+  *                                  data.
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
+  *                                     This must be a multiple of 400, or
+  *                                     inaccurate results will be returned.
+  * @returns Number of samples per frame.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_samples_per_frame(const unsigned char *data, opus_int32 Fs) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of channels from an Opus packet.
+  * @param [in] data <tt>char*</tt>: Opus packet
+  * @returns Number of channels
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_channels(const unsigned char *data) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of frames in an Opus packet.
+  * @param [in] packet <tt>char*</tt>: Opus packet
+  * @param [in] len <tt>opus_int32</tt>: Length of packet
+  * @returns Number of frames
+  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_frames(const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of samples of an Opus packet.
+  * @param [in] packet <tt>char*</tt>: Opus packet
+  * @param [in] len <tt>opus_int32</tt>: Length of packet
+  * @param [in] Fs <tt>opus_int32</tt>: Sampling rate in Hz.
+  *                                     This must be a multiple of 400, or
+  *                                     inaccurate results will be returned.
+  * @returns Number of samples
+  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_packet_get_nb_samples(const unsigned char packet[], opus_int32 len, opus_int32 Fs) OPUS_ARG_NONNULL(1);
+
+/** Gets the number of samples of an Opus packet.
+  * @param [in] dec <tt>OpusDecoder*</tt>: Decoder state
+  * @param [in] packet <tt>char*</tt>: Opus packet
+  * @param [in] len <tt>opus_int32</tt>: Length of packet
+  * @returns Number of samples
+  * @retval OPUS_BAD_ARG Insufficient data was passed to the function
+  * @retval OPUS_INVALID_PACKET The compressed data passed is corrupted or of an unsupported type
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_decoder_get_nb_samples(const OpusDecoder *dec, const unsigned char packet[], opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+
+/** Applies soft-clipping to bring a float signal within the [-1,1] range. If
+  * the signal is already in that range, nothing is done. If there are values
+  * outside of [-1,1], then the signal is clipped as smoothly as possible to
+  * both fit in the range and avoid creating excessive distortion in the
+  * process.
+  * @param [in,out] pcm <tt>float*</tt>: Input PCM and modified PCM
+  * @param [in] frame_size <tt>int</tt> Number of samples per channel to process
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @param [in,out] softclip_mem <tt>float*</tt>: State memory for the soft clipping process (one float per channel, initialized to zero)
+  */
+OPUS_EXPORT void opus_pcm_soft_clip(float *pcm, int frame_size, int channels, float *softclip_mem);
+
+
+/**@}*/
+
+/** @defgroup opus_repacketizer Repacketizer
+  * @{
+  *
+  * The repacketizer can be used to merge multiple Opus packets into a single
+  * packet or alternatively to split Opus packets that have previously been
+  * merged. Splitting valid Opus packets is always guaranteed to succeed,
+  * whereas merging valid packets only succeeds if all frames have the same
+  * mode, bandwidth, and frame size, and when the total duration of the merged
+  * packet is no more than 120 ms. The 120 ms limit comes from the
+  * specification and limits decoder memory requirements at a point where
+  * framing overhead becomes negligible.
+  *
+  * The repacketizer currently only operates on elementary Opus
+  * streams. It will not manipualte multistream packets successfully, except in
+  * the degenerate case where they consist of data from a single stream.
+  *
+  * The repacketizing process starts with creating a repacketizer state, either
+  * by calling opus_repacketizer_create() or by allocating the memory yourself,
+  * e.g.,
+  * @code
+  * OpusRepacketizer *rp;
+  * rp = (OpusRepacketizer*)malloc(opus_repacketizer_get_size());
+  * if (rp != NULL)
+  *     opus_repacketizer_init(rp);
+  * @endcode
+  *
+  * Then the application should submit packets with opus_repacketizer_cat(),
+  * extract new packets with opus_repacketizer_out() or
+  * opus_repacketizer_out_range(), and then reset the state for the next set of
+  * input packets via opus_repacketizer_init().
+  *
+  * For example, to split a sequence of packets into individual frames:
+  * @code
+  * unsigned char *data;
+  * int len;
+  * while (get_next_packet(&data, &len))
+  * {
+  *   unsigned char out[1276];
+  *   opus_int32 out_len;
+  *   int nb_frames;
+  *   int err;
+  *   int i;
+  *   err = opus_repacketizer_cat(rp, data, len);
+  *   if (err != OPUS_OK)
+  *   {
+  *     release_packet(data);
+  *     return err;
+  *   }
+  *   nb_frames = opus_repacketizer_get_nb_frames(rp);
+  *   for (i = 0; i < nb_frames; i++)
+  *   {
+  *     out_len = opus_repacketizer_out_range(rp, i, i+1, out, sizeof(out));
+  *     if (out_len < 0)
+  *     {
+  *        release_packet(data);
+  *        return (int)out_len;
+  *     }
+  *     output_next_packet(out, out_len);
+  *   }
+  *   opus_repacketizer_init(rp);
+  *   release_packet(data);
+  * }
+  * @endcode
+  *
+  * Alternatively, to combine a sequence of frames into packets that each
+  * contain up to <code>TARGET_DURATION_MS</code> milliseconds of data:
+  * @code
+  * // The maximum number of packets with duration TARGET_DURATION_MS occurs
+  * // when the frame size is 2.5 ms, for a total of (TARGET_DURATION_MS*2/5)
+  * // packets.
+  * unsigned char *data[(TARGET_DURATION_MS*2/5)+1];
+  * opus_int32 len[(TARGET_DURATION_MS*2/5)+1];
+  * int nb_packets;
+  * unsigned char out[1277*(TARGET_DURATION_MS*2/2)];
+  * opus_int32 out_len;
+  * int prev_toc;
+  * nb_packets = 0;
+  * while (get_next_packet(data+nb_packets, len+nb_packets))
+  * {
+  *   int nb_frames;
+  *   int err;
+  *   nb_frames = opus_packet_get_nb_frames(data[nb_packets], len[nb_packets]);
+  *   if (nb_frames < 1)
+  *   {
+  *     release_packets(data, nb_packets+1);
+  *     return nb_frames;
+  *   }
+  *   nb_frames += opus_repacketizer_get_nb_frames(rp);
+  *   // If adding the next packet would exceed our target, or it has an
+  *   // incompatible TOC sequence, output the packets we already have before
+  *   // submitting it.
+  *   // N.B., The nb_packets > 0 check ensures we've submitted at least one
+  *   // packet since the last call to opus_repacketizer_init(). Otherwise a
+  *   // single packet longer than TARGET_DURATION_MS would cause us to try to
+  *   // output an (invalid) empty packet. It also ensures that prev_toc has
+  *   // been set to a valid value. Additionally, len[nb_packets] > 0 is
+  *   // guaranteed by the call to opus_packet_get_nb_frames() above, so the
+  *   // reference to data[nb_packets][0] should be valid.
+  *   if (nb_packets > 0 && (
+  *       ((prev_toc & 0xFC) != (data[nb_packets][0] & 0xFC)) ||
+  *       opus_packet_get_samples_per_frame(data[nb_packets], 48000)*nb_frames >
+  *       TARGET_DURATION_MS*48))
+  *   {
+  *     out_len = opus_repacketizer_out(rp, out, sizeof(out));
+  *     if (out_len < 0)
+  *     {
+  *        release_packets(data, nb_packets+1);
+  *        return (int)out_len;
+  *     }
+  *     output_next_packet(out, out_len);
+  *     opus_repacketizer_init(rp);
+  *     release_packets(data, nb_packets);
+  *     data[0] = data[nb_packets];
+  *     len[0] = len[nb_packets];
+  *     nb_packets = 0;
+  *   }
+  *   err = opus_repacketizer_cat(rp, data[nb_packets], len[nb_packets]);
+  *   if (err != OPUS_OK)
+  *   {
+  *     release_packets(data, nb_packets+1);
+  *     return err;
+  *   }
+  *   prev_toc = data[nb_packets][0];
+  *   nb_packets++;
+  * }
+  * // Output the final, partial packet.
+  * if (nb_packets > 0)
+  * {
+  *   out_len = opus_repacketizer_out(rp, out, sizeof(out));
+  *   release_packets(data, nb_packets);
+  *   if (out_len < 0)
+  *     return (int)out_len;
+  *   output_next_packet(out, out_len);
+  * }
+  * @endcode
+  *
+  * An alternate way of merging packets is to simply call opus_repacketizer_cat()
+  * unconditionally until it fails. At that point, the merged packet can be
+  * obtained with opus_repacketizer_out() and the input packet for which
+  * opus_repacketizer_cat() needs to be re-added to a newly reinitialized
+  * repacketizer state.
+  */
+
+typedef struct OpusRepacketizer OpusRepacketizer;
+
+/** Gets the size of an <code>OpusRepacketizer</code> structure.
+  * @returns The size in bytes.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_size(void);
+
+/** (Re)initializes a previously allocated repacketizer state.
+  * The state must be at least the size returned by opus_repacketizer_get_size().
+  * This can be used for applications which use their own allocator instead of
+  * malloc().
+  * It must also be called to reset the queue of packets waiting to be
+  * repacketized, which is necessary if the maximum packet duration of 120 ms
+  * is reached or if you wish to submit packets with a different Opus
+  * configuration (coding mode, audio bandwidth, frame size, or channel count).
+  * Failure to do so will prevent a new packet from being added with
+  * opus_repacketizer_cat().
+  * @see opus_repacketizer_create
+  * @see opus_repacketizer_get_size
+  * @see opus_repacketizer_cat
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to
+  *                                       (re)initialize.
+  * @returns A pointer to the same repacketizer state that was passed in.
+  */
+OPUS_EXPORT OpusRepacketizer *opus_repacketizer_init(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
+
+/** Allocates memory and initializes the new repacketizer with
+ * opus_repacketizer_init().
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusRepacketizer *opus_repacketizer_create(void);
+
+/** Frees an <code>OpusRepacketizer</code> allocated by
+  * opus_repacketizer_create().
+  * @param[in] rp <tt>OpusRepacketizer*</tt>: State to be freed.
+  */
+OPUS_EXPORT void opus_repacketizer_destroy(OpusRepacketizer *rp);
+
+/** Add a packet to the current repacketizer state.
+  * This packet must match the configuration of any packets already submitted
+  * for repacketization since the last call to opus_repacketizer_init().
+  * This means that it must have the same coding mode, audio bandwidth, frame
+  * size, and channel count.
+  * This can be checked in advance by examining the top 6 bits of the first
+  * byte of the packet, and ensuring they match the top 6 bits of the first
+  * byte of any previously submitted packet.
+  * The total duration of audio in the repacketizer state also must not exceed
+  * 120 ms, the maximum duration of a single packet, after adding this packet.
+  *
+  * The contents of the current repacketizer state can be extracted into new
+  * packets using opus_repacketizer_out() or opus_repacketizer_out_range().
+  *
+  * In order to add a packet with a different configuration or to add more
+  * audio beyond 120 ms, you must clear the repacketizer state by calling
+  * opus_repacketizer_init().
+  * If a packet is too large to add to the current repacketizer state, no part
+  * of it is added, even if it contains multiple frames, some of which might
+  * fit.
+  * If you wish to be able to add parts of such packets, you should first use
+  * another repacketizer to split the packet into pieces and add them
+  * individually.
+  * @see opus_repacketizer_out_range
+  * @see opus_repacketizer_out
+  * @see opus_repacketizer_init
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state to which to
+  *                                       add the packet.
+  * @param[in] data <tt>const unsigned char*</tt>: The packet data.
+  *                                                The application must ensure
+  *                                                this pointer remains valid
+  *                                                until the next call to
+  *                                                opus_repacketizer_init() or
+  *                                                opus_repacketizer_destroy().
+  * @param len <tt>opus_int32</tt>: The number of bytes in the packet data.
+  * @returns An error code indicating whether or not the operation succeeded.
+  * @retval #OPUS_OK The packet's contents have been added to the repacketizer
+  *                  state.
+  * @retval #OPUS_INVALID_PACKET The packet did not have a valid TOC sequence,
+  *                              the packet's TOC sequence was not compatible
+  *                              with previously submitted packets (because
+  *                              the coding mode, audio bandwidth, frame size,
+  *                              or channel count did not match), or adding
+  *                              this packet would increase the total amount of
+  *                              audio stored in the repacketizer state to more
+  *                              than 120 ms.
+  */
+OPUS_EXPORT int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+
+
+/** Construct a new packet from data previously submitted to the repacketizer
+  * state via opus_repacketizer_cat().
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
+  *                                       construct the new packet.
+  * @param begin <tt>int</tt>: The index of the first frame in the current
+  *                            repacketizer state to include in the output.
+  * @param end <tt>int</tt>: One past the index of the last frame in the
+  *                          current repacketizer state to include in the
+  *                          output.
+  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
+  *                                                 store the output packet.
+  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
+  *                                    the output buffer. In order to guarantee
+  *                                    success, this should be at least
+  *                                    <code>1276</code> for a single frame,
+  *                                    or for multiple frames,
+  *                                    <code>1277*(end-begin)</code>.
+  *                                    However, <code>1*(end-begin)</code> plus
+  *                                    the size of all packet data submitted to
+  *                                    the repacketizer since the last call to
+  *                                    opus_repacketizer_init() or
+  *                                    opus_repacketizer_create() is also
+  *                                    sufficient, and possibly much smaller.
+  * @returns The total size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BAD_ARG <code>[begin,end)</code> was an invalid range of
+  *                       frames (begin < 0, begin >= end, or end >
+  *                       opus_repacketizer_get_nb_frames()).
+  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+  *                                complete output packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out_range(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Return the total number of frames contained in packet data submitted to
+  * the repacketizer state so far via opus_repacketizer_cat() since the last
+  * call to opus_repacketizer_init() or opus_repacketizer_create().
+  * This defines the valid range of packets that can be extracted with
+  * opus_repacketizer_out_range() or opus_repacketizer_out().
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state containing the
+  *                                       frames.
+  * @returns The total number of frames contained in the packet data submitted
+  *          to the repacketizer state.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_repacketizer_get_nb_frames(OpusRepacketizer *rp) OPUS_ARG_NONNULL(1);
+
+/** Construct a new packet from data previously submitted to the repacketizer
+  * state via opus_repacketizer_cat().
+  * This is a convenience routine that returns all the data submitted so far
+  * in a single packet.
+  * It is equivalent to calling
+  * @code
+  * opus_repacketizer_out_range(rp, 0, opus_repacketizer_get_nb_frames(rp),
+  *                             data, maxlen)
+  * @endcode
+  * @param rp <tt>OpusRepacketizer*</tt>: The repacketizer state from which to
+  *                                       construct the new packet.
+  * @param[out] data <tt>const unsigned char*</tt>: The buffer in which to
+  *                                                 store the output packet.
+  * @param maxlen <tt>opus_int32</tt>: The maximum number of bytes to store in
+  *                                    the output buffer. In order to guarantee
+  *                                    success, this should be at least
+  *                                    <code>1277*opus_repacketizer_get_nb_frames(rp)</code>.
+  *                                    However,
+  *                                    <code>1*opus_repacketizer_get_nb_frames(rp)</code>
+  *                                    plus the size of all packet data
+  *                                    submitted to the repacketizer since the
+  *                                    last call to opus_repacketizer_init() or
+  *                                    opus_repacketizer_create() is also
+  *                                    sufficient, and possibly much smaller.
+  * @returns The total size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BUFFER_TOO_SMALL \a maxlen was insufficient to contain the
+  *                                complete output packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_repacketizer_out(OpusRepacketizer *rp, unsigned char *data, opus_int32 maxlen) OPUS_ARG_NONNULL(1);
+
+/** Pads a given Opus packet to a larger size (possibly changing the TOC sequence).
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to pad.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
+  *                                 This must be at least as large as len.
+  * @returns an error code
+  * @retval #OPUS_OK \a on success.
+  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT int opus_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len);
+
+/** Remove all padding from a given Opus packet and rewrite the TOC sequence to
+  * minimize space usage.
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to strip.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @returns The new size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BAD_ARG \a len was less than 1.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_packet_unpad(unsigned char *data, opus_int32 len);
+
+/** Pads a given Opus multi-stream packet to a larger size (possibly changing the TOC sequence).
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to pad.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @param new_len <tt>opus_int32</tt>: The desired size of the packet after padding.
+  *                                 This must be at least 1.
+  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
+  *                                 This must be at least as large as len.
+  * @returns an error code
+  * @retval #OPUS_OK \a on success.
+  * @retval #OPUS_BAD_ARG \a len was less than 1.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT int opus_multistream_packet_pad(unsigned char *data, opus_int32 len, opus_int32 new_len, int nb_streams);
+
+/** Remove all padding from a given Opus multi-stream packet and rewrite the TOC sequence to
+  * minimize space usage.
+  * @param[in,out] data <tt>const unsigned char*</tt>: The buffer containing the
+  *                                                   packet to strip.
+  * @param len <tt>opus_int32</tt>: The size of the packet.
+  *                                 This must be at least 1.
+  * @param nb_streams <tt>opus_int32</tt>: The number of streams (not channels) in the packet.
+  *                                 This must be at least 1.
+  * @returns The new size of the output packet on success, or an error code
+  *          on failure.
+  * @retval #OPUS_BAD_ARG \a len was less than 1 or new_len was less than len.
+  * @retval #OPUS_INVALID_PACKET \a data did not contain a valid Opus packet.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_packet_unpad(unsigned char *data, opus_int32 len, int nb_streams);
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_H */
@@ -0,0 +1,342 @@
+/* Copyright (c) 2007-2008 CSIRO
+   Copyright (c) 2007-2009 Xiph.Org Foundation
+   Copyright (c) 2008-2012 Gregory Maxwell
+   Written by Jean-Marc Valin and Gregory Maxwell */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+  @file opus_custom.h
+  @brief Opus-Custom reference implementation API
+ */
+
+#ifndef OPUS_CUSTOM_H
+#define OPUS_CUSTOM_H
+
+#include "opus_defines.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifdef CUSTOM_MODES
+# define OPUS_CUSTOM_EXPORT OPUS_EXPORT
+# define OPUS_CUSTOM_EXPORT_STATIC OPUS_EXPORT
+#else
+# define OPUS_CUSTOM_EXPORT
+# ifdef OPUS_BUILD
+#  define OPUS_CUSTOM_EXPORT_STATIC static OPUS_INLINE
+# else
+#  define OPUS_CUSTOM_EXPORT_STATIC
+# endif
+#endif
+
+/** @defgroup opus_custom Opus Custom
+  * @{
+  *  Opus Custom is an optional part of the Opus specification and
+  * reference implementation which uses a distinct API from the regular
+  * API and supports frame sizes that are not normally supported.\ Use
+  * of Opus Custom is discouraged for all but very special applications
+  * for which a frame size different from 2.5, 5, 10, or 20 ms is needed
+  * (for either complexity or latency reasons) and where interoperability
+  * is less important.
+  *
+  * In addition to the interoperability limitations the use of Opus custom
+  * disables a substantial chunk of the codec and generally lowers the
+  * quality available at a given bitrate. Normally when an application needs
+  * a different frame size from the codec it should buffer to match the
+  * sizes but this adds a small amount of delay which may be important
+  * in some very low latency applications. Some transports (especially
+  * constant rate RF transports) may also work best with frames of
+  * particular durations.
+  *
+  * Libopus only supports custom modes if they are enabled at compile time.
+  *
+  * The Opus Custom API is similar to the regular API but the
+  * @ref opus_encoder_create and @ref opus_decoder_create calls take
+  * an additional mode parameter which is a structure produced by
+  * a call to @ref opus_custom_mode_create. Both the encoder and decoder
+  * must create a mode using the same sample rate (fs) and frame size
+  * (frame size) so these parameters must either be signaled out of band
+  * or fixed in a particular implementation.
+  *
+  * Similar to regular Opus the custom modes support on the fly frame size
+  * switching, but the sizes available depend on the particular frame size in
+  * use. For some initial frame sizes on a single on the fly size is available.
+  */
+
+/** Contains the state of an encoder. One encoder state is needed
+    for each stream. It is initialized once at the beginning of the
+    stream. Do *not* re-initialize the state for every frame.
+   @brief Encoder state
+ */
+typedef struct OpusCustomEncoder OpusCustomEncoder;
+
+/** State of the decoder. One decoder state is needed for each stream.
+    It is initialized once at the beginning of the stream. Do *not*
+    re-initialize the state for every frame.
+   @brief Decoder state
+ */
+typedef struct OpusCustomDecoder OpusCustomDecoder;
+
+/** The mode contains all the information necessary to create an
+    encoder. Both the encoder and decoder need to be initialized
+    with exactly the same mode, otherwise the output will be
+    corrupted.
+   @brief Mode configuration
+ */
+typedef struct OpusCustomMode OpusCustomMode;
+
+/** Creates a new mode struct. This will be passed to an encoder or
+  * decoder. The mode MUST NOT BE DESTROYED until the encoders and
+  * decoders that use it are destroyed as well.
+  * @param [in] Fs <tt>int</tt>: Sampling rate (8000 to 96000 Hz)
+  * @param [in] frame_size <tt>int</tt>: Number of samples (per channel) to encode in each
+  *        packet (64 - 1024, prime factorization must contain zero or more 2s, 3s, or 5s and no other primes)
+  * @param [out] error <tt>int*</tt>: Returned error code (if NULL, no error will be returned)
+  * @return A newly created mode
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomMode *opus_custom_mode_create(opus_int32 Fs, int frame_size, int *error);
+
+/** Destroys a mode struct. Only call this after all encoders and
+  * decoders using this mode are destroyed as well.
+  * @param [in] mode <tt>OpusCustomMode*</tt>: Mode to be freed.
+  */
+OPUS_CUSTOM_EXPORT void opus_custom_mode_destroy(OpusCustomMode *mode);
+
+
+#if !defined(OPUS_BUILD) || defined(CELT_ENCODER_C)
+
+/* Encoder */
+/** Gets the size of an OpusCustomEncoder structure.
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @returns size
+  */
+OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_encoder_get_size(
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1);
+
+# ifdef CUSTOM_MODES
+/** Initializes a previously allocated encoder state
+  * The memory pointed to by st must be the size returned by opus_custom_encoder_get_size.
+  * This is intended for applications which use their own allocator instead of malloc.
+  * @see opus_custom_encoder_create(),opus_custom_encoder_get_size()
+  * To reset a previously initialized state use the OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
+  *  the stream (must be the same characteristics as used for the
+  *  decoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @return OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT int opus_custom_encoder_init(
+    OpusCustomEncoder *st,
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+# endif
+#endif
+
+
+/** Creates a new encoder state. Each stream needs its own encoder
+  * state (can't be shared across simultaneous streams).
+  * @param [in] mode <tt>OpusCustomMode*</tt>: Contains all the information about the characteristics of
+  *  the stream (must be the same characteristics as used for the
+  *  decoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @param [out] error <tt>int*</tt>: Returns an error code
+  * @return Newly created encoder state.
+*/
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomEncoder *opus_custom_encoder_create(
+    const OpusCustomMode *mode,
+    int channels,
+    int *error
+) OPUS_ARG_NONNULL(1);
+
+
+/** Destroys a an encoder state.
+  * @param[in] st <tt>OpusCustomEncoder*</tt>: State to be freed.
+  */
+OPUS_CUSTOM_EXPORT void opus_custom_encoder_destroy(OpusCustomEncoder *st);
+
+/** Encodes a frame of audio.
+  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>float*</tt>: PCM audio in float format, with a normal range of +/-1.0.
+  *          Samples with a range beyond +/-1.0 are supported but will
+  *          be clipped by decoders using the integer API and should
+  *          only be used if it is known that the far end supports
+  *          extended dynamic range. There must be exactly
+  *          frame_size samples per channel.
+  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+  *          (can change from one frame to another)
+  * @return Number of bytes written to "compressed".
+  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+  *       the length returned be somehow transmitted to the decoder. Otherwise, no
+  *       decoding is possible.
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode_float(
+    OpusCustomEncoder *st,
+    const float *pcm,
+    int frame_size,
+    unsigned char *compressed,
+    int maxCompressedBytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes a frame of audio.
+  * @param [in] st <tt>OpusCustomEncoder*</tt>: Encoder state
+  * @param [in] pcm <tt>opus_int16*</tt>: PCM audio in signed 16-bit format (native endian).
+  *          There must be exactly frame_size samples per channel.
+  * @param [in] frame_size <tt>int</tt>: Number of samples per frame of input signal
+  * @param [out] compressed <tt>char *</tt>: The compressed data is written here. This may not alias pcm and must be at least maxCompressedBytes long.
+  * @param [in] maxCompressedBytes <tt>int</tt>: Maximum number of bytes to use for compressing the frame
+  *          (can change from one frame to another)
+  * @return Number of bytes written to "compressed".
+  *       If negative, an error has occurred (see error codes). It is IMPORTANT that
+  *       the length returned be somehow transmitted to the decoder. Otherwise, no
+  *       decoding is possible.
+ */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_encode(
+    OpusCustomEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *compressed,
+    int maxCompressedBytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on an Opus custom encoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @see opus_encoderctls
+  */
+OPUS_CUSTOM_EXPORT int opus_custom_encoder_ctl(OpusCustomEncoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
+
+
+#if !defined(OPUS_BUILD) || defined(CELT_DECODER_C)
+/* Decoder */
+
+/** Gets the size of an OpusCustomDecoder structure.
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Mode configuration
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @returns size
+  */
+OPUS_CUSTOM_EXPORT_STATIC OPUS_WARN_UNUSED_RESULT int opus_custom_decoder_get_size(
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1);
+
+/** Initializes a previously allocated decoder state
+  * The memory pointed to by st must be the size returned by opus_custom_decoder_get_size.
+  * This is intended for applications which use their own allocator instead of malloc.
+  * @see opus_custom_decoder_create(),opus_custom_decoder_get_size()
+  * To reset a previously initialized state use the OPUS_RESET_STATE CTL.
+  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+  * @param [in] mode <tt>OpusCustomMode *</tt>: Contains all the information about the characteristics of
+  *  the stream (must be the same characteristics as used for the
+  *  encoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @return OPUS_OK Success or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT_STATIC int opus_custom_decoder_init(
+    OpusCustomDecoder *st,
+    const OpusCustomMode *mode,
+    int channels
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2);
+
+#endif
+
+
+/** Creates a new decoder state. Each stream needs its own decoder state (can't
+  * be shared across simultaneous streams).
+  * @param [in] mode <tt>OpusCustomMode</tt>: Contains all the information about the characteristics of the
+  *          stream (must be the same characteristics as used for the encoder)
+  * @param [in] channels <tt>int</tt>: Number of channels
+  * @param [out] error <tt>int*</tt>: Returns an error code
+  * @return Newly created decoder state.
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT OpusCustomDecoder *opus_custom_decoder_create(
+    const OpusCustomMode *mode,
+    int channels,
+    int *error
+) OPUS_ARG_NONNULL(1);
+
+/** Destroys a an decoder state.
+  * @param[in] st <tt>OpusCustomDecoder*</tt>: State to be freed.
+  */
+OPUS_CUSTOM_EXPORT void opus_custom_decoder_destroy(OpusCustomDecoder *st);
+
+/** Decode an opus custom frame with floating point output
+  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>int</tt>: Number of bytes in payload
+  * @param [out] pcm <tt>float*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(float)
+  * @param [in] frame_size Number of samples per channel of available space in *pcm.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode_float(
+    OpusCustomDecoder *st,
+    const unsigned char *data,
+    int len,
+    float *pcm,
+    int frame_size
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode an opus custom frame
+  * @param [in] st <tt>OpusCustomDecoder*</tt>: Decoder state
+  * @param [in] data <tt>char*</tt>: Input payload. Use a NULL pointer to indicate packet loss
+  * @param [in] len <tt>int</tt>: Number of bytes in payload
+  * @param [out] pcm <tt>opus_int16*</tt>: Output signal (interleaved if 2 channels). length
+  *  is frame_size*channels*sizeof(opus_int16)
+  * @param [in] frame_size Number of samples per channel of available space in *pcm.
+  * @returns Number of decoded samples or @ref opus_errorcodes
+  */
+OPUS_CUSTOM_EXPORT OPUS_WARN_UNUSED_RESULT int opus_custom_decode(
+    OpusCustomDecoder *st,
+    const unsigned char *data,
+    int len,
+    opus_int16 *pcm,
+    int frame_size
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on an Opus custom decoder.
+  *
+  * Generally the request and subsequent arguments are generated
+  * by a convenience macro.
+  * @see opus_genericctls
+  */
+OPUS_CUSTOM_EXPORT int opus_custom_decoder_ctl(OpusCustomDecoder * OPUS_RESTRICT st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_CUSTOM_H */
@@ -0,0 +1,788 @@
+/* Copyright (c) 2010-2011 Xiph.Org Foundation, Skype Limited
+   Written by Jean-Marc Valin and Koen Vos */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus_defines.h
+ * @brief Opus reference implementation constants
+ */
+
+#ifndef OPUS_DEFINES_H
+#define OPUS_DEFINES_H
+
+#include "opus_types.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @defgroup opus_errorcodes Error codes
+ * @{
+ */
+/** No error @hideinitializer*/
+#define OPUS_OK                0
+/** One or more invalid/out of range arguments @hideinitializer*/
+#define OPUS_BAD_ARG          -1
+/** Not enough bytes allocated in the buffer @hideinitializer*/
+#define OPUS_BUFFER_TOO_SMALL -2
+/** An internal error was detected @hideinitializer*/
+#define OPUS_INTERNAL_ERROR   -3
+/** The compressed data passed is corrupted @hideinitializer*/
+#define OPUS_INVALID_PACKET   -4
+/** Invalid/unsupported request number @hideinitializer*/
+#define OPUS_UNIMPLEMENTED    -5
+/** An encoder or decoder structure is invalid or already freed @hideinitializer*/
+#define OPUS_INVALID_STATE    -6
+/** Memory allocation has failed @hideinitializer*/
+#define OPUS_ALLOC_FAIL       -7
+/**@}*/
+
+/** @cond OPUS_INTERNAL_DOC */
+/**Export control for opus functions */
+
+#ifndef OPUS_EXPORT
+# if defined(WIN32)
+#  if defined(OPUS_BUILD) && defined(DLL_EXPORT)
+#   define OPUS_EXPORT __declspec(dllexport)
+#  else
+#   define OPUS_EXPORT
+#  endif
+# elif defined(__GNUC__) && defined(OPUS_BUILD)
+#  define OPUS_EXPORT __attribute__ ((visibility ("default")))
+# else
+#  define OPUS_EXPORT
+# endif
+#endif
+
+# if !defined(OPUS_GNUC_PREREQ)
+#  if defined(__GNUC__)&&defined(__GNUC_MINOR__)
+#   define OPUS_GNUC_PREREQ(_maj,_min) \
+ ((__GNUC__<<16)+__GNUC_MINOR__>=((_maj)<<16)+(_min))
+#  else
+#   define OPUS_GNUC_PREREQ(_maj,_min) 0
+#  endif
+# endif
+
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
+# if OPUS_GNUC_PREREQ(3,0)
+#  define OPUS_RESTRICT __restrict__
+# elif (defined(_MSC_VER) && _MSC_VER >= 1400)
+#  define OPUS_RESTRICT __restrict
+# else
+#  define OPUS_RESTRICT
+# endif
+#else
+# define OPUS_RESTRICT restrict
+#endif
+
+#if (!defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L) )
+# if OPUS_GNUC_PREREQ(2,7)
+#  define OPUS_INLINE __inline__
+# elif (defined(_MSC_VER))
+#  define OPUS_INLINE __inline
+# else
+#  define OPUS_INLINE
+# endif
+#else
+# define OPUS_INLINE inline
+#endif
+
+/**Warning attributes for opus functions
+  * NONNULL is not used in OPUS_BUILD to avoid the compiler optimizing out
+  * some paranoid null checks. */
+#if defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
+# define OPUS_WARN_UNUSED_RESULT __attribute__ ((__warn_unused_result__))
+#else
+# define OPUS_WARN_UNUSED_RESULT
+#endif
+#if !defined(OPUS_BUILD) && defined(__GNUC__) && OPUS_GNUC_PREREQ(3, 4)
+# define OPUS_ARG_NONNULL(_x)  __attribute__ ((__nonnull__(_x)))
+#else
+# define OPUS_ARG_NONNULL(_x)
+#endif
+
+/** These are the actual Encoder CTL ID numbers.
+  * They should not be used directly by applications.
+  * In general, SETs should be even and GETs should be odd.*/
+#define OPUS_SET_APPLICATION_REQUEST         4000
+#define OPUS_GET_APPLICATION_REQUEST         4001
+#define OPUS_SET_BITRATE_REQUEST             4002
+#define OPUS_GET_BITRATE_REQUEST             4003
+#define OPUS_SET_MAX_BANDWIDTH_REQUEST       4004
+#define OPUS_GET_MAX_BANDWIDTH_REQUEST       4005
+#define OPUS_SET_VBR_REQUEST                 4006
+#define OPUS_GET_VBR_REQUEST                 4007
+#define OPUS_SET_BANDWIDTH_REQUEST           4008
+#define OPUS_GET_BANDWIDTH_REQUEST           4009
+#define OPUS_SET_COMPLEXITY_REQUEST          4010
+#define OPUS_GET_COMPLEXITY_REQUEST          4011
+#define OPUS_SET_INBAND_FEC_REQUEST          4012
+#define OPUS_GET_INBAND_FEC_REQUEST          4013
+#define OPUS_SET_PACKET_LOSS_PERC_REQUEST    4014
+#define OPUS_GET_PACKET_LOSS_PERC_REQUEST    4015
+#define OPUS_SET_DTX_REQUEST                 4016
+#define OPUS_GET_DTX_REQUEST                 4017
+#define OPUS_SET_VBR_CONSTRAINT_REQUEST      4020
+#define OPUS_GET_VBR_CONSTRAINT_REQUEST      4021
+#define OPUS_SET_FORCE_CHANNELS_REQUEST      4022
+#define OPUS_GET_FORCE_CHANNELS_REQUEST      4023
+#define OPUS_SET_SIGNAL_REQUEST              4024
+#define OPUS_GET_SIGNAL_REQUEST              4025
+#define OPUS_GET_LOOKAHEAD_REQUEST           4027
+/* #define OPUS_RESET_STATE 4028 */
+#define OPUS_GET_SAMPLE_RATE_REQUEST         4029
+#define OPUS_GET_FINAL_RANGE_REQUEST         4031
+#define OPUS_GET_PITCH_REQUEST               4033
+#define OPUS_SET_GAIN_REQUEST                4034
+#define OPUS_GET_GAIN_REQUEST                4045 /* Should have been 4035 */
+#define OPUS_SET_LSB_DEPTH_REQUEST           4036
+#define OPUS_GET_LSB_DEPTH_REQUEST           4037
+#define OPUS_GET_LAST_PACKET_DURATION_REQUEST 4039
+#define OPUS_SET_EXPERT_FRAME_DURATION_REQUEST 4040
+#define OPUS_GET_EXPERT_FRAME_DURATION_REQUEST 4041
+#define OPUS_SET_PREDICTION_DISABLED_REQUEST 4042
+#define OPUS_GET_PREDICTION_DISABLED_REQUEST 4043
+/* Don't use 4045, it's already taken by OPUS_GET_GAIN_REQUEST */
+#define OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST 4046
+#define OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST 4047
+
+/** Defines for the presence of extended APIs. */
+#define OPUS_HAVE_OPUS_PROJECTION_H
+
+/* Macros to trigger compilation errors when the wrong types are provided to a CTL */
+#define __opus_check_int(x) (((void)((x) == (opus_int32)0)), (opus_int32)(x))
+#define __opus_check_int_ptr(ptr) ((ptr) + ((ptr) - (opus_int32*)(ptr)))
+#define __opus_check_uint_ptr(ptr) ((ptr) + ((ptr) - (opus_uint32*)(ptr)))
+#define __opus_check_val16_ptr(ptr) ((ptr) + ((ptr) - (opus_val16*)(ptr)))
+/** @endcond */
+
+/** @defgroup opus_ctlvalues Pre-defined values for CTL interface
+  * @see opus_genericctls, opus_encoderctls
+  * @{
+  */
+/* Values for the various encoder CTLs */
+#define OPUS_AUTO                           -1000 /**<Auto/default setting @hideinitializer*/
+#define OPUS_BITRATE_MAX                       -1 /**<Maximum bitrate @hideinitializer*/
+
+/** Best for most VoIP/videoconference applications where listening quality and intelligibility matter most
+ * @hideinitializer */
+#define OPUS_APPLICATION_VOIP                2048
+/** Best for broadcast/high-fidelity application where the decoded audio should be as close as possible to the input
+ * @hideinitializer */
+#define OPUS_APPLICATION_AUDIO               2049
+/** Only use when lowest-achievable latency is what matters most. Voice-optimized modes cannot be used.
+ * @hideinitializer */
+#define OPUS_APPLICATION_RESTRICTED_LOWDELAY 2051
+
+#define OPUS_SIGNAL_VOICE                    3001 /**< Signal being encoded is voice */
+#define OPUS_SIGNAL_MUSIC                    3002 /**< Signal being encoded is music */
+#define OPUS_BANDWIDTH_NARROWBAND            1101 /**< 4 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_MEDIUMBAND            1102 /**< 6 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_WIDEBAND              1103 /**< 8 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_SUPERWIDEBAND         1104 /**<12 kHz bandpass @hideinitializer*/
+#define OPUS_BANDWIDTH_FULLBAND              1105 /**<20 kHz bandpass @hideinitializer*/
+
+#define OPUS_FRAMESIZE_ARG                   5000 /**< Select frame size from the argument (default) */
+#define OPUS_FRAMESIZE_2_5_MS                5001 /**< Use 2.5 ms frames */
+#define OPUS_FRAMESIZE_5_MS                  5002 /**< Use 5 ms frames */
+#define OPUS_FRAMESIZE_10_MS                 5003 /**< Use 10 ms frames */
+#define OPUS_FRAMESIZE_20_MS                 5004 /**< Use 20 ms frames */
+#define OPUS_FRAMESIZE_40_MS                 5005 /**< Use 40 ms frames */
+#define OPUS_FRAMESIZE_60_MS                 5006 /**< Use 60 ms frames */
+#define OPUS_FRAMESIZE_80_MS                 5007 /**< Use 80 ms frames */
+#define OPUS_FRAMESIZE_100_MS                5008 /**< Use 100 ms frames */
+#define OPUS_FRAMESIZE_120_MS                5009 /**< Use 120 ms frames */
+
+/**@}*/
+
+
+/** @defgroup opus_encoderctls Encoder related CTLs
+  *
+  * These are convenience macros for use with the \c opus_encode_ctl
+  * interface. They are used to generate the appropriate series of
+  * arguments for that call, passing the correct type, size and so
+  * on as expected for each particular request.
+  *
+  * Some usage examples:
+  *
+  * @code
+  * int ret;
+  * ret = opus_encoder_ctl(enc_ctx, OPUS_SET_BANDWIDTH(OPUS_AUTO));
+  * if (ret != OPUS_OK) return ret;
+  *
+  * opus_int32 rate;
+  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&rate));
+  *
+  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
+  * @endcode
+  *
+  * @see opus_genericctls, opus_encoder
+  * @{
+  */
+
+/** Configures the encoder's computational complexity.
+  * The supported range is 0-10 inclusive with 10 representing the highest complexity.
+  * @see OPUS_GET_COMPLEXITY
+  * @param[in] x <tt>opus_int32</tt>: Allowed values: 0-10, inclusive.
+  *
+  * @hideinitializer */
+#define OPUS_SET_COMPLEXITY(x) OPUS_SET_COMPLEXITY_REQUEST, __opus_check_int(x)
+/** Gets the encoder's complexity configuration.
+  * @see OPUS_SET_COMPLEXITY
+  * @param[out] x <tt>opus_int32 *</tt>: Returns a value in the range 0-10,
+  *                                      inclusive.
+  * @hideinitializer */
+#define OPUS_GET_COMPLEXITY(x) OPUS_GET_COMPLEXITY_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the bitrate in the encoder.
+  * Rates from 500 to 512000 bits per second are meaningful, as well as the
+  * special values #OPUS_AUTO and #OPUS_BITRATE_MAX.
+  * The value #OPUS_BITRATE_MAX can be used to cause the codec to use as much
+  * rate as it can, which is useful for controlling the rate by adjusting the
+  * output buffer size.
+  * @see OPUS_GET_BITRATE
+  * @param[in] x <tt>opus_int32</tt>: Bitrate in bits per second. The default
+  *                                   is determined based on the number of
+  *                                   channels and the input sampling rate.
+  * @hideinitializer */
+#define OPUS_SET_BITRATE(x) OPUS_SET_BITRATE_REQUEST, __opus_check_int(x)
+/** Gets the encoder's bitrate configuration.
+  * @see OPUS_SET_BITRATE
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the bitrate in bits per second.
+  *                                      The default is determined based on the
+  *                                      number of channels and the input
+  *                                      sampling rate.
+  * @hideinitializer */
+#define OPUS_GET_BITRATE(x) OPUS_GET_BITRATE_REQUEST, __opus_check_int_ptr(x)
+
+/** Enables or disables variable bitrate (VBR) in the encoder.
+  * The configured bitrate may not be met exactly because frames must
+  * be an integer number of bytes in length.
+  * @see OPUS_GET_VBR
+  * @see OPUS_SET_VBR_CONSTRAINT
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Hard CBR. For LPC/hybrid modes at very low bit-rate, this can
+  *               cause noticeable quality degradation.</dd>
+  * <dt>1</dt><dd>VBR (default). The exact type of VBR is controlled by
+  *               #OPUS_SET_VBR_CONSTRAINT.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_VBR(x) OPUS_SET_VBR_REQUEST, __opus_check_int(x)
+/** Determine if variable bitrate (VBR) is enabled in the encoder.
+  * @see OPUS_SET_VBR
+  * @see OPUS_GET_VBR_CONSTRAINT
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Hard CBR.</dd>
+  * <dt>1</dt><dd>VBR (default). The exact type of VBR may be retrieved via
+  *               #OPUS_GET_VBR_CONSTRAINT.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_VBR(x) OPUS_GET_VBR_REQUEST, __opus_check_int_ptr(x)
+
+/** Enables or disables constrained VBR in the encoder.
+  * This setting is ignored when the encoder is in CBR mode.
+  * @warning Only the MDCT mode of Opus currently heeds the constraint.
+  *  Speech mode ignores it completely, hybrid mode may fail to obey it
+  *  if the LPC layer uses more bitrate than the constraint would have
+  *  permitted.
+  * @see OPUS_GET_VBR_CONSTRAINT
+  * @see OPUS_SET_VBR
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Unconstrained VBR.</dd>
+  * <dt>1</dt><dd>Constrained VBR (default). This creates a maximum of one
+  *               frame of buffering delay assuming a transport with a
+  *               serialization speed of the nominal bitrate.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_VBR_CONSTRAINT(x) OPUS_SET_VBR_CONSTRAINT_REQUEST, __opus_check_int(x)
+/** Determine if constrained VBR is enabled in the encoder.
+  * @see OPUS_SET_VBR_CONSTRAINT
+  * @see OPUS_GET_VBR
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Unconstrained VBR.</dd>
+  * <dt>1</dt><dd>Constrained VBR (default).</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_VBR_CONSTRAINT(x) OPUS_GET_VBR_CONSTRAINT_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures mono/stereo forcing in the encoder.
+  * This can force the encoder to produce packets encoded as either mono or
+  * stereo, regardless of the format of the input audio. This is useful when
+  * the caller knows that the input signal is currently a mono source embedded
+  * in a stereo stream.
+  * @see OPUS_GET_FORCE_CHANNELS
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
+  * <dt>1</dt>         <dd>Forced mono</dd>
+  * <dt>2</dt>         <dd>Forced stereo</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_FORCE_CHANNELS(x) OPUS_SET_FORCE_CHANNELS_REQUEST, __opus_check_int(x)
+/** Gets the encoder's forced channel configuration.
+  * @see OPUS_SET_FORCE_CHANNELS
+  * @param[out] x <tt>opus_int32 *</tt>:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt><dd>Not forced (default)</dd>
+  * <dt>1</dt>         <dd>Forced mono</dd>
+  * <dt>2</dt>         <dd>Forced stereo</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_FORCE_CHANNELS(x) OPUS_GET_FORCE_CHANNELS_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the maximum bandpass that the encoder will select automatically.
+  * Applications should normally use this instead of #OPUS_SET_BANDWIDTH
+  * (leaving that set to the default, #OPUS_AUTO). This allows the
+  * application to set an upper bound based on the type of input it is
+  * providing, but still gives the encoder the freedom to reduce the bandpass
+  * when the bitrate becomes too low, for better overall quality.
+  * @see OPUS_GET_MAX_BANDWIDTH
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_MAX_BANDWIDTH(x) OPUS_SET_MAX_BANDWIDTH_REQUEST, __opus_check_int(x)
+
+/** Gets the encoder's configured maximum allowed bandpass.
+  * @see OPUS_SET_MAX_BANDWIDTH
+  * @param[out] x <tt>opus_int32 *</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband (default)</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_MAX_BANDWIDTH(x) OPUS_GET_MAX_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
+
+/** Sets the encoder's bandpass to a specific value.
+  * This prevents the encoder from automatically selecting the bandpass based
+  * on the available bitrate. If an application knows the bandpass of the input
+  * audio it is providing, it should normally use #OPUS_SET_MAX_BANDWIDTH
+  * instead, which still gives the encoder the freedom to reduce the bandpass
+  * when the bitrate becomes too low, for better overall quality.
+  * @see OPUS_GET_BANDWIDTH
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
+  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_BANDWIDTH(x) OPUS_SET_BANDWIDTH_REQUEST, __opus_check_int(x)
+
+/** Configures the type of signal being encoded.
+  * This is a hint which helps the encoder's mode selection.
+  * @see OPUS_GET_SIGNAL
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
+  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_SIGNAL(x) OPUS_SET_SIGNAL_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured signal type.
+  * @see OPUS_SET_SIGNAL
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>        <dd>(default)</dd>
+  * <dt>#OPUS_SIGNAL_VOICE</dt><dd>Bias thresholds towards choosing LPC or Hybrid modes.</dd>
+  * <dt>#OPUS_SIGNAL_MUSIC</dt><dd>Bias thresholds towards choosing MDCT modes.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_SIGNAL(x) OPUS_GET_SIGNAL_REQUEST, __opus_check_int_ptr(x)
+
+
+/** Configures the encoder's intended application.
+  * The initial value is a mandatory argument to the encoder_create function.
+  * @see OPUS_GET_APPLICATION
+  * @param[in] x <tt>opus_int32</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_APPLICATION(x) OPUS_SET_APPLICATION_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured application.
+  * @see OPUS_SET_APPLICATION
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_APPLICATION(x) OPUS_GET_APPLICATION_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the total samples of delay added by the entire codec.
+  * This can be queried by the encoder and then the provided number of samples can be
+  * skipped on from the start of the decoder's output to provide time aligned input
+  * and output. From the perspective of a decoding application the real data begins this many
+  * samples late.
+  *
+  * The decoder contribution to this delay is identical for all decoders, but the
+  * encoder portion of the delay may vary from implementation to implementation,
+  * version to version, or even depend on the encoder's initial configuration.
+  * Applications needing delay compensation should call this CTL rather than
+  * hard-coding a value.
+  * @param[out] x <tt>opus_int32 *</tt>:   Number of lookahead samples
+  * @hideinitializer */
+#define OPUS_GET_LOOKAHEAD(x) OPUS_GET_LOOKAHEAD_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's use of inband forward error correction (FEC).
+  * @note This is only applicable to the LPC layer
+  * @see OPUS_GET_INBAND_FEC
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Disable inband FEC (default).</dd>
+  * <dt>1</dt><dd>Enable inband FEC.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_INBAND_FEC(x) OPUS_SET_INBAND_FEC_REQUEST, __opus_check_int(x)
+/** Gets encoder's configured use of inband forward error correction.
+  * @see OPUS_SET_INBAND_FEC
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Inband FEC disabled (default).</dd>
+  * <dt>1</dt><dd>Inband FEC enabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_INBAND_FEC(x) OPUS_GET_INBAND_FEC_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's expected packet loss percentage.
+  * Higher values trigger progressively more loss resistant behavior in the encoder
+  * at the expense of quality at a given bitrate in the absence of packet loss, but
+  * greater quality under loss.
+  * @see OPUS_GET_PACKET_LOSS_PERC
+  * @param[in] x <tt>opus_int32</tt>:   Loss percentage in the range 0-100, inclusive (default: 0).
+  * @hideinitializer */
+#define OPUS_SET_PACKET_LOSS_PERC(x) OPUS_SET_PACKET_LOSS_PERC_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured packet loss percentage.
+  * @see OPUS_SET_PACKET_LOSS_PERC
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the configured loss percentage
+  *                                      in the range 0-100, inclusive (default: 0).
+  * @hideinitializer */
+#define OPUS_GET_PACKET_LOSS_PERC(x) OPUS_GET_PACKET_LOSS_PERC_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's use of discontinuous transmission (DTX).
+  * @note This is only applicable to the LPC layer
+  * @see OPUS_GET_DTX
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Disable DTX (default).</dd>
+  * <dt>1</dt><dd>Enabled DTX.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_DTX(x) OPUS_SET_DTX_REQUEST, __opus_check_int(x)
+/** Gets encoder's configured use of discontinuous transmission.
+  * @see OPUS_SET_DTX
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>DTX disabled (default).</dd>
+  * <dt>1</dt><dd>DTX enabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_DTX(x) OPUS_GET_DTX_REQUEST, __opus_check_int_ptr(x)
+/** Configures the depth of signal being encoded.
+  *
+  * This is a hint which helps the encoder identify silence and near-silence.
+  * It represents the number of significant bits of linear intensity below
+  * which the signal contains ignorable quantization or other noise.
+  *
+  * For example, OPUS_SET_LSB_DEPTH(14) would be an appropriate setting
+  * for G.711 u-law input. OPUS_SET_LSB_DEPTH(16) would be appropriate
+  * for 16-bit linear pcm input with opus_encode_float().
+  *
+  * When using opus_encode() instead of opus_encode_float(), or when libopus
+  * is compiled for fixed-point, the encoder uses the minimum of the value
+  * set here and the value 16.
+  *
+  * @see OPUS_GET_LSB_DEPTH
+  * @param[in] x <tt>opus_int32</tt>: Input precision in bits, between 8 and 24
+  *                                   (default: 24).
+  * @hideinitializer */
+#define OPUS_SET_LSB_DEPTH(x) OPUS_SET_LSB_DEPTH_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured signal depth.
+  * @see OPUS_SET_LSB_DEPTH
+  * @param[out] x <tt>opus_int32 *</tt>: Input precision in bits, between 8 and
+  *                                      24 (default: 24).
+  * @hideinitializer */
+#define OPUS_GET_LSB_DEPTH(x) OPUS_GET_LSB_DEPTH_REQUEST, __opus_check_int_ptr(x)
+
+/** Configures the encoder's use of variable duration frames.
+  * When variable duration is enabled, the encoder is free to use a shorter frame
+  * size than the one requested in the opus_encode*() call.
+  * It is then the user's responsibility
+  * to verify how much audio was encoded by checking the ToC byte of the encoded
+  * packet. The part of the audio that was not encoded needs to be resent to the
+  * encoder for the next call. Do not use this option unless you <b>really</b>
+  * know what you are doing.
+  * @see OPUS_GET_EXPERT_FRAME_DURATION
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_EXPERT_FRAME_DURATION(x) OPUS_SET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured use of variable duration frames.
+  * @see OPUS_SET_EXPERT_FRAME_DURATION
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>OPUS_FRAMESIZE_ARG</dt><dd>Select frame size from the argument (default).</dd>
+  * <dt>OPUS_FRAMESIZE_2_5_MS</dt><dd>Use 2.5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_5_MS</dt><dd>Use 5 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_10_MS</dt><dd>Use 10 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_20_MS</dt><dd>Use 20 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_40_MS</dt><dd>Use 40 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_60_MS</dt><dd>Use 60 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_80_MS</dt><dd>Use 80 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_100_MS</dt><dd>Use 100 ms frames.</dd>
+  * <dt>OPUS_FRAMESIZE_120_MS</dt><dd>Use 120 ms frames.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_EXPERT_FRAME_DURATION(x) OPUS_GET_EXPERT_FRAME_DURATION_REQUEST, __opus_check_int_ptr(x)
+
+/** If set to 1, disables almost all use of prediction, making frames almost
+  * completely independent. This reduces quality.
+  * @see OPUS_GET_PREDICTION_DISABLED
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Enable prediction (default).</dd>
+  * <dt>1</dt><dd>Disable prediction.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_PREDICTION_DISABLED(x) OPUS_SET_PREDICTION_DISABLED_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured prediction status.
+  * @see OPUS_SET_PREDICTION_DISABLED
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Prediction enabled (default).</dd>
+  * <dt>1</dt><dd>Prediction disabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_PREDICTION_DISABLED(x) OPUS_GET_PREDICTION_DISABLED_REQUEST, __opus_check_int_ptr(x)
+
+/**@}*/
+
+/** @defgroup opus_genericctls Generic CTLs
+  *
+  * These macros are used with the \c opus_decoder_ctl and
+  * \c opus_encoder_ctl calls to generate a particular
+  * request.
+  *
+  * When called on an \c OpusDecoder they apply to that
+  * particular decoder instance. When called on an
+  * \c OpusEncoder they apply to the corresponding setting
+  * on that encoder instance, if present.
+  *
+  * Some usage examples:
+  *
+  * @code
+  * int ret;
+  * opus_int32 pitch;
+  * ret = opus_decoder_ctl(dec_ctx, OPUS_GET_PITCH(&pitch));
+  * if (ret == OPUS_OK) return ret;
+  *
+  * opus_encoder_ctl(enc_ctx, OPUS_RESET_STATE);
+  * opus_decoder_ctl(dec_ctx, OPUS_RESET_STATE);
+  *
+  * opus_int32 enc_bw, dec_bw;
+  * opus_encoder_ctl(enc_ctx, OPUS_GET_BANDWIDTH(&enc_bw));
+  * opus_decoder_ctl(dec_ctx, OPUS_GET_BANDWIDTH(&dec_bw));
+  * if (enc_bw != dec_bw) {
+  *   printf("packet bandwidth mismatch!\n");
+  * }
+  * @endcode
+  *
+  * @see opus_encoder, opus_decoder_ctl, opus_encoder_ctl, opus_decoderctls, opus_encoderctls
+  * @{
+  */
+
+/** Resets the codec state to be equivalent to a freshly initialized state.
+  * This should be called when switching streams in order to prevent
+  * the back to back decoding from giving different results from
+  * one at a time decoding.
+  * @hideinitializer */
+#define OPUS_RESET_STATE 4028
+
+/** Gets the final state of the codec's entropy coder.
+  * This is used for testing purposes,
+  * The encoder and decoder state should be identical after coding a payload
+  * (assuming no data corruption or software bugs)
+  *
+  * @param[out] x <tt>opus_uint32 *</tt>: Entropy coder state
+  *
+  * @hideinitializer */
+#define OPUS_GET_FINAL_RANGE(x) OPUS_GET_FINAL_RANGE_REQUEST, __opus_check_uint_ptr(x)
+
+/** Gets the encoder's configured bandpass or the decoder's last bandpass.
+  * @see OPUS_SET_BANDWIDTH
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>#OPUS_AUTO</dt>                    <dd>(default)</dd>
+  * <dt>#OPUS_BANDWIDTH_NARROWBAND</dt>    <dd>4 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_MEDIUMBAND</dt>    <dd>6 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_WIDEBAND</dt>      <dd>8 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_SUPERWIDEBAND</dt><dd>12 kHz passband</dd>
+  * <dt>#OPUS_BANDWIDTH_FULLBAND</dt>     <dd>20 kHz passband</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_BANDWIDTH(x) OPUS_GET_BANDWIDTH_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the sampling rate the encoder or decoder was initialized with.
+  * This simply returns the <code>Fs</code> value passed to opus_encoder_init()
+  * or opus_decoder_init().
+  * @param[out] x <tt>opus_int32 *</tt>: Sampling rate of encoder or decoder.
+  * @hideinitializer
+  */
+#define OPUS_GET_SAMPLE_RATE(x) OPUS_GET_SAMPLE_RATE_REQUEST, __opus_check_int_ptr(x)
+
+/** If set to 1, disables the use of phase inversion for intensity stereo,
+  * improving the quality of mono downmixes, but slightly reducing normal
+  * stereo quality. Disabling phase inversion in the decoder does not comply
+  * with RFC 6716, although it does not cause any interoperability issue and
+  * is expected to become part of the Opus standard once RFC 6716 is updated
+  * by draft-ietf-codec-opus-update.
+  * @see OPUS_GET_PHASE_INVERSION_DISABLED
+  * @param[in] x <tt>opus_int32</tt>: Allowed values:
+  * <dl>
+  * <dt>0</dt><dd>Enable phase inversion (default).</dd>
+  * <dt>1</dt><dd>Disable phase inversion.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_SET_PHASE_INVERSION_DISABLED(x) OPUS_SET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int(x)
+/** Gets the encoder's configured phase inversion status.
+  * @see OPUS_SET_PHASE_INVERSION_DISABLED
+  * @param[out] x <tt>opus_int32 *</tt>: Returns one of the following values:
+  * <dl>
+  * <dt>0</dt><dd>Stereo phase inversion enabled (default).</dd>
+  * <dt>1</dt><dd>Stereo phase inversion disabled.</dd>
+  * </dl>
+  * @hideinitializer */
+#define OPUS_GET_PHASE_INVERSION_DISABLED(x) OPUS_GET_PHASE_INVERSION_DISABLED_REQUEST, __opus_check_int_ptr(x)
+
+/**@}*/
+
+/** @defgroup opus_decoderctls Decoder related CTLs
+  * @see opus_genericctls, opus_encoderctls, opus_decoder
+  * @{
+  */
+
+/** Configures decoder gain adjustment.
+  * Scales the decoded output by a factor specified in Q8 dB units.
+  * This has a maximum range of -32768 to 32767 inclusive, and returns
+  * OPUS_BAD_ARG otherwise. The default is zero indicating no adjustment.
+  * This setting survives decoder reset.
+  *
+  * gain = pow(10, x/(20.0*256))
+  *
+  * @param[in] x <tt>opus_int32</tt>:   Amount to scale PCM signal by in Q8 dB units.
+  * @hideinitializer */
+#define OPUS_SET_GAIN(x) OPUS_SET_GAIN_REQUEST, __opus_check_int(x)
+/** Gets the decoder's configured gain adjustment. @see OPUS_SET_GAIN
+  *
+  * @param[out] x <tt>opus_int32 *</tt>: Amount to scale PCM signal by in Q8 dB units.
+  * @hideinitializer */
+#define OPUS_GET_GAIN(x) OPUS_GET_GAIN_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the duration (in samples) of the last packet successfully decoded or concealed.
+  * @param[out] x <tt>opus_int32 *</tt>: Number of samples (at current sampling rate).
+  * @hideinitializer */
+#define OPUS_GET_LAST_PACKET_DURATION(x) OPUS_GET_LAST_PACKET_DURATION_REQUEST, __opus_check_int_ptr(x)
+
+/** Gets the pitch of the last decoded frame, if available.
+  * This can be used for any post-processing algorithm requiring the use of pitch,
+  * e.g. time stretching/shortening. If the last frame was not voiced, or if the
+  * pitch was not coded in the frame, then zero is returned.
+  *
+  * This CTL is only implemented for decoder instances.
+  *
+  * @param[out] x <tt>opus_int32 *</tt>: pitch period at 48 kHz (or 0 if not available)
+  *
+  * @hideinitializer */
+#define OPUS_GET_PITCH(x) OPUS_GET_PITCH_REQUEST, __opus_check_int_ptr(x)
+
+/**@}*/
+
+/** @defgroup opus_libinfo Opus library information functions
+  * @{
+  */
+
+/** Converts an opus error code into a human readable string.
+  *
+  * @param[in] error <tt>int</tt>: Error number
+  * @returns Error string
+  */
+OPUS_EXPORT const char *opus_strerror(int error);
+
+/** Gets the libopus version string.
+  *
+  * Applications may look for the substring "-fixed" in the version string to
+  * determine whether they have a fixed-point or floating-point build at
+  * runtime.
+  *
+  * @returns Version string
+  */
+OPUS_EXPORT const char *opus_get_version_string(void);
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_DEFINES_H */
@@ -0,0 +1,660 @@
+/* Copyright (c) 2011 Xiph.Org Foundation
+   Written by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus_multistream.h
+ * @brief Opus reference implementation multistream API
+ */
+
+#ifndef OPUS_MULTISTREAM_H
+#define OPUS_MULTISTREAM_H
+
+#include "opus.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @cond OPUS_INTERNAL_DOC */
+
+/** Macros to trigger compilation errors when the wrong types are provided to a
+  * CTL. */
+/**@{*/
+#define __opus_check_encstate_ptr(ptr) ((ptr) + ((ptr) - (OpusEncoder**)(ptr)))
+#define __opus_check_decstate_ptr(ptr) ((ptr) + ((ptr) - (OpusDecoder**)(ptr)))
+/**@}*/
+
+/** These are the actual encoder and decoder CTL ID numbers.
+  * They should not be used directly by applications.
+  * In general, SETs should be even and GETs should be odd.*/
+/**@{*/
+#define OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST 5120
+#define OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST 5122
+/**@}*/
+
+/** @endcond */
+
+/** @defgroup opus_multistream_ctls Multistream specific encoder and decoder CTLs
+  *
+  * These are convenience macros that are specific to the
+  * opus_multistream_encoder_ctl() and opus_multistream_decoder_ctl()
+  * interface.
+  * The CTLs from @ref opus_genericctls, @ref opus_encoderctls, and
+  * @ref opus_decoderctls may be applied to a multistream encoder or decoder as
+  * well.
+  * In addition, you may retrieve the encoder or decoder state for an specific
+  * stream via #OPUS_MULTISTREAM_GET_ENCODER_STATE or
+  * #OPUS_MULTISTREAM_GET_DECODER_STATE and apply CTLs to it individually.
+  */
+/**@{*/
+
+/** Gets the encoder state for an individual stream of a multistream encoder.
+  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose encoder you
+  *                                   wish to retrieve.
+  *                                   This must be non-negative and less than
+  *                                   the <code>streams</code> parameter used
+  *                                   to initialize the encoder.
+  * @param[out] y <tt>OpusEncoder**</tt>: Returns a pointer to the given
+  *                                       encoder state.
+  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
+  * @hideinitializer
+  */
+#define OPUS_MULTISTREAM_GET_ENCODER_STATE(x,y) OPUS_MULTISTREAM_GET_ENCODER_STATE_REQUEST, __opus_check_int(x), __opus_check_encstate_ptr(y)
+
+/** Gets the decoder state for an individual stream of a multistream decoder.
+  * @param[in] x <tt>opus_int32</tt>: The index of the stream whose decoder you
+  *                                   wish to retrieve.
+  *                                   This must be non-negative and less than
+  *                                   the <code>streams</code> parameter used
+  *                                   to initialize the decoder.
+  * @param[out] y <tt>OpusDecoder**</tt>: Returns a pointer to the given
+  *                                       decoder state.
+  * @retval OPUS_BAD_ARG The index of the requested stream was out of range.
+  * @hideinitializer
+  */
+#define OPUS_MULTISTREAM_GET_DECODER_STATE(x,y) OPUS_MULTISTREAM_GET_DECODER_STATE_REQUEST, __opus_check_int(x), __opus_check_decstate_ptr(y)
+
+/**@}*/
+
+/** @defgroup opus_multistream Opus Multistream API
+  * @{
+  *
+  * The multistream API allows individual Opus streams to be combined into a
+  * single packet, enabling support for up to 255 channels. Unlike an
+  * elementary Opus stream, the encoder and decoder must negotiate the channel
+  * configuration before the decoder can successfully interpret the data in the
+  * packets produced by the encoder. Some basic information, such as packet
+  * duration, can be computed without any special negotiation.
+  *
+  * The format for multistream Opus packets is defined in
+  * <a href="https://tools.ietf.org/html/rfc7845">RFC 7845</a>
+  * and is based on the self-delimited Opus framing described in Appendix B of
+  * <a href="https://tools.ietf.org/html/rfc6716">RFC 6716</a>.
+  * Normal Opus packets are just a degenerate case of multistream Opus packets,
+  * and can be encoded or decoded with the multistream API by setting
+  * <code>streams</code> to <code>1</code> when initializing the encoder or
+  * decoder.
+  *
+  * Multistream Opus streams can contain up to 255 elementary Opus streams.
+  * These may be either "uncoupled" or "coupled", indicating that the decoder
+  * is configured to decode them to either 1 or 2 channels, respectively.
+  * The streams are ordered so that all coupled streams appear at the
+  * beginning.
+  *
+  * A <code>mapping</code> table defines which decoded channel <code>i</code>
+  * should be used for each input/output (I/O) channel <code>j</code>. This table is
+  * typically provided as an unsigned char array.
+  * Let <code>i = mapping[j]</code> be the index for I/O channel <code>j</code>.
+  * If <code>i < 2*coupled_streams</code>, then I/O channel <code>j</code> is
+  * encoded as the left channel of stream <code>(i/2)</code> if <code>i</code>
+  * is even, or  as the right channel of stream <code>(i/2)</code> if
+  * <code>i</code> is odd. Otherwise, I/O channel <code>j</code> is encoded as
+  * mono in stream <code>(i - coupled_streams)</code>, unless it has the special
+  * value 255, in which case it is omitted from the encoding entirely (the
+  * decoder will reproduce it as silence). Each value <code>i</code> must either
+  * be the special value 255 or be less than <code>streams + coupled_streams</code>.
+  *
+  * The output channels specified by the encoder
+  * should use the
+  * <a href="https://www.xiph.org/vorbis/doc/Vorbis_I_spec.html#x1-810004.3.9">Vorbis
+  * channel ordering</a>. A decoder may wish to apply an additional permutation
+  * to the mapping the encoder used to achieve a different output channel
+  * order (e.g. for outputing in WAV order).
+  *
+  * Each multistream packet contains an Opus packet for each stream, and all of
+  * the Opus packets in a single multistream packet must have the same
+  * duration. Therefore the duration of a multistream packet can be extracted
+  * from the TOC sequence of the first stream, which is located at the
+  * beginning of the packet, just like an elementary Opus stream:
+  *
+  * @code
+  * int nb_samples;
+  * int nb_frames;
+  * nb_frames = opus_packet_get_nb_frames(data, len);
+  * if (nb_frames < 1)
+  *   return nb_frames;
+  * nb_samples = opus_packet_get_samples_per_frame(data, 48000) * nb_frames;
+  * @endcode
+  *
+  * The general encoding and decoding process proceeds exactly the same as in
+  * the normal @ref opus_encoder and @ref opus_decoder APIs.
+  * See their documentation for an overview of how to use the corresponding
+  * multistream functions.
+  */
+
+/** Opus multistream encoder state.
+  * This contains the complete state of a multistream Opus encoder.
+  * It is position independent and can be freely copied.
+  * @see opus_multistream_encoder_create
+  * @see opus_multistream_encoder_init
+  */
+typedef struct OpusMSEncoder OpusMSEncoder;
+
+/** Opus multistream decoder state.
+  * This contains the complete state of a multistream Opus decoder.
+  * It is position independent and can be freely copied.
+  * @see opus_multistream_decoder_create
+  * @see opus_multistream_decoder_init
+  */
+typedef struct OpusMSDecoder OpusMSDecoder;
+
+/**\name Multistream encoder functions */
+/**@{*/
+
+/** Gets the size of an OpusMSEncoder structure.
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_encoder_get_size(
+      int streams,
+      int coupled_streams
+);
+
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_surround_encoder_get_size(
+      int channels,
+      int mapping_family
+);
+
+
+/** Allocates and initializes a multistream encoder state.
+  * Call opus_multistream_encoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than the number of channels.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than the number of input channels.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    encoded channels to input channels, as described in
+  *                    @ref opus_multistream. As an extra constraint, the
+  *                    multistream encoder does not allow encoding coupled
+  *                    streams for which one channel is unused since this
+  *                    is never a good idea.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_encoder_create(
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping,
+      int application,
+      int *error
+) OPUS_ARG_NONNULL(5);
+
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSEncoder *opus_multistream_surround_encoder_create(
+      opus_int32 Fs,
+      int channels,
+      int mapping_family,
+      int *streams,
+      int *coupled_streams,
+      unsigned char *mapping,
+      int application,
+      int *error
+) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
+
+/** Initialize a previously allocated multistream encoder state.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_multistream_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_multistream_encoder_create
+  * @see opus_multistream_encoder_get_size
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than the number of channels.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than the number of input channels.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    encoded channels to input channels, as described in
+  *                    @ref opus_multistream. As an extra constraint, the
+  *                    multistream encoder does not allow encoding coupled
+  *                    streams for which one channel is unused since this
+  *                    is never a good idea.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_multistream_encoder_init(
+      OpusMSEncoder *st,
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping,
+      int application
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+
+OPUS_EXPORT int opus_multistream_surround_encoder_init(
+      OpusMSEncoder *st,
+      opus_int32 Fs,
+      int channels,
+      int mapping_family,
+      int *streams,
+      int *coupled_streams,
+      unsigned char *mapping,
+      int application
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6) OPUS_ARG_NONNULL(7);
+
+/** Encodes a multistream Opus frame.
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
+  *                                            samples.
+  *                                            This must contain
+  *                                            <code>frame_size*channels</code>
+  *                                            samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode(
+    OpusMSEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Encodes a multistream Opus frame from floating point input.
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
+  *                                       samples with a normal range of
+  *                                       +/-1.0.
+  *                                       Samples with a range beyond +/-1.0
+  *                                       are supported but will be clipped by
+  *                                       decoders using the integer API and
+  *                                       should only be used if it is known
+  *                                       that the far end supports extended
+  *                                       dynamic range.
+  *                                       This must contain
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_encode_float(
+      OpusMSEncoder *st,
+      const float *pcm,
+      int frame_size,
+      unsigned char *data,
+      opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+/** Frees an <code>OpusMSEncoder</code> allocated by
+  * opus_multistream_encoder_create().
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to be freed.
+  */
+OPUS_EXPORT void opus_multistream_encoder_destroy(OpusMSEncoder *st);
+
+/** Perform a CTL function on a multistream Opus encoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_encoderctls, or @ref opus_multistream_ctls.
+  * @see opus_genericctls
+  * @see opus_encoderctls
+  * @see opus_multistream_ctls
+  */
+OPUS_EXPORT int opus_multistream_encoder_ctl(OpusMSEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/**@}*/
+
+/**\name Multistream decoder functions */
+/**@{*/
+
+/** Gets the size of an <code>OpusMSDecoder</code> structure.
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_multistream_decoder_get_size(
+      int streams,
+      int coupled_streams
+);
+
+/** Allocates and initializes a multistream decoder state.
+  * Call opus_multistream_decoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    coded channels to output channels, as described in
+  *                    @ref opus_multistream.
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusMSDecoder *opus_multistream_decoder_create(
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping,
+      int *error
+) OPUS_ARG_NONNULL(5);
+
+/** Intialize a previously allocated decoder state object.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_multistream_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_multistream_decoder_create
+  * @see opus_multistream_deocder_get_size
+  * @param st <tt>OpusMSEncoder*</tt>: Multistream encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] mapping <code>const unsigned char[channels]</code>: Mapping from
+  *                    coded channels to output channels, as described in
+  *                    @ref opus_multistream.
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_multistream_decoder_init(
+      OpusMSDecoder *st,
+      opus_int32 Fs,
+      int channels,
+      int streams,
+      int coupled_streams,
+      const unsigned char *mapping
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+
+/** Decode a multistream Opus packet.
+  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode(
+    OpusMSDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int16 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Decode a multistream Opus packet with floating point output.
+  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_multistream_decode_float(
+    OpusMSDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    float *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+/** Perform a CTL function on a multistream Opus decoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusMSDecoder*</tt>: Multistream decoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_decoderctls, or @ref opus_multistream_ctls.
+  * @see opus_genericctls
+  * @see opus_decoderctls
+  * @see opus_multistream_ctls
+  */
+OPUS_EXPORT int opus_multistream_decoder_ctl(OpusMSDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+/** Frees an <code>OpusMSDecoder</code> allocated by
+  * opus_multistream_decoder_create().
+  * @param st <tt>OpusMSDecoder</tt>: Multistream decoder state to be freed.
+  */
+OPUS_EXPORT void opus_multistream_decoder_destroy(OpusMSDecoder *st);
+
+/**@}*/
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_MULTISTREAM_H */
@@ -0,0 +1,568 @@
+/* Copyright (c) 2017 Google Inc.
+   Written by Andrew Allen */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+/**
+ * @file opus_projection.h
+ * @brief Opus projection reference API
+ */
+
+#ifndef OPUS_PROJECTION_H
+#define OPUS_PROJECTION_H
+
+#include "opus_multistream.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** @cond OPUS_INTERNAL_DOC */
+
+/** These are the actual encoder and decoder CTL ID numbers.
+  * They should not be used directly by applications.c
+  * In general, SETs should be even and GETs should be odd.*/
+/**@{*/
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST    6001
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST    6003
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST         6005
+/**@}*/
+
+
+/** @endcond */
+
+/** @defgroup opus_projection_ctls Projection specific encoder and decoder CTLs
+  *
+  * These are convenience macros that are specific to the
+  * opus_projection_encoder_ctl() and opus_projection_decoder_ctl()
+  * interface.
+  * The CTLs from @ref opus_genericctls, @ref opus_encoderctls,
+  * @ref opus_decoderctls, and @ref opus_multistream_ctls may be applied to a
+  * projection encoder or decoder as well.
+  */
+/**@{*/
+
+/** Gets the gain (in dB. S7.8-format) of the demixing matrix from the encoder.
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the gain (in dB. S7.8-format)
+  *                                      of the demixing matrix.
+  * @hideinitializer
+  */
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_GAIN_REQUEST, __opus_check_int_ptr(x)
+
+
+/** Gets the size in bytes of the demixing matrix from the encoder.
+  * @param[out] x <tt>opus_int32 *</tt>: Returns the size in bytes of the
+  *                                      demixing matrix.
+  * @hideinitializer
+  */
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE(x) OPUS_PROJECTION_GET_DEMIXING_MATRIX_SIZE_REQUEST, __opus_check_int_ptr(x)
+
+
+/** Copies the demixing matrix to the supplied pointer location.
+  * @param[out] x <tt>unsigned char *</tt>: Returns the demixing matrix to the
+  *                                         supplied pointer location.
+  * @param y <tt>opus_int32</tt>: The size in bytes of the reserved memory at the
+  *                              pointer location.
+  * @hideinitializer
+  */
+#define OPUS_PROJECTION_GET_DEMIXING_MATRIX(x,y) OPUS_PROJECTION_GET_DEMIXING_MATRIX_REQUEST, x, __opus_check_int(y)
+
+
+/**@}*/
+
+/** Opus projection encoder state.
+ * This contains the complete state of a projection Opus encoder.
+ * It is position independent and can be freely copied.
+ * @see opus_projection_ambisonics_encoder_create
+ */
+typedef struct OpusProjectionEncoder OpusProjectionEncoder;
+
+
+/** Opus projection decoder state.
+  * This contains the complete state of a projection Opus decoder.
+  * It is position independent and can be freely copied.
+  * @see opus_projection_decoder_create
+  * @see opus_projection_decoder_init
+  */
+typedef struct OpusProjectionDecoder OpusProjectionDecoder;
+
+
+/**\name Projection encoder functions */
+/**@{*/
+
+/** Gets the size of an OpusProjectionEncoder structure.
+  * @param channels <tt>int</tt>: The total number of input channels to encode.
+  *                               This must be no more than 255.
+  * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
+  *                                     the appropriate projection.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_ambisonics_encoder_get_size(
+    int channels,
+    int mapping_family
+);
+
+
+/** Allocates and initializes a projection encoder state.
+  * Call opus_projection_encoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param mapping_family <tt>int</tt>: The mapping family to use for selecting
+  *                                     the appropriate projection.
+  * @param[out] streams <tt>int *</tt>: The total number of streams that will
+  *                                     be encoded from the input.
+  * @param[out] coupled_streams <tt>int *</tt>: Number of coupled (2 channel)
+  *                                 streams that will be encoded from the input.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionEncoder *opus_projection_ambisonics_encoder_create(
+    opus_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    int application,
+    int *error
+) OPUS_ARG_NONNULL(4) OPUS_ARG_NONNULL(5);
+
+
+/** Initialize a previously allocated projection encoder state.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_projection_ambisonics_encoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_projection_ambisonics_encoder_create
+  * @see opus_projection_ambisonics_encoder_get_size
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate of the input signal (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels in the input signal.
+  *                               This must be at most 255.
+  *                               It may be greater than the number of
+  *                               coded channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams to encode from the
+  *                              input.
+  *                              This must be no more than the number of channels.
+  * @param coupled_streams <tt>int</tt>: Number of coupled (2 channel) streams
+  *                                      to encode.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      encoded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than the number of input channels.
+  * @param application <tt>int</tt>: The target encoder application.
+  *                                  This must be one of the following:
+  * <dl>
+  * <dt>#OPUS_APPLICATION_VOIP</dt>
+  * <dd>Process signal for improved speech intelligibility.</dd>
+  * <dt>#OPUS_APPLICATION_AUDIO</dt>
+  * <dd>Favor faithfulness to the original input.</dd>
+  * <dt>#OPUS_APPLICATION_RESTRICTED_LOWDELAY</dt>
+  * <dd>Configure the minimum possible coding delay by disabling certain modes
+  * of operation.</dd>
+  * </dl>
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_projection_ambisonics_encoder_init(
+    OpusProjectionEncoder *st,
+    opus_int32 Fs,
+    int channels,
+    int mapping_family,
+    int *streams,
+    int *coupled_streams,
+    int application
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(5) OPUS_ARG_NONNULL(6);
+
+
+/** Encodes a projection Opus frame.
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param[in] pcm <tt>const opus_int16*</tt>: The input signal as interleaved
+  *                                            samples.
+  *                                            This must contain
+  *                                            <code>frame_size*channels</code>
+  *                                            samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode(
+    OpusProjectionEncoder *st,
+    const opus_int16 *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+
+/** Encodes a projection Opus frame from floating point input.
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param[in] pcm <tt>const float*</tt>: The input signal as interleaved
+  *                                       samples with a normal range of
+  *                                       +/-1.0.
+  *                                       Samples with a range beyond +/-1.0
+  *                                       are supported but will be clipped by
+  *                                       decoders using the integer API and
+  *                                       should only be used if it is known
+  *                                       that the far end supports extended
+  *                                       dynamic range.
+  *                                       This must contain
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: Number of samples per channel in the input
+  *                                 signal.
+  *                                 This must be an Opus frame size for the
+  *                                 encoder's sampling rate.
+  *                                 For example, at 48 kHz the permitted values
+  *                                 are 120, 240, 480, 960, 1920, and 2880.
+  *                                 Passing in a duration of less than 10 ms
+  *                                 (480 samples at 48 kHz) will prevent the
+  *                                 encoder from using the LPC or hybrid modes.
+  * @param[out] data <tt>unsigned char*</tt>: Output payload.
+  *                                           This must contain storage for at
+  *                                           least \a max_data_bytes.
+  * @param [in] max_data_bytes <tt>opus_int32</tt>: Size of the allocated
+  *                                                 memory for the output
+  *                                                 payload. This may be
+  *                                                 used to impose an upper limit on
+  *                                                 the instant bitrate, but should
+  *                                                 not be used as the only bitrate
+  *                                                 control. Use #OPUS_SET_BITRATE to
+  *                                                 control the bitrate.
+  * @returns The length of the encoded packet (in bytes) on success or a
+  *          negative error code (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_encode_float(
+    OpusProjectionEncoder *st,
+    const float *pcm,
+    int frame_size,
+    unsigned char *data,
+    opus_int32 max_data_bytes
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(2) OPUS_ARG_NONNULL(4);
+
+
+/** Frees an <code>OpusProjectionEncoder</code> allocated by
+  * opus_projection_ambisonics_encoder_create().
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state to be freed.
+  */
+OPUS_EXPORT void opus_projection_encoder_destroy(OpusProjectionEncoder *st);
+
+
+/** Perform a CTL function on a projection Opus encoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusProjectionEncoder*</tt>: Projection encoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_encoderctls, @ref opus_multistream_ctls, or
+  *                @ref opus_projection_ctls
+  * @see opus_genericctls
+  * @see opus_encoderctls
+  * @see opus_multistream_ctls
+  * @see opus_projection_ctls
+  */
+OPUS_EXPORT int opus_projection_encoder_ctl(OpusProjectionEncoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+
+/**@}*/
+
+/**\name Projection decoder functions */
+/**@{*/
+
+/** Gets the size of an <code>OpusProjectionDecoder</code> structure.
+  * @param channels <tt>int</tt>: The total number of output channels.
+  *                               This must be no more than 255.
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @returns The size in bytes on success, or a negative error code
+  *          (see @ref opus_errorcodes) on error.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT opus_int32 opus_projection_decoder_get_size(
+    int channels,
+    int streams,
+    int coupled_streams
+);
+
+
+/** Allocates and initializes a projection decoder state.
+  * Call opus_projection_decoder_destroy() to release
+  * this object when finished.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
+  *                         that mapping from coded channels to output channels,
+  *                         as described in @ref opus_projection and
+  *                         @ref opus_projection_ctls.
+  * @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
+  *                                                  demixing matrix, as
+  *                                                  described in @ref
+  *                                                  opus_projection_ctls.
+  * @param[out] error <tt>int *</tt>: Returns #OPUS_OK on success, or an error
+  *                                   code (see @ref opus_errorcodes) on
+  *                                   failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT OpusProjectionDecoder *opus_projection_decoder_create(
+    opus_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    unsigned char *demixing_matrix,
+    opus_int32 demixing_matrix_size,
+    int *error
+) OPUS_ARG_NONNULL(5);
+
+
+/** Intialize a previously allocated projection decoder state object.
+  * The memory pointed to by \a st must be at least the size returned by
+  * opus_projection_decoder_get_size().
+  * This is intended for applications which use their own allocator instead of
+  * malloc.
+  * To reset a previously initialized state, use the #OPUS_RESET_STATE CTL.
+  * @see opus_projection_decoder_create
+  * @see opus_projection_deocder_get_size
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection encoder state to initialize.
+  * @param Fs <tt>opus_int32</tt>: Sampling rate to decode at (in Hz).
+  *                                This must be one of 8000, 12000, 16000,
+  *                                24000, or 48000.
+  * @param channels <tt>int</tt>: Number of channels to output.
+  *                               This must be at most 255.
+  *                               It may be different from the number of coded
+  *                               channels (<code>streams +
+  *                               coupled_streams</code>).
+  * @param streams <tt>int</tt>: The total number of streams coded in the
+  *                              input.
+  *                              This must be no more than 255.
+  * @param coupled_streams <tt>int</tt>: Number of streams to decode as coupled
+  *                                      (2 channel) streams.
+  *                                      This must be no larger than the total
+  *                                      number of streams.
+  *                                      Additionally, The total number of
+  *                                      coded channels (<code>streams +
+  *                                      coupled_streams</code>) must be no
+  *                                      more than 255.
+  * @param[in] demixing_matrix <tt>const unsigned char[demixing_matrix_size]</tt>: Demixing matrix
+  *                         that mapping from coded channels to output channels,
+  *                         as described in @ref opus_projection and
+  *                         @ref opus_projection_ctls.
+  * @param demixing_matrix_size <tt>opus_int32</tt>: The size in bytes of the
+  *                                                  demixing matrix, as
+  *                                                  described in @ref
+  *                                                  opus_projection_ctls.
+  * @returns #OPUS_OK on success, or an error code (see @ref opus_errorcodes)
+  *          on failure.
+  */
+OPUS_EXPORT int opus_projection_decoder_init(
+    OpusProjectionDecoder *st,
+    opus_int32 Fs,
+    int channels,
+    int streams,
+    int coupled_streams,
+    unsigned char *demixing_matrix,
+    opus_int32 demixing_matrix_size
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(6);
+
+
+/** Decode a projection Opus packet.
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode(
+    OpusProjectionDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    opus_int16 *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+
+/** Decode a projection Opus packet with floating point output.
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param[in] data <tt>const unsigned char*</tt>: Input payload.
+  *                                                Use a <code>NULL</code>
+  *                                                pointer to indicate packet
+  *                                                loss.
+  * @param len <tt>opus_int32</tt>: Number of bytes in payload.
+  * @param[out] pcm <tt>opus_int16*</tt>: Output signal, with interleaved
+  *                                       samples.
+  *                                       This must contain room for
+  *                                       <code>frame_size*channels</code>
+  *                                       samples.
+  * @param frame_size <tt>int</tt>: The number of samples per channel of
+  *                                 available space in \a pcm.
+  *                                 If this is less than the maximum packet duration
+  *                                 (120 ms; 5760 for 48kHz), this function will not be capable
+  *                                 of decoding some packets. In the case of PLC (data==NULL)
+  *                                 or FEC (decode_fec=1), then frame_size needs to be exactly
+  *                                 the duration of audio that is missing, otherwise the
+  *                                 decoder will not be in the optimal state to decode the
+  *                                 next incoming packet. For the PLC and FEC cases, frame_size
+  *                                 <b>must</b> be a multiple of 2.5 ms.
+  * @param decode_fec <tt>int</tt>: Flag (0 or 1) to request that any in-band
+  *                                 forward error correction data be decoded.
+  *                                 If no such data is available, the frame is
+  *                                 decoded as if it were lost.
+  * @returns Number of samples decoded on success or a negative error code
+  *          (see @ref opus_errorcodes) on failure.
+  */
+OPUS_EXPORT OPUS_WARN_UNUSED_RESULT int opus_projection_decode_float(
+    OpusProjectionDecoder *st,
+    const unsigned char *data,
+    opus_int32 len,
+    float *pcm,
+    int frame_size,
+    int decode_fec
+) OPUS_ARG_NONNULL(1) OPUS_ARG_NONNULL(4);
+
+
+/** Perform a CTL function on a projection Opus decoder.
+  *
+  * Generally the request and subsequent arguments are generated by a
+  * convenience macro.
+  * @param st <tt>OpusProjectionDecoder*</tt>: Projection decoder state.
+  * @param request This and all remaining parameters should be replaced by one
+  *                of the convenience macros in @ref opus_genericctls,
+  *                @ref opus_decoderctls, @ref opus_multistream_ctls, or
+  *                @ref opus_projection_ctls.
+  * @see opus_genericctls
+  * @see opus_decoderctls
+  * @see opus_multistream_ctls
+  * @see opus_projection_ctls
+  */
+OPUS_EXPORT int opus_projection_decoder_ctl(OpusProjectionDecoder *st, int request, ...) OPUS_ARG_NONNULL(1);
+
+
+/** Frees an <code>OpusProjectionDecoder</code> allocated by
+  * opus_projection_decoder_create().
+  * @param st <tt>OpusProjectionDecoder</tt>: Projection decoder state to be freed.
+  */
+OPUS_EXPORT void opus_projection_decoder_destroy(OpusProjectionDecoder *st);
+
+
+/**@}*/
+
+/**@}*/
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OPUS_PROJECTION_H */
@@ -0,0 +1,166 @@
+/* (C) COPYRIGHT 1994-2002 Xiph.Org Foundation */
+/* Modified by Jean-Marc Valin */
+/*
+   Redistribution and use in source and binary forms, with or without
+   modification, are permitted provided that the following conditions
+   are met:
+
+   - Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+   - Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+   ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+   OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+   EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+   PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+   PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+   LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+   NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+   SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* opus_types.h based on ogg_types.h from libogg */
+
+/**
+   @file opus_types.h
+   @brief Opus reference implementation types
+*/
+#ifndef OPUS_TYPES_H
+#define OPUS_TYPES_H
+
+#define opus_int         int                     /* used for counters etc; at least 16 bits */
+#define opus_int64       long long
+#define opus_int8        signed char
+
+#define opus_uint        unsigned int            /* used for counters etc; at least 16 bits */
+#define opus_uint64      unsigned long long
+#define opus_uint8       unsigned char
+
+/* Use the real stdint.h if it's there (taken from Paul Hsieh's pstdint.h) */
+#if (defined(__STDC__) && __STDC__ && defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || (defined(__GNUC__) && (defined(_STDINT_H) || defined(_STDINT_H_)) || defined (HAVE_STDINT_H))
+#include <stdint.h>
+#  undef opus_int64
+#  undef opus_int8
+#  undef opus_uint64
+#  undef opus_uint8
+   typedef int8_t opus_int8;
+   typedef uint8_t opus_uint8;
+   typedef int16_t opus_int16;
+   typedef uint16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef uint32_t opus_uint32;
+   typedef int64_t opus_int64;
+   typedef uint64_t opus_uint64;
+#elif defined(_WIN32)
+
+#  if defined(__CYGWIN__)
+#    include <_G_config.h>
+     typedef _G_int32_t opus_int32;
+     typedef _G_uint32_t opus_uint32;
+     typedef _G_int16 opus_int16;
+     typedef _G_uint16 opus_uint16;
+#  elif defined(__MINGW32__)
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+#  elif defined(__MWERKS__)
+     typedef int opus_int32;
+     typedef unsigned int opus_uint32;
+     typedef short opus_int16;
+     typedef unsigned short opus_uint16;
+#  else
+     /* MSVC/Borland */
+     typedef __int32 opus_int32;
+     typedef unsigned __int32 opus_uint32;
+     typedef __int16 opus_int16;
+     typedef unsigned __int16 opus_uint16;
+#  endif
+
+#elif defined(__MACOS__)
+
+#  include <sys/types.h>
+   typedef SInt16 opus_int16;
+   typedef UInt16 opus_uint16;
+   typedef SInt32 opus_int32;
+   typedef UInt32 opus_uint32;
+
+#elif (defined(__APPLE__) && defined(__MACH__)) /* MacOS X Framework build */
+
+#  include <sys/types.h>
+   typedef int16_t opus_int16;
+   typedef u_int16_t opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined(__BEOS__)
+
+   /* Be */
+#  include <inttypes.h>
+   typedef int16 opus_int16;
+   typedef u_int16 opus_uint16;
+   typedef int32_t opus_int32;
+   typedef u_int32_t opus_uint32;
+
+#elif defined (__EMX__)
+
+   /* OS/2 GCC */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined (DJGPP)
+
+   /* DJGPP */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(R5900)
+
+   /* PS2 EE */
+   typedef int opus_int32;
+   typedef unsigned opus_uint32;
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+
+#elif defined(__SYMBIAN32__)
+
+   /* Symbian GCC */
+   typedef signed short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef signed int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#elif defined(CONFIG_TI_C54X) || defined (CONFIG_TI_C55X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef long opus_int32;
+   typedef unsigned long opus_uint32;
+
+#elif defined(CONFIG_TI_C6X)
+
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#else
+
+   /* Give up, take a reasonable guess */
+   typedef short opus_int16;
+   typedef unsigned short opus_uint16;
+   typedef int opus_int32;
+   typedef unsigned int opus_uint32;
+
+#endif
+
+#endif  /* OPUS_TYPES_H */
@@ -0,0 +1,13 @@
+LOCAL_PATH:= $(call my-dir)
+ 
+include $(CLEAR_VARS)
+LOCAL_MODULE:= libssl
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/libssl.a
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+include $(PREBUILT_STATIC_LIBRARY)
+ 
+include $(CLEAR_VARS)
+LOCAL_MODULE:= libcrypto
+LOCAL_SRC_FILES:= $(TARGET_ARCH_ABI)/libcrypto.a
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
+include $(PREBUILT_STATIC_LIBRARY)
--- a/Show More
+++ b/Show More