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

2014-07-02 23:42:54 -07:00
582 changed files with 9873 additions and 65456 deletions
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
@@ -1,35 +1 @@
-#built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Windows thumbnail db
-Thumbs.db
-
-# OSX files
-.DS_Store
-
-# Eclipse project files
-.classpath
-.project
-
-# Android Studio
-.idea
-#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
-.gradle
-build/
-
-# Compiled JNI libraries folder
-**/jniLibs
+/bin/*
@@ -0,0 +1,2 @@
+*** SESSION Sep 21, 2013 18:55:11.17 -------------------------------------------
+*** SESSION Sep 21, 2013 18:55:55.08 -------------------------------------------
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -0,0 +1 @@
+
@@ -0,0 +1,3 @@
+com.android.ide.eclipse.adt.fixLegacyEditors=1
+com.android.ide.eclipse.adt.sdk=C\:\\Users\\Andrew\\Desktop\\ADT\\adt-bundle-windows-x86_64-20130917\\sdk
+eclipse.preferences.version=1
@@ -0,0 +1,4 @@
+eclipse.preferences.version=1
+spelling_locale_initialized=true
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+version=1
@@ -0,0 +1,13 @@
+content_assist_proposals_background=255,255,255
+content_assist_proposals_foreground=0,0,0
+eclipse.preferences.version=1
+fontPropagated=true
+org.eclipse.jdt.ui.editor.tab.width=
+org.eclipse.jdt.ui.formatterprofiles.version=12
+org.eclipse.jdt.ui.javadoclocations.migrated=true
+org.eclipse.jface.textfont=1|Courier New|10.0|0|WINDOWS|1|0|0|0|0|0|0|0|0|1|0|0|0|0|Courier New;
+proposalOrderMigrated=true
+spelling_locale_initialized=true
+tabWidthPropagated=true
+useAnnotationsPrefPage=true
+useQuickDiffPrefPage=true
@@ -0,0 +1,5 @@
+PROBLEMS_FILTERS_MIGRATE=true
+eclipse.preferences.version=1
+platformState=1379804095671
+quickStart=false
+tipsAndTricks=true
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+showIntro=false
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<typeInfoHistroy/>
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<qualifiedTypeNameHistroy/>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="org.eclipse.jdt.internal.ui.packageview.PackageExplorerPart">
+		<item value="true" key="group_libraries"/>
+		<item value="false" key="linkWithEditor"/>
+		<item value="2" key="layout"/>
+		<item value="1" key="rootMode"/>
+		<item value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot;?&gt;&#x0D;&#x0A;&lt;packageExplorer group_libraries=&quot;1&quot; layout=&quot;2&quot; linkWithEditor=&quot;0&quot; rootMode=&quot;1&quot; workingSetName=&quot;&quot;&gt;&#x0D;&#x0A;&lt;customFilters userDefinedPatternsEnabled=&quot;false&quot;&gt;&#x0D;&#x0A;&lt;xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.LocalTypesFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.StaticsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ClosedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonSharedProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaElementFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ContainedLibraryFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.CuAndClassFileFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonJavaProjectsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyInnerPackageFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.PackageDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.EmptyPackageFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.ImportDeclarationFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.FieldsFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.internal.ui.PackageExplorer.HideInnerClassFilesFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.NonPublicFilter&quot; isEnabled=&quot;false&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer_patternFilterId_.*&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.EmptyLibraryContainerFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;child filterId=&quot;org.eclipse.jdt.ui.PackageExplorer.SyntheticMembersFilter&quot; isEnabled=&quot;true&quot;/&gt;&#x0D;&#x0A;&lt;/xmlDefinedFilters&gt;&#x0D;&#x0A;&lt;/customFilters&gt;&#x0D;&#x0A;&lt;/packageExplorer&gt;" key="memento"/>
+	</section>
+	<section name="JavaElementSearchActions">
+	</section>
+</section>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="ChooseWorkspaceDialogSettings">
+		<item value="185" key="DIALOG_Y_ORIGIN"/>
+		<item value="381" key="DIALOG_X_ORIGIN"/>
+	</section>
+	<section name="WORKBENCH_SETTINGS">
+		<list key="ENABLED_TRANSFERS">
+		</list>
+	</section>
+	<section name="ExternalProjectImportWizard">
+		<item value="false" key="WizardProjectsImportPage.STORE_ARCHIVE_SELECTED"/>
+		<item value="false" key="WizardProjectsImportPage.STORE_COPY_PROJECT_ID"/>
+	</section>
+</section>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<section name="Workbench">
+	<section name="org.eclipse.ui.internal.QuickAccess">
+		<item value="1025" key="dialogWidth"/>
+		<item value="525" key="dialogHeight"/>
+		<list key="orderedProviders">
+		</list>
+		<list key="textArray">
+		</list>
+		<list key="orderedElements">
+		</list>
+		<list key="textEntries">
+		</list>
+	</section>
+	<section name="ImportExportAction">
+	</section>
+</section>
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<workingSetManager>
+<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1379804109849_0" label="Window Working Set" name="Aggregate for window 1379804109848"/>
+<workingSet aggregate="true" factoryID="org.eclipse.ui.internal.WorkingSetFactory" id="1379804153983_1" label="Window Working Set" name="Aggregate for window 1379804153983"/>
+</workingSetManager>
@@ -0,0 +1 @@
+org.eclipse.core.runtime=1
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Limelight</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
@@ -0,0 +1,11 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.limelight"
+    android:versionCode="18"
+    android:versionName="2.4" >
+
+    <uses-sdk
+        android:minSdkVersion="16"
+        android:targetSdkVersion="19" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
+    
+    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@style/AppTheme" >
+        <activity
+            android:name="com.limelight.Connection"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+                <category android:name="tv.ouya.intent.category.APP" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="com.limelight.Game"
+            android:screenOrientation="sensorLandscape"
+            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection"
+            android:label="@string/title_activity_game"
+            android:parentActivityName="com.limelight.Connection"
+            android:theme="@style/FullscreenTheme" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="com.limelight.Connection" />
+        </activity>
+    </application>
+
+</manifest>
@@ -1,39 +1,45 @@
 #Limelight

 Limelight 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.
+We reverse engineered the Shield streaming software, and created a version that can be run on any Android device.

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

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

 ##Features

-* Streams any of your games from your PC to your Android device
+* Streams Steam and all 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
+
+##Features in development
+
+* Use mDNS to scan for compatible GeForce Experience (GFE) machines on the network
+* Choose from the list of available games instead of just launching Steam
+* Keyboard input

 ##Installation

 * Download and install Limelight for Android from
-[Google Play](https://play.google.com/store/apps/details?id=com.limelight)
+[XDA](http://forum.xda-developers.com/showthread.php?t=2505510)
 * 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 GTX 600/700 series GPU
+* [GFE compatible](http://shield.nvidia.com/play-pc-games/) computer with GTX 600/700 series GPU
 * Android device running 4.1 (Jelly Bean) or higher
 * High-end wireless router (802.11n dual-band recommended)
+* Exynos/Snapdragon SoC __OR__ Quad-Core 1.4 GHz Cortex-A9 or higher (Tegra 3)

 ##Usage

-* Turn on GameStream in the GFE settings
+* Turn on Shield Streaming in the GFE settings
 * If you are connecting from outside the same network, turn on internet
  streaming
-* When on the same network as your PC, open Limelight and tap on your PC in the list
+* In Limelight, enter your PC's IP or Hostname and click "Pair"
 * Accept the pairing confirmation on your PC
-* Tap your PC again to view the list of apps to stream
+* In Limelight, click "Start Streaming"
 * Play games!

 ##Contribute
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="limelight-android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":app" />
-      </configuration>
-    </facet>
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="nonRootDebug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleNonRootDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileNonRootDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleNonRootDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateNonRootDebugSources" />
-        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateNonRootDebugTestSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/nonRoot/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/nonRoot/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/nonRoot/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/nonRoot/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/nonRoot/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/nonRoot/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRootDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/nonRoot/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/nonRoot/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/nonRoot/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestNonRoot/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="bcprov-jdk15on-1.51" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-r7" level="project" />
-    <orderEntry type="library" exported="" name="jmdns-fixed" level="project" />
-    <orderEntry type="library" exported="" name="bcpkix-jdk15on-1.51" level="project" />
-    <orderEntry type="library" exported="" name="tinyrtsp" level="project" />
-    <orderEntry type="library" exported="" name="okhttp-2.1.0" level="project" />
-    <orderEntry type="library" exported="" name="limelight-common" level="project" />
-    <orderEntry type="library" exported="" name="okio-1.0.1" level="project" />
-    <orderEntry type="library" exported="" name="androidasync-e1dfb4" level="project" />
-    <orderEntry type="library" exported="" name="jcodec-0.1.9" level="project" />
-    <orderEntry type="library" exported="" name="ion-2f46fa" level="project" />
-  </component>
-</module>
-
@@ -1,81 +0,0 @@
-import com.android.builder.model.ProductFlavor
-import org.apache.tools.ant.taskdefs.condition.Os
-
-apply plugin: 'com.android.application'
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion "21.1.1"
-
-    defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 21
-
-        versionName "3.0.2"
-        versionCode = 48
-    }
-
-    productFlavors {
-        root {
-            applicationId "com.limelight.root"
-        }
-
-        nonRoot {
-            applicationId "com.limelight"
-        }
-    }
-
-    buildTypes {
-        release {
-            runProguard false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
-        }
-    }
-
-    sourceSets.main.jni.srcDirs = []
-
-    //noinspection GroovyAssignabilityCheck,GroovyAssignabilityCheck
-    task ndkBuild(type: Exec, description: 'Compile JNI source via NDK') {
-        Properties properties = new Properties()
-        properties.load(project.rootProject.file('local.properties').newDataInputStream())
-        def ndkDir = properties.getProperty('ndk.dir')
-
-        if (Os.isFamily(Os.FAMILY_WINDOWS)) {
-            commandLine "$ndkDir\\ndk-build.cmd",
-                    'NDK_PROJECT_PATH=build/intermediates/ndk',
-                    'NDK_LIBS_OUT=src/main/jniLibs',
-                    'APP_BUILD_SCRIPT=src/main/jni/Android.mk',
-                    'NDK_APPLICATION_MK=src/main/jni/Application.mk'
-        }
-        else {
-            commandLine "$ndkDir/ndk-build",
-                    'NDK_PROJECT_PATH=build/intermediates/ndk',
-                    'NDK_LIBS_OUT=src/main/jniLibs',
-                    'APP_BUILD_SCRIPT=src/main/jni/Android.mk',
-                    'NDK_APPLICATION_MK=src/main/jni/Application.mk'
-        }
-    }
-
-    tasks.withType(JavaCompile) {
-        compileTask -> compileTask.dependsOn ndkBuild
-    }
-}
-
-dependencies {
-    compile group: 'org.jcodec', name: 'jcodec', version: '+'
-    compile group: 'org.bouncycastle', name: 'bcprov-jdk15on', version: '+'
-    compile group: 'org.bouncycastle', name: 'bcpkix-jdk15on', version: '+'
-    compile group: 'com.google.android', name: 'support-v4', version:'+'
-
-    // FIXME: Pending resolution of issue #346 using custom build
-    //compile group: 'com.koushikdutta.ion', name: 'ion', version:'+'
-    compile group: 'com.google.code.gson', name: 'gson', version:'+'
-    compile files('libs/androidasync-e1dfb4.jar')
-    compile files('libs/ion-2f46fa.jar')
-
-    compile group: 'com.squareup.okhttp', name: 'okhttp', version:'+'
-    compile group: 'com.squareup.okio', name:'okio', version:'+'
-    compile files('libs/jmdns-fixed.jar')
-    compile files('libs/limelight-common.jar')
-    compile files('libs/tinyrtsp.jar')
-}
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.limelight">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    
-    <uses-feature android:name="android.hardware.touchscreen" android:required="false" />
-    <uses-feature android:name="android.hardware.wifi" android:required="false" />
-    <uses-feature android:name="android.hardware.gamepad" android:required="false" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
-        android:theme="@style/AppTheme" >
-        
-        <!-- Launcher for traditional devices -->
-        <activity
-            android:name=".PcView"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="tv.ouya.intent.category.APP" />
-            </intent-filter>
-        </activity>
-        
-        <!-- Launcher for Android TV devices -->
-        <activity
-            android:name=".PcViewTv"
-            android:logo="@drawable/atv_banner"
-            android:icon="@drawable/atv_banner"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
-            </intent-filter>
-        </activity>
-        
-        <activity
-            android:name=".AppView"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.PcView" />
-        </activity>
-        <activity
-            android:name=".preferences.StreamSettings"
-            android:label="Streaming Settings" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.PcView" />
-        </activity>
-        <activity
-            android:name=".preferences.AddComputerManually"
-            android:label="Add Computer Manually" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.PcView" />
-        </activity>
-        <activity
-            android:name=".Game"
-            android:screenOrientation="sensorLandscape"
-            android:theme="@style/StreamTheme"
-            android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize|layoutDirection" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="com.limelight.Connection" />
-        </activity>
-        <service
-            android:name=".discovery.DiscoveryService"
-            android:label="mDNS PC Auto-Discovery Service" />
-        <service
-            android:name=".computers.ComputerManagerService"
-            android:label="Computer Management Service" />
-    </application>
-
-</manifest>
@@ -1,298 +0,0 @@
-package com.limelight;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.List;
-
-import org.xmlpull.v1.XmlPullParserException;
-
-import com.limelight.binding.PlatformBinding;
-import com.limelight.grid.AppGridAdapter;
-import com.limelight.nvstream.http.GfeHttpResponseException;
-import com.limelight.nvstream.http.NvApp;
-import com.limelight.nvstream.http.NvHTTP;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.SpinnerDialog;
-import com.limelight.utils.UiHelper;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.TextView;
-import android.widget.Toast;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-
-public class AppView extends Activity {
-    private AppGridAdapter appGridAdapter;
-	private InetAddress ipAddress;
-	private String uniqueId;
-	private boolean remote;
-    private boolean firstLoad = true;
-	
-	private final static int RESUME_ID = 1;
-	private final static int QUIT_ID = 2;
-	private final static int CANCEL_ID = 3;
-	
-	public final static String ADDRESS_EXTRA = "Address";
-	public final static String UNIQUEID_EXTRA = "UniqueId";
-	public final static String NAME_EXTRA = "Name";
-	public final static String REMOTE_EXTRA = "Remote";
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		setContentView(R.layout.activity_app_view);
-
-        UiHelper.notifyNewRootView(this);
-		
-		byte[] address = getIntent().getByteArrayExtra(ADDRESS_EXTRA);
-		uniqueId = getIntent().getStringExtra(UNIQUEID_EXTRA);
-		remote = getIntent().getBooleanExtra(REMOTE_EXTRA, false);
-		if (address == null || uniqueId == null) {
-            finish();
-			return;
-		}
-		
-		String labelText = getResources().getString(R.string.title_applist)+" "+getIntent().getStringExtra(NAME_EXTRA);
-		TextView label = (TextView) findViewById(R.id.appListText);
-		setTitle(labelText);
-		label.setText(labelText);
-		
-		try {
-			ipAddress = InetAddress.getByAddress(address);
-		} catch (UnknownHostException e) {
-            e.printStackTrace();
-            finish();
-            return;
-		}
-		
-		// Setup the list view
-        GridView appGrid = (GridView) findViewById(R.id.appGridView);
-        try {
-            appGridAdapter = new AppGridAdapter(this, ipAddress, uniqueId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            finish();
-            return;
-        }
-        appGrid.setAdapter(appGridAdapter);
-        appGrid.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
-                                    long id) {
-                AppObject app = (AppObject) appGridAdapter.getItem(pos);
-                if (app == null || app.app == null) {
-                    return;
-                }
-
-                // Only open the context menu if something is running, otherwise start it
-                if (getRunningAppId() != -1) {
-                    openContextMenu(arg1);
-                } else {
-                    doStart(app.app);
-                }
-            }
-        });
-        registerForContextMenu(appGrid);
-	}
-	
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		
-		SpinnerDialog.closeDialogs(this);
-		Dialog.closeDialogs();
-	}
-	
-	@Override
-	protected void onResume() {
-		super.onResume();
-
-        // Display the error message if it was the
-        // first load, but just kill the activity
-        // on subsequent errors
-        updateAppList(firstLoad);
-        firstLoad = false;
-	}
-	
-	private int getRunningAppId() {
-        int runningAppId = -1;
-        for (int i = 0; i < appGridAdapter.getCount(); i++) {
-        	AppObject app = (AppObject) appGridAdapter.getItem(i);
-        	if (app.app == null) {
-        		continue;
-        	}
-        	
-        	if (app.app.getIsRunning()) {
-        		runningAppId = app.app.getAppId();
-        		break;
-        	}
-        }
-        return runningAppId;
-	}
-	
-	@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);
-        if (selectedApp == null || selectedApp.app == null) {
-        	return;
-        }
-        
-        int runningAppId = getRunningAppId();
-        if (runningAppId != -1) {
-        	if (runningAppId == selectedApp.app.getAppId()) {
-                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_resume));
-                menu.add(Menu.NONE, QUIT_ID, 2, getResources().getString(R.string.applist_menu_quit));
-        	}
-        	else {
-                menu.add(Menu.NONE, RESUME_ID, 1, getResources().getString(R.string.applist_menu_quit_and_start));
-                menu.add(Menu.NONE, CANCEL_ID, 2, getResources().getString(R.string.applist_menu_cancel));
-        	}
-        }
-    }
-	
-	@Override
-	public void onContextMenuClosed(Menu menu) {
-	}
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        AppObject app = (AppObject) appGridAdapter.getItem(info.position);
-        switch (item.getItemId()) {
-            case RESUME_ID:
-                // Resume is the same as start for us
-                doStart(app.app);
-                return true;
-
-            case QUIT_ID:
-                doQuit(app.app);
-                return true;
-
-            case CANCEL_ID:
-                return true;
-
-            default:
-                return super.onContextItemSelected(item);
-        }
-    }
-    
-    private void updateAppList(final boolean displayError) {
-		final SpinnerDialog spinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.applist_refresh_title),
-				getResources().getString(R.string.applist_refresh_msg), true);
-		new Thread() {
-			@Override
-			public void run() {
-				NvHTTP httpConn = new NvHTTP(ipAddress, uniqueId, null,  PlatformBinding.getCryptoProvider(AppView.this));
-				
-				try {
-					final List<NvApp> appList = httpConn.getAppList();
-					
-					AppView.this.runOnUiThread(new Runnable() {
-						@Override
-						public void run() {
-                            appGridAdapter.clear();
-                            for (NvApp app : appList) {
-                                appGridAdapter.addApp(new AppObject(app));
-                            }
-
-                            appGridAdapter.notifyDataSetChanged();
-						}
-					});
-					
-					// Success case
-					return;
-				} catch (GfeHttpResponseException ignored) {
-				} catch (IOException ignored) {
-				} catch (XmlPullParserException ignored) {
-				} finally {
-					spinner.dismiss();
-				}
-
-                if (displayError) {
-                    Dialog.displayDialog(AppView.this, getResources().getString(R.string.applist_refresh_error_title),
-                            getResources().getString(R.string.applist_refresh_error_msg), true);
-                }
-                else {
-                    // Just finish the activity immediately
-                    AppView.this.runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            finish();
-                        }
-                    });
-                }
-			}
-		}.start();
-    }
-	
-	private void doStart(NvApp app) {
-		Intent intent = new Intent(this, Game.class);
-		intent.putExtra(Game.EXTRA_HOST, ipAddress.getHostAddress());
-		intent.putExtra(Game.EXTRA_APP, app.getAppName());
-		intent.putExtra(Game.EXTRA_UNIQUEID, uniqueId);
-		intent.putExtra(Game.EXTRA_STREAMING_REMOTE, remote);
-		startActivity(intent);
-	}
-	
-	private void doQuit(final NvApp app) {
-		Toast.makeText(AppView.this, getResources().getString(R.string.applist_quit_app)+" "+app.getAppName()+"...", Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				NvHTTP httpConn;
-				String message;
-				try {
-					httpConn = new NvHTTP(ipAddress, uniqueId, null,  PlatformBinding.getCryptoProvider(AppView.this));
-					if (httpConn.quitApp()) {
-						message = getResources().getString(R.string.applist_quit_success)+" "+app.getAppName();
-					}
-					else {
-						message = getResources().getString(R.string.applist_quit_fail)+" "+app.getAppName();
-					}
-					updateAppList(true);
-				} catch (UnknownHostException e) {
-					message = getResources().getString(R.string.error_unknown_host);
-				} catch (FileNotFoundException e) {
-					message = getResources().getString(R.string.error_404);
-				} catch (Exception e) {
-					message = e.getMessage();
-				}
-				
-				final String toastMessage = message;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						Toast.makeText(AppView.this, toastMessage, Toast.LENGTH_LONG).show();
-					}
-				});
-			}
-		}).start();
-	}
-	
-	public class AppObject {
-		public NvApp app;
-		
-		public AppObject(NvApp app) {
-			this.app = app;
-		}
-		
-		@Override
-		public String toString() {
-			return app.getAppName();
-		}
-	}
-}
@@ -1,842 +0,0 @@
-package com.limelight;
-
-
-import com.limelight.LimelightBuildProps;
-import com.limelight.binding.PlatformBinding;
-import com.limelight.binding.input.ControllerHandler;
-import com.limelight.binding.input.KeyboardTranslator;
-import com.limelight.binding.input.TouchContext;
-import com.limelight.binding.input.evdev.EvdevListener;
-import com.limelight.binding.input.evdev.EvdevWatcher;
-import com.limelight.binding.video.ConfigurableDecoderRenderer;
-import com.limelight.nvstream.NvConnection;
-import com.limelight.nvstream.NvConnectionListener;
-import com.limelight.nvstream.StreamConfiguration;
-import com.limelight.nvstream.av.video.VideoDecoderRenderer;
-import com.limelight.nvstream.input.KeyboardPacket;
-import com.limelight.nvstream.input.MouseButtonPacket;
-import com.limelight.preferences.PreferenceConfiguration;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.SpinnerDialog;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.Context;
-import android.graphics.Point;
-import android.media.AudioManager;
-import android.net.ConnectivityManager;
-import android.net.wifi.WifiManager;
-import android.os.Bundle;
-import android.os.Handler;
-import android.view.Display;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-import android.view.SurfaceHolder;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.View.OnGenericMotionListener;
-import android.view.View.OnSystemUiVisibilityChangeListener;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
-import android.widget.Toast;
-
-
-public class Game extends Activity implements SurfaceHolder.Callback,
-	OnGenericMotionListener, OnTouchListener, NvConnectionListener, EvdevListener,
-	OnSystemUiVisibilityChangeListener
-{
-	private int lastMouseX = Integer.MIN_VALUE;
-	private int lastMouseY = Integer.MIN_VALUE;
-	private int lastButtonState = 0;
-	
-	// Only 2 touches are supported
-	private TouchContext[] touchContextMap = new TouchContext[2];
-	
-	private ControllerHandler controllerHandler;
-	private KeyboardTranslator keybTranslator;
-	
-	private PreferenceConfiguration prefConfig;
-	private Point screenSize = new Point(0, 0);
-	
-	private NvConnection conn;
-	private SpinnerDialog spinner;
-	private boolean displayedFailureDialog = false;
-	private boolean connecting = false;
-	private boolean connected = false;
-	
-	private EvdevWatcher evdevWatcher;
-	private int modifierFlags = 0;
-	private boolean grabbedInput = true;
-	private boolean grabComboDown = false;
-	
-	private ConfigurableDecoderRenderer decoderRenderer;
-	
-	private WifiManager.WifiLock wifiLock;
-	
-	private int drFlags = 0;
-	
-	public static final String EXTRA_HOST = "Host";
-	public static final String EXTRA_APP = "App";
-	public static final String EXTRA_UNIQUEID = "UniqueId";
-	public static final String EXTRA_STREAMING_REMOTE = "Remote";
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		// We don't want a title bar
-		requestWindowFeature(Window.FEATURE_NO_TITLE);
-		
-		// Full-screen and don't let the display go off
-		getWindow().addFlags(
-				WindowManager.LayoutParams.FLAG_FULLSCREEN |
-				WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
-		
-		// If we're going to use immersive mode, we want to have
-		// the entire screen
-		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-			getWindow().getDecorView().setSystemUiVisibility(
-					View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-					View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-					View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
-			
-			getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
-		}
-		
-		// Listen for UI visibility events
-		getWindow().getDecorView().setOnSystemUiVisibilityChangeListener(this);
-		
-		// Change volume button behavior
-		setVolumeControlStream(AudioManager.STREAM_MUSIC);
-		
-		// Inflate the content
-		setContentView(R.layout.activity_game);
-		
-		// Start the spinner
-		spinner = SpinnerDialog.displayDialog(this, getResources().getString(R.string.conn_establishing_title),
-				getResources().getString(R.string.conn_establishing_msg), true);
-		
-		// Read the stream preferences
-		prefConfig = PreferenceConfiguration.readPreferences(this);
-		switch (prefConfig.decoder) {
-		case PreferenceConfiguration.FORCE_SOFTWARE_DECODER:
-			drFlags |= VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING;
-			break;
-		case PreferenceConfiguration.AUTOSELECT_DECODER:
-			break;
-		case PreferenceConfiguration.FORCE_HARDWARE_DECODER:
-			drFlags |= VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING;
-			break;
-		}
-		
-		if (prefConfig.stretchVideo) {
-			drFlags |= VideoDecoderRenderer.FLAG_FILL_SCREEN;
-		}
-		
-		Display display = getWindowManager().getDefaultDisplay();
-		display.getSize(screenSize);
-		
-		// Listen for events on the game surface
-		SurfaceView sv = (SurfaceView) findViewById(R.id.surfaceView);
-		sv.setOnGenericMotionListener(this);
-		sv.setOnTouchListener(this);
-		        
-		// Warn the user if they're on a metered connection
-		checkDataConnection();
-		
-		// Make sure Wi-Fi is fully powered up
-		WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-		wifiLock = wifiMgr.createWifiLock(WifiManager.WIFI_MODE_FULL_HIGH_PERF, "Limelight");
-		wifiLock.setReferenceCounted(false);
-		wifiLock.acquire();
-		
-		String host = Game.this.getIntent().getStringExtra(EXTRA_HOST);
-		String app = Game.this.getIntent().getStringExtra(EXTRA_APP);
-		String uniqueId = Game.this.getIntent().getStringExtra(EXTRA_UNIQUEID);
-        boolean remote = Game.this.getIntent().getBooleanExtra(EXTRA_STREAMING_REMOTE, false);
-		
-		decoderRenderer = new ConfigurableDecoderRenderer();
-		decoderRenderer.initializeWithFlags(drFlags);
-        
-		StreamConfiguration config = new StreamConfiguration.Builder()
-                .setResolution(prefConfig.width, prefConfig.height)
-                .setRefreshRate(prefConfig.fps)
-                .setApp(app)
-                .setBitrate(prefConfig.bitrate * 1000)
-                .setEnableSops(prefConfig.enableSops)
-                .enableAdaptiveResolution((decoderRenderer.getCapabilities() &
-                        VideoDecoderRenderer.CAPABILITY_ADAPTIVE_RESOLUTION) != 0)
-                .enableLocalAudioPlayback(prefConfig.playHostAudio)
-                .setMaxPacketSize(remote ? 1024 : 1292)
-                .setRemote(remote)
-                .build();
-
-		// Initialize the connection
-		conn = new NvConnection(host, uniqueId, Game.this, config, PlatformBinding.getCryptoProvider(this));
-		keybTranslator = new KeyboardTranslator(conn);
-		controllerHandler = new ControllerHandler(conn, prefConfig.deadzonePercentage);
-		
-		SurfaceHolder sh = sv.getHolder();
-		if (prefConfig.stretchVideo || !decoderRenderer.isHardwareAccelerated()) {
-			// Set the surface to the size of the video
-			sh.setFixedSize(prefConfig.width, prefConfig.height);
-		}
-		
-		// Initialize touch contexts
-		for (int i = 0; i < touchContextMap.length; i++) {
-			touchContextMap[i] = new TouchContext(conn, i,
-                    ((double)prefConfig.width / (double)screenSize.x),
-                    ((double)prefConfig.height / (double)screenSize.y));
-		}
-		
-		if (LimelightBuildProps.ROOT_BUILD) {
-			// Start watching for raw input
-			evdevWatcher = new EvdevWatcher(this);
-			evdevWatcher.start();
-		}
-		
-		// The connection will be started when the surface gets created
-		sh.addCallback(this);
-	}
-	
-	private void resizeSurfaceWithAspectRatio(SurfaceView sv, double vidWidth, double vidHeight)
-	{
-		// Get the visible width of the activity
-	    double visibleWidth = getWindow().getDecorView().getWidth();
-	    
-	    ViewGroup.LayoutParams lp = sv.getLayoutParams();
-	    
-	    // Calculate the new size of the SurfaceView
-	    lp.width = (int) visibleWidth;
-	    lp.height = (int) ((vidHeight / vidWidth) * visibleWidth);
-
-	    // Apply the size change
-	    sv.setLayoutParams(lp);
-	}
-	
-	private void checkDataConnection()
-	{
-		ConnectivityManager mgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
-		if (mgr.isActiveNetworkMetered()) {
-			displayTransientMessage(getResources().getString(R.string.conn_metered));
-		}
-	}
-
-	@SuppressLint("InlinedApi")
-	private Runnable hideSystemUi = new Runnable() {
-			@Override
-			public void run() {
-				// Use immersive mode on 4.4+ or standard low profile on previous builds
-				if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-					Game.this.getWindow().getDecorView().setSystemUiVisibility(
-							View.SYSTEM_UI_FLAG_LAYOUT_STABLE |
-							View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION |
-							View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN |
-							View.SYSTEM_UI_FLAG_HIDE_NAVIGATION |
-							View.SYSTEM_UI_FLAG_FULLSCREEN |
-							View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
-				}
-				else {
-					Game.this.getWindow().getDecorView().setSystemUiVisibility(
-							View.SYSTEM_UI_FLAG_FULLSCREEN |
-							View.SYSTEM_UI_FLAG_LOW_PROFILE);
-				}
-			}
-	};
-
-	private void hideSystemUi(int delay) {
-		Handler h = getWindow().getDecorView().getHandler();
-		if (h != null) {
-			h.removeCallbacks(hideSystemUi);
-			h.postDelayed(hideSystemUi, delay);               
-		}
-	}
-	
-	@Override
-	protected void onStop() {
-		super.onStop();
-		
-		SpinnerDialog.closeDialogs(this);
-		Dialog.closeDialogs();
-		
-		displayedFailureDialog = true;
-		stopConnection();
-		
-		int averageEndToEndLat = decoderRenderer.getAverageEndToEndLatency();
-		int averageDecoderLat = decoderRenderer.getAverageDecoderLatency();
-		String message = null;
-		if (averageEndToEndLat > 0) {
-			message = getResources().getString(R.string.conn_client_latency)+" "+averageEndToEndLat+" ms";
-			if (averageDecoderLat > 0) {
-				message += " ("+getResources().getString(R.string.conn_client_latency_hw)+" "+averageDecoderLat+" ms)";
-			}
-		}
-		else if (averageDecoderLat > 0) {
-			message = getResources().getString(R.string.conn_hardware_latency)+" "+averageDecoderLat+" ms";
-		}
-		
-		if (message != null) {
-			Toast.makeText(this, message, Toast.LENGTH_LONG).show();
-		}
-
-		finish();
-	}
-	
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		
-		wifiLock.release();
-	}
-	
-	private Runnable toggleGrab = new Runnable() {
-		@Override
-		public void run() {
-			
-			if (evdevWatcher != null) {
-				if (grabbedInput) {
-					evdevWatcher.ungrabAll();
-				}
-				else {
-					evdevWatcher.regrabAll();
-				}
-			}
-			
-			grabbedInput = !grabbedInput;
-		}
-	};
-	
-	// Returns true if the key stroke was consumed
-	private boolean handleSpecialKeys(short translatedKey, boolean down) {
-		int modifierMask = 0;
-		
-		// Mask off the high byte
-		translatedKey &= 0xff;
-		
-		if (translatedKey == KeyboardTranslator.VK_CONTROL) {
-			modifierMask = KeyboardPacket.MODIFIER_CTRL;
-		}
-		else if (translatedKey == KeyboardTranslator.VK_SHIFT) {
-			modifierMask = KeyboardPacket.MODIFIER_SHIFT;
-		}
-		else if (translatedKey == KeyboardTranslator.VK_ALT) {
-			modifierMask = KeyboardPacket.MODIFIER_ALT;
-		}
-		
-		if (down) {
-			this.modifierFlags |= modifierMask;
-		}
-		else {
-			this.modifierFlags &= ~modifierMask;
-		}
-		
-		// Check if Ctrl+Shift+Z is pressed
-		if (translatedKey == KeyboardTranslator.VK_Z &&
-			(modifierFlags & (KeyboardPacket.MODIFIER_CTRL | KeyboardPacket.MODIFIER_SHIFT)) ==
-				(KeyboardPacket.MODIFIER_CTRL | KeyboardPacket.MODIFIER_SHIFT))
-		{
-			if (down) {
-				// Now that we've pressed the magic combo
-				// we'll wait for one of the keys to come up
-				grabComboDown = true;
-			}
-			else {
-				// Toggle the grab if Z comes up
-				Handler h = getWindow().getDecorView().getHandler();
-				if (h != null) {
-					h.postDelayed(toggleGrab, 250);               
-				}
-				
-				grabComboDown = false;
-			}
-			
-			return true;
-		}
-		// Toggle the grab if control or shift comes up
-		else if (grabComboDown) {
-			Handler h = getWindow().getDecorView().getHandler();
-			if (h != null) {
-				h.postDelayed(toggleGrab, 250);               
-			}
-			
-			grabComboDown = false;
-			return true;
-		}
-		
-		// Not a special combo
-		return false;
-	}
-	
-	private static byte getModifierState(KeyEvent event) {
-		byte modifier = 0;
-		if (event.isShiftPressed()) {
-			modifier |= KeyboardPacket.MODIFIER_SHIFT;
-		}
-		if (event.isCtrlPressed()) {
-			modifier |= KeyboardPacket.MODIFIER_CTRL;
-		}
-		if (event.isAltPressed()) {
-			modifier |= KeyboardPacket.MODIFIER_ALT;
-		}
-		return modifier;
-	}
-	
-	private byte getModifierState() {
-		return (byte) modifierFlags;
-	}
-	
-	@Override
-	public boolean onKeyDown(int keyCode, KeyEvent event) {
-		// Pass-through virtual navigation keys
-		if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
-			return super.onKeyDown(keyCode, event);
-		}
-		
-		// Try the controller handler first
-		boolean handled = controllerHandler.handleButtonDown(event);
-		if (!handled) {
-			// Try the keyboard handler
-			short translated = keybTranslator.translate(event.getKeyCode());
-			if (translated == 0) {
-				return super.onKeyDown(keyCode, event);
-			}
-			
-			// Let this method take duplicate key down events
-			if (handleSpecialKeys(translated, true)) {
-				return true;
-			}
-			
-			// Eat repeat down events
-			if (event.getRepeatCount() > 0) {
-				return true;
-			}
-			
-			// Pass through keyboard input if we're not grabbing
-			if (!grabbedInput) {
-				return super.onKeyDown(keyCode, event);
-			}
-			
-			keybTranslator.sendKeyDown(translated,
-					getModifierState(event));
-		}
-		
-		return true;
-	}
-	
-	@Override
-	public boolean onKeyUp(int keyCode, KeyEvent event) {
-		// Pass-through virtual navigation keys
-		if ((event.getFlags() & KeyEvent.FLAG_VIRTUAL_HARD_KEY) != 0) {
-			return super.onKeyUp(keyCode, event);
-		}
-		
-		// Try the controller handler first
-		boolean handled = controllerHandler.handleButtonUp(event);
-		if (!handled) {
-			// Try the keyboard handler
-			short translated = keybTranslator.translate(event.getKeyCode());
-			if (translated == 0) {
-				return super.onKeyUp(keyCode, event);
-			}
-			
-			if (handleSpecialKeys(translated, false)) {
-				return true;
-			}
-			
-			// Pass through keyboard input if we're not grabbing
-			if (!grabbedInput) {
-				return super.onKeyUp(keyCode, event);
-			}
-			
-			keybTranslator.sendKeyUp(translated,
-					getModifierState(event));
-		}
-		
-		return true;
-	}
-	
-	private TouchContext getTouchContext(int actionIndex)
-	{	
-		if (actionIndex < touchContextMap.length) {
-			return touchContextMap[actionIndex];
-		}
-		else {
-			return null;
-		}
-	}
-
-	// Returns true if the event was consumed
-	private boolean handleMotionEvent(MotionEvent event) {
-		// Pass through keyboard input if we're not grabbing
-		if (!grabbedInput) {
-			return false;
-		}
-
-		if ((event.getSource() & InputDevice.SOURCE_CLASS_JOYSTICK) != 0) {
-			if (controllerHandler.handleMotionEvent(event)) {
-				return true;
-			}		
-		}
-		else if ((event.getSource() & InputDevice.SOURCE_CLASS_POINTER) != 0)
-		{
-			// This case is for touch-based input devices
-			if (event.getSource() == InputDevice.SOURCE_TOUCHSCREEN ||
-					event.getSource() == InputDevice.SOURCE_STYLUS)
-			{
-				int actionIndex = event.getActionIndex();
-
-				int eventX = (int)event.getX(actionIndex);
-				int eventY = (int)event.getY(actionIndex);
-
-				TouchContext context = getTouchContext(actionIndex);
-				if (context == null) {
-					return false;
-				}
-
-				switch (event.getActionMasked())
-				{
-				case MotionEvent.ACTION_POINTER_DOWN:
-				case MotionEvent.ACTION_DOWN:
-					context.touchDownEvent(eventX, eventY);
-					break;
-				case MotionEvent.ACTION_POINTER_UP:
-				case MotionEvent.ACTION_UP:
-					context.touchUpEvent(eventX, eventY);
-					if (actionIndex == 0 && event.getPointerCount() > 1) {
-						// The original secondary touch now becomes primary
-						context.touchDownEvent((int)event.getX(1), (int)event.getY(1));
-					}
-					break;
-				case MotionEvent.ACTION_MOVE:
-					// ACTION_MOVE is special because it always has actionIndex == 0
-					// We'll call the move handlers for all indexes manually
-
-                    // First process the historical events
-                    for (int i = 0; i < event.getHistorySize(); i++) {
-                        for (TouchContext aTouchContextMap : touchContextMap) {
-                            if (aTouchContextMap.getActionIndex() < event.getPointerCount())
-                            {
-                                aTouchContextMap.touchMoveEvent(
-                                        (int)event.getHistoricalX(aTouchContextMap.getActionIndex(), i),
-                                        (int)event.getHistoricalY(aTouchContextMap.getActionIndex(), i));
-                            }
-                        }
-                    }
-
-                    // Now process the current values
-                    for (TouchContext aTouchContextMap : touchContextMap) {
-                        if (aTouchContextMap.getActionIndex() < event.getPointerCount())
-                        {
-                            aTouchContextMap.touchMoveEvent(
-                                    (int)event.getX(aTouchContextMap.getActionIndex()),
-                                    (int)event.getY(aTouchContextMap.getActionIndex()));
-                        }
-                    }
-					break;
-				default:
-					return false;
-				}
-			}
-			// This case is for mice
-			else if (event.getSource() == InputDevice.SOURCE_MOUSE)
-			{
-				int changedButtons = event.getButtonState() ^ lastButtonState;
-				
-				if (event.getActionMasked() == MotionEvent.ACTION_SCROLL) {
-					// Send the vertical scroll packet
-					byte vScrollClicks = (byte) event.getAxisValue(MotionEvent.AXIS_VSCROLL);
-					conn.sendMouseScroll(vScrollClicks);
-				}
-
-				if ((changedButtons & MotionEvent.BUTTON_PRIMARY) != 0) {
-					if ((event.getButtonState() & MotionEvent.BUTTON_PRIMARY) != 0) {
-						conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_LEFT);
-					}
-					else {
-						conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_LEFT);
-					}
-				}
-
-				if ((changedButtons & MotionEvent.BUTTON_SECONDARY) != 0) {
-					if ((event.getButtonState() & MotionEvent.BUTTON_SECONDARY) != 0) {
-						conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_RIGHT);
-					}
-					else {
-						conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_RIGHT);
-					}
-				}
-
-				if ((changedButtons & MotionEvent.BUTTON_TERTIARY) != 0) {
-					if ((event.getButtonState() & MotionEvent.BUTTON_TERTIARY) != 0) {
-						conn.sendMouseButtonDown(MouseButtonPacket.BUTTON_MIDDLE);
-					}
-					else {
-						conn.sendMouseButtonUp(MouseButtonPacket.BUTTON_MIDDLE);
-					}
-				}
-
-                // First process the history
-                for (int i = 0; i < event.getHistorySize(); i++) {
-                    updateMousePosition((int)event.getHistoricalX(i), (int)event.getHistoricalY(i));
-                }
-
-                // Now process the current values
-                updateMousePosition((int)event.getX(), (int)event.getY());
-
-                lastButtonState = event.getButtonState();
-			}
-			else
-			{
-				// Unknown source
-				return false;
-			}
-
-			// Handled a known source
-			return true;
-		}
-
-		// Unknown class
-		return false;
-	}
-	
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-        return handleMotionEvent(event) || super.onTouchEvent(event);
-
-    }
-
-	@Override
-	public boolean onGenericMotionEvent(MotionEvent event) {
-        return handleMotionEvent(event) || super.onGenericMotionEvent(event);
-
-    }
-	
-	private void updateMousePosition(int eventX, int eventY) {
-		// Send a mouse move if we already have a mouse location
-		// and the mouse coordinates change
-		if (lastMouseX != Integer.MIN_VALUE &&
-			lastMouseY != Integer.MIN_VALUE &&
-			!(lastMouseX == eventX && lastMouseY == eventY))
-		{
-			int deltaX = eventX - lastMouseX;
-			int deltaY = eventY - lastMouseY;
-			
-			// Scale the deltas if the device resolution is different
-			// than the stream resolution
-			deltaX = (int)Math.round((double)deltaX * ((double)prefConfig.width / (double)screenSize.x));
-			deltaY = (int)Math.round((double)deltaY * ((double)prefConfig.height / (double)screenSize.y));
-			
-			conn.sendMouseMove((short)deltaX, (short)deltaY);
-		}
-		
-		// Update pointer location for delta calculation next time
-		lastMouseX = eventX;
-		lastMouseY = eventY;
-	}
-
-	@Override
-	public boolean onGenericMotion(View v, MotionEvent event) {
-		return handleMotionEvent(event);
-	}
-
-	@SuppressLint("ClickableViewAccessibility")
-	@Override
-	public boolean onTouch(View v, MotionEvent event) {
-		return handleMotionEvent(event);
-	}
-
-	@Override
-	public void stageStarting(Stage stage) {
-		if (spinner != null) {
-			spinner.setMessage(getResources().getString(R.string.conn_starting)+" "+stage.getName());
-		}
-	}
-
-	@Override
-	public void stageComplete(Stage stage) {
-	}
-	
-	private void stopConnection() {
-		if (connecting || connected) {
-			connecting = connected = false;
-			conn.stop();
-		}
-		
-		// Close the Evdev watcher to allow use of captured input devices
-		if (evdevWatcher != null) {
-			evdevWatcher.shutdown();
-			evdevWatcher = null;
-		}
-	}
-
-	@Override
-	public void stageFailed(Stage stage) {
-		if (spinner != null) {
-			spinner.dismiss();
-			spinner = null;
-		}
-
-		if (!displayedFailureDialog) {
-			displayedFailureDialog = true;
-			stopConnection();
-			Dialog.displayDialog(this, getResources().getString(R.string.conn_error_title),
-					getResources().getString(R.string.conn_error_msg)+" "+stage.getName(), true);
-		}
-	}
-
-	@Override
-	public void connectionTerminated(Exception e) {
-		if (!displayedFailureDialog) {
-			displayedFailureDialog = true;
-			e.printStackTrace();
-			
-			stopConnection();
-			Dialog.displayDialog(this, getResources().getString(R.string.conn_terminated_title),
-					getResources().getString(R.string.conn_terminated_msg), true);
-		}
-	}
-
-	@Override
-	public void connectionStarted() {
-		if (spinner != null) {
-			spinner.dismiss();
-			spinner = null;
-		}
-		
-		connecting = false;
-		connected = true;
-		
-		hideSystemUi(1000);
-	}
-
-	@Override
-	public void displayMessage(final String message) {
-		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(Game.this, message, Toast.LENGTH_LONG).show();
-			}
-		});
-	}
-
-	@Override
-	public void displayTransientMessage(final String message) {
-		if (!prefConfig.disableWarnings) {
-			runOnUiThread(new Runnable() {
-				@Override
-				public void run() {
-					Toast.makeText(Game.this, message, Toast.LENGTH_LONG).show();
-				}
-			});	
-		}
-	}
-
-	@Override
-	public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
-	}
-
-	@Override
-	public void surfaceCreated(SurfaceHolder holder) {
-		if (!connected && !connecting) {
-			connecting = true;
-			
-			// Resize the surface to match the aspect ratio of the video
-			// This must be done after the surface is created.
-			if (!prefConfig.stretchVideo && decoderRenderer.isHardwareAccelerated()) {
-				resizeSurfaceWithAspectRatio((SurfaceView) findViewById(R.id.surfaceView),
-                        prefConfig.width, prefConfig.height);
-			}
-			
-			conn.start(PlatformBinding.getDeviceName(), holder, drFlags,
-					PlatformBinding.getAudioRenderer(), decoderRenderer);
-		}
-	}
-
-	@Override
-	public void surfaceDestroyed(SurfaceHolder holder) {
-		if (connected) {
-			stopConnection();
-		}
-	}
-
-	@Override
-	public void mouseMove(int deltaX, int deltaY) {
-		conn.sendMouseMove((short) deltaX, (short) deltaY);
-	}
-
-	@Override
-	public void mouseButtonEvent(int buttonId, boolean down) {
-		byte buttonIndex;
-		
-		switch (buttonId)
-		{
-		case EvdevListener.BUTTON_LEFT:
-			buttonIndex = MouseButtonPacket.BUTTON_LEFT;
-			break;
-		case EvdevListener.BUTTON_MIDDLE:
-			buttonIndex = MouseButtonPacket.BUTTON_MIDDLE;
-			break;
-		case EvdevListener.BUTTON_RIGHT:
-			buttonIndex = MouseButtonPacket.BUTTON_RIGHT;
-			break;
-		default:
-			LimeLog.warning("Unhandled button: "+buttonId);
-			return;
-		}
-		
-		if (down) {
-			conn.sendMouseButtonDown(buttonIndex);
-		}
-		else {
-			conn.sendMouseButtonUp(buttonIndex);
-		}
-	}
-
-	@Override
-	public void mouseScroll(byte amount) {
-		conn.sendMouseScroll(amount);
-	}
-
-	@Override
-	public void keyboardEvent(boolean buttonDown, short keyCode) {
-		short keyMap = keybTranslator.translate(keyCode);
-		if (keyMap != 0) {
-			if (handleSpecialKeys(keyMap, buttonDown)) {
-				return;
-			}
-			
-			if (buttonDown) {
-				keybTranslator.sendKeyDown(keyMap, getModifierState());
-			}
-			else {
-				keybTranslator.sendKeyUp(keyMap, getModifierState());
-			}
-		}
-	}
-
-	@Override
-	public void onSystemUiVisibilityChange(int visibility) {
-		// Don't do anything if we're not connected
-		if (!connected) {
-			return;
-		}
-		
-		// This flag is set for all devices
-		if ((visibility & View.SYSTEM_UI_FLAG_FULLSCREEN) == 0) {
-			hideSystemUi(2000);
-		}
-		// This flag is only set on 4.4+
-		else if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT &&
-				 (visibility & View.SYSTEM_UI_FLAG_HIDE_NAVIGATION) == 0) {
-			hideSystemUi(2000);
-		}
-		// This flag is only set before 4.4+
-		else if (android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.KITKAT &&
-				 (visibility & View.SYSTEM_UI_FLAG_LOW_PROFILE) == 0) {
-			hideSystemUi(2000);	 
-		}
-	}
-}
@@ -1,577 +0,0 @@
-package com.limelight;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-
-import com.limelight.binding.PlatformBinding;
-import com.limelight.binding.crypto.AndroidCryptoProvider;
-import com.limelight.computers.ComputerManagerListener;
-import com.limelight.computers.ComputerManagerService;
-import com.limelight.grid.PcGridAdapter;
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvHTTP;
-import com.limelight.nvstream.http.PairingManager;
-import com.limelight.nvstream.http.PairingManager.PairState;
-import com.limelight.nvstream.wol.WakeOnLanSender;
-import com.limelight.preferences.AddComputerManually;
-import com.limelight.preferences.StreamSettings;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.UiHelper;
-
-import android.app.Activity;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.content.res.Configuration;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.preference.PreferenceManager;
-import android.view.ContextMenu;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ContextMenu.ContextMenuInfo;
-import android.view.View.OnClickListener;
-import android.widget.AdapterView;
-import android.widget.AdapterView.OnItemClickListener;
-import android.widget.GridView;
-import android.widget.ImageButton;
-import android.widget.RelativeLayout;
-import android.widget.Toast;
-import android.widget.AdapterView.AdapterContextMenuInfo;
-
-public class PcView extends Activity {
-    private RelativeLayout noPcFoundLayout;
-    private PcGridAdapter pcGridAdapter;
-	private ComputerManagerService.ComputerManagerBinder managerBinder;
-	private boolean freezeUpdates, runningPolling;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, IBinder binder) {
-			final ComputerManagerService.ComputerManagerBinder localBinder =
-					((ComputerManagerService.ComputerManagerBinder)binder);
-			
-			// Wait in a separate thread to avoid stalling the UI
-			new Thread() {
-				@Override
-				public void run() {
-					// Wait for the binder to be ready
-					localBinder.waitForReady();
-					
-					// Now make the binder visible
-					managerBinder = localBinder;
-					
-					// Start updates
-					startComputerUpdates();
-					
-					// Force a keypair to be generated early to avoid discovery delays
-					new AndroidCryptoProvider(PcView.this).getClientCertificate();
-				}
-			}.start();
-		}
-
-		public void onServiceDisconnected(ComponentName className) {
-			managerBinder = null;
-		}
-	};
-	
-	public void onConfigurationChanged(Configuration newConfig) {
-		super.onConfigurationChanged(newConfig);
-		
-		// Reinitialize views just in case orientation changed
-		initializeViews();
-	}
-	
-	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;
-	private final static int DELETE_ID = 5;
-	
-	private void initializeViews() {
-		setContentView(R.layout.activity_pc_view);
-
-        UiHelper.notifyNewRootView(this);
-
-        // Set default preferences if we've never been run
-        PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
-
-		// Setup the list view
-        ImageButton settingsButton = (ImageButton) findViewById(R.id.settingsButton);
-        ImageButton addComputerButton = (ImageButton) findViewById(R.id.manuallyAddPc);
-
-        GridView pcGrid = (GridView) findViewById(R.id.pcGridView);
-        pcGrid.setAdapter(pcGridAdapter);
-        pcGrid.setOnItemClickListener(new OnItemClickListener() {
-            @Override
-            public void onItemClick(AdapterView<?> arg0, View arg1, int pos,
-                                    long id) {
-                ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(pos);
-                if (computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-                    // Do nothing
-                } else if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
-                    // Open the context menu if a PC is offline
-                    openContextMenu(arg1);
-                } else if (computer.details.pairState != PairState.PAIRED) {
-                    // Pair an unpaired machine by default
-                    doPair(computer.details);
-                } else {
-                    doAppList(computer.details);
-                }
-            }
-        });
-		registerForContextMenu(pcGrid);
-		settingsButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                startActivity(new Intent(PcView.this, StreamSettings.class));
-            }
-        });
-		addComputerButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent i = new Intent(PcView.this, AddComputerManually.class);
-                startActivity(i);
-            }
-        });
-
-        noPcFoundLayout = (RelativeLayout) findViewById(R.id.no_pc_found_layout);
-        if (pcGridAdapter.getCount() == 0) {
-            noPcFoundLayout.setVisibility(View.VISIBLE);
-        }
-        else {
-            noPcFoundLayout.setVisibility(View.INVISIBLE);
-        }
-        pcGridAdapter.notifyDataSetChanged();
-    }
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		// Bind to the computer manager service
-		bindService(new Intent(PcView.this, ComputerManagerService.class), serviceConnection,
-				Service.BIND_AUTO_CREATE);
-
-        pcGridAdapter = new PcGridAdapter(this);
-		
-		initializeViews();
-	}
-	
-	private void startComputerUpdates() {
-		if (managerBinder != null) {
-			if (runningPolling) {
-				return;
-			}
-			
-			freezeUpdates = false;
-			managerBinder.startPolling(new ComputerManagerListener() {
-				@Override
-				public void notifyComputerUpdated(final ComputerDetails details) {
-					if (!freezeUpdates) {
-						PcView.this.runOnUiThread(new Runnable() {
-							@Override
-							public void run() {
-								updateComputer(details);
-							}
-						});
-					}
-				}
-			});
-			runningPolling = true;
-		}
-	}
-	
-	private void stopComputerUpdates(boolean wait) {
-		if (managerBinder != null) {
-			if (!runningPolling) {
-				return;
-			}
-			
-			freezeUpdates = true;
-			
-			managerBinder.stopPolling();
-			
-			if (wait) {
-				managerBinder.waitForPollingStopped();
-			}
-			
-			runningPolling = false;
-		}
-	}
-	
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		
-		if (managerBinder != null) {
-			unbindService(serviceConnection);
-		}
-	}
-	
-	@Override
-	protected void onResume() {
-		super.onResume();
-		
-		startComputerUpdates();
-	}
-	
-	@Override
-	protected void onPause() {
-		super.onPause();
-		
-		stopComputerUpdates(false);
-	}
-	
-	@Override
-	protected void onStop() {
-		super.onStop();
-		
-		Dialog.closeDialogs();
-	}
-	
-	@Override
-	public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
-		stopComputerUpdates(false);
-		
-		// Call superclass
-		super.onCreateContextMenu(menu, v, menuInfo);
-                
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
-        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        if (computer == null || computer.details == null ||
-                computer.details.reachability == ComputerDetails.Reachability.UNKNOWN) {
-        	startComputerUpdates();
-        	return;
-        }
-        
-        // Inflate the context menu
-        if (computer.details.reachability == ComputerDetails.Reachability.OFFLINE) {
-            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 {
-            menu.add(Menu.NONE, APP_LIST_ID, 1, getResources().getString(R.string.pcview_menu_app_list));
-            menu.add(Menu.NONE, UNPAIR_ID, 2, getResources().getString(R.string.pcview_menu_unpair_pc));
-        }
-    }
-	
-	@Override
-	public void onContextMenuClosed(Menu menu) {
-		startComputerUpdates();
-	}
-	
-	private void doPair(final ComputerDetails computer) {
-		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_offline), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		if (computer.runningGameId != 0) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.pair_pc_ingame), Toast.LENGTH_LONG).show();
-			return;
-		}
-		if (managerBinder == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-			return;
-		}
-		
-		Toast.makeText(PcView.this, getResources().getString(R.string.pairing), Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				NvHTTP httpConn;
-				String message;
-                boolean success = false;
-				try {
-					// Stop updates and wait while pairing
-					stopComputerUpdates(true);
-					
-					InetAddress addr = null;
-					if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-						addr = computer.localIp;
-					}
-					else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-						addr = computer.remoteIp;
-					}
-					
-					httpConn = new NvHTTP(addr,
-							managerBinder.getUniqueId(),
-							PlatformBinding.getDeviceName(), 
-							PlatformBinding.getCryptoProvider(PcView.this));
-					if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
-                        // Don't display any toast, but open the app list
-						message = null;
-                        success = true;
-					}
-					else {
-						final String pinStr = PairingManager.generatePinString();
-						
-						// Spin the dialog off in a thread because it blocks
-						Dialog.displayDialog(PcView.this, getResources().getString(R.string.pair_pairing_title),
-								getResources().getString(R.string.pair_pairing_msg)+" "+pinStr, false);
-						
-						PairingManager.PairState pairState = httpConn.pair(pinStr);
-						if (pairState == PairingManager.PairState.PIN_WRONG) {
-							message = getResources().getString(R.string.pair_incorrect_pin);
-						}
-						else if (pairState == PairingManager.PairState.FAILED) {
-							message = getResources().getString(R.string.pair_fail);
-						}
-						else if (pairState == PairingManager.PairState.PAIRED) {
-                            // Just navigate to the app view without displaying a toast
-                            message = null;
-                            success = true;
-						}
-						else {
-							// Should be no other values
-							message = null;
-						}
-					}
-				} catch (UnknownHostException e) {
-					message = getResources().getString(R.string.error_unknown_host);
-				} catch (FileNotFoundException e) {
-					message = getResources().getString(R.string.error_404);
-				} catch (Exception e) {
-                    e.printStackTrace();
-					message = e.getMessage();
-				}
-				
-				Dialog.closeDialogs();
-				
-				final String toastMessage = message;
-                final boolean toastSuccess = success;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-                        if (toastMessage != null) {
-                            Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
-                        }
-
-                        if (toastSuccess) {
-                            // Open the app list after a successful pairing attemp
-                            doAppList(computer);
-                        }
-					}
-				});
-				
-				// Start polling again
-				startComputerUpdates();
-			}
-		}).start();
-	}
-	
-	private void doWakeOnLan(final ComputerDetails computer) {
-		if (computer.reachability != ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.wol_pc_online), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		
-		if (computer.macAddress == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.wol_no_mac), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		
-		Toast.makeText(PcView.this, getResources().getString(R.string.wol_waking_pc), Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				String message;
-				try {
-					WakeOnLanSender.sendWolPacket(computer);
-					message = getResources().getString(R.string.wol_waking_msg);
-				} catch (IOException e) {
-					message = getResources().getString(R.string.wol_fail);
-				}
-				
-				final String toastMessage = message;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
-					}
-				});
-			}
-		}).start();
-	}
-	
-	private void doUnpair(final ComputerDetails computer) {
-		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		if (managerBinder == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-			return;
-		}
-		
-		Toast.makeText(PcView.this, getResources().getString(R.string.unpairing), Toast.LENGTH_SHORT).show();
-		new Thread(new Runnable() {
-			@Override
-			public void run() {
-				NvHTTP httpConn;
-				String message;
-				try {
-					InetAddress addr = null;
-					if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-						addr = computer.localIp;
-					}
-					else if (computer.reachability == ComputerDetails.Reachability.REMOTE) {
-						addr = computer.remoteIp;
-					}
-					
-					httpConn = new NvHTTP(addr,
-							managerBinder.getUniqueId(),
-							PlatformBinding.getDeviceName(), 
-							PlatformBinding.getCryptoProvider(PcView.this));
-					if (httpConn.getPairState() == PairingManager.PairState.PAIRED) {
-						httpConn.unpair();
-						if (httpConn.getPairState() == PairingManager.PairState.NOT_PAIRED) {
-							message = getResources().getString(R.string.unpair_success);
-						}
-						else {
-							message = getResources().getString(R.string.unpair_fail);
-						}
-					}
-					else {
-						message = getResources().getString(R.string.unpair_error);
-					}
-				} catch (UnknownHostException e) {
-					message = getResources().getString(R.string.error_unknown_host);
-				} catch (FileNotFoundException e) {
-					message = getResources().getString(R.string.error_404);
-				} catch (Exception e) {
-					message = e.getMessage();
-				}
-								
-				final String toastMessage = message;
-				runOnUiThread(new Runnable() {
-					@Override
-					public void run() {
-						Toast.makeText(PcView.this, toastMessage, Toast.LENGTH_LONG).show();
-					}
-				});
-			}
-		}).start();
-	}
-	
-	private void doAppList(ComputerDetails computer) {
-		if (computer.reachability == ComputerDetails.Reachability.OFFLINE) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_pc_offline), Toast.LENGTH_SHORT).show();
-			return;
-		}
-		if (managerBinder == null) {
-			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-			return;
-		}
-		
-		Intent i = new Intent(this, AppView.class);
-		i.putExtra(AppView.NAME_EXTRA, computer.name);
-		i.putExtra(AppView.UNIQUEID_EXTRA, managerBinder.getUniqueId());
-		
-		if (computer.reachability == ComputerDetails.Reachability.LOCAL) {
-			i.putExtra(AppView.ADDRESS_EXTRA, computer.localIp.getAddress());
-			i.putExtra(AppView.REMOTE_EXTRA, false);
-		}
-		else {
-			i.putExtra(AppView.ADDRESS_EXTRA, computer.remoteIp.getAddress());
-			i.putExtra(AppView.REMOTE_EXTRA, true);
-		}
-		startActivity(i);
-	}
-
-    @Override
-    public boolean onContextItemSelected(MenuItem item) {
-        AdapterContextMenuInfo info = (AdapterContextMenuInfo) item.getMenuInfo();
-        ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(info.position);
-        switch (item.getItemId())
-        {
-        case PAIR_ID:
-        	doPair(computer.details);
-        	return true;
-        	
-        case UNPAIR_ID:
-        	doUnpair(computer.details);
-        	return true;
-        	
-        case WOL_ID:
-        	doWakeOnLan(computer.details);
-        	return true;
-        	
-        case DELETE_ID:
-    		if (managerBinder == null) {
-    			Toast.makeText(PcView.this, getResources().getString(R.string.error_manager_not_running), Toast.LENGTH_LONG).show();
-    			return true;
-    		}
-        	managerBinder.removeComputer(computer.details.name);
-        	removeComputer(computer.details);
-        	return true;
-        	
-        case APP_LIST_ID:
-        	doAppList(computer.details);
-        	return true;
-        	
-        default:
-          return super.onContextItemSelected(item);
-        }
-    }
-    
-    private void removeComputer(ComputerDetails details) {
-		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-			
-			if (details.equals(computer.details)) {
-                pcGridAdapter.removeComputer(computer);
-                pcGridAdapter.notifyDataSetChanged();
-				break;
-			}
-		}
-    }
-    
-	private void updateComputer(ComputerDetails details) {
-		ComputerObject existingEntry = null;
-		
-		for (int i = 0; i < pcGridAdapter.getCount(); i++) {
-			ComputerObject computer = (ComputerObject) pcGridAdapter.getItem(i);
-			
-			// Check if this is the same computer
-			if (details.equals(computer.details)) {
-				existingEntry = computer;
-				break;
-			}
-		}
-		
-		if (existingEntry != null) {
-			// Replace the information in the existing entry
-			existingEntry.details = details;
-		}
-		else {
-			// Add a new entry
-            pcGridAdapter.addComputer(new ComputerObject(details));
-
-            // Remove the "Discovery in progress" view
-            noPcFoundLayout.setVisibility(View.INVISIBLE);
-		}
-
-        // Notify the view that the data has changed
-        pcGridAdapter.notifyDataSetChanged();
-	}
-	
-	public class ComputerObject {
-		public ComputerDetails details;
-		
-		public ComputerObject(ComputerDetails details) {
-			this.details = details;
-		}
-		
-		@Override
-		public String toString() {
-			return details.name;
-		}
-	}
-}
@@ -1,6 +0,0 @@
-package com.limelight;
-
-/* This is a dummy class to allow for a separate icon
- * and launcher for TV.
- */
-public class PcViewTv extends PcView {}
@@ -1,97 +0,0 @@
-package com.limelight.binding.audio;
-
-import android.media.AudioFormat;
-import android.media.AudioManager;
-import android.media.AudioTrack;
-
-import com.limelight.LimeLog;
-import com.limelight.nvstream.av.audio.AudioRenderer;
-
-public class AndroidAudioRenderer implements AudioRenderer {
-
-	public static final int FRAME_SIZE = 960;
-	
-	private AudioTrack track;
-
-	@Override
-	public boolean streamInitialized(int channelCount, int sampleRate) {
-		int channelConfig;
-		int bufferSize;
-
-		switch (channelCount)
-		{
-		case 1:
-			channelConfig = AudioFormat.CHANNEL_OUT_MONO;
-			break;
-		case 2:
-			channelConfig = AudioFormat.CHANNEL_OUT_STEREO;
-			break;
-		default:
-			LimeLog.severe("Decoder returned unhandled channel count");
-			return false;
-		}
-
-        // 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.
-        // We'll try the small buffer size first and if it fails,
-        // use the recommended larger buffer size.
-        try {
-            // Buffer two frames of audio if possible
-            bufferSize = FRAME_SIZE * 2;
-
-            track = new AudioTrack(AudioManager.STREAM_MUSIC,
-                    sampleRate,
-                    channelConfig,
-                    AudioFormat.ENCODING_PCM_16BIT,
-                    bufferSize,
-                    AudioTrack.MODE_STREAM);
-            track.play();
-        } catch (Exception e) {
-            // Try to release the AudioTrack if we got far enough
-            try {
-                if (track != null) {
-                    track.release();
-                }
-            } catch (Exception ignored) {}
-
-            // Now try the larger buffer size
-            bufferSize = Math.max(AudioTrack.getMinBufferSize(sampleRate,
-                            channelConfig,
-                            AudioFormat.ENCODING_PCM_16BIT),
-                    FRAME_SIZE * 2);
-
-            // Round to next frame
-            bufferSize = (((bufferSize + (FRAME_SIZE - 1)) / FRAME_SIZE) * FRAME_SIZE);
-
-            track = new AudioTrack(AudioManager.STREAM_MUSIC,
-                    sampleRate,
-                    channelConfig,
-                    AudioFormat.ENCODING_PCM_16BIT,
-                    bufferSize,
-                    AudioTrack.MODE_STREAM);
-            track.play();
-        }
-		
-		LimeLog.info("Audio track buffer size: "+bufferSize);
-
-		return true;
-	}
-
-	@Override
-	public void playDecodedAudio(byte[] audioData, int offset, int length) {
-		track.write(audioData, offset, length);
-	}
-
-	@Override
-	public void streamClosing() {
-		if (track != null) {
-			track.release();
-		}
-	}
-
-	@Override
-	public int getCapabilities() {
-		return 0;
-	}
-}
@@ -1,731 +0,0 @@
-package com.limelight.binding.input;
-
-import java.util.HashMap;
-
-import android.os.SystemClock;
-import android.view.InputDevice;
-import android.view.KeyEvent;
-import android.view.MotionEvent;
-
-import com.limelight.LimeLog;
-import com.limelight.nvstream.NvConnection;
-import com.limelight.nvstream.input.ControllerPacket;
-import com.limelight.utils.Vector2d;
-
-public class ControllerHandler {
-	private short inputMap = 0x0000;
-	private byte leftTrigger = 0x00;
-	private byte rightTrigger = 0x00;
-	private short rightStickX = 0x0000;
-	private short rightStickY = 0x0000;
-	private short leftStickX = 0x0000;
-	private short leftStickY = 0x0000;
-	private int emulatingButtonFlags = 0;
-	
-	// 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
-	// a bumper up and compare that to our maximum delay when we receive
-	// a Start button press to see if we should activate one of our 
-	// emulated button combos.
-	private long lastLbUpTime = 0;
-	private long lastRbUpTime = 0;
-	private static final int MAXIMUM_BUMPER_UP_DELAY_MS = 100;
-	
-	private static final int MINIMUM_BUTTON_DOWN_TIME_MS = 25;
-	
-	private static final int EMULATING_SPECIAL = 0x1;
-	private static final int EMULATING_SELECT = 0x2;
-	
-	private static final int EMULATED_SPECIAL_UP_DELAY_MS = 100;
-	private static final int EMULATED_SELECT_UP_DELAY_MS = 30;
-	
-	private Vector2d inputVector = new Vector2d();
-	
-	private HashMap<String, ControllerMapping> mappings = new HashMap<String, ControllerMapping>();
-	
-	private NvConnection conn;
-    private double stickDeadzone;
-    private final ControllerMapping defaultMapping = new ControllerMapping();
-    private boolean hasGameController;
-	
-	public ControllerHandler(NvConnection conn, int deadzonePercentage) {
-		this.conn = conn;
-
-        // HACK: For now we're hardcoding a 10% deadzone. Some deadzone
-        // is required for controller batching support to work.
-        deadzonePercentage = 10;
-
-        int[] ids = InputDevice.getDeviceIds();
-        for (int i = 0; i < ids.length; i++) {
-            InputDevice dev = InputDevice.getDevice(ids[i]);
-            if ((dev.getSources() & InputDevice.SOURCE_JOYSTICK) != 0 ||
-                    (dev.getSources() & InputDevice.SOURCE_GAMEPAD) != 0) {
-                // This looks like a gamepad, but we'll check X and Y to be sure
-                if (getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_X) != null &&
-                    getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Y) != null) {
-                    // This is a gamepad
-                    hasGameController = true;
-                }
-            }
-        }
-
-        // 1% is the lowest possible deadzone we support
-        if (deadzonePercentage <= 0) {
-            deadzonePercentage = 1;
-        }
-
-        this.stickDeadzone = (double)deadzonePercentage / 100.0;
-
-        // Initialize the default mapping for events with no device
-        defaultMapping.leftStickXAxis = MotionEvent.AXIS_X;
-        defaultMapping.leftStickYAxis = MotionEvent.AXIS_Y;
-        defaultMapping.leftStickDeadzoneRadius = (float) stickDeadzone;
-        defaultMapping.rightStickXAxis = MotionEvent.AXIS_Z;
-        defaultMapping.rightStickYAxis = MotionEvent.AXIS_RZ;
-        defaultMapping.rightStickDeadzoneRadius = (float) stickDeadzone;
-        defaultMapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-        defaultMapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
-	}
-	
-	private static InputDevice.MotionRange getMotionRangeForJoystickAxis(InputDevice dev, int axis) {
-		InputDevice.MotionRange range;
-		
-		// First get the axis for SOURCE_JOYSTICK
-		range = dev.getMotionRange(axis, InputDevice.SOURCE_JOYSTICK);
-		if (range == null) {
-			// Now try the axis for SOURCE_GAMEPAD
-			range = dev.getMotionRange(axis, InputDevice.SOURCE_GAMEPAD);
-		}
-		
-		return range;
-	}
-	
-	private ControllerMapping createMappingForDevice(InputDevice dev) {
-		ControllerMapping mapping = new ControllerMapping();
-        String devName = dev.getName();
-
-        LimeLog.info("Creating controller mapping for device: "+devName);
-
-        mapping.leftStickXAxis = MotionEvent.AXIS_X;
-		mapping.leftStickYAxis = MotionEvent.AXIS_Y;
-        if (getMotionRangeForJoystickAxis(dev, mapping.leftStickXAxis) != null &&
-                getMotionRangeForJoystickAxis(dev, mapping.leftStickYAxis) != null) {
-            // This is a gamepad
-            hasGameController = true;
-            mapping.hasJoystickAxes = true;
-        }
-		
-		InputDevice.MotionRange leftTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_LTRIGGER);
-		InputDevice.MotionRange rightTriggerRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RTRIGGER);
-		InputDevice.MotionRange brakeRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_BRAKE);
-		InputDevice.MotionRange gasRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_GAS);
-		if (leftTriggerRange != null && rightTriggerRange != null)
-		{
-			// Some controllers use LTRIGGER and RTRIGGER (like Ouya)
-			mapping.leftTriggerAxis = MotionEvent.AXIS_LTRIGGER;
-			mapping.rightTriggerAxis = MotionEvent.AXIS_RTRIGGER;
-		}
-		else if (brakeRange != null && gasRange != null)
-		{
-			// Others use GAS and BRAKE (like Moga)
-			mapping.leftTriggerAxis = MotionEvent.AXIS_BRAKE;
-			mapping.rightTriggerAxis = MotionEvent.AXIS_GAS;
-		}
-		else
-		{
-			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
-					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
-					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
-					
-					// Xbox controllers use Z and RZ for triggers
-					mapping.leftTriggerAxis = MotionEvent.AXIS_Z;
-					mapping.rightTriggerAxis = MotionEvent.AXIS_RZ;
-					mapping.triggersIdleNegative = true;
-					mapping.isXboxController = true;
-				}
-				else {
-					// DS4 controller uses RX and RY for triggers
-					mapping.leftTriggerAxis = MotionEvent.AXIS_RX;
-					mapping.rightTriggerAxis = MotionEvent.AXIS_RY;
-					mapping.triggersIdleNegative = true;
-					
-					mapping.isDualShock4 = true;
-				}
-			}
-		}
-		
-		if (mapping.rightStickXAxis == -1 && mapping.rightStickYAxis == -1) {
-			InputDevice.MotionRange zRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_Z);
-			InputDevice.MotionRange rzRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RZ);
-			
-			// Most other controllers use Z and RZ for the right stick
-			if (zRange != null && rzRange != null) {
-				mapping.rightStickXAxis = MotionEvent.AXIS_Z;
-				mapping.rightStickYAxis = MotionEvent.AXIS_RZ;
-			}
-			else {
-				InputDevice.MotionRange rxRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RX);
-				InputDevice.MotionRange ryRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_RY);
-				
-				// Try RX and RY now
-				if (rxRange != null && ryRange != null) {
-					mapping.rightStickXAxis = MotionEvent.AXIS_RX;
-					mapping.rightStickYAxis = MotionEvent.AXIS_RY;
-				}
-			}
-		}
-		
-		// Some devices have "hats" for d-pads
-		InputDevice.MotionRange hatXRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_X);
-		InputDevice.MotionRange hatYRange = getMotionRangeForJoystickAxis(dev, MotionEvent.AXIS_HAT_Y);
-		if (hatXRange != null && hatYRange != null) {
-			mapping.hatXAxis = MotionEvent.AXIS_HAT_X;
-			mapping.hatYAxis = MotionEvent.AXIS_HAT_Y;
-		}
-		
-		if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
-            mapping.leftStickDeadzoneRadius = (float) stickDeadzone;
-		}
-		
-		if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
-            mapping.rightStickDeadzoneRadius = (float) stickDeadzone;
-        }
-
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
-            InputDevice.MotionRange ltRange = getMotionRangeForJoystickAxis(dev, mapping.leftTriggerAxis);
-            InputDevice.MotionRange rtRange = getMotionRangeForJoystickAxis(dev, mapping.rightTriggerAxis);
-
-            // It's important to have a valid deadzone so controller packet batching works properly
-            mapping.triggerDeadzone = Math.max(Math.abs(ltRange.getFlat()), Math.abs(rtRange.getFlat()));
-
-            // For triggers without (valid) deadzones, we'll use 13% (around XInput's default)
-            if (mapping.triggerDeadzone < 0.13f ||
-                mapping.triggerDeadzone > 0.30f)
-            {
-                mapping.triggerDeadzone = 0.13f;
-            }
-        }
-
-        if (devName != null) {
-            // For the Nexus Player (and probably other ATV devices), we should
-            // use the back button as start since it doesn't have a start/menu button
-            // on the controller
-            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) {
-                    boolean[] hasStartKey = dev.hasKeys(KeyEvent.KEYCODE_BUTTON_START, KeyEvent.KEYCODE_MENU, 0);
-                    if (!hasStartKey[0] && !hasStartKey[1]) {
-                        mapping.backIsStart = true;
-                    }
-                }
-
-                // The ASUS Gamepad has triggers that sit far forward and are prone to false presses
-                // so we increase the deadzone on them to minimize this
-                mapping.triggerDeadzone = 0.30f;
-            }
-            // Classify this device as a remote by name
-            else if (devName.contains("Fire TV Remote") || devName.contains("Nexus Remote")) {
-                // It's only a remote if it doesn't any sticks
-                if (!mapping.hasJoystickAxes) {
-                    mapping.isRemote = true;
-                }
-            }
-            // NYKO Playpad has a fake hat that mimics the left stick for some reason
-            else if (devName.contains("NYKO PLAYPAD")) {
-                mapping.hatXAxis = -1;
-                mapping.hatYAxis = -1;
-            }
-        }
-
-        LimeLog.info("Analog stick deadzone: "+mapping.leftStickDeadzoneRadius+" "+mapping.rightStickDeadzoneRadius);
-        LimeLog.info("Trigger deadzone: "+mapping.triggerDeadzone);
-		
-		return mapping;
-	}
-	
-	private ControllerMapping getMappingForDevice(InputDevice dev) {
-		// Unknown devices use the default mapping
-		if (dev == null) {
-			return defaultMapping;
-		}
-		
-		String descriptor = dev.getDescriptor();
-		
-		// Return the existing mapping if it exists
-		ControllerMapping mapping = mappings.get(descriptor);
-		if (mapping != null) {
-			return mapping;
-		}
-		
-		// Otherwise create a new mapping
-		mapping = createMappingForDevice(dev);
-		mappings.put(descriptor, mapping);
-		
-		return mapping;
-	}
-	
-	private void sendControllerInputPacket() {
-		conn.sendControllerInput(inputMap, leftTrigger, rightTrigger,
-				leftStickX, leftStickY, rightStickX, rightStickY);
-	}
-
-    // Return a valid keycode, 0 to consume, or -1 to not consume the event
-    // Device MAY BE NULL
-	private int handleRemapping(ControllerMapping mapping, KeyEvent event) {
-        // For remotes, don't capture the back button
-		if (mapping.isRemote) {
-            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
-                return -1;
-            }
-        }
-
-        if (mapping.isDualShock4) {
-			switch (event.getKeyCode()) {
-			case KeyEvent.KEYCODE_BUTTON_Y:
-				return KeyEvent.KEYCODE_BUTTON_L1;
-				
-			case KeyEvent.KEYCODE_BUTTON_Z:
-				return KeyEvent.KEYCODE_BUTTON_R1;
-				
-			case KeyEvent.KEYCODE_BUTTON_C:
-				return KeyEvent.KEYCODE_BUTTON_B;
-				
-			case KeyEvent.KEYCODE_BUTTON_X:
-				return KeyEvent.KEYCODE_BUTTON_Y;
-				
-			case KeyEvent.KEYCODE_BUTTON_B:
-				return KeyEvent.KEYCODE_BUTTON_A;
-				
-			case KeyEvent.KEYCODE_BUTTON_A:
-				return KeyEvent.KEYCODE_BUTTON_X;
-				
-			case KeyEvent.KEYCODE_BUTTON_SELECT:
-				return KeyEvent.KEYCODE_BUTTON_THUMBL;
-				
-			case KeyEvent.KEYCODE_BUTTON_START:
-				return KeyEvent.KEYCODE_BUTTON_THUMBR;
-				
-			case KeyEvent.KEYCODE_BUTTON_L2:
-				return KeyEvent.KEYCODE_BUTTON_SELECT;
-				
-			case KeyEvent.KEYCODE_BUTTON_R2:
-				return KeyEvent.KEYCODE_BUTTON_START;
-				
-			// These are duplicate trigger events
-			case KeyEvent.KEYCODE_BUTTON_R1:
-			case KeyEvent.KEYCODE_BUTTON_L1:
-				return 0;
-			}
-		}
-		
-		if (mapping.hatXAxis != -1 && mapping.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;
-			}
-		}
-		else if (mapping.hatXAxis == -1 &&
-				 mapping.hatYAxis == -1 &&
-				 mapping.isXboxController &&
-				 event.getKeyCode() == KeyEvent.KEYCODE_UNKNOWN) {
-			// If there's not a proper Xbox controller mapping, we'll translate the raw d-pad
-			// scan codes into proper key codes
-			switch (event.getScanCode())
-			{
-			case 704:
-				return KeyEvent.KEYCODE_DPAD_LEFT;
-			case 705:
-				return KeyEvent.KEYCODE_DPAD_RIGHT;
-			case 706:
-				return KeyEvent.KEYCODE_DPAD_UP;
-			case 707:
-				return KeyEvent.KEYCODE_DPAD_DOWN;
-			}
-		}
-
-        // Past here we can fixup the keycode and potentially trigger
-        // another special case so we need to remember what keycode we're using
-        int keyCode = event.getKeyCode();
-
-        // This is a hack for (at least) the "Tablet Remote" app
-        // which sends BACK with META_ALT_ON instead of KEYCODE_BUTTON_B
-        if (keyCode == KeyEvent.KEYCODE_BACK &&
-                !event.hasNoModifiers() &&
-                (event.getFlags() & KeyEvent.FLAG_SOFT_KEYBOARD) != 0)
-        {
-            keyCode = KeyEvent.KEYCODE_BUTTON_B;
-        }
-
-        if (keyCode == KeyEvent.KEYCODE_BUTTON_START ||
-                keyCode == KeyEvent.KEYCODE_MENU) {
-            // Ensure that we never use back as start if we have a real start
-            mapping.backIsStart = false;
-        }
-        else if (mapping.backIsStart && keyCode == KeyEvent.KEYCODE_BACK) {
-            // Emulate the start button with back
-            return KeyEvent.KEYCODE_BUTTON_START;
-        }
-		
-		return keyCode;
-	}
-
-    private Vector2d populateCachedVector(float x, float y) {
-        // Reinitialize our cached Vector2d object
-        inputVector.initialize(x, y);
-        return inputVector;
-    }
-	
-	private void handleDeadZone(Vector2d stickVector, float deadzoneRadius) {
-		if (stickVector.getMagnitude() <= deadzoneRadius) {
-			// Deadzone
-            stickVector.initialize(0, 0);
-		}
-
-        // We're not normalizing here because we let the computer handle the deadzones.
-        // Normalizing can make the deadzones larger than they should be after the computer also
-        // evaluates the deadzone.
-    }
-
-    private void handleAxisSet(ControllerMapping mapping, float lsX, float lsY, float rsX,
-                               float rsY, float lt, float rt, float hatX, float hatY) {
-
-        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
-            Vector2d leftStickVector = populateCachedVector(lsX, lsY);
-
-            handleDeadZone(leftStickVector, mapping.leftStickDeadzoneRadius);
-
-            leftStickX = (short) (leftStickVector.getX() * 0x7FFE);
-            leftStickY = (short) (-leftStickVector.getY() * 0x7FFE);
-        }
-
-        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
-            Vector2d rightStickVector = populateCachedVector(rsX, rsY);
-
-            handleDeadZone(rightStickVector, mapping.rightStickDeadzoneRadius);
-
-            rightStickX = (short) (rightStickVector.getX() * 0x7FFE);
-            rightStickY = (short) (-rightStickVector.getY() * 0x7FFE);
-        }
-
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
-            if (mapping.triggersIdleNegative) {
-                lt = (lt + 1) / 2;
-                rt = (rt + 1) / 2;
-            }
-
-            if (lt <= mapping.triggerDeadzone) {
-                lt = 0;
-            }
-            if (rt <= mapping.triggerDeadzone) {
-                rt = 0;
-            }
-
-            leftTrigger = (byte)(lt * 0xFF);
-            rightTrigger = (byte)(rt * 0xFF);
-        }
-
-        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
-            inputMap &= ~(ControllerPacket.LEFT_FLAG | ControllerPacket.RIGHT_FLAG);
-            if (hatX < -0.5) {
-                inputMap |= ControllerPacket.LEFT_FLAG;
-            }
-            else if (hatX > 0.5) {
-                inputMap |= ControllerPacket.RIGHT_FLAG;
-            }
-
-            inputMap &= ~(ControllerPacket.UP_FLAG | ControllerPacket.DOWN_FLAG);
-            if (hatY < -0.5) {
-                inputMap |= ControllerPacket.UP_FLAG;
-            }
-            else if (hatY > 0.5) {
-                inputMap |= ControllerPacket.DOWN_FLAG;
-            }
-        }
-
-        sendControllerInputPacket();
-    }
-	
-	public boolean handleMotionEvent(MotionEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
-        float lsX = 0, lsY = 0, rsX = 0, rsY = 0, rt = 0, lt = 0, hatX = 0, hatY = 0;
-
-        // We purposefully ignore the historical values in the motion event as it makes
-        // the controller feel sluggish for some users.
-
-        if (mapping.leftStickXAxis != -1 && mapping.leftStickYAxis != -1) {
-            lsX = event.getAxisValue(mapping.leftStickXAxis);
-            lsY = event.getAxisValue(mapping.leftStickYAxis);
-        }
-
-        if (mapping.rightStickXAxis != -1 && mapping.rightStickYAxis != -1) {
-            rsX = event.getAxisValue(mapping.rightStickXAxis);
-            rsY = event.getAxisValue(mapping.rightStickYAxis);
-        }
-
-        if (mapping.leftTriggerAxis != -1 && mapping.rightTriggerAxis != -1) {
-            lt = event.getAxisValue(mapping.leftTriggerAxis);
-            rt = event.getAxisValue(mapping.rightTriggerAxis);
-        }
-
-        if (mapping.hatXAxis != -1 && mapping.hatYAxis != -1) {
-            hatX = event.getAxisValue(MotionEvent.AXIS_HAT_X);
-            hatY = event.getAxisValue(MotionEvent.AXIS_HAT_Y);
-        }
-
-        handleAxisSet(mapping, lsX, lsY, rsX, rsY, lt, rt, hatX, hatY);
-
-		return true;
-	}
-	
-	public boolean handleButtonUp(KeyEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
-
-        int keyCode = handleRemapping(mapping, event);
-		if (keyCode == 0) {
-			return true;
-		}
-		
-		// If the button hasn't been down long enough, sleep for a bit before sending the up event
-		// This allows "instant" button presses (like OUYA's virtual menu button) to work. This
-		// path should not be triggered during normal usage.
-		if (SystemClock.uptimeMillis() - event.getDownTime() < ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS)
-		{
-			// Since our sleep time is so short (10 ms), it shouldn't cause a problem doing this in the
-			// UI thread.
-			try {
-				Thread.sleep(ControllerHandler.MINIMUM_BUTTON_DOWN_TIME_MS);
-			} catch (InterruptedException ignored) {}
-		}
-		
-		switch (keyCode) {
-		case KeyEvent.KEYCODE_BUTTON_MODE:
-			inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_START:
-		case KeyEvent.KEYCODE_MENU:
-			inputMap &= ~ControllerPacket.PLAY_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BACK:
-		case KeyEvent.KEYCODE_BUTTON_SELECT:
-			inputMap &= ~ControllerPacket.BACK_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_LEFT:
-			inputMap &= ~ControllerPacket.LEFT_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_RIGHT:
-			inputMap &= ~ControllerPacket.RIGHT_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_UP:
-			inputMap &= ~ControllerPacket.UP_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_DOWN:
-			inputMap &= ~ControllerPacket.DOWN_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_B:
-			inputMap &= ~ControllerPacket.B_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_CENTER:
-		case KeyEvent.KEYCODE_BUTTON_A:
-			inputMap &= ~ControllerPacket.A_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_X:
-			inputMap &= ~ControllerPacket.X_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_Y:
-			inputMap &= ~ControllerPacket.Y_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_L1:
-			inputMap &= ~ControllerPacket.LB_FLAG;
-			lastLbUpTime = SystemClock.uptimeMillis();
-			break;
-		case KeyEvent.KEYCODE_BUTTON_R1:
-			inputMap &= ~ControllerPacket.RB_FLAG;
-			lastRbUpTime = SystemClock.uptimeMillis();
-			break;
-		case KeyEvent.KEYCODE_BUTTON_THUMBL:
-			inputMap &= ~ControllerPacket.LS_CLK_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_THUMBR:
-			inputMap &= ~ControllerPacket.RS_CLK_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_L2:
-			leftTrigger = 0;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_R2:
-			rightTrigger = 0;
-			break;
-		default:
-			return false;
-		}
-		
-		// Check if we're emulating the select button
-		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SELECT) != 0)
-		{
-			// If either start or LB is up, select comes up too
-			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-				(inputMap & ControllerPacket.LB_FLAG) == 0)
-			{
-				inputMap &= ~ControllerPacket.BACK_FLAG;
-				
-				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SELECT;
-				
-				try {
-					Thread.sleep(EMULATED_SELECT_UP_DELAY_MS);
-				} catch (InterruptedException ignored) {}
-			}
-		}
-		
-		// Check if we're emulating the special button
-		if ((emulatingButtonFlags & ControllerHandler.EMULATING_SPECIAL) != 0)
-		{
-			// If either start or select and RB is up, the special button comes up too
-			if ((inputMap & ControllerPacket.PLAY_FLAG) == 0 ||
-				((inputMap & ControllerPacket.BACK_FLAG) == 0 &&
-				 (inputMap & ControllerPacket.RB_FLAG) == 0))
-			{
-				inputMap &= ~ControllerPacket.SPECIAL_BUTTON_FLAG;
-				
-				emulatingButtonFlags &= ~ControllerHandler.EMULATING_SPECIAL;
-				
-				try {
-					Thread.sleep(EMULATED_SPECIAL_UP_DELAY_MS);
-				} catch (InterruptedException ignored) {}
-			}
-		}
-		
-		sendControllerInputPacket();
-		return true;
-	}
-	
-	public boolean handleButtonDown(KeyEvent event) {
-		ControllerMapping mapping = getMappingForDevice(event.getDevice());
-
-        int keyCode = handleRemapping(mapping, event);
-		if (keyCode == 0) {
-			return true;
-		}
-		
-		switch (keyCode) {
-		case KeyEvent.KEYCODE_BUTTON_MODE:
-			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_START:
-		case KeyEvent.KEYCODE_MENU:
-			inputMap |= ControllerPacket.PLAY_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BACK:
-		case KeyEvent.KEYCODE_BUTTON_SELECT:
-			inputMap |= ControllerPacket.BACK_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_LEFT:
-			inputMap |= ControllerPacket.LEFT_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_RIGHT:
-			inputMap |= ControllerPacket.RIGHT_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_UP:
-			inputMap |= ControllerPacket.UP_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_DOWN:
-			inputMap |= ControllerPacket.DOWN_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_B:
-			inputMap |= ControllerPacket.B_FLAG;
-			break;
-		case KeyEvent.KEYCODE_DPAD_CENTER:
-		case KeyEvent.KEYCODE_BUTTON_A:
-			inputMap |= ControllerPacket.A_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_X:
-			inputMap |= ControllerPacket.X_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_Y:
-			inputMap |= ControllerPacket.Y_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_L1:
-			inputMap |= ControllerPacket.LB_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_R1:
-			inputMap |= ControllerPacket.RB_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_THUMBL:
-			inputMap |= ControllerPacket.LS_CLK_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_THUMBR:
-			inputMap |= ControllerPacket.RS_CLK_FLAG;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_L2:
-			leftTrigger = (byte)0xFF;
-			break;
-		case KeyEvent.KEYCODE_BUTTON_R2:
-			rightTrigger = (byte)0xFF;
-			break;
-		default:
-			return false;
-		}
-		
-		// Start+LB acts like select for controllers with one button
-		if ((inputMap & ControllerPacket.PLAY_FLAG) != 0 &&
-			((inputMap & ControllerPacket.LB_FLAG) != 0 ||
-			  SystemClock.uptimeMillis() - lastLbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS))
-		{
-			inputMap &= ~(ControllerPacket.PLAY_FLAG | ControllerPacket.LB_FLAG);
-			inputMap |= ControllerPacket.BACK_FLAG;
-			
-			emulatingButtonFlags |= ControllerHandler.EMULATING_SELECT;
-		}
-		
-		// We detect select+start or start+RB as the special button combo
-		if (((inputMap & ControllerPacket.RB_FLAG) != 0 ||
-			 (SystemClock.uptimeMillis() - lastRbUpTime <= MAXIMUM_BUMPER_UP_DELAY_MS) ||
-			 (inputMap & ControllerPacket.BACK_FLAG) != 0) &&
-			(inputMap & ControllerPacket.PLAY_FLAG) != 0)
-		{
-			inputMap &= ~(ControllerPacket.BACK_FLAG | ControllerPacket.PLAY_FLAG | ControllerPacket.RB_FLAG);
-			inputMap |= ControllerPacket.SPECIAL_BUTTON_FLAG;
-			
-			emulatingButtonFlags |= ControllerHandler.EMULATING_SPECIAL;
-		}
-
-        // Send a new input packet if this is the first instance of a button down event
-        // or anytime if we're emulating a button
-        if (event.getRepeatCount() == 0 || emulatingButtonFlags != 0) {
-            sendControllerInputPacket();
-        }
-		return true;
-	}
-	
-	class ControllerMapping {
-		public int leftStickXAxis = -1;		
-		public int leftStickYAxis = -1;
-		public float leftStickDeadzoneRadius;
-
-		public int rightStickXAxis = -1;
-		public int rightStickYAxis = -1;
-		public float rightStickDeadzoneRadius;
-		
-		public int leftTriggerAxis = -1;
-		public int rightTriggerAxis = -1;
-		public boolean triggersIdleNegative;
-        public float triggerDeadzone;
-		
-		public int hatXAxis = -1;
-		public int hatYAxis = -1;
-		
-		public boolean isDualShock4;
-		public boolean isXboxController;
-        public boolean backIsStart;
-        public boolean isRemote;
-        public boolean hasJoystickAxes;
-	}
-}
@@ -1,105 +0,0 @@
-package com.limelight.binding.input;
-
-import com.limelight.nvstream.NvConnection;
-import com.limelight.nvstream.input.MouseButtonPacket;
-
-public class TouchContext {
-	private int lastTouchX = 0;
-	private int lastTouchY = 0;
-	private int originalTouchX = 0;
-	private int originalTouchY = 0;
-	private long originalTouchTime = 0;
-	
-	private NvConnection conn;
-	private int actionIndex;
-    private double xFactor, yFactor;
-	
-	private static final int TAP_MOVEMENT_THRESHOLD = 10;
-	private static final int TAP_TIME_THRESHOLD = 250;
-	
-	public TouchContext(NvConnection conn, int actionIndex, double xFactor, double yFactor)
-	{
-		this.conn = conn;
-		this.actionIndex = actionIndex;
-        this.xFactor = xFactor;
-        this.yFactor = yFactor;
-	}
-
-    public int getActionIndex()
-    {
-        return actionIndex;
-    }
-	
-	private boolean isTap()
-	{
-		int xDelta = Math.abs(lastTouchX - originalTouchX);
-		int yDelta = Math.abs(lastTouchY - originalTouchY);
-		long timeDelta = System.currentTimeMillis() - originalTouchTime;
-		
-		return xDelta <= TAP_MOVEMENT_THRESHOLD &&
-				yDelta <= TAP_MOVEMENT_THRESHOLD &&
-				timeDelta <= TAP_TIME_THRESHOLD;
-	}
-	
-	private byte getMouseButtonIndex()
-	{
-		if (actionIndex == 1) {
-			return MouseButtonPacket.BUTTON_RIGHT;
-		}
-		else {
-			return MouseButtonPacket.BUTTON_LEFT;
-		}
-	}
-	
-	public boolean touchDownEvent(int eventX, int eventY)
-	{
-		originalTouchX = lastTouchX = eventX;
-		originalTouchY = lastTouchY = eventY;
-		originalTouchTime = System.currentTimeMillis();
-		
-		return true;
-	}
-	
-	public void touchUpEvent(int eventX, int eventY)
-	{
-		if (isTap())
-		{
-			byte buttonIndex = getMouseButtonIndex();
-			
-			// Lower the mouse button
-			conn.sendMouseButtonDown(buttonIndex);
-			
-			// We need to sleep a bit here because some games
-			// do input detection by polling
-			try {
-				Thread.sleep(100);
-			} catch (InterruptedException ignored) {}
-			
-			// Raise the mouse button
-			conn.sendMouseButtonUp(buttonIndex);
-		}
-	}
-	
-	public boolean touchMoveEvent(int eventX, int eventY)
-	{	
-		if (eventX != lastTouchX || eventY != lastTouchY)
-		{
-			// We only send moves for the primary touch point
-			if (actionIndex == 0) {
-                int deltaX = eventX - lastTouchX;
-                int deltaY = eventY - lastTouchY;
-
-                // Scale the deltas based on the factors passed to our constructor
-                deltaX = (int)Math.round((double)deltaX * xFactor);
-                deltaY = (int)Math.round((double)deltaY * yFactor);
-
-				conn.sendMouseMove((short)deltaX, (short)deltaY);
-			}
-			
-			lastTouchX = eventX;
-			lastTouchY = eventY;
-		}
-		
-		return true;
-	}
-}
@@ -1,41 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-public class EvdevEvent {
-	public static final int EVDEV_MIN_EVENT_SIZE = 16;
-	public static final int EVDEV_MAX_EVENT_SIZE = 24;
-	
-	/* Event types */
-	public static final short EV_SYN = 0x00;
-	public static final short EV_KEY = 0x01;
-	public static final short EV_REL = 0x02;
-	public static final short EV_MSC = 0x04;
-	
-	/* Relative axes */
-	public static final short REL_X = 0x00;
-	public static final short REL_Y = 0x01;
-	public static final short REL_WHEEL = 0x08;
-	
-	/* Buttons */
-	public static final short BTN_LEFT = 0x110;
-	public static final short BTN_RIGHT = 0x111;
-	public static final short BTN_MIDDLE = 0x112;
-	public static final short BTN_SIDE = 0x113;
-	public static final short BTN_EXTRA = 0x114;
-	public static final short BTN_FORWARD = 0x115;
-	public static final short BTN_BACK = 0x116;
-	public static final short BTN_TASK = 0x117;
-	public static final short BTN_GAMEPAD = 0x130;
-	
-	/* Keys */
-	public static final short KEY_Q = 16;
-	
-	public short type;
-	public short code;
-	public int value;
-	
-	public EvdevEvent(short type, short code, int value) {
-		this.type = type;
-		this.code = code;
-		this.value = value;
-	}
-}
@@ -1,167 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-import com.limelight.LimeLog;
-
-public class EvdevHandler {
-
-	private String absolutePath;
-	private EvdevListener listener;
-	private boolean shutdown = false;
-	private int fd = -1;
-	
-	private Thread handlerThread = new Thread() {
-		@Override
-		public void run() {
-			// All the finally blocks here make this code look like a mess
-			// but it's important that we get this right to avoid causing
-			// system-wide input problems.
-			
-			// Open the /dev/input/eventX file
-			fd = EvdevReader.open(absolutePath);
-			if (fd == -1) {
-				LimeLog.warning("Unable to open "+absolutePath);
-				return;
-			}
-
-			try {
-				// Check if it's a mouse or keyboard, but not a gamepad
-				if ((!EvdevReader.isMouse(fd) && !EvdevReader.isAlphaKeyboard(fd)) ||
-					EvdevReader.isGamepad(fd)) {
-					// We only handle keyboards and mice
-					return;
-				}
-
-				// Grab it for ourselves
-				if (!EvdevReader.grab(fd)) {
-					LimeLog.warning("Unable to grab "+absolutePath);
-					return;
-				}
-
-				LimeLog.info("Grabbed device for raw keyboard/mouse input: "+absolutePath);
-
-				ByteBuffer buffer = ByteBuffer.allocate(EvdevEvent.EVDEV_MAX_EVENT_SIZE).order(ByteOrder.nativeOrder());
-
-				try {
-					int deltaX = 0;
-					int deltaY = 0;
-					byte deltaScroll = 0;
-
-					while (!isInterrupted() && !shutdown) {
-						EvdevEvent event = EvdevReader.read(fd, buffer);
-						if (event == null) {
-							return;
-						}
-
-						switch (event.type)
-						{
-						case EvdevEvent.EV_SYN:
-							if (deltaX != 0 || deltaY != 0) {
-								listener.mouseMove(deltaX, deltaY);
-								deltaX = deltaY = 0;
-							}
-							if (deltaScroll != 0) {
-								listener.mouseScroll(deltaScroll);
-								deltaScroll = 0;
-							}
-							break;
-
-						case EvdevEvent.EV_REL:
-							switch (event.code)
-							{
-							case EvdevEvent.REL_X:
-								deltaX = event.value;
-								break;
-							case EvdevEvent.REL_Y:
-								deltaY = event.value;
-								break;
-							case EvdevEvent.REL_WHEEL:
-								deltaScroll = (byte) event.value;
-								break;
-							}
-							break;
-
-						case EvdevEvent.EV_KEY:
-							switch (event.code)
-							{
-							case EvdevEvent.BTN_LEFT:
-								listener.mouseButtonEvent(EvdevListener.BUTTON_LEFT,
-										event.value != 0);
-								break;
-							case EvdevEvent.BTN_MIDDLE:
-								listener.mouseButtonEvent(EvdevListener.BUTTON_MIDDLE,
-										event.value != 0);
-								break;
-							case EvdevEvent.BTN_RIGHT:
-								listener.mouseButtonEvent(EvdevListener.BUTTON_RIGHT,
-										event.value != 0);
-								break;
-								
-							case EvdevEvent.BTN_SIDE:
-							case EvdevEvent.BTN_EXTRA:
-							case EvdevEvent.BTN_FORWARD:
-							case EvdevEvent.BTN_BACK:
-							case EvdevEvent.BTN_TASK:
-								// Other unhandled mouse buttons
-								break;
-								
-							default:
-								// We got some unrecognized button. This means
-								// someone is trying to use the other device in this
-								// "combination" input device. We'll try to handle
-								// it via keyboard, but we're not going to disconnect
-								// if we can't
-								short keyCode = EvdevTranslator.translateEvdevKeyCode(event.code);
-								if (keyCode != 0) {
-									listener.keyboardEvent(event.value != 0, keyCode);
-								}
-								break;
-							}
-							break;
-							
-						case EvdevEvent.EV_MSC:
-							break;
-						}
-					}
-				} finally {
-					// Release our grab
-					EvdevReader.ungrab(fd);
-				}
-			} finally {
-				// Close the file
-				EvdevReader.close(fd);
-			}
-		}
-	};
-	
-	public EvdevHandler(String absolutePath, EvdevListener listener) {
-		this.absolutePath = absolutePath;
-		this.listener = listener;
-	}
-	
-	public void start() {
-		handlerThread.start();
-	}
-	
-	public void stop() {
-		// Close the fd. It doesn't matter if this races
-		// with the handler thread. We'll close this out from
-		// under the thread to wake it up
-		if (fd != -1) {
-			EvdevReader.close(fd);
-		}
-		
-		shutdown = true;
-		handlerThread.interrupt();
-		
-		try {
-			handlerThread.join();
-		} catch (InterruptedException ignored) {}
-	}
-	
-	public void notifyDeleted() {
-		stop();
-	}
-}
@@ -1,12 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-public interface EvdevListener {
-	public static final int BUTTON_LEFT = 1;
-	public static final int BUTTON_MIDDLE = 2;
-	public static final int BUTTON_RIGHT = 3;
-	
-	public void mouseMove(int deltaX, int deltaY);
-	public void mouseButtonEvent(int buttonId, boolean down);
-	public void mouseScroll(byte amount);
-	public void keyboardEvent(boolean buttonDown, short keyCode);
-}
@@ -1,105 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import android.os.Build;
-
-import java.nio.ByteBuffer;
-import java.util.Locale;
-
-import com.limelight.LimeLog;
-
-public class EvdevReader {
-	static {
-		System.loadLibrary("evdev_reader");
-	}
-
-    public static void patchSeLinuxPolicies() {
-        //
-        // FIXME: We REALLY shouldn't being changing permissions on the input devices like this.
-        // We should probably do something clever with a separate daemon and talk via a localhost
-        // socket. We don't return the SELinux policies back to default after we're done which I feel
-        // bad about, but we do chmod the input devices back so I don't think any additional attack surface
-        // remains opened after streaming other than listing the /dev/input directory which you wouldn't
-        // normally be able to do with SELinux enforcing on Lollipop.
-        //
-        // We need to modify SELinux policies to allow us to capture input devices on Lollipop and possibly other
-        // more restrictive ROMs. Per Chainfire's SuperSU documentation, the supolicy binary is provided on
-        // 4.4 and later to do live SELinux policy changes.
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            EvdevShell shell = EvdevShell.getInstance();
-            shell.runCommand("supolicy --live \"allow untrusted_app input_device dir getattr\" " +
-                    "\"allow untrusted_app input_device chr_file { open read write ioctl }\"");
-        }
-    }
-	
-	// Requires root to chmod /dev/input/eventX
-	public static void setPermissions(String[] files, int octalPermissions) {
-        EvdevShell shell = EvdevShell.getInstance();
-
-        for (String file : files) {
-            shell.runCommand(String.format((Locale)null, "chmod %o %s", octalPermissions, file));
-        }
-	}
-	
-	// Returns the fd to be passed to other function or -1 on error
-	public static native int open(String fileName);
-	
-	// Prevent other apps (including Android itself) from using the device while "grabbed"
-	public static native boolean grab(int fd);
-	public static native boolean ungrab(int fd);
-	
-	// Used for checking device capabilities
-	public static native boolean hasRelAxis(int fd, short axis);
-	public static native boolean hasAbsAxis(int fd, short axis);
-	public static native boolean hasKey(int fd, short key);
-	
-	public static boolean isMouse(int fd) {
-		// This is the same check that Android does in EventHub.cpp
-		return hasRelAxis(fd, EvdevEvent.REL_X) &&
-				hasRelAxis(fd, EvdevEvent.REL_Y) &&
-				hasKey(fd, EvdevEvent.BTN_LEFT);
-	}
-	
-	public static boolean isAlphaKeyboard(int fd) {
-		// This is the same check that Android does in EventHub.cpp
-		return hasKey(fd, EvdevEvent.KEY_Q);
-	}
-	
-	public static boolean isGamepad(int fd) {
-		return hasKey(fd, EvdevEvent.BTN_GAMEPAD);
-	}
-	
-	// Returns the bytes read or -1 on error
-	private static native int read(int fd, byte[] buffer);
-	
-	// Takes a byte buffer to use to read the output into.
-	// This buffer MUST be in native byte order and at least
-	// EVDEV_MAX_EVENT_SIZE bytes long.
-	public static EvdevEvent read(int fd, ByteBuffer buffer) {
-		int bytesRead = read(fd, buffer.array());
-		if (bytesRead < 0) {
-			LimeLog.warning("Failed to read: "+bytesRead);
-			return null;
-		}
-		else if (bytesRead < EvdevEvent.EVDEV_MIN_EVENT_SIZE) {
-			LimeLog.warning("Short read: "+bytesRead);
-			return null;
-		}
-		
-		buffer.limit(bytesRead);
-		buffer.rewind();
-		
-		// Throw away the time stamp
-		if (bytesRead == EvdevEvent.EVDEV_MAX_EVENT_SIZE) {
-			buffer.getLong();
-			buffer.getLong();
-		} else {
-			buffer.getInt();
-			buffer.getInt();
-		}
-		
-		return new EvdevEvent(buffer.getShort(), buffer.getShort(), buffer.getInt());
-	}
-	
-	// Closes the fd from open()
-	public static native int close(int fd);
-}
@@ -1,116 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.util.Scanner;
-import java.util.UUID;
-
-public class EvdevShell {
-    private OutputStream stdin;
-    private InputStream stdout;
-    private Process shell;
-    private final String uuidString = UUID.randomUUID().toString();
-
-    private static final EvdevShell globalShell = new EvdevShell();
-
-    public static EvdevShell getInstance() {
-        return globalShell;
-    }
-
-    public void startShell() {
-        ProcessBuilder builder = new ProcessBuilder("su");
-
-        try {
-            // Redirect stderr to stdout
-            builder.redirectErrorStream(true);
-            shell = builder.start();
-
-            stdin = shell.getOutputStream();
-            stdout = shell.getInputStream();
-        } catch (IOException e) {
-            // This is unexpected
-            e.printStackTrace();
-
-            // Kill the shell if it spawned
-            if (stdin != null) {
-                try {
-                    stdin.close();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                } finally {
-                    stdin = null;
-                }
-            }
-            if (stdout != null) {
-                try {
-                    stdout.close();
-                } catch (IOException e1) {
-                    e1.printStackTrace();
-                } finally {
-                    stdout = null;
-                }
-            }
-            if (shell != null) {
-                shell.destroy();
-                shell = null;
-            }
-        }
-    }
-
-    public void runCommand(String command) {
-        if (shell == null) {
-            // Shell never started
-            return;
-        }
-
-        try {
-            // Write the command followed by an echo with our UUID
-            stdin.write((command+'\n').getBytes("UTF-8"));
-            stdin.write(("echo "+uuidString+'\n').getBytes("UTF-8"));
-            stdin.flush();
-
-            // This is the only command in flight so we can use a scanner
-            // without worrying about it eating too many characters
-            Scanner scanner = new Scanner(stdout);
-            while (scanner.hasNext()) {
-                if (scanner.next().contains(uuidString)) {
-                    // Our command ran
-                    return;
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public void stopShell() throws InterruptedException {
-        boolean exitWritten = false;
-
-        if (shell == null) {
-            // Shell never started
-            return;
-        }
-
-        try {
-            stdin.write("exit\n".getBytes("UTF-8"));
-            exitWritten = true;
-        } catch (IOException e) {
-            // We'll destroy the process without
-            // waiting for it to terminate since
-            // we don't know whether our exit command made it
-            e.printStackTrace();
-        }
-
-        if (exitWritten) {
-            try {
-                shell.waitFor();
-            } finally {
-                shell.destroy();
-            }
-        }
-        else {
-            shell.destroy();
-        }
-    }
-}
@@ -1,139 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import android.view.KeyEvent;
-
-public class EvdevTranslator {
-
-	public static final short EVDEV_KEY_CODES[] = {
-		0, //KeyEvent.VK_RESERVED
-		KeyEvent.KEYCODE_ESCAPE,
-		KeyEvent.KEYCODE_1,
-		KeyEvent.KEYCODE_2,
-		KeyEvent.KEYCODE_3,
-		KeyEvent.KEYCODE_4,
-		KeyEvent.KEYCODE_5,
-		KeyEvent.KEYCODE_6,
-		KeyEvent.KEYCODE_7,
-		KeyEvent.KEYCODE_8,
-		KeyEvent.KEYCODE_9,
-		KeyEvent.KEYCODE_0,
-		KeyEvent.KEYCODE_MINUS,
-		KeyEvent.KEYCODE_EQUALS,
-		KeyEvent.KEYCODE_DEL,
-		KeyEvent.KEYCODE_TAB,
-		KeyEvent.KEYCODE_Q,
-		KeyEvent.KEYCODE_W,
-		KeyEvent.KEYCODE_E,
-		KeyEvent.KEYCODE_R,
-		KeyEvent.KEYCODE_T,
-		KeyEvent.KEYCODE_Y,
-		KeyEvent.KEYCODE_U,
-		KeyEvent.KEYCODE_I,
-		KeyEvent.KEYCODE_O,
-		KeyEvent.KEYCODE_P,
-		KeyEvent.KEYCODE_LEFT_BRACKET,
-		KeyEvent.KEYCODE_RIGHT_BRACKET,
-		KeyEvent.KEYCODE_ENTER,
-		KeyEvent.KEYCODE_CTRL_LEFT,
-		KeyEvent.KEYCODE_A,
-		KeyEvent.KEYCODE_S,
-		KeyEvent.KEYCODE_D,
-		KeyEvent.KEYCODE_F,
-		KeyEvent.KEYCODE_G,
-		KeyEvent.KEYCODE_H,
-		KeyEvent.KEYCODE_J,
-		KeyEvent.KEYCODE_K,
-		KeyEvent.KEYCODE_L,
-		KeyEvent.KEYCODE_SEMICOLON,
-		KeyEvent.KEYCODE_APOSTROPHE,
-		KeyEvent.KEYCODE_GRAVE,
-		KeyEvent.KEYCODE_SHIFT_LEFT,
-		KeyEvent.KEYCODE_BACKSLASH,
-		KeyEvent.KEYCODE_Z,
-		KeyEvent.KEYCODE_X,
-		KeyEvent.KEYCODE_C,
-		KeyEvent.KEYCODE_V,
-		KeyEvent.KEYCODE_B,
-		KeyEvent.KEYCODE_N,
-		KeyEvent.KEYCODE_M,
-		KeyEvent.KEYCODE_COMMA,
-		KeyEvent.KEYCODE_PERIOD,
-		KeyEvent.KEYCODE_SLASH,
-		KeyEvent.KEYCODE_SHIFT_RIGHT,
-		KeyEvent.KEYCODE_NUMPAD_MULTIPLY,
-		KeyEvent.KEYCODE_ALT_LEFT,
-		KeyEvent.KEYCODE_SPACE,
-		KeyEvent.KEYCODE_CAPS_LOCK,
-		KeyEvent.KEYCODE_F1,
-		KeyEvent.KEYCODE_F2,
-		KeyEvent.KEYCODE_F3,
-		KeyEvent.KEYCODE_F4,
-		KeyEvent.KEYCODE_F5,
-		KeyEvent.KEYCODE_F6,
-		KeyEvent.KEYCODE_F7,
-		KeyEvent.KEYCODE_F8,
-		KeyEvent.KEYCODE_F9,
-		KeyEvent.KEYCODE_F10,
-		KeyEvent.KEYCODE_NUM_LOCK,
-		KeyEvent.KEYCODE_SCROLL_LOCK,
-		KeyEvent.KEYCODE_NUMPAD_7,
-		KeyEvent.KEYCODE_NUMPAD_8,
-		KeyEvent.KEYCODE_NUMPAD_9,
-		KeyEvent.KEYCODE_NUMPAD_SUBTRACT,
-		KeyEvent.KEYCODE_NUMPAD_4,
-		KeyEvent.KEYCODE_NUMPAD_5,
-		KeyEvent.KEYCODE_NUMPAD_6,
-		KeyEvent.KEYCODE_NUMPAD_ADD,
-		KeyEvent.KEYCODE_NUMPAD_1,
-		KeyEvent.KEYCODE_NUMPAD_2,
-		KeyEvent.KEYCODE_NUMPAD_3,
-		KeyEvent.KEYCODE_NUMPAD_0,
-		KeyEvent.KEYCODE_NUMPAD_DOT,
-		0,
-		0, //KeyEvent.VK_ZENKAKUHANKAKU,
-		0, //KeyEvent.VK_102ND,
-		KeyEvent.KEYCODE_F11,
-		KeyEvent.KEYCODE_F12,
-		0, //KeyEvent.VK_RO,
-		0, //KeyEvent.VK_KATAKANA,
-		0, //KeyEvent.VK_HIRAGANA,
-		0, //KeyEvent.VK_HENKAN,
-		0, //KeyEvent.VK_KATAKANAHIRAGANA,
-		0, //KeyEvent.VK_MUHENKAN,
-		0, //KeyEvent.VK_KPJPCOMMA,
-		KeyEvent.KEYCODE_NUMPAD_ENTER,
-		KeyEvent.KEYCODE_CTRL_RIGHT,
-		KeyEvent.KEYCODE_NUMPAD_DIVIDE,
-		KeyEvent.KEYCODE_SYSRQ,
-		KeyEvent.KEYCODE_ALT_RIGHT,
-		0, //KeyEvent.VK_LINEFEED,
-		KeyEvent.KEYCODE_HOME,
-		KeyEvent.KEYCODE_DPAD_UP,
-		KeyEvent.KEYCODE_PAGE_UP,
-		KeyEvent.KEYCODE_DPAD_LEFT,
-		KeyEvent.KEYCODE_DPAD_RIGHT,
-		KeyEvent.KEYCODE_MOVE_END,
-		KeyEvent.KEYCODE_DPAD_DOWN,
-		KeyEvent.KEYCODE_PAGE_DOWN,
-		KeyEvent.KEYCODE_INSERT,
-		KeyEvent.KEYCODE_FORWARD_DEL,
-		0, //KeyEvent.VK_MACRO,
-		0, //KeyEvent.VK_MUTE,
-		0, //KeyEvent.VK_VOLUMEDOWN,
-		0, //KeyEvent.VK_VOLUMEUP,
-		0, //KeyEvent.VK_POWER, /* SC System Power Down */
-		KeyEvent.KEYCODE_NUMPAD_EQUALS,
-		0, //KeyEvent.VK_KPPLUSMINUS,
-		KeyEvent.KEYCODE_BREAK,
-		0, //KeyEvent.VK_SCALE, /* AL Compiz Scale (Expose) */
-	};
-	
-	public static short translateEvdevKeyCode(short evdevKeyCode) {
-		if (evdevKeyCode < EVDEV_KEY_CODES.length) {
-			return EVDEV_KEY_CODES[evdevKeyCode];
-		}
-		
-		return 0;
-	}
-
-}
@@ -1,188 +0,0 @@
-package com.limelight.binding.input.evdev;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.limelight.LimeLog;
-
-import android.os.FileObserver;
-
-@SuppressWarnings("ALL")
-public class EvdevWatcher {
-	private static final String PATH = "/dev/input";
-	private static final String REQUIRED_FILE_PREFIX = "event";
-	
-	private final HashMap<String, EvdevHandler> handlers = new HashMap<String, EvdevHandler>();
-	private boolean shutdown = false;
-	private boolean init = false;
-	private boolean ungrabbed = false;
-	private EvdevListener listener;
-	private Thread startThread;
-
-    private static boolean patchedSeLinuxPolicies = false;
-	
-	private FileObserver observer = new FileObserver(PATH, FileObserver.CREATE | FileObserver.DELETE) {
-		@Override
-		public void onEvent(int event, String fileName) {
-			if (fileName == null) {
-				return;
-			}
-			
-			if (!fileName.startsWith(REQUIRED_FILE_PREFIX)) {
-				return;
-			}
-			
-			synchronized (handlers) {
-				if (shutdown) {
-					return;
-				}
-				
-				if ((event & FileObserver.CREATE) != 0) {
-					LimeLog.info("Starting evdev handler for "+fileName);
-					
-					if (!init) {
-						// If this a real new device, update permissions again so we can read it
-						EvdevReader.setPermissions(new String[]{PATH + "/" + fileName}, 0666);
-					}
-					
-					EvdevHandler handler = new EvdevHandler(PATH + "/" + fileName, listener);
-					
-					// If we're ungrabbed now, don't start the handler
-					if (!ungrabbed) {
-						handler.start();
-					}
-					
-					handlers.put(fileName, handler);
-				}
-				
-				if ((event & FileObserver.DELETE) != 0) {
-					LimeLog.info("Halting evdev handler for "+fileName);
-					
-					EvdevHandler handler = handlers.remove(fileName);
-					if (handler != null) {
-						handler.notifyDeleted();
-					}
-				}
-			}
-		}
-	};
-	
-	public EvdevWatcher(EvdevListener listener) {
-		this.listener = listener;
-	}
-	
-	private File[] rundownWithPermissionsChange(int newPermissions) {
-		// Rundown existing files
-		File devInputDir = new File(PATH);
-		File[] files = devInputDir.listFiles();
-		if (files == null) {
-			return new File[0];
-		}
-		
-		// Set desired permissions
-		String[] filePaths = new String[files.length];
-		for (int i = 0; i < files.length; i++) {
-			filePaths[i] = files[i].getAbsolutePath();
-		}
-		EvdevReader.setPermissions(filePaths, newPermissions);
-		
-		return files;
-	}
-	
-	public void ungrabAll() {
-		synchronized (handlers) {
-			// Note that we're ungrabbed for now
-			ungrabbed = true;
-			
-			// Stop all handlers
-			for (EvdevHandler handler : handlers.values()) {
-				handler.stop();
-			}
-		}
-	}
-	
-	public void regrabAll() {
-		synchronized (handlers) {
-			// We're regrabbing everything now
-			ungrabbed = false;
-			
-			for (Map.Entry<String, EvdevHandler> entry : handlers.entrySet()) {
-				// We need to recreate each entry since we can't reuse a stopped one
-				entry.setValue(new EvdevHandler(PATH + "/" + entry.getKey(), listener));
-				entry.getValue().start();
-			}
-		}
-	}
-	
-	public void start() {
-		startThread = new Thread() {
-			@Override
-			public void run() {
-                // Initialize the root shell
-                EvdevShell.getInstance().startShell();
-
-                // Patch SELinux policies (if needed)
-                if (!patchedSeLinuxPolicies) {
-                    EvdevReader.patchSeLinuxPolicies();
-                    patchedSeLinuxPolicies = true;
-                }
-
-				// List all files and allow us access
-				File[] files = rundownWithPermissionsChange(0666);
-				
-				init = true;
-				for (File f : files) {
-					observer.onEvent(FileObserver.CREATE, f.getName());
-				}
-				
-				// Done with initial onEvent calls
-				init = false;
-				
-				// Start watching for new files
-				observer.startWatching();
-				
-				synchronized (startThread) {
-					// Wait to be awoken again by shutdown()
-					try {
-						startThread.wait();
-					} catch (InterruptedException e) {}
-				}
-				
-				// Giveup eventX permissions
-				rundownWithPermissionsChange(0660);
-
-                // Kill the root shell
-                try {
-                    EvdevShell.getInstance().stopShell();
-                } catch (InterruptedException e) {}
-			}
-		};
-		startThread.start();
-	}
-	
-	public void shutdown() {
-		// Let start thread cleanup on it's own sweet time
-		synchronized (startThread) {
-			startThread.notify();
-		}
-		
-		// Stop the observer
-		observer.stopWatching();
-		
-		synchronized (handlers) {			
-			// Stop creating new handlers
-			shutdown = true;
-			
-			// If we've already ungrabbed, there's nothing else to do
-			if (ungrabbed) {
-				return;
-			}
-			
-			// Stop all handlers
-			for (EvdevHandler handler : handlers.values()) {
-				handler.stop();
-			}
-		}
-	}
-}
@@ -1,87 +0,0 @@
-package com.limelight.binding.video;
-
-import com.limelight.nvstream.av.video.VideoDecoderRenderer;
-import com.limelight.nvstream.av.video.VideoDepacketizer;
-
-public class ConfigurableDecoderRenderer extends EnhancedDecoderRenderer {
-
-	private EnhancedDecoderRenderer decoderRenderer;
-	
-	@Override
-	public void release() {
-		if (decoderRenderer != null) {
-			decoderRenderer.release();
-		}
-	}
-
-	@Override
-	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
-		if (decoderRenderer == null) {
-			throw new IllegalStateException("ConfigurableDecoderRenderer not initialized");
-		}
-		return decoderRenderer.setup(width, height, redrawRate, renderTarget, drFlags);
-	}
-	
-	public void initializeWithFlags(int drFlags) {
-		if ((drFlags & VideoDecoderRenderer.FLAG_FORCE_HARDWARE_DECODING) != 0 ||
-				((drFlags & VideoDecoderRenderer.FLAG_FORCE_SOFTWARE_DECODING) == 0 &&
-				MediaCodecHelper.findProbableSafeDecoder() != null)) {
-			decoderRenderer = new MediaCodecDecoderRenderer();
-		}
-		else {
-			decoderRenderer = new AndroidCpuDecoderRenderer();
-		}
-	}
-	
-	public boolean isHardwareAccelerated() {
-		if (decoderRenderer == null) {
-			throw new IllegalStateException("ConfigurableDecoderRenderer not initialized");
-		}
-		return (decoderRenderer instanceof MediaCodecDecoderRenderer);
-	}
-
-	@Override
-	public boolean start(VideoDepacketizer depacketizer) {
-		return decoderRenderer.start(depacketizer);
-	}
-
-	@Override
-	public void stop() {
-		decoderRenderer.stop();
-	}
-
-	@Override
-	public int getCapabilities() {
-		return decoderRenderer.getCapabilities();
-	}
-
-	@Override
-	public int getAverageDecoderLatency() {
-		if (decoderRenderer != null) {
-			return decoderRenderer.getAverageDecoderLatency();
-		}
-		else {
-			return 0;
-		}
-	}
-
-	@Override
-	public int getAverageEndToEndLatency() {
-		if (decoderRenderer != null) {
-			return decoderRenderer.getAverageEndToEndLatency();
-		}
-		else {
-			return 0;
-		}
-	}
-
-    @Override
-    public String getDecoderName() {
-        if (decoderRenderer != null) {
-            return decoderRenderer.getDecoderName();
-        }
-        else {
-            return null;
-        }
-    }
-}
@@ -1,7 +0,0 @@
-package com.limelight.binding.video;
-
-import com.limelight.nvstream.av.video.VideoDecoderRenderer;
-
-public abstract class EnhancedDecoderRenderer implements VideoDecoderRenderer {
-    public abstract String getDecoderName();
-}
@@ -1,617 +0,0 @@
-package com.limelight.binding.video;
-
-import java.nio.ByteBuffer;
-import java.util.Locale;
-import java.util.concurrent.locks.LockSupport;
-
-import org.jcodec.codecs.h264.io.model.SeqParameterSet;
-import org.jcodec.codecs.h264.io.model.VUIParameters;
-
-import com.limelight.LimeLog;
-import com.limelight.nvstream.av.ByteBufferDescriptor;
-import com.limelight.nvstream.av.DecodeUnit;
-import com.limelight.nvstream.av.video.VideoDecoderRenderer;
-import com.limelight.nvstream.av.video.VideoDepacketizer;
-
-import android.annotation.TargetApi;
-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.view.SurfaceHolder;
-
-@SuppressWarnings("unused")
-public class MediaCodecDecoderRenderer extends EnhancedDecoderRenderer {
-
-	private ByteBuffer[] videoDecoderInputBuffers;
-	private MediaCodec videoDecoder;
-	private Thread rendererThread;
-	private boolean needsSpsBitstreamFixup, isExynos4;
-	private VideoDepacketizer depacketizer;
-	private boolean adaptivePlayback;
-	private int initialWidth, initialHeight;
-
-    private boolean needsBaselineSpsHack;
-    private SeqParameterSet savedSps;
-	
-	private long lastTimestampUs;
-	private long totalTimeMs;
-	private long decoderTimeMs;
-	private int totalFrames;
-	
-	private String decoderName;
-	private int numSpsIn;
-	private int numPpsIn;
-	private int numIframeIn;
-	
-	private static final boolean ENABLE_ASYNC_RENDERER = false;
-	
-	@TargetApi(Build.VERSION_CODES.KITKAT)
-	public MediaCodecDecoderRenderer() {
-		//dumpDecoders();
-		
-		MediaCodecInfo decoder = MediaCodecHelper.findProbableSafeDecoder();
-		if (decoder == null) {
-			decoder = MediaCodecHelper.findFirstDecoder();
-		}
-		if (decoder == null) {
-			// This case is handled later in setup()
-			return;
-		}
-		
-		decoderName = decoder.getName();
-		
-		// Set decoder-specific attributes
-		adaptivePlayback = MediaCodecHelper.decoderSupportsAdaptivePlayback(decoderName, decoder);
-		needsSpsBitstreamFixup = MediaCodecHelper.decoderNeedsSpsBitstreamRestrictions(decoderName, decoder);
-        needsBaselineSpsHack = MediaCodecHelper.decoderNeedsBaselineSpsHack(decoderName, decoder);
-        isExynos4 = MediaCodecHelper.isExynos4Device();
-        if (needsSpsBitstreamFixup) {
-			LimeLog.info("Decoder "+decoderName+" needs SPS bitstream restrictions fixup");
-		}
-        if (needsBaselineSpsHack) {
-            LimeLog.info("Decoder "+decoderName+" needs baseline SPS hack");
-        }
-		if (isExynos4) {
-			LimeLog.info("Decoder "+decoderName+" is on Exynos 4");
-		}
-	}
-	
-	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-	@Override
-	public boolean setup(int width, int height, int redrawRate, Object renderTarget, int drFlags) {
-		this.initialWidth = width;
-		this.initialHeight = height;
-		
-		if (decoderName == null) {
-			LimeLog.severe("No available hardware decoder!");
-			return false;
-		}
-		
-		// Codecs have been known to throw all sorts of crazy runtime exceptions
-		// due to implementation problems
-		try {
-			videoDecoder = MediaCodec.createByCodecName(decoderName);
-		} catch (Exception e) {
-			return false;
-		}
-		
-		MediaFormat videoFormat = MediaFormat.createVideoFormat("video/avc", width, height);
-		
-		// 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) {
-			videoFormat.setInteger(MediaFormat.KEY_MAX_WIDTH, width);
-			videoFormat.setInteger(MediaFormat.KEY_MAX_HEIGHT, height);
-		}
-		
-		// On Lollipop, we use asynchronous mode to avoid having a busy looping renderer thread
-		if (ENABLE_ASYNC_RENDERER && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			videoDecoder.setCallback(new MediaCodec.Callback() {
-				@Override
-				public void onOutputFormatChanged(MediaCodec codec, MediaFormat format) {
-			    	LimeLog.info("Output format changed");
-			    	LimeLog.info("New output Format: " + format);
-				}
-				
-				@Override
-				public void onOutputBufferAvailable(MediaCodec codec, int index,
-						BufferInfo info) {
-					try {
-						// FIXME: It looks like we can't frameskip here
-						codec.releaseOutputBuffer(index, true);
-					} catch (Exception e) {
-						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
-					}
-				}
-				
-				@Override
-				public void onInputBufferAvailable(MediaCodec codec, int index) {
-					try {
-						submitDecodeUnit(depacketizer.takeNextDecodeUnit(), codec.getInputBuffer(index), index);
-					} catch (InterruptedException e) {
-						// What do we do here?
-						e.printStackTrace();
-					} catch (Exception e) {
-						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
-					}
-				}
-				
-				@Override
-				public void onError(MediaCodec codec, CodecException e) {
-					if (e.isTransient()) {
-						LimeLog.warning(e.getDiagnosticInfo());
-						e.printStackTrace();
-					}
-					else {
-						LimeLog.severe(e.getDiagnosticInfo());
-						e.printStackTrace();
-					}
-				}
-			});
-		}
-		
-		videoDecoder.configure(videoFormat, ((SurfaceHolder)renderTarget).getSurface(), null, 0);
-		videoDecoder.setVideoScalingMode(MediaCodec.VIDEO_SCALING_MODE_SCALE_TO_FIT);
-		
-		LimeLog.info("Using hardware decoding");
-		
-		return true;
-	}
-	
-	@TargetApi(Build.VERSION_CODES.LOLLIPOP)
-	private void handleDecoderException(MediaCodecDecoderRenderer dr, Exception e, ByteBuffer buf, int codecFlags) {
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			if (e instanceof CodecException) {
-				CodecException codecExc = (CodecException) e;
-				
-				if (codecExc.isTransient()) {
-					// We'll let transient exceptions go
-					LimeLog.warning(codecExc.getDiagnosticInfo());
-					return;
-				}
-				
-				LimeLog.severe(codecExc.getDiagnosticInfo());
-			}
-		}
-		
-		if (buf != null || codecFlags != 0) {
-			throw new RendererException(dr, e, buf, codecFlags);
-		}
-		else {
-			throw new RendererException(dr, e);
-		}
-	}
-	
-	private void startRendererThread()
-	{
-		rendererThread = new Thread() {
-			@SuppressWarnings("deprecation")
-			@Override
-			public void run() {
-				BufferInfo info = new BufferInfo();
-				DecodeUnit du = null;
-				int inputIndex = -1;
-				while (!isInterrupted())
-				{
-					// In order to get as much data to the decoder as early as possible,
-					// try to submit up to 5 decode units at once without blocking.
-					if (inputIndex == -1 && du == null) {
-						try {
-							for (int i = 0; i < 5; i++) {
-								inputIndex = videoDecoder.dequeueInputBuffer(0);
-								du = depacketizer.pollNextDecodeUnit();
-
-								// Stop if we can't get a DU or input buffer
-								if (du == null || inputIndex == -1) {
-									break;
-								}
-								
-								submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
-								
-								du = null;
-								inputIndex = -1;
-							}
-						} catch (Exception e) {
-							inputIndex = -1;
-							handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
-						}
-					}
-					
-					// Grab an input buffer if we don't have one already.
-					// This way we can have one ready hopefully by the time
-					// the depacketizer is done with this frame. It's important
-					// that this can timeout because it's possible that we could exhaust
-					// the decoder's input buffers and deadlocks because aren't pulling
-					// frames out of the other end.
-					if (inputIndex == -1) {
-						try {
-							// If we've got a DU waiting to be given to the decoder, 
-							// wait a full 3 ms for an input buffer. Otherwise
-							// just see if we can get one immediately.
-							inputIndex = videoDecoder.dequeueInputBuffer(du != null ? 3000 : 0);
-						} catch (Exception e) {
-							inputIndex = -1;
-							handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
-						}
-					}
-					
-					// Grab a decode unit if we don't have one already
-					if (du == null) {
-						du = depacketizer.pollNextDecodeUnit();
-					}
-					
-					// If we've got both a decode unit and an input buffer, we'll
-					// submit now. Otherwise, we wait until we have one.
-					if (du != null && inputIndex >= 0) {
-						submitDecodeUnit(du, videoDecoderInputBuffers[inputIndex], inputIndex);
-						
-						// DU and input buffer have both been consumed
-						du = null;
-						inputIndex = -1;
-					}
-					
-					// Try to output a frame
-					try {
-						int outIndex = videoDecoder.dequeueOutputBuffer(info, 0);
-
-					    if (outIndex >= 0) {
-					    	long presentationTimeUs = info.presentationTimeUs;
-						    int lastIndex = outIndex;
-						    
-						    // Get the last output buffer in the queue
-						    while ((outIndex = videoDecoder.dequeueOutputBuffer(info, 0)) >= 0) {
-						    	videoDecoder.releaseOutputBuffer(lastIndex, false);
-						    	lastIndex = outIndex;
-						    	presentationTimeUs = info.presentationTimeUs;
-						    }
-						    
-						    // Render the last buffer
-					    	videoDecoder.releaseOutputBuffer(lastIndex, true);
-					    	
-						    // Add delta time to the totals (excluding probable outliers)
-						    long delta = System.currentTimeMillis()-(presentationTimeUs/1000);
-						    if (delta >= 0 && delta < 1000) {
-						    	decoderTimeMs += delta;
-							    totalTimeMs += delta;
-						    }
-					    } else {
-						    switch (outIndex) {
-						    case MediaCodec.INFO_TRY_AGAIN_LATER:
-						    	// Getting an input buffer may already block
-						    	// so don't park if we still need to do that
-						    	if (inputIndex >= 0) {
-							    	LockSupport.parkNanos(1);
-						    	}
-						    	break;
-						    case MediaCodec.INFO_OUTPUT_BUFFERS_CHANGED:
-						    	LimeLog.info("Output buffers changed");
-							    break;
-						    case MediaCodec.INFO_OUTPUT_FORMAT_CHANGED:
-						    	LimeLog.info("Output format changed");
-						    	LimeLog.info("New output Format: " + videoDecoder.getOutputFormat());
-						    	break;
-						    default:
-						      break;
-						    }
-					    }
-					} catch (Exception e) {
-						handleDecoderException(MediaCodecDecoderRenderer.this, e, null, 0);
-					}
-				}
-			}
-		};
-		rendererThread.setName("Video - Renderer (MediaCodec)");
-		rendererThread.setPriority(Thread.MAX_PRIORITY);
-		rendererThread.start();
-	}
-
-	@SuppressWarnings("deprecation")
-	@Override
-	public boolean start(VideoDepacketizer depacketizer) {
-		this.depacketizer = depacketizer;
-		
-		// Start the decoder
-		videoDecoder.start();
-		
-		// On devices pre-Lollipop, we'll use a rendering thread
-		if (!ENABLE_ASYNC_RENDERER || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
-			videoDecoderInputBuffers = videoDecoder.getInputBuffers();
-			startRendererThread();
-		}
-		return true;
-	}
-
-	@Override
-	public void stop() {
-		if (rendererThread != null) {
-			// Halt the rendering thread
-			rendererThread.interrupt();
-			try {
-				rendererThread.join();
-			} catch (InterruptedException ignored) { }
-		}
-		
-		// Stop the decoder
-		videoDecoder.stop();
-	}
-
-	@Override
-	public void release() {
-		if (videoDecoder != null) {
-			videoDecoder.release();
-		}
-	}
-	
-	private void queueInputBuffer(int inputBufferIndex, int offset, int length, long timestampUs, int codecFlags) {
-		// Try 25 times to submit the input buffer before throwing a real exception
-		int i;
-		Exception lastException = null;
-		
-		for (i = 0; i < 25; i++) {
-			try {
-				videoDecoder.queueInputBuffer(inputBufferIndex,
-						0, length,
-						timestampUs, codecFlags);
-				break;
-			} catch (Exception e) {
-				handleDecoderException(this, e, null, codecFlags);
-				lastException = e;
-			}
-		}
-		
-		if (i == 25) {
-			throw new RendererException(this, lastException, null, codecFlags);
-		}
-	}
-
-	@SuppressWarnings("deprecation")
-	private void submitDecodeUnit(DecodeUnit decodeUnit, ByteBuffer buf, int inputBufferIndex) {
-		long currentTime = System.currentTimeMillis();
-		long delta = currentTime-decodeUnit.getReceiveTimestamp();
-		if (delta >= 0 && delta < 1000) {
-		    totalTimeMs += currentTime-decodeUnit.getReceiveTimestamp();
-		    totalFrames++;
-		}
-		
-		long timestampUs = currentTime * 1000;
-		if (timestampUs <= lastTimestampUs) {
-			// We can't submit multiple buffers with the same timestamp
-			// so bump it up by one before queuing
-			timestampUs = lastTimestampUs + 1;
-		}
-		lastTimestampUs = timestampUs;
-		
-		// Clear old input data
-		buf.clear();
-		
-		int codecFlags = 0;
-		int decodeUnitFlags = decodeUnit.getFlags();
-		if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
-			codecFlags |= MediaCodec.BUFFER_FLAG_CODEC_CONFIG;
-		}
-		if ((decodeUnitFlags & DecodeUnit.DU_FLAG_SYNC_FRAME) != 0) {
-			codecFlags |= MediaCodec.BUFFER_FLAG_SYNC_FRAME;
-			numIframeIn++;
-		}
-
-        boolean needsSpsReplay = false;
-		
-		if ((decodeUnitFlags & DecodeUnit.DU_FLAG_CODEC_CONFIG) != 0) {
-			ByteBufferDescriptor header = decodeUnit.getBufferList().get(0);
-			if (header.data[header.offset+4] == 0x67) {
-				numSpsIn++;
-				
-				ByteBuffer spsBuf = ByteBuffer.wrap(header.data);
-				
-				// Skip to the start of the NALU data
-				spsBuf.position(header.offset+5);
-				
-				SeqParameterSet sps = SeqParameterSet.read(spsBuf);
-
-                // Some decoders rely on H264 level to decide how many buffers are needed
-                // Since we only need one frame buffered, we'll set the level as low as we can
-                // for known resolution combinations
-                if (initialWidth == 1280 && initialHeight == 720) {
-                    // Max 5 buffered frames at 1280x720x60
-                    LimeLog.info("Patching level_idc to 32");
-                    sps.level_idc = 32;
-                }
-                else if (initialWidth == 1920 && initialHeight == 1080) {
-                    // Max 4 buffered frames at 1920x1080x64
-                    LimeLog.info("Patching level_idc to 42");
-                    sps.level_idc = 42;
-                }
-                else {
-                    // Leave the profile alone (currently 5.0)
-                }
-				
-				// TI OMAP4 requires a reference frame count of 1 to decode successfully. Exynos 4
-				// also requires this fixup.
-				//
-				// I'm doing this fixup for all devices because I haven't seen any devices that
-				// this causes issues for. At worst, it seems to do nothing and at best it fixes
-				// issues with video lag, hangs, and crashes.
-				LimeLog.info("Patching num_ref_frames in SPS");
-				sps.num_ref_frames = 1;
-				
-				if (needsSpsBitstreamFixup || isExynos4) {
-					// The SPS that comes in the current H264 bytestream doesn't set bitstream_restriction_flag
-					// or max_dec_frame_buffering which increases decoding latency on Tegra.
-					LimeLog.info("Adding bitstream restrictions");
-
-					sps.vuiParams.bitstreamRestriction = new VUIParameters.BitstreamRestriction();
-					sps.vuiParams.bitstreamRestriction.motion_vectors_over_pic_boundaries_flag = true;
-					sps.vuiParams.bitstreamRestriction.max_bytes_per_pic_denom = 2;
-					sps.vuiParams.bitstreamRestriction.max_bits_per_mb_denom = 1;
-					sps.vuiParams.bitstreamRestriction.log2_max_mv_length_horizontal = 16;
-					sps.vuiParams.bitstreamRestriction.log2_max_mv_length_vertical = 16;
-					sps.vuiParams.bitstreamRestriction.num_reorder_frames = 0;
-					sps.vuiParams.bitstreamRestriction.max_dec_frame_buffering = 1;
-				}
-
-                // If we need to hack this SPS to say we're baseline, do so now
-                if (needsBaselineSpsHack) {
-                    LimeLog.info("Hacking SPS to baseline");
-                    sps.profile_idc = 66;
-                    savedSps = sps;
-                }
-				
-				// Write the annex B header
-				buf.put(header.data, header.offset, 5);
-				
-				// Write the modified SPS to the input buffer
-				sps.write(buf);
-				
-				queueInputBuffer(inputBufferIndex,
-						0, buf.position(),
-						timestampUs, codecFlags);
-				
-				depacketizer.freeDecodeUnit(decodeUnit);
-				return;
-			} else if (header.data[header.offset+4] == 0x68) {
-				numPpsIn++;
-
-                if (needsBaselineSpsHack) {
-                    LimeLog.info("Saw PPS; disabling SPS hack");
-                    needsBaselineSpsHack = false;
-
-                    // Give the decoder the SPS again with the proper profile now
-                    needsSpsReplay = true;
-                }
-			}
-		}
-
-		// Copy data from our buffer list into the input buffer
-		for (ByteBufferDescriptor desc : decodeUnit.getBufferList())
-		{
-			buf.put(desc.data, desc.offset, desc.length);
-		}
-
-		queueInputBuffer(inputBufferIndex,
-				0, decodeUnit.getDataLength(),
-				timestampUs, codecFlags);
-		
-		depacketizer.freeDecodeUnit(decodeUnit);
-
-        if (needsSpsReplay) {
-            replaySps();
-        }
-	}
-
-    private void replaySps() {
-        int inputIndex = videoDecoder.dequeueInputBuffer(-1);
-        ByteBuffer inputBuffer = videoDecoderInputBuffers[inputIndex];
-
-        inputBuffer.clear();
-
-        // Write the Annex B header
-        inputBuffer.put(new byte[]{0x00, 0x00, 0x00, 0x01, 0x67});
-
-        // Switch the H264 profile back to high
-        savedSps.profile_idc = 100;
-
-        // Write the SPS data
-        savedSps.write(inputBuffer);
-
-        // No need for the SPS anymore
-        savedSps = null;
-
-        // Queue the new SPS
-        queueInputBuffer(inputIndex,
-                0, inputBuffer.position(),
-                System.currentTimeMillis() * 1000,
-                MediaCodec.BUFFER_FLAG_CODEC_CONFIG);
-
-        LimeLog.info("SPS replay complete");
-    }
-
-	@Override
-	public int getCapabilities() {
-		return adaptivePlayback ?
-				VideoDecoderRenderer.CAPABILITY_ADAPTIVE_RESOLUTION : 0;
-	}
-
-	@Override
-	public int getAverageDecoderLatency() {
-		if (totalFrames == 0) {
-			return 0;
-		}
-		return (int)(decoderTimeMs / totalFrames);
-	}
-
-	@Override
-	public int getAverageEndToEndLatency() {
-		if (totalFrames == 0) {
-			return 0;
-		}
-		return (int)(totalTimeMs / totalFrames);
-	}
-
-    @Override
-    public String getDecoderName() {
-        return decoderName;
-    }
-
-    public class RendererException extends RuntimeException {
-		private static final long serialVersionUID = 8985937536997012406L;
-		
-		private Exception originalException;
-		private MediaCodecDecoderRenderer renderer;
-		private ByteBuffer currentBuffer;
-		private int currentCodecFlags;
-		
-		public RendererException(MediaCodecDecoderRenderer renderer, Exception e) {
-			this.renderer = renderer;
-			this.originalException = e;
-		}
-		
-		public RendererException(MediaCodecDecoderRenderer renderer, Exception e, ByteBuffer currentBuffer, int currentCodecFlags) {
-			this.renderer = renderer;
-			this.originalException = e;
-			this.currentBuffer = currentBuffer;
-			this.currentCodecFlags = currentCodecFlags;
-		}
-		
-		public String toString() {
-			String str = "";
-			
-			str += "Decoder: "+renderer.decoderName+"\n";
-			str += "Initial video dimensions: "+renderer.initialWidth+"x"+renderer.initialHeight+"\n";
-			str += "In stats: "+renderer.numSpsIn+", "+renderer.numPpsIn+", "+renderer.numIframeIn+"\n";
-			str += "Total frames: "+renderer.totalFrames+"\n";
-			
-			if (currentBuffer != null) {
-				str += "Current buffer: ";
-				currentBuffer.flip();
-				while (currentBuffer.hasRemaining() && currentBuffer.position() < 10) {
-					str += String.format((Locale)null, "%02x ", currentBuffer.get());
-				}
-				str += "\n";
-				str += "Buffer codec flags: "+currentCodecFlags+"\n";
-			}
-			
-			str += "Is Exynos 4: "+renderer.isExynos4+"\n";
-			
-			str += "/proc/cpuinfo:\n";
-			try {
-				str += MediaCodecHelper.readCpuinfo();
-			} catch (Exception e) {
-				str += e.getMessage();
-			}
-			
-			str += "Full decoder dump:\n";
-			try {
-				str += MediaCodecHelper.dumpDecoders();
-			} catch (Exception e) {
-				str += e.getMessage();
-			}
-			
-			str += originalException.toString();
-			
-			return str;
-		}
-	}
-}
@@ -1,313 +0,0 @@
-package com.limelight.binding.video;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-
-import android.annotation.SuppressLint;
-import android.annotation.TargetApi;
-import android.media.MediaCodecInfo;
-import android.media.MediaCodecList;
-import android.media.MediaCodecInfo.CodecCapabilities;
-import android.media.MediaCodecInfo.CodecProfileLevel;
-import android.os.Build;
-
-import com.limelight.LimeLog;
-
-public class MediaCodecHelper {
-	
-	public static final List<String> preferredDecoders;
-
-	public static final List<String> blacklistedDecoderPrefixes;
-	public static final List<String> spsFixupBitstreamFixupDecoderPrefixes;
-	public static final List<String> whitelistedAdaptiveResolutionPrefixes;
-    public static final List<String> baselineProfileHackPrefixes;
-	
-	static {
-		preferredDecoders = new LinkedList<String>();
-	}
-	
-	static {
-		blacklistedDecoderPrefixes = new LinkedList<String>();
-		
-		// Software decoders that don't support H264 high profile
-		blacklistedDecoderPrefixes.add("omx.google");
-		blacklistedDecoderPrefixes.add("AVCDecoder");
-	}
-	
-	static {
-		spsFixupBitstreamFixupDecoderPrefixes = new LinkedList<String>();
-		spsFixupBitstreamFixupDecoderPrefixes.add("omx.nvidia");
-		spsFixupBitstreamFixupDecoderPrefixes.add("omx.qcom");
-		spsFixupBitstreamFixupDecoderPrefixes.add("omx.mtk");
-        spsFixupBitstreamFixupDecoderPrefixes.add("omx.brcm");
-
-        baselineProfileHackPrefixes = new LinkedList<String>();
-        baselineProfileHackPrefixes.add("omx.intel");
-
-		whitelistedAdaptiveResolutionPrefixes = new LinkedList<String>();
-		whitelistedAdaptiveResolutionPrefixes.add("omx.nvidia");
-		whitelistedAdaptiveResolutionPrefixes.add("omx.qcom");
-		whitelistedAdaptiveResolutionPrefixes.add("omx.sec");
-		whitelistedAdaptiveResolutionPrefixes.add("omx.TI");
-	}
-
-	private static boolean isDecoderInList(List<String> decoderList, String decoderName) {
-		for (String badPrefix : decoderList) {
-			if (decoderName.length() >= badPrefix.length()) {
-				String prefix = decoderName.substring(0, badPrefix.length());
-				if (prefix.equalsIgnoreCase(badPrefix)) {
-					return true;
-				}
-			}
-		}
-		
-		return false;
-	}
-	
-	@TargetApi(Build.VERSION_CODES.KITKAT)
-	public static boolean decoderSupportsAdaptivePlayback(String decoderName, MediaCodecInfo decoderInfo) {
-		/*
-		FIXME: Intel's decoder on Nexus Player forces the high latency path if adaptive playback is enabled
-		so we'll keep it off for now, since we don't know whether other devices also do the same
-
-		if (isDecoderInList(whitelistedAdaptiveResolutionPrefixes, decoderName)) {
-			LimeLog.info("Adaptive playback supported (whitelist)");
-			return true;
-		}
-		
-		// Possibly enable adaptive playback on KitKat and above
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-			try {
-				if (decoderInfo.getCapabilitiesForType("video/avc").
-						isFeatureSupported(CodecCapabilities.FEATURE_AdaptivePlayback))
-				{
-					// This will make getCapabilities() return that adaptive playback is supported
-					LimeLog.info("Adaptive playback supported (FEATURE_AdaptivePlayback)");
-					return true;
-				}
-			} catch (Exception e) {
-				// Tolerate buggy codecs
-			}
-		}*/
-		
-		return false;
-	}
-	
-	public static boolean decoderNeedsSpsBitstreamRestrictions(String decoderName, MediaCodecInfo decoderInfo) {
-		return isDecoderInList(spsFixupBitstreamFixupDecoderPrefixes, decoderName);
-	}
-
-    public static boolean decoderNeedsBaselineSpsHack(String decoderName, MediaCodecInfo decoderInfo) {
-        return isDecoderInList(baselineProfileHackPrefixes, decoderName);
-    }
-	
-	@SuppressWarnings("deprecation")
-	@SuppressLint("NewApi")
-	private static LinkedList<MediaCodecInfo> getMediaCodecList() {
-		LinkedList<MediaCodecInfo> infoList = new LinkedList<MediaCodecInfo>();
-		
-		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-			MediaCodecList mcl = new MediaCodecList(MediaCodecList.REGULAR_CODECS);
-            Collections.addAll(infoList, mcl.getCodecInfos());
-		}
-		else {
-			for (int i = 0; i < MediaCodecList.getCodecCount(); i++) {
-				infoList.add(MediaCodecList.getCodecInfoAt(i));
-			}	
-		}
-		
-		return infoList;
-	}
-	
-	@SuppressWarnings("RedundantThrows")
-    public static String dumpDecoders() throws Exception {
-		String str = "";
-		for (MediaCodecInfo codecInfo : getMediaCodecList()) {
-			// Skip encoders
-			if (codecInfo.isEncoder()) {
-				continue;
-			}
-			
-			str += "Decoder: "+codecInfo.getName()+"\n";
-			for (String type : codecInfo.getSupportedTypes()) {
-				str += "\t"+type+"\n";
-				CodecCapabilities caps = codecInfo.getCapabilitiesForType(type);
-				
-				for (CodecProfileLevel profile : caps.profileLevels) {
-					str += "\t\t"+profile.profile+" "+profile.level+"\n";
-				}
-			}
-		}
-		return str;
-	}
-	
-	public static MediaCodecInfo findPreferredDecoder() {
-		// This is a different algorithm than the other findXXXDecoder functions,
-		// because we want to evaluate the decoders in our list's order
-		// rather than MediaCodecList's order
-		
-		for (String preferredDecoder : preferredDecoders) {
-			for (MediaCodecInfo codecInfo : getMediaCodecList()) {
-				// Skip encoders
-				if (codecInfo.isEncoder()) {
-					continue;
-				}
-				
-				// Check for preferred decoders
-				if (preferredDecoder.equalsIgnoreCase(codecInfo.getName())) {
-					LimeLog.info("Preferred decoder choice is "+codecInfo.getName());
-					return codecInfo;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	public static MediaCodecInfo findFirstDecoder() {
-		for (MediaCodecInfo codecInfo : getMediaCodecList()) {
-			// Skip encoders
-			if (codecInfo.isEncoder()) {
-				continue;
-			}
-			
-			// Check for explicitly blacklisted decoders
-			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
-				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
-				continue;
-			}
-			
-			// Find a decoder that supports H.264
-			for (String mime : codecInfo.getSupportedTypes()) {
-				if (mime.equalsIgnoreCase("video/avc")) {
-					LimeLog.info("First decoder choice is "+codecInfo.getName());
-					return codecInfo;
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	public static MediaCodecInfo findProbableSafeDecoder() {
-		// First look for a preferred decoder by name
-		MediaCodecInfo info = findPreferredDecoder();
-		if (info != null) {
-			return info;
-		}
-		
-		// Now look for decoders we know are safe
-		try {
-			// If this function completes, it will determine if the decoder is safe
-			return findKnownSafeDecoder();
-		} catch (Exception e) {
-			// Some buggy devices seem to throw exceptions
-			// from getCapabilitiesForType() so we'll just assume
-			// they're okay and go with the first one we find
-			return findFirstDecoder();
-		}
-	}
-
-	// We declare this method as explicitly throwing Exception
-	// since some bad decoders can throw IllegalArgumentExceptions unexpectedly
-	// and we want to be sure all callers are handling this possibility
-	@SuppressWarnings("RedundantThrows")
-    public static MediaCodecInfo findKnownSafeDecoder() throws Exception {
-		for (MediaCodecInfo codecInfo : getMediaCodecList()) {		
-			// Skip encoders
-			if (codecInfo.isEncoder()) {
-				continue;
-			}
-			
-			// Check for explicitly blacklisted decoders
-			if (isDecoderInList(blacklistedDecoderPrefixes, codecInfo.getName())) {
-				LimeLog.info("Skipping blacklisted decoder: "+codecInfo.getName());
-				continue;
-			}
-			
-			// Find a decoder that supports H.264 high profile
-			for (String mime : codecInfo.getSupportedTypes()) {
-				if (mime.equalsIgnoreCase("video/avc")) {
-					LimeLog.info("Examining decoder capabilities of "+codecInfo.getName());
-					
-					CodecCapabilities caps = codecInfo.getCapabilitiesForType(mime);
-					for (CodecProfileLevel profile : caps.profileLevels) {
-						if (profile.profile == CodecProfileLevel.AVCProfileHigh) {
-							LimeLog.info("Decoder "+codecInfo.getName()+" supports high profile");
-							LimeLog.info("Selected decoder: "+codecInfo.getName());
-							return codecInfo;
-						}
-					}
-					
-					LimeLog.info("Decoder "+codecInfo.getName()+" does NOT support high profile");
-				}
-			}
-		}
-		
-		return null;
-	}
-	
-	public static String readCpuinfo() throws Exception {
-		StringBuilder cpuInfo = new StringBuilder();
-		BufferedReader br = new BufferedReader(new FileReader(new File("/proc/cpuinfo")));
-		try {
-			for (;;) {
-				int ch = br.read();
-				if (ch == -1)
-					break;
-				cpuInfo.append((char)ch);
-			}
-			
-			return cpuInfo.toString();
-		} finally {
-			br.close();
-		}
-	}
-	
-	private static boolean stringContainsIgnoreCase(String string, String substring) {
-		return string.toLowerCase(Locale.ENGLISH).contains(substring.toLowerCase(Locale.ENGLISH));
-	}
-	
-	public static boolean isExynos4Device() {
-		try {
-			// Try reading CPU info too look for 
-			String cpuInfo = readCpuinfo();
-			
-			// SMDK4xxx is Exynos 4 
-			if (stringContainsIgnoreCase(cpuInfo, "SMDK4")) {
-				LimeLog.info("Found SMDK4 in /proc/cpuinfo");
-				return true;
-			}
-			
-			// If we see "Exynos 4" also we'll count it
-			if (stringContainsIgnoreCase(cpuInfo, "Exynos 4")) {
-				LimeLog.info("Found Exynos 4 in /proc/cpuinfo");
-				return true;
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		try {
-			File systemDir = new File("/sys/devices/system");
-			File[] files = systemDir.listFiles();
-			if (files != null) {
-				for (File f : files) {
-					if (stringContainsIgnoreCase(f.getName(), "exynos4")) {
-						LimeLog.info("Found exynos4 in /sys/devices/system");
-						return true;
-					}
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		
-		return false;
-	}
-}
@@ -1,169 +0,0 @@
-package com.limelight.computers;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.UUID;
-
-import com.limelight.LimeLog;
-import com.limelight.nvstream.http.ComputerDetails;
-
-import android.content.ContentValues;
-import android.content.Context;
-import android.database.Cursor;
-import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteException;
-
-public class ComputerDatabaseManager {
-	private static final String COMPUTER_DB_NAME = "computers.db";
-	private static final String COMPUTER_TABLE_NAME = "Computers";
-	private static final String COMPUTER_NAME_COLUMN_NAME = "ComputerName";
-	private static final String COMPUTER_UUID_COLUMN_NAME = "UUID";
-	private static final String LOCAL_IP_COLUMN_NAME = "LocalIp";
-	private static final String REMOTE_IP_COLUMN_NAME = "RemoteIp";
-	private static final String MAC_COLUMN_NAME = "Mac";
-	
-	private SQLiteDatabase computerDb;
-	
-	public ComputerDatabaseManager(Context c) {
-		try {
-			// Create or open an existing DB
-			computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
-		} catch (SQLiteException e) {
-			// Delete the DB and try again
-			c.deleteDatabase(COMPUTER_DB_NAME);
-			computerDb = c.openOrCreateDatabase(COMPUTER_DB_NAME, 0, null);
-		}
-		initializeDb();
-	}
-	
-	public void close() {
-		computerDb.close();
-	}
-	
-	private void initializeDb() {
-		// 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 NOT NULL, %s TEXT NOT NULL, %s TEXT NOT NULL)",
-				COMPUTER_TABLE_NAME,
-				COMPUTER_NAME_COLUMN_NAME, COMPUTER_UUID_COLUMN_NAME, LOCAL_IP_COLUMN_NAME,
-				REMOTE_IP_COLUMN_NAME, MAC_COLUMN_NAME));
-	}
-	
-	public void deleteComputer(String name) {
-		computerDb.delete(COMPUTER_TABLE_NAME, COMPUTER_NAME_COLUMN_NAME+"='"+name+"'", null);
-	}
-	
-	public boolean updateComputer(ComputerDetails details) {
-		ContentValues values = new ContentValues();
-		values.put(COMPUTER_NAME_COLUMN_NAME, details.name);
-		values.put(COMPUTER_UUID_COLUMN_NAME, details.uuid.toString());
-		values.put(LOCAL_IP_COLUMN_NAME, details.localIp.getAddress());
-		values.put(REMOTE_IP_COLUMN_NAME, details.remoteIp.getAddress());
-		values.put(MAC_COLUMN_NAME, details.macAddress);
-		return -1 != computerDb.insertWithOnConflict(COMPUTER_TABLE_NAME, null, values, SQLiteDatabase.CONFLICT_REPLACE);
-	}
-	
-	public List<ComputerDetails> getAllComputers() {
-		Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME, null);
-		LinkedList<ComputerDetails> computerList = new LinkedList<ComputerDetails>();
-		while (c.moveToNext()) {
-			ComputerDetails details = new ComputerDetails();
-			
-			details.name = c.getString(0);
-			
-			String uuidStr = c.getString(1);
-			try {
-				details.uuid = UUID.fromString(uuidStr);
-			} catch (IllegalArgumentException e) {
-				// We'll delete this entry
-				LimeLog.severe("DB: Corrupted UUID for "+details.name);
-			}
-			
-			try {
-				details.localIp = InetAddress.getByAddress(c.getBlob(2));
-			} catch (UnknownHostException e) {
-				// We'll delete this entry
-				LimeLog.severe("DB: Corrupted local IP for "+details.name);
-			}
-			
-			try {
-				details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-			} catch (UnknownHostException e) {
-				// We'll delete this entry
-				LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-			}
-			
-			details.macAddress = c.getString(4);
-			
-			// This signifies we don't have dynamic state (like pair state)
-            details.state = ComputerDetails.State.UNKNOWN;
-            details.reachability = ComputerDetails.Reachability.UNKNOWN;
-			
-			// If a field is corrupt or missing, skip the database entry
-			if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
-					details.macAddress == null) {
-				continue;
-			}
-
-
-            computerList.add(details);
-		}
-		
-		c.close();
-		
-		return computerList;
-	}
-	
-	public ComputerDetails getComputerByName(String name) {
-		Cursor c = computerDb.rawQuery("SELECT * FROM "+COMPUTER_TABLE_NAME+" WHERE "+COMPUTER_NAME_COLUMN_NAME+"='"+name+"'", null);
-		ComputerDetails details = new ComputerDetails();
-		if (!c.moveToFirst()) {
-			// No matching computer
-			c.close();
-			return null;
-		}
-
-		details.name = c.getString(0);
-		
-		String uuidStr = c.getString(1);
-		try {
-			details.uuid = UUID.fromString(uuidStr);
-		} catch (IllegalArgumentException e) {
-			// We'll delete this entry
-			LimeLog.severe("DB: Corrupted UUID for "+details.name);
-		}
-		
-		try {
-			details.localIp = InetAddress.getByAddress(c.getBlob(2));
-		} catch (UnknownHostException e) {
-			// We'll delete this entry
-			LimeLog.severe("DB: Corrupted local IP for "+details.name);
-		}
-		
-		try {
-			details.remoteIp = InetAddress.getByAddress(c.getBlob(3));
-		} catch (UnknownHostException e) {
-			// We'll delete this entry
-			LimeLog.severe("DB: Corrupted remote IP for "+details.name);
-		}
-		
-		details.macAddress = c.getString(4);
-		
-		c.close();
-
-        details.state = ComputerDetails.State.UNKNOWN;
-        details.reachability = ComputerDetails.Reachability.UNKNOWN;
-		
-		// If a field is corrupt or missing, delete the database entry
-		if (details.uuid == null || details.localIp == null || details.remoteIp == null ||
-				details.macAddress == null) {
-			deleteComputer(details.name);
-			return null;
-		}
-		
-		return details;
-	}
-}
@@ -1,7 +0,0 @@
-package com.limelight.computers;
-
-import com.limelight.nvstream.http.ComputerDetails;
-
-public interface ComputerManagerListener {
-	public void notifyComputerUpdated(ComputerDetails details);
-}
@@ -1,470 +0,0 @@
-package com.limelight.computers;
-
-import java.net.InetAddress;
-import java.util.LinkedList;
-import java.util.concurrent.atomic.AtomicInteger;
-
-import com.limelight.LimeLog;
-import com.limelight.binding.PlatformBinding;
-import com.limelight.discovery.DiscoveryService;
-import com.limelight.nvstream.http.ComputerDetails;
-import com.limelight.nvstream.http.NvHTTP;
-import com.limelight.nvstream.mdns.MdnsComputer;
-import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
-
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Binder;
-import android.os.IBinder;
-
-public class ComputerManagerService extends Service {
-	private static final int POLLING_PERIOD_MS = 3000;
-	private static final int MDNS_QUERY_PERIOD_MS = 1000;
-	
-	private ComputerManagerBinder binder = new ComputerManagerBinder();
-	
-	private ComputerDatabaseManager dbManager;
-	private AtomicInteger dbRefCount = new AtomicInteger(0);
-	
-	private IdentityManager idManager;
-	private final LinkedList<PollingTuple> pollingTuples = new LinkedList<PollingTuple>();
-	private ComputerManagerListener listener = null;
-	private AtomicInteger activePolls = new AtomicInteger(0);
-    private boolean pollingActive = false;
-
-	private DiscoveryService.DiscoveryBinder discoveryBinder;
-	private final ServiceConnection discoveryServiceConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, IBinder binder) {
-			synchronized (discoveryServiceConnection) {
-				DiscoveryService.DiscoveryBinder privateBinder = ((DiscoveryService.DiscoveryBinder)binder);
-				
-				// Set us as the event listener
-				privateBinder.setListener(createDiscoveryListener());
-				
-				// Signal a possible waiter that we're all setup
-				discoveryBinder = privateBinder;
-				discoveryServiceConnection.notifyAll();
-			}
-		}
-
-		public void onServiceDisconnected(ComponentName className) {
-			discoveryBinder = null;
-		}
-	};
-
-    // Returns true if the details object was modified
-    private boolean runPoll(ComputerDetails details)
-    {
-        boolean newPc = details.name.isEmpty();
-
-        if (!getLocalDatabaseReference()) {
-            return false;
-        }
-
-        activePolls.incrementAndGet();
-
-        // Poll the machine
-        if (!doPollMachine(details)) {
-            details.state = ComputerDetails.State.OFFLINE;
-            details.reachability = ComputerDetails.Reachability.OFFLINE;
-        }
-
-        activePolls.decrementAndGet();
-
-        // If it's online, update our persistent state
-        if (details.state == ComputerDetails.State.ONLINE) {
-            if (!newPc) {
-                // Check if it's in the database because it could have been
-                // removed after this was issued
-                if (dbManager.getComputerByName(details.name) == null) {
-                    // It's gone
-                    releaseLocalDatabaseReference();
-                    return true;
-                }
-            }
-
-            dbManager.updateComputer(details);
-        }
-
-        // Don't call the listener if this is a failed lookup of a new PC
-        if ((!newPc || details.state == ComputerDetails.State.ONLINE) && listener != null) {
-            listener.notifyComputerUpdated(details);
-        }
-
-        releaseLocalDatabaseReference();
-        return true;
-    }
-
-    private Thread createPollingThread(final ComputerDetails details) {
-        Thread t = new Thread() {
-            @Override
-            public void run() {
-                while (!isInterrupted() && pollingActive) {
-                    // Check if this poll has modified the details
-                    runPoll(details);
-
-                    // Wait until the next polling interval
-                    try {
-                        Thread.sleep(POLLING_PERIOD_MS);
-                    } catch (InterruptedException e) {
-                        break;
-                    }
-                }
-            }
-        };
-        t.setName("Polling thread for "+details.localIp.getHostAddress());
-        return t;
-    }
-	
-	public class ComputerManagerBinder extends Binder {
-		public void startPolling(ComputerManagerListener listener) {
-            // Polling is active
-            pollingActive = true;
-
-			// Set the listener
-			ComputerManagerService.this.listener = listener;
-			
-			// Start mDNS autodiscovery too
-			discoveryBinder.startDiscovery(MDNS_QUERY_PERIOD_MS);
-
-            synchronized (pollingTuples) {
-                for (PollingTuple tuple : pollingTuples) {
-                    // This polling thread might already be there
-                    if (tuple.thread == null) {
-                        // Report this computer initially
-                        listener.notifyComputerUpdated(tuple.computer);
-
-                        tuple.thread = createPollingThread(tuple.computer);
-                        tuple.thread.start();
-                    }
-                }
-            }
-		}
-		
-		public void waitForReady() {
-			synchronized (discoveryServiceConnection) {
-				try {
-					while (discoveryBinder == null) {
-						// Wait for the bind notification
-						discoveryServiceConnection.wait(1000);
-					}
-				} catch (InterruptedException ignored) {
-				}
-			}
-		}
-		
-		public void waitForPollingStopped() {
-			while (activePolls.get() != 0) {
-				try {
-					Thread.sleep(250);
-				} catch (InterruptedException ignored) {}
-			}
-		}
-		
-		public boolean addComputerBlocking(InetAddress addr) {
-			return ComputerManagerService.this.addComputerBlocking(addr);
-		}
-		
-		public void addComputer(InetAddress addr) {
-			ComputerManagerService.this.addComputer(addr);
-		}
-		
-		public void removeComputer(String name) {
-			ComputerManagerService.this.removeComputer(name);
-		}
-		
-		public void stopPolling() {
-			// Just call the unbind handler to cleanup
-			ComputerManagerService.this.onUnbind(null);
-		}
-		
-		public String getUniqueId() {
-			return idManager.getUniqueId();
-		}
-	}
-	
-	@Override
-	public boolean onUnbind(Intent intent) {
-		// Stop mDNS autodiscovery
-		discoveryBinder.stopDiscovery();
-		
-		// Stop polling
-        pollingActive = false;
-        synchronized (pollingTuples) {
-            for (PollingTuple tuple : pollingTuples) {
-                if (tuple.thread != null) {
-                    // Interrupt and remove the thread
-                    tuple.thread.interrupt();
-                    tuple.thread = null;
-                }
-            }
-        }
-		
-		// Remove the listener
-		listener = null;
-		
-		return false;
-	}
-	
-	private MdnsDiscoveryListener createDiscoveryListener() {
-		return new MdnsDiscoveryListener() {
-			@Override
-			public void notifyComputerAdded(MdnsComputer computer) {
-				// Kick off a serverinfo poll on this machine
-				addComputer(computer.getAddress());
-			}
-
-			@Override
-			public void notifyComputerRemoved(MdnsComputer computer) {
-				// Nothing to do here
-			}
-
-			@Override
-			public void notifyDiscoveryFailure(Exception e) {
-				LimeLog.severe("mDNS discovery failed");
-				e.printStackTrace();
-			}
-		};
-	}
-
-	public void addComputer(InetAddress addr) {
-		// Setup a placeholder
-		ComputerDetails fakeDetails = new ComputerDetails();
-		fakeDetails.localIp = addr;
-		fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
-
-        addTuple(fakeDetails);
-	}
-
-    private void addTuple(ComputerDetails details) {
-        synchronized (pollingTuples) {
-            for (PollingTuple tuple : pollingTuples) {
-                // Check if this is the same computer
-                if (tuple.computer == details ||
-                        // If there's no name on one of these computers, compare with the local IP
-                        ((details.name.isEmpty() || tuple.computer.name.isEmpty()) &&
-                                tuple.computer.localIp.equals(details.localIp)) ||
-                        // If there is a name on both computers, compare with name
-                        ((!details.name.isEmpty() && !tuple.computer.name.isEmpty()) &&
-                                tuple.computer.name.equals(details.name))) {
-
-                    // Start a polling thread if polling is active
-                    if (pollingActive && tuple.thread == null) {
-                        tuple.thread = createPollingThread(details);
-                        tuple.thread.start();
-                    }
-
-                    // Found an entry so we're done
-                    return;
-                }
-            }
-
-            // If we got here, we didn't find an entry
-            PollingTuple tuple = new PollingTuple(details, pollingActive ? createPollingThread(details) : null);
-            pollingTuples.add(tuple);
-            if (tuple.thread != null) {
-                tuple.thread.start();
-            }
-        }
-    }
-
-	public boolean addComputerBlocking(InetAddress addr) {
-		// Setup a placeholder
-		ComputerDetails fakeDetails = new ComputerDetails();
-		fakeDetails.localIp = addr;
-		fakeDetails.remoteIp = addr;
-        fakeDetails.name = "";
-		
-		// Block while we try to fill the details
-        runPoll(fakeDetails);
-		
-		// If the machine is reachable, it was successful
-		if (fakeDetails.state == ComputerDetails.State.ONLINE) {
-            // Start a polling thread for this machine
-            addTuple(fakeDetails);
-            return true;
-        }
-        else {
-            return false;
-        }
-	}
-	
-	public void removeComputer(String name) {
-		if (!getLocalDatabaseReference()) {
-			return;
-		}
-		
-		// Remove it from the database
-		dbManager.deleteComputer(name);
-
-        synchronized (pollingTuples) {
-            // Remove the computer from the computer list
-            for (PollingTuple tuple : pollingTuples) {
-                if (tuple.computer.name.equals(name)) {
-                    if (tuple.thread != null) {
-                        // Interrupt the thread on this entry
-                        tuple.thread.interrupt();
-                    }
-                    pollingTuples.remove(tuple);
-                    break;
-                }
-            }
-        }
-		
-		releaseLocalDatabaseReference();
-	}
-	
-	private boolean getLocalDatabaseReference() {
-		if (dbRefCount.get() == 0) {
-			return false;
-		}
-		
-		dbRefCount.incrementAndGet();
-		return true;
-	}
-	
-	private void releaseLocalDatabaseReference() {
-		if (dbRefCount.decrementAndGet() == 0) {
-			dbManager.close();
-		}
-	}
-	
-	private ComputerDetails tryPollIp(ComputerDetails details, InetAddress ipAddr) {
-		try {
-			NvHTTP http = new NvHTTP(ipAddr, idManager.getUniqueId(),
-					null, PlatformBinding.getCryptoProvider(ComputerManagerService.this));
-
-			ComputerDetails newDetails = http.getComputerDetails();
-
-            // Check if this is the PC we expected
-            if (details.uuid != null && newDetails.uuid != null &&
-                    !details.uuid.equals(newDetails.uuid)) {
-                // We got the wrong PC!
-                LimeLog.info("Polling returned the wrong PC!");
-                return null;
-            }
-
-            return newDetails;
-		} catch (Exception e) {
-			return null;
-		}
-	}
-	
-	private boolean pollComputer(ComputerDetails details, boolean localFirst) {
-		ComputerDetails polledDetails;
-
-        // If the local address is routable across the Internet,
-        // always consider this PC remote to be conservative
-        if (details.localIp.equals(details.remoteIp)) {
-            localFirst = false;
-        }
-		
-		if (localFirst) {
-			polledDetails = tryPollIp(details, details.localIp);
-		}
-		else {
-			polledDetails = tryPollIp(details, details.remoteIp);
-		}
-		
-		if (polledDetails == null && !details.localIp.equals(details.remoteIp)) {
-			// Failed, so let's try the fallback
-			if (!localFirst) {
-				polledDetails = tryPollIp(details, details.localIp);
-			}
-			else {
-				polledDetails = tryPollIp(details, details.remoteIp);
-			}
-			
-			// The fallback poll worked
-			if (polledDetails != null) {
-				polledDetails.reachability = !localFirst ? ComputerDetails.Reachability.LOCAL :
-					ComputerDetails.Reachability.REMOTE;
-			}
-		}
-		else if (polledDetails != null) {
-			polledDetails.reachability = localFirst ? ComputerDetails.Reachability.LOCAL :
-				ComputerDetails.Reachability.REMOTE;
-		}
-		
-		// Machine was unreachable both tries
-		if (polledDetails == null) {
-			return false;
-		}
-		
-		// If we got here, it's reachable
-		details.update(polledDetails);
-		return true;
-	}
-	
-	private boolean doPollMachine(ComputerDetails details) {
-        if (details.reachability == ComputerDetails.Reachability.UNKNOWN ||
-            details.reachability == ComputerDetails.Reachability.OFFLINE) {
-            // Always try local first to avoid potential UDP issues when
-            // attempting to stream via the router's external IP address
-            // behind its NAT
-            return pollComputer(details, true);
-        }
-        else {
-            // If we're already reached a machine via a particular IP address,
-            // always try that one first
-            return pollComputer(details, details.reachability == ComputerDetails.Reachability.LOCAL);
-        }
-	}
-	
-	@Override
-	public void onCreate() {
-		// Bind to the discovery service
-		bindService(new Intent(this, DiscoveryService.class),
-				discoveryServiceConnection, Service.BIND_AUTO_CREATE);
-		
-		// Lookup or generate this device's UID
-		idManager = new IdentityManager(this);
-		
-		// Initialize the DB
-		dbManager = new ComputerDatabaseManager(this);
-		dbRefCount.set(1);
-
-        // Grab known machines into our computer list
-        if (!getLocalDatabaseReference()) {
-            return;
-        }
-
-        for (ComputerDetails computer : dbManager.getAllComputers()) {
-            // Add tuples for each computer
-            addTuple(computer);
-        }
-
-        releaseLocalDatabaseReference();
-	}
-	
-	@Override
-	public void onDestroy() {
-		if (discoveryBinder != null) {
-			// Unbind from the discovery service
-			unbindService(discoveryServiceConnection);
-		}
-		
-		// FIXME: Should await termination here but we have timeout issues in HttpURLConnection
-		
-		// Remove the initial DB reference
-		releaseLocalDatabaseReference();
-	}
-	
-	@Override
-	public IBinder onBind(Intent intent) {
-		return binder;
-	}
-}
-
-class PollingTuple {
-    public Thread thread;
-    public ComputerDetails computer;
-
-    public PollingTuple(ComputerDetails computer, Thread thread) {
-        this.computer = computer;
-        this.thread = thread;
-    }
-}
@@ -1,86 +0,0 @@
-package com.limelight.computers;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.util.Locale;
-import java.util.Random;
-
-import com.limelight.LimeLog;
-
-import android.content.Context;
-
-public class IdentityManager {
-	private static final String UNIQUE_ID_FILE_NAME = "uniqueid";
-	private static final int UID_SIZE_IN_BYTES = 8;
-	
-	private String uniqueId;
-	
-	public IdentityManager(Context c) {
-		uniqueId = loadUniqueId(c);
-		if (uniqueId == null) {
-			uniqueId = generateNewUniqueId(c);
-		}
-		
-		LimeLog.info("UID is now: "+uniqueId);
-	}
-	
-	public String getUniqueId() {
-		return uniqueId;
-	}
-	
-	private static String loadUniqueId(Context c) {
-		// 2 Hex digits per byte
-		char[] uid = new char[UID_SIZE_IN_BYTES * 2];
-		InputStreamReader reader = null;
-		LimeLog.info("Reading UID from disk");
-		try {
-			reader = new InputStreamReader(c.openFileInput(UNIQUE_ID_FILE_NAME));
-			if (reader.read(uid) != UID_SIZE_IN_BYTES * 2)
-			{
-				LimeLog.severe("UID file data is truncated");
-				return null;
-			}
-			return new String(uid);
-		} catch (FileNotFoundException e) {
-			LimeLog.info("No UID file found");
-			return null;
-		} catch (IOException e) {
-			LimeLog.severe("Error while reading UID file");
-			e.printStackTrace();
-			return null;
-		} finally {
-			if (reader != null) {
-				try {
-					reader.close();
-				} catch (IOException ignored) {}
-			}
-		}
-	}
-	
-	private static String generateNewUniqueId(Context c) {
-		// Generate a new UID hex string
-		LimeLog.info("Generating new UID");
-		String uidStr = String.format((Locale)null, "%016x", new Random().nextLong());
-		
-		OutputStreamWriter writer = null;
-		try {
-			writer = new OutputStreamWriter(c.openFileOutput(UNIQUE_ID_FILE_NAME, 0));
-			writer.write(uidStr);
-			LimeLog.info("UID written to disk");
-		} catch (IOException e) {
-			LimeLog.severe("Error while writing UID file");
-			e.printStackTrace();
-		} finally {
-			if (writer != null) {
-				try {
-					writer.close();
-				} catch (IOException ignored) {}
-			}
-		}
-		
-		// We can return a UID even if I/O fails
-		return uidStr;
-	}
-}
@@ -1,90 +0,0 @@
-package com.limelight.discovery;
-
-import java.util.List;
-
-import com.limelight.nvstream.mdns.MdnsComputer;
-import com.limelight.nvstream.mdns.MdnsDiscoveryAgent;
-import com.limelight.nvstream.mdns.MdnsDiscoveryListener;
-
-import android.app.Service;
-import android.content.Context;
-import android.content.Intent;
-import android.net.wifi.WifiManager;
-import android.net.wifi.WifiManager.MulticastLock;
-import android.os.Binder;
-import android.os.IBinder;
-
-public class DiscoveryService extends Service {
-	
-	private MdnsDiscoveryAgent discoveryAgent;
-	private MdnsDiscoveryListener boundListener;
-	private MulticastLock multicastLock;
-	
-	public class DiscoveryBinder extends Binder {
-		public void setListener(MdnsDiscoveryListener listener) {
-			boundListener = listener;
-		}
-		
-		public void startDiscovery(int queryIntervalMs) {
-			multicastLock.acquire();
-			discoveryAgent.startDiscovery(queryIntervalMs);
-		}
-		
-		public void stopDiscovery() {
-			discoveryAgent.stopDiscovery();
-			multicastLock.release();
-		}
-		
-		public List<MdnsComputer> getComputerSet() {
-			return discoveryAgent.getComputerSet();
-		}
-	}
-	
-	@Override
-	public void onCreate() {
-		WifiManager wifiMgr = (WifiManager) getSystemService(Context.WIFI_SERVICE);
-		multicastLock = wifiMgr.createMulticastLock("Limelight mDNS");
-		multicastLock.setReferenceCounted(false);
-		
-		discoveryAgent = new MdnsDiscoveryAgent(new MdnsDiscoveryListener() {
-			@Override
-			public void notifyComputerAdded(MdnsComputer computer) {
-				if (boundListener != null) {
-					boundListener.notifyComputerAdded(computer);
-				}
-			}
-
-			@Override
-			public void notifyComputerRemoved(MdnsComputer computer) {
-				if (boundListener != null) {
-					boundListener.notifyComputerRemoved(computer);
-				}
-			}
-
-			@Override
-			public void notifyDiscoveryFailure(Exception e) {
-				if (boundListener != null) {
-					boundListener.notifyDiscoveryFailure(e);
-				}
-			}
-		});
-	}
-	
-	private DiscoveryBinder binder = new DiscoveryBinder();
-	
-	@Override
-	public IBinder onBind(Intent intent) {
-		return binder;
-	}
-	
-	@Override
-	public boolean onUnbind(Intent intent) {
-		// Stop any discovery session
-		discoveryAgent.stopDiscovery();
-		multicastLock.release();
-		
-		// Unbind the listener
-		boundListener = null;
-		return false;
-	}
-}
@@ -1,169 +0,0 @@
-package com.limelight.grid;
-
-import android.content.Context;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.koushikdutta.async.future.FutureCallback;
-import com.koushikdutta.ion.Ion;
-import com.limelight.AppView;
-import com.limelight.R;
-import com.limelight.binding.PlatformBinding;
-import com.limelight.nvstream.http.LimelightCryptoProvider;
-
-import java.net.InetAddress;
-import java.net.Socket;
-import java.security.KeyManagementException;
-import java.security.NoSuchAlgorithmException;
-import java.security.Principal;
-import java.security.PrivateKey;
-import java.security.SecureRandom;
-import java.util.HashMap;
-import java.util.concurrent.Future;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLSession;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.X509KeyManager;
-import javax.net.ssl.X509TrustManager;
-import java.security.cert.X509Certificate;
-
-public class AppGridAdapter extends GenericGridAdapter<AppView.AppObject> {
-
-    private InetAddress address;
-    private String uniqueId;
-    private LimelightCryptoProvider cryptoProvider;
-    private SSLContext sslContext;
-    private final HashMap<ImageView, Future> pendingRequests = new HashMap<ImageView, Future>();
-
-    public AppGridAdapter(Context context, InetAddress address, String uniqueId) throws NoSuchAlgorithmException, KeyManagementException {
-        super(context, R.layout.app_grid_item, R.drawable.image_loading);
-
-        this.address = address;
-        this.uniqueId = uniqueId;
-
-        cryptoProvider = PlatformBinding.getCryptoProvider(context);
-
-        sslContext = SSLContext.getInstance("SSL");
-        sslContext.init(ourKeyman, trustAllCerts, new SecureRandom());
-    }
-
-    TrustManager[] trustAllCerts = new TrustManager[] {
-            new X509TrustManager() {
-                public X509Certificate[] getAcceptedIssuers() {
-                    return new X509Certificate[0];
-                }
-                public void checkClientTrusted(X509Certificate[] certs, String authType) {}
-                public void checkServerTrusted(X509Certificate[] certs, String authType) {}
-            }};
-
-    KeyManager[] ourKeyman = new 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;
-                }
-            }
-    };
-
-    // Ignore differences between given hostname and certificate hostname
-    HostnameVerifier hv = new HostnameVerifier() {
-        public boolean verify(String hostname, SSLSession session) { return true; }
-    };
-
-    public void addApp(AppView.AppObject app) {
-        itemList.add(app);
-    }
-
-    public void abortPendingRequests() {
-        HashMap<ImageView, Future> tempMap;
-
-        synchronized (pendingRequests) {
-            // Copy the pending requests under a lock
-            tempMap = new HashMap<ImageView, Future>(pendingRequests);
-        }
-
-        for (Future f : tempMap.values()) {
-            f.cancel(true);
-        }
-
-        synchronized (pendingRequests) {
-            // Remove cancelled requests
-            for (ImageView v : tempMap.keySet()) {
-                pendingRequests.remove(v);
-            }
-        }
-    }
-
-    @Override
-    public boolean populateImageView(final ImageView imgView, AppView.AppObject obj) {
-
-        // Set SSL contexts correctly to allow us to authenticate
-        Ion.getDefault(imgView.getContext()).getHttpClient().getSSLSocketMiddleware().setTrustManagers(trustAllCerts);
-        Ion.getDefault(imgView.getContext()).getHttpClient().getSSLSocketMiddleware().setSSLContext(sslContext);
-
-        // Set off the deferred image load
-        synchronized (pendingRequests) {
-            Future f = Ion.with(imgView)
-                    .placeholder(defaultImageRes)
-                    .error(defaultImageRes)
-                    .load("https://" + address.getHostAddress() + ":47984/appasset?uniqueid=" + uniqueId + "&appid=" +
-                            obj.app.getAppId() + "&AssetType=2&AssetIdx=0")
-                    .setCallback(new FutureCallback<ImageView>() {
-                        @Override
-                        public void onCompleted(Exception e, ImageView result) {
-                            synchronized (pendingRequests) {
-                                pendingRequests.remove(imgView);
-                            }
-                        }
-                    });
-            pendingRequests.put(imgView, f);
-        }
-
-        return true;
-    }
-
-    @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.app.getIsRunning()) {
-            // Show the play button overlay
-            overlayView.setImageResource(R.drawable.play);
-            return true;
-        }
-
-        // No overlay
-        return false;
-    }
-}
@@ -1,78 +0,0 @@
-package com.limelight.grid;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.limelight.R;
-
-import java.util.ArrayList;
-
-public abstract class GenericGridAdapter<T> extends BaseAdapter {
-    protected Context context;
-    protected int defaultImageRes;
-    protected int layoutId;
-    protected ArrayList<T> itemList = new ArrayList<T>();
-    protected LayoutInflater inflater;
-
-    public GenericGridAdapter(Context context, int layoutId, int defaultImageRes) {
-        this.context = context;
-        this.layoutId = layoutId;
-        this.defaultImageRes = defaultImageRes;
-
-        this.inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    }
-
-    public void clear() {
-        itemList.clear();
-    }
-
-    @Override
-    public int getCount() {
-        return itemList.size();
-    }
-
-    @Override
-    public Object getItem(int i) {
-        return itemList.get(i);
-    }
-
-    @Override
-    public long getItemId(int i) {
-        return i;
-    }
-
-    public abstract boolean populateImageView(ImageView imgView, T obj);
-    public abstract boolean populateTextView(TextView txtView, T obj);
-    public abstract boolean populateOverlayView(ImageView overlayView, T obj);
-
-    @Override
-    public View getView(int i, View convertView, ViewGroup viewGroup) {
-        if (convertView == null) {
-            convertView = inflater.inflate(layoutId, viewGroup, false);
-        }
-
-        ImageView imgView = (ImageView) convertView.findViewById(R.id.grid_image);
-        ImageView overlayView = (ImageView) convertView.findViewById(R.id.grid_overlay);
-        TextView txtView = (TextView) convertView.findViewById(R.id.grid_text);
-
-        if (!populateImageView(imgView, itemList.get(i))) {
-            imgView.setImageResource(defaultImageRes);
-        }
-        if (!populateTextView(txtView, itemList.get(i))) {
-            txtView.setText(itemList.get(i).toString());
-        }
-        if (!populateOverlayView(overlayView, itemList.get(i))) {
-            overlayView.setVisibility(View.INVISIBLE);
-        }
-        else {
-            overlayView.setVisibility(View.VISIBLE);
-        }
-
-        return convertView;
-    }
-}
@@ -1,62 +0,0 @@
-package com.limelight.grid;
-
-import android.content.Context;
-import android.widget.ImageView;
-import android.widget.TextView;
-
-import com.limelight.PcView;
-import com.limelight.R;
-import com.limelight.nvstream.http.ComputerDetails;
-
-public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
-
-    public PcGridAdapter(Context context) {
-        super(context, R.layout.pc_grid_item, R.drawable.computer);
-    }
-
-    public void addComputer(PcView.ComputerObject computer) {
-        itemList.add(computer);
-    }
-
-    public boolean removeComputer(PcView.ComputerObject computer) {
-        return itemList.remove(computer);
-    }
-
-    @Override
-    public boolean populateImageView(ImageView imgView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
-            imgView.setAlpha(1.0f);
-        }
-        else {
-            imgView.setAlpha(0.4f);
-        }
-
-        // Return false to use the default drawable
-        return false;
-    }
-
-    @Override
-    public boolean populateTextView(TextView txtView, PcView.ComputerObject obj) {
-        if (obj.details.reachability != ComputerDetails.Reachability.OFFLINE) {
-            txtView.setAlpha(1.0f);
-        }
-        else {
-            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.reachability == ComputerDetails.Reachability.UNKNOWN) {
-            // Still refreshing this PC so display the overlay
-            overlayView.setImageResource(R.drawable.image_loading);
-            return true;
-        }
-
-        // No overlay
-        return false;
-    }
-}
@@ -1,164 +0,0 @@
-package com.limelight.preferences;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.concurrent.LinkedBlockingQueue;
-
-import com.limelight.computers.ComputerManagerService;
-import com.limelight.R;
-import com.limelight.utils.Dialog;
-import com.limelight.utils.SpinnerDialog;
-import com.limelight.utils.UiHelper;
-
-import android.app.Activity;
-import android.app.Service;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
-import android.os.Bundle;
-import android.os.IBinder;
-import android.view.KeyEvent;
-import android.view.inputmethod.EditorInfo;
-import android.widget.TextView;
-import android.widget.Toast;
-
-public class AddComputerManually extends Activity {
-	private TextView hostText;
-	private ComputerManagerService.ComputerManagerBinder managerBinder;
-	private LinkedBlockingQueue<String> computersToAdd = new LinkedBlockingQueue<String>();
-	private Thread addThread;
-	private ServiceConnection serviceConnection = new ServiceConnection() {
-		public void onServiceConnected(ComponentName className, final IBinder binder) {
-			managerBinder = ((ComputerManagerService.ComputerManagerBinder)binder);
-			startAddThread();
-		}
-
-		public void onServiceDisconnected(ComponentName className) {
-			joinAddThread();
-			managerBinder = null;
-		}
-	};
-	
-	private void doAddPc(String host) {
-		String msg;
-		boolean finish = false;
-
-        SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
-			getResources().getString(R.string.msg_add_pc), false);
-
-		try {
-			InetAddress addr = InetAddress.getByName(host);
-			
-			if (!managerBinder.addComputerBlocking(addr)){
-				msg = getResources().getString(R.string.addpc_fail);
-			}
-			else {
-				msg = getResources().getString(R.string.addpc_success);
-				finish = true;
-			}
-		} catch (UnknownHostException e) {
-			msg = getResources().getString(R.string.addpc_unknown_host);
-		}
-
-        dialog.dismiss();
-
-        final boolean toastFinish = finish;
-		final String toastMsg = msg;
-		AddComputerManually.this.runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				Toast.makeText(AddComputerManually.this, toastMsg, Toast.LENGTH_LONG).show();
-				
-				if (toastFinish && !isFinishing()) {
-					// Close the activity
-					AddComputerManually.this.finish();
-				}
-			}
-		});
-	}
-	
-	private void startAddThread() {
-		addThread = new Thread() {
-			@Override
-			public void run() {
-				while (!isInterrupted()) {
-					String computer;
-					
-					try {
-						computer = computersToAdd.take();
-					} catch (InterruptedException e) {
-						return;
-					}
-					
-					doAddPc(computer);
-				}
-			}
-		};
-		addThread.setName("UI - AddComputerManually");
-		addThread.start();
-	}
-	
-	private void joinAddThread() {
-		if (addThread != null) {
-			addThread.interrupt();
-			
-			try {
-				addThread.join();
-			} catch (InterruptedException ignored) {}
-			
-			addThread = null;
-		}
-	}
-
-	@Override
-	protected void onStop() {
-		super.onStop();
-		
-		Dialog.closeDialogs();
-        SpinnerDialog.closeDialogs(this);
-	}
-	
-	@Override
-	protected void onDestroy() {
-		super.onDestroy();
-		
-		if (managerBinder != null) {
-			joinAddThread();
-			unbindService(serviceConnection);
-		}
-	}
-	
-	@Override
-	protected void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		
-		setContentView(R.layout.activity_add_computer_manually);
-
-        UiHelper.notifyNewRootView(this);
-
-		this.hostText = (TextView) findViewById(R.id.hostTextView);
-        hostText.setImeOptions(EditorInfo.IME_ACTION_DONE);
-        hostText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
-            @Override
-            public boolean onEditorAction(TextView textView, int actionId, KeyEvent keyEvent) {
-                if (actionId == EditorInfo.IME_ACTION_DONE ||
-                        (keyEvent != null &&
-                                keyEvent.getAction() == KeyEvent.ACTION_DOWN &&
-                                keyEvent.getKeyCode() == KeyEvent.KEYCODE_ENTER)) {
-                    if (hostText.getText().length() == 0) {
-                        Toast.makeText(AddComputerManually.this, getResources().getString(R.string.addpc_enter_ip), Toast.LENGTH_LONG).show();
-                        return true;
-                    }
-
-                    computersToAdd.add(hostText.getText().toString());
-                }
-
-                return false;
-            }
-        });
-		
-		// Bind to the ComputerManager service
-		bindService(new Intent(AddComputerManually.this,
-					ComputerManagerService.class), serviceConnection, Service.BIND_AUTO_CREATE);
-	}
-}
@@ -1,146 +0,0 @@
-package com.limelight.preferences;
-
-import android.content.Context;
-import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
-
-public class PreferenceConfiguration {
-    static final String RES_FPS_PREF_STRING = "list_resolution_fps";
-    private static final String DECODER_PREF_STRING = "list_decoders";
-    static final String BITRATE_PREF_STRING = "seekbar_bitrate";
-    private static final String STRETCH_PREF_STRING = "checkbox_stretch_video";
-    private static final String SOPS_PREF_STRING = "checkbox_enable_sops";
-    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 int BITRATE_DEFAULT_720_30 = 5;
-    private static final int BITRATE_DEFAULT_720_60 = 10;
-    private static final int BITRATE_DEFAULT_1080_30 = 10;
-    private static final int BITRATE_DEFAULT_1080_60 = 20;
-
-    private static final String DEFAULT_RES_FPS = "720p60";
-    private static final String DEFAULT_DECODER = "auto";
-    private static final int DEFAULT_BITRATE = BITRATE_DEFAULT_720_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;
-
-    public static final int FORCE_HARDWARE_DECODER = -1;
-    public static final int AUTOSELECT_DECODER = 0;
-    public static final int FORCE_SOFTWARE_DECODER = 1;
-
-    public int width, height, fps;
-    public int bitrate;
-    public int decoder;
-    public int deadzonePercentage;
-    public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
-
-    public static int getDefaultBitrate(String resFpsString) {
-        if (resFpsString.equals("720p30")) {
-            return BITRATE_DEFAULT_720_30;
-        }
-        else if (resFpsString.equals("720p60")) {
-            return BITRATE_DEFAULT_720_60;
-        }
-        else if (resFpsString.equals("1080p30")) {
-            return BITRATE_DEFAULT_1080_30;
-        }
-        else if (resFpsString.equals("1080p60")) {
-            return BITRATE_DEFAULT_1080_60;
-        }
-        else {
-            // Should never get here
-            return DEFAULT_BITRATE;
-        }
-    }
-
-    public static int getDefaultBitrate(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        String str = prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS);
-        if (str.equals("720p30")) {
-            return BITRATE_DEFAULT_720_30;
-        }
-        else if (str.equals("720p60")) {
-            return BITRATE_DEFAULT_720_60;
-        }
-        else if (str.equals("1080p30")) {
-            return BITRATE_DEFAULT_1080_30;
-        }
-        else if (str.equals("1080p60")) {
-            return BITRATE_DEFAULT_1080_60;
-        }
-        else {
-            // Should never get here
-            return DEFAULT_BITRATE;
-        }
-    }
-
-    private static int getDecoderValue(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-
-        String str = prefs.getString(DECODER_PREF_STRING, DEFAULT_DECODER);
-        if (str.equals("auto")) {
-            return AUTOSELECT_DECODER;
-        }
-        else if (str.equals("software")) {
-            return FORCE_SOFTWARE_DECODER;
-        }
-        else if (str.equals("hardware")) {
-            return FORCE_HARDWARE_DECODER;
-        }
-        else {
-            // Should never get here
-            return AUTOSELECT_DECODER;
-        }
-    }
-
-    public static PreferenceConfiguration readPreferences(Context context) {
-        SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-        PreferenceConfiguration config = new PreferenceConfiguration();
-
-        config.bitrate = prefs.getInt(BITRATE_PREF_STRING, getDefaultBitrate(context));
-        String str = prefs.getString(RES_FPS_PREF_STRING, DEFAULT_RES_FPS);
-        if (str.equals("720p30")) {
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 30;
-        }
-        else if (str.equals("720p60")) {
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 60;
-        }
-        else if (str.equals("1080p30")) {
-            config.width = 1920;
-            config.height = 1080;
-            config.fps = 30;
-        }
-        else if (str.equals("1080p60")) {
-            config.width = 1920;
-            config.height = 1080;
-            config.fps = 60;
-        }
-        else {
-            // Should never get here
-            config.width = 1280;
-            config.height = 720;
-            config.fps = 60;
-        }
-
-        config.decoder = getDecoderValue(context);
-
-        config.deadzonePercentage = prefs.getInt(DEADZONE_PREF_STRING, DEFAULT_DEADZONE);
-
-        // Checkbox preferences
-        config.disableWarnings = prefs.getBoolean(DISABLE_TOASTS_PREF_STRING, DEFAULT_DISABLE_TOASTS);
-        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);
-
-        return config;
-    }
-}
@@ -1,165 +0,0 @@
-package com.limelight.preferences;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.os.Bundle;
-import android.preference.DialogPreference;
-import android.util.AttributeSet;
-import android.view.Gravity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.Button;
-import android.widget.LinearLayout;
-import android.widget.SeekBar;
-import android.widget.TextView;
-
-// Based on a Stack Overflow example: http://stackoverflow.com/questions/1974193/slider-on-my-preferencescreen
-public class SeekBarPreference extends DialogPreference
-{
-    private static final String SCHEMA_URL = "http://schemas.android.com/apk/res/android";
-
-    private SeekBar seekBar;
-    private TextView valueText;
-    private Context context;
-
-    private String dialogMessage, suffix;
-    private int defaultValue, maxValue, minValue, currentValue;
-
-    public SeekBarPreference(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        this.context = context;
-
-        // Read the message from XML
-        int dialogMessageId = attrs.getAttributeResourceValue(SCHEMA_URL, "dialogMessage", 0);
-        if (dialogMessageId == 0) {
-            dialogMessage = attrs.getAttributeValue(SCHEMA_URL, "dialogMessage");
-        }
-        else {
-            dialogMessage = context.getString(dialogMessageId);
-        }
-
-        // Get the suffix for the number displayed in the dialog
-        int suffixId = attrs.getAttributeResourceValue(SCHEMA_URL, "text", 0);
-        if (suffixId == 0) {
-            suffix = attrs.getAttributeValue(SCHEMA_URL, "text");
-        }
-        else {
-            suffix = context.getString(suffixId);
-        }
-
-        // Get default, min, and max seekbar values
-        defaultValue = attrs.getAttributeIntValue(SCHEMA_URL, "defaultValue", PreferenceConfiguration.getDefaultBitrate(context));
-        maxValue = attrs.getAttributeIntValue(SCHEMA_URL, "max", 100);
-        minValue = 1;
-    }
-
-    @Override
-    protected View onCreateDialogView() {
-
-        LinearLayout.LayoutParams params;
-        LinearLayout layout = new LinearLayout(context);
-        layout.setOrientation(LinearLayout.VERTICAL);
-        layout.setPadding(6, 6, 6, 6);
-
-        TextView splashText = new TextView(context);
-        splashText.setPadding(30, 10, 30, 10);
-        if (dialogMessage != null) {
-            splashText.setText(dialogMessage);
-        }
-        layout.addView(splashText);
-
-        valueText = new TextView(context);
-        valueText.setGravity(Gravity.CENTER_HORIZONTAL);
-        valueText.setTextSize(32);
-        params = new LinearLayout.LayoutParams(
-                LinearLayout.LayoutParams.MATCH_PARENT,
-                LinearLayout.LayoutParams.WRAP_CONTENT);
-        layout.addView(valueText, params);
-
-        seekBar = new SeekBar(context);
-        seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
-            @Override
-            public void onProgressChanged(SeekBar seekBar, int value, boolean b) {
-                if (value < minValue) {
-                    seekBar.setProgress(minValue);
-                    return;
-                }
-
-                String t = String.valueOf(value);
-                valueText.setText(suffix == null ? t : t.concat(suffix.length() > 1 ? " "+suffix : suffix));
-            }
-
-            @Override
-            public void onStartTrackingTouch(SeekBar seekBar) {}
-
-            @Override
-            public void onStopTrackingTouch(SeekBar seekBar) {}
-        });
-
-        layout.addView(seekBar, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT));
-
-        if (shouldPersist()) {
-            currentValue = getPersistedInt(defaultValue);
-        }
-
-        seekBar.setMax(maxValue);
-        seekBar.setProgress(currentValue);
-
-        return layout;
-    }
-
-    @Override
-    protected void onBindDialogView(View v) {
-        super.onBindDialogView(v);
-        seekBar.setMax(maxValue);
-        seekBar.setProgress(currentValue);
-    }
-
-    @Override
-    protected void onSetInitialValue(boolean restore, Object defaultValue)
-    {
-        super.onSetInitialValue(restore, defaultValue);
-        if (restore) {
-            currentValue = shouldPersist() ? getPersistedInt(this.defaultValue) : 0;
-        }
-        else {
-            currentValue = (Integer) defaultValue;
-        }
-    }
-
-    public void setMax(int max) {
-        this.maxValue = max;
-    }
-    public int getMax() {
-        return this.maxValue;
-    }
-
-    public void setProgress(int progress) {
-        this.currentValue = progress;
-        if (seekBar != null) {
-            seekBar.setProgress(progress);
-        }
-    }
-    public int getProgress() {
-        return currentValue;
-    }
-
-    @Override
-    public void showDialog(Bundle state) {
-        super.showDialog(state);
-
-        Button positiveButton = ((AlertDialog) getDialog()).getButton(AlertDialog.BUTTON_POSITIVE);
-        positiveButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (shouldPersist()) {
-                    currentValue = seekBar.getProgress();
-                    persistInt(seekBar.getProgress());
-                    callChangeListener(seekBar.getProgress());
-                }
-
-                getDialog().dismiss();
-            }
-        });
-    }
-}
@@ -1,54 +0,0 @@
-package com.limelight.preferences;
-
-import android.content.SharedPreferences;
-import android.os.Bundle;
-import android.app.Activity;
-import android.preference.Preference;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-
-import com.limelight.R;
-import com.limelight.utils.UiHelper;
-
-public class StreamSettings extends Activity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        setContentView(R.layout.activity_stream_settings);
-        getFragmentManager().beginTransaction().replace(
-                R.id.stream_settings, new SettingsFragment()
-        ).commit();
-
-        UiHelper.notifyNewRootView(this);
-    }
-
-    public static class SettingsFragment extends PreferenceFragment {
-        @Override
-        public void onCreate(Bundle savedInstanceState) {
-            super.onCreate(savedInstanceState);
-
-            addPreferencesFromResource(R.xml.preferences);
-
-            // Add a listener to the FPS and resolution preference
-            // so the bitrate can be auto-adjusted
-            Preference pref = findPreference(PreferenceConfiguration.RES_FPS_PREF_STRING);
-            pref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
-                @Override
-                public boolean onPreferenceChange(Preference preference, Object newValue) {
-                    SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(SettingsFragment.this.getActivity());
-                    String valueStr = (String) newValue;
-
-                    // Write the new bitrate value
-                    prefs.edit()
-                            .putInt(PreferenceConfiguration.BITRATE_PREF_STRING,
-                                    PreferenceConfiguration.getDefaultBitrate(valueStr))
-                            .apply();
-
-                    // Allow the original preference change to take place
-                    return true;
-                }
-            });
-        }
-    }
-}
@@ -1,31 +0,0 @@
-package com.limelight.utils;
-
-import android.app.Activity;
-import android.app.UiModeManager;
-import android.content.Context;
-import android.content.res.Configuration;
-import android.view.View;
-
-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;
-
-    public static void notifyNewRootView(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);
-        }
-    }
-}
@@ -1,13 +0,0 @@
-# Android.mk for Limelight's Evdev Reader
-MY_LOCAL_PATH := $(call my-dir)
-
-include $(call all-subdir-makefiles)
-
-LOCAL_PATH := $(MY_LOCAL_PATH)
-
-include $(CLEAR_VARS)
-LOCAL_MODULE    := evdev_reader
-LOCAL_SRC_FILES := evdev_reader.c
-LOCAL_LDLIBS    := -llog
-
-include $(BUILD_SHARED_LIBRARY)
@@ -1,118 +0,0 @@
-#include <stdlib.h>
-#include <jni.h>
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <linux/input.h>
-#include <unistd.h>
-#include <poll.h>
-#include <errno.h>
-
-#include <android/log.h>
-
-JNIEXPORT jint JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_open(JNIEnv *env, jobject this, jstring absolutePath) {
-	const char *path;
-	
-	path = (*env)->GetStringUTFChars(env, absolutePath, NULL);
-	
-	return open(path, O_RDWR);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_grab(JNIEnv *env, jobject this, jint fd) {
-    return ioctl(fd, EVIOCGRAB, 1) == 0;
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_ungrab(JNIEnv *env, jobject this, jint fd) {
-    return ioctl(fd, EVIOCGRAB, 0) == 0;
-}
-
-// has*() and friends are based on Android's EventHub.cpp
-
-#define test_bit(bit, array)    (array[bit/8] & (1<<(bit%8)))
-
-JNIEXPORT jboolean JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_hasRelAxis(JNIEnv *env, jobject this, jint fd, jshort axis) {
-    unsigned char relBitmask[(REL_MAX + 1) / 8];
-    
-    ioctl(fd, EVIOCGBIT(EV_REL, sizeof(relBitmask)), relBitmask);
-    
-    return test_bit(axis, relBitmask);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_hasAbsAxis(JNIEnv *env, jobject this, jint fd, jshort axis) {
-    unsigned char absBitmask[(ABS_MAX + 1) / 8];
-    
-    ioctl(fd, EVIOCGBIT(EV_ABS, sizeof(absBitmask)), absBitmask);
-    
-    return test_bit(axis, absBitmask);
-}
-
-JNIEXPORT jboolean JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_hasKey(JNIEnv *env, jobject this, jint fd, jshort key) {
-    unsigned char keyBitmask[(KEY_MAX + 1) / 8];
-    
-    ioctl(fd, EVIOCGBIT(EV_KEY, sizeof(keyBitmask)), keyBitmask);
-    
-    return test_bit(key, keyBitmask);
-}
-
-JNIEXPORT jint JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_read(JNIEnv *env, jobject this, jint fd, jbyteArray buffer) {
-    jint ret;
-    jbyte *data;
-    int pollres;
-    struct pollfd pollinfo;
-    
-    data = (*env)->GetByteArrayElements(env, buffer, NULL);
-    if (data == NULL) {
-        __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-            "Failed to get byte array");
-        return -1;
-    }
-
-    do
-    {
-        // Unwait every 250 ms to return to caller if the fd is closed
-        pollinfo.fd = fd;
-        pollinfo.events = POLLIN;
-        pollinfo.revents = 0;
-        pollres = poll(&pollinfo, 1, 250);
-    }
-    while (pollres == 0);
-    
-    if (pollres > 0 && (pollinfo.revents & POLLIN)) {
-        // We'll have data available now
-        ret = read(fd, data, sizeof(struct input_event));
-        if (ret < 0) {
-            __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                "read() failed: %d", errno);
-        }
-    }
-    else {
-        // There must have been a failure
-        ret = -1;
-    
-        if (pollres < 0) {
-            __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                "poll() failed: %d", errno);
-        }
-        else {
-            __android_log_print(ANDROID_LOG_ERROR, "EvdevReader",
-                "Unexpected revents: %d", pollinfo.revents);
-        }
-    }
-    
-    (*env)->ReleaseByteArrayElements(env, buffer, data, 0);
-
-	return ret;
-}
-
-JNIEXPORT jint JNICALL
-Java_com_limelight_binding_input_evdev_EvdevReader_close(JNIEnv *env, jobject this, jint fd) {
-	return close(fd);
-}
@@ -1,397 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_OLD_CODEC_IDS_H
-#define AVCODEC_OLD_CODEC_IDS_H
-
-#include "libavutil/common.h"
-
-/*
- * This header exists to prevent new codec IDs from being accidentally added to
- * the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVCodecID enum instead.
- */
-
-    CODEC_ID_NONE = AV_CODEC_ID_NONE,
-
-    /* video codecs */
-    CODEC_ID_MPEG1VIDEO,
-    CODEC_ID_MPEG2VIDEO, ///< preferred ID for MPEG-1/2 video decoding
-    CODEC_ID_MPEG2VIDEO_XVMC,
-    CODEC_ID_H261,
-    CODEC_ID_H263,
-    CODEC_ID_RV10,
-    CODEC_ID_RV20,
-    CODEC_ID_MJPEG,
-    CODEC_ID_MJPEGB,
-    CODEC_ID_LJPEG,
-    CODEC_ID_SP5X,
-    CODEC_ID_JPEGLS,
-    CODEC_ID_MPEG4,
-    CODEC_ID_RAWVIDEO,
-    CODEC_ID_MSMPEG4V1,
-    CODEC_ID_MSMPEG4V2,
-    CODEC_ID_MSMPEG4V3,
-    CODEC_ID_WMV1,
-    CODEC_ID_WMV2,
-    CODEC_ID_H263P,
-    CODEC_ID_H263I,
-    CODEC_ID_FLV1,
-    CODEC_ID_SVQ1,
-    CODEC_ID_SVQ3,
-    CODEC_ID_DVVIDEO,
-    CODEC_ID_HUFFYUV,
-    CODEC_ID_CYUV,
-    CODEC_ID_H264,
-    CODEC_ID_INDEO3,
-    CODEC_ID_VP3,
-    CODEC_ID_THEORA,
-    CODEC_ID_ASV1,
-    CODEC_ID_ASV2,
-    CODEC_ID_FFV1,
-    CODEC_ID_4XM,
-    CODEC_ID_VCR1,
-    CODEC_ID_CLJR,
-    CODEC_ID_MDEC,
-    CODEC_ID_ROQ,
-    CODEC_ID_INTERPLAY_VIDEO,
-    CODEC_ID_XAN_WC3,
-    CODEC_ID_XAN_WC4,
-    CODEC_ID_RPZA,
-    CODEC_ID_CINEPAK,
-    CODEC_ID_WS_VQA,
-    CODEC_ID_MSRLE,
-    CODEC_ID_MSVIDEO1,
-    CODEC_ID_IDCIN,
-    CODEC_ID_8BPS,
-    CODEC_ID_SMC,
-    CODEC_ID_FLIC,
-    CODEC_ID_TRUEMOTION1,
-    CODEC_ID_VMDVIDEO,
-    CODEC_ID_MSZH,
-    CODEC_ID_ZLIB,
-    CODEC_ID_QTRLE,
-    CODEC_ID_TSCC,
-    CODEC_ID_ULTI,
-    CODEC_ID_QDRAW,
-    CODEC_ID_VIXL,
-    CODEC_ID_QPEG,
-    CODEC_ID_PNG,
-    CODEC_ID_PPM,
-    CODEC_ID_PBM,
-    CODEC_ID_PGM,
-    CODEC_ID_PGMYUV,
-    CODEC_ID_PAM,
-    CODEC_ID_FFVHUFF,
-    CODEC_ID_RV30,
-    CODEC_ID_RV40,
-    CODEC_ID_VC1,
-    CODEC_ID_WMV3,
-    CODEC_ID_LOCO,
-    CODEC_ID_WNV1,
-    CODEC_ID_AASC,
-    CODEC_ID_INDEO2,
-    CODEC_ID_FRAPS,
-    CODEC_ID_TRUEMOTION2,
-    CODEC_ID_BMP,
-    CODEC_ID_CSCD,
-    CODEC_ID_MMVIDEO,
-    CODEC_ID_ZMBV,
-    CODEC_ID_AVS,
-    CODEC_ID_SMACKVIDEO,
-    CODEC_ID_NUV,
-    CODEC_ID_KMVC,
-    CODEC_ID_FLASHSV,
-    CODEC_ID_CAVS,
-    CODEC_ID_JPEG2000,
-    CODEC_ID_VMNC,
-    CODEC_ID_VP5,
-    CODEC_ID_VP6,
-    CODEC_ID_VP6F,
-    CODEC_ID_TARGA,
-    CODEC_ID_DSICINVIDEO,
-    CODEC_ID_TIERTEXSEQVIDEO,
-    CODEC_ID_TIFF,
-    CODEC_ID_GIF,
-    CODEC_ID_DXA,
-    CODEC_ID_DNXHD,
-    CODEC_ID_THP,
-    CODEC_ID_SGI,
-    CODEC_ID_C93,
-    CODEC_ID_BETHSOFTVID,
-    CODEC_ID_PTX,
-    CODEC_ID_TXD,
-    CODEC_ID_VP6A,
-    CODEC_ID_AMV,
-    CODEC_ID_VB,
-    CODEC_ID_PCX,
-    CODEC_ID_SUNRAST,
-    CODEC_ID_INDEO4,
-    CODEC_ID_INDEO5,
-    CODEC_ID_MIMIC,
-    CODEC_ID_RL2,
-    CODEC_ID_ESCAPE124,
-    CODEC_ID_DIRAC,
-    CODEC_ID_BFI,
-    CODEC_ID_CMV,
-    CODEC_ID_MOTIONPIXELS,
-    CODEC_ID_TGV,
-    CODEC_ID_TGQ,
-    CODEC_ID_TQI,
-    CODEC_ID_AURA,
-    CODEC_ID_AURA2,
-    CODEC_ID_V210X,
-    CODEC_ID_TMV,
-    CODEC_ID_V210,
-    CODEC_ID_DPX,
-    CODEC_ID_MAD,
-    CODEC_ID_FRWU,
-    CODEC_ID_FLASHSV2,
-    CODEC_ID_CDGRAPHICS,
-    CODEC_ID_R210,
-    CODEC_ID_ANM,
-    CODEC_ID_BINKVIDEO,
-    CODEC_ID_IFF_ILBM,
-    CODEC_ID_IFF_BYTERUN1,
-    CODEC_ID_KGV1,
-    CODEC_ID_YOP,
-    CODEC_ID_VP8,
-    CODEC_ID_PICTOR,
-    CODEC_ID_ANSI,
-    CODEC_ID_A64_MULTI,
-    CODEC_ID_A64_MULTI5,
-    CODEC_ID_R10K,
-    CODEC_ID_MXPEG,
-    CODEC_ID_LAGARITH,
-    CODEC_ID_PRORES,
-    CODEC_ID_JV,
-    CODEC_ID_DFA,
-    CODEC_ID_WMV3IMAGE,
-    CODEC_ID_VC1IMAGE,
-    CODEC_ID_UTVIDEO,
-    CODEC_ID_BMV_VIDEO,
-    CODEC_ID_VBLE,
-    CODEC_ID_DXTORY,
-    CODEC_ID_V410,
-    CODEC_ID_XWD,
-    CODEC_ID_CDXL,
-    CODEC_ID_XBM,
-    CODEC_ID_ZEROCODEC,
-    CODEC_ID_MSS1,
-    CODEC_ID_MSA1,
-    CODEC_ID_TSCC2,
-    CODEC_ID_MTS2,
-    CODEC_ID_CLLC,
-    CODEC_ID_Y41P       = MKBETAG('Y','4','1','P'),
-    CODEC_ID_ESCAPE130  = MKBETAG('E','1','3','0'),
-    CODEC_ID_EXR        = MKBETAG('0','E','X','R'),
-    CODEC_ID_AVRP       = MKBETAG('A','V','R','P'),
-
-    CODEC_ID_G2M        = MKBETAG( 0 ,'G','2','M'),
-    CODEC_ID_AVUI       = MKBETAG('A','V','U','I'),
-    CODEC_ID_AYUV       = MKBETAG('A','Y','U','V'),
-    CODEC_ID_V308       = MKBETAG('V','3','0','8'),
-    CODEC_ID_V408       = MKBETAG('V','4','0','8'),
-    CODEC_ID_YUV4       = MKBETAG('Y','U','V','4'),
-    CODEC_ID_SANM       = MKBETAG('S','A','N','M'),
-    CODEC_ID_PAF_VIDEO  = MKBETAG('P','A','F','V'),
-    CODEC_ID_SNOW       = AV_CODEC_ID_SNOW,
-
-    /* various PCM "codecs" */
-    CODEC_ID_FIRST_AUDIO = 0x10000,     ///< A dummy id pointing at the start of audio codecs
-    CODEC_ID_PCM_S16LE = 0x10000,
-    CODEC_ID_PCM_S16BE,
-    CODEC_ID_PCM_U16LE,
-    CODEC_ID_PCM_U16BE,
-    CODEC_ID_PCM_S8,
-    CODEC_ID_PCM_U8,
-    CODEC_ID_PCM_MULAW,
-    CODEC_ID_PCM_ALAW,
-    CODEC_ID_PCM_S32LE,
-    CODEC_ID_PCM_S32BE,
-    CODEC_ID_PCM_U32LE,
-    CODEC_ID_PCM_U32BE,
-    CODEC_ID_PCM_S24LE,
-    CODEC_ID_PCM_S24BE,
-    CODEC_ID_PCM_U24LE,
-    CODEC_ID_PCM_U24BE,
-    CODEC_ID_PCM_S24DAUD,
-    CODEC_ID_PCM_ZORK,
-    CODEC_ID_PCM_S16LE_PLANAR,
-    CODEC_ID_PCM_DVD,
-    CODEC_ID_PCM_F32BE,
-    CODEC_ID_PCM_F32LE,
-    CODEC_ID_PCM_F64BE,
-    CODEC_ID_PCM_F64LE,
-    CODEC_ID_PCM_BLURAY,
-    CODEC_ID_PCM_LXF,
-    CODEC_ID_S302M,
-    CODEC_ID_PCM_S8_PLANAR,
-
-    /* various ADPCM codecs */
-    CODEC_ID_ADPCM_IMA_QT = 0x11000,
-    CODEC_ID_ADPCM_IMA_WAV,
-    CODEC_ID_ADPCM_IMA_DK3,
-    CODEC_ID_ADPCM_IMA_DK4,
-    CODEC_ID_ADPCM_IMA_WS,
-    CODEC_ID_ADPCM_IMA_SMJPEG,
-    CODEC_ID_ADPCM_MS,
-    CODEC_ID_ADPCM_4XM,
-    CODEC_ID_ADPCM_XA,
-    CODEC_ID_ADPCM_ADX,
-    CODEC_ID_ADPCM_EA,
-    CODEC_ID_ADPCM_G726,
-    CODEC_ID_ADPCM_CT,
-    CODEC_ID_ADPCM_SWF,
-    CODEC_ID_ADPCM_YAMAHA,
-    CODEC_ID_ADPCM_SBPRO_4,
-    CODEC_ID_ADPCM_SBPRO_3,
-    CODEC_ID_ADPCM_SBPRO_2,
-    CODEC_ID_ADPCM_THP,
-    CODEC_ID_ADPCM_IMA_AMV,
-    CODEC_ID_ADPCM_EA_R1,
-    CODEC_ID_ADPCM_EA_R3,
-    CODEC_ID_ADPCM_EA_R2,
-    CODEC_ID_ADPCM_IMA_EA_SEAD,
-    CODEC_ID_ADPCM_IMA_EA_EACS,
-    CODEC_ID_ADPCM_EA_XAS,
-    CODEC_ID_ADPCM_EA_MAXIS_XA,
-    CODEC_ID_ADPCM_IMA_ISS,
-    CODEC_ID_ADPCM_G722,
-    CODEC_ID_ADPCM_IMA_APC,
-    CODEC_ID_VIMA       = MKBETAG('V','I','M','A'),
-
-    /* AMR */
-    CODEC_ID_AMR_NB = 0x12000,
-    CODEC_ID_AMR_WB,
-
-    /* RealAudio codecs*/
-    CODEC_ID_RA_144 = 0x13000,
-    CODEC_ID_RA_288,
-
-    /* various DPCM codecs */
-    CODEC_ID_ROQ_DPCM = 0x14000,
-    CODEC_ID_INTERPLAY_DPCM,
-    CODEC_ID_XAN_DPCM,
-    CODEC_ID_SOL_DPCM,
-
-    /* audio codecs */
-    CODEC_ID_MP2 = 0x15000,
-    CODEC_ID_MP3, ///< preferred ID for decoding MPEG audio layer 1, 2 or 3
-    CODEC_ID_AAC,
-    CODEC_ID_AC3,
-    CODEC_ID_DTS,
-    CODEC_ID_VORBIS,
-    CODEC_ID_DVAUDIO,
-    CODEC_ID_WMAV1,
-    CODEC_ID_WMAV2,
-    CODEC_ID_MACE3,
-    CODEC_ID_MACE6,
-    CODEC_ID_VMDAUDIO,
-    CODEC_ID_FLAC,
-    CODEC_ID_MP3ADU,
-    CODEC_ID_MP3ON4,
-    CODEC_ID_SHORTEN,
-    CODEC_ID_ALAC,
-    CODEC_ID_WESTWOOD_SND1,
-    CODEC_ID_GSM, ///< as in Berlin toast format
-    CODEC_ID_QDM2,
-    CODEC_ID_COOK,
-    CODEC_ID_TRUESPEECH,
-    CODEC_ID_TTA,
-    CODEC_ID_SMACKAUDIO,
-    CODEC_ID_QCELP,
-    CODEC_ID_WAVPACK,
-    CODEC_ID_DSICINAUDIO,
-    CODEC_ID_IMC,
-    CODEC_ID_MUSEPACK7,
-    CODEC_ID_MLP,
-    CODEC_ID_GSM_MS, /* as found in WAV */
-    CODEC_ID_ATRAC3,
-    CODEC_ID_VOXWARE,
-    CODEC_ID_APE,
-    CODEC_ID_NELLYMOSER,
-    CODEC_ID_MUSEPACK8,
-    CODEC_ID_SPEEX,
-    CODEC_ID_WMAVOICE,
-    CODEC_ID_WMAPRO,
-    CODEC_ID_WMALOSSLESS,
-    CODEC_ID_ATRAC3P,
-    CODEC_ID_EAC3,
-    CODEC_ID_SIPR,
-    CODEC_ID_MP1,
-    CODEC_ID_TWINVQ,
-    CODEC_ID_TRUEHD,
-    CODEC_ID_MP4ALS,
-    CODEC_ID_ATRAC1,
-    CODEC_ID_BINKAUDIO_RDFT,
-    CODEC_ID_BINKAUDIO_DCT,
-    CODEC_ID_AAC_LATM,
-    CODEC_ID_QDMC,
-    CODEC_ID_CELT,
-    CODEC_ID_G723_1,
-    CODEC_ID_G729,
-    CODEC_ID_8SVX_EXP,
-    CODEC_ID_8SVX_FIB,
-    CODEC_ID_BMV_AUDIO,
-    CODEC_ID_RALF,
-    CODEC_ID_IAC,
-    CODEC_ID_ILBC,
-    CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
-    CODEC_ID_SONIC       = MKBETAG('S','O','N','C'),
-    CODEC_ID_SONIC_LS    = MKBETAG('S','O','N','L'),
-    CODEC_ID_PAF_AUDIO   = MKBETAG('P','A','F','A'),
-    CODEC_ID_OPUS        = MKBETAG('O','P','U','S'),
-
-    /* subtitle codecs */
-    CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.
-    CODEC_ID_DVD_SUBTITLE = 0x17000,
-    CODEC_ID_DVB_SUBTITLE,
-    CODEC_ID_TEXT,  ///< raw UTF-8 text
-    CODEC_ID_XSUB,
-    CODEC_ID_SSA,
-    CODEC_ID_MOV_TEXT,
-    CODEC_ID_HDMV_PGS_SUBTITLE,
-    CODEC_ID_DVB_TELETEXT,
-    CODEC_ID_SRT,
-    CODEC_ID_MICRODVD   = MKBETAG('m','D','V','D'),
-    CODEC_ID_EIA_608    = MKBETAG('c','6','0','8'),
-    CODEC_ID_JACOSUB    = MKBETAG('J','S','U','B'),
-    CODEC_ID_SAMI       = MKBETAG('S','A','M','I'),
-    CODEC_ID_REALTEXT   = MKBETAG('R','T','X','T'),
-    CODEC_ID_SUBVIEWER  = MKBETAG('S','u','b','V'),
-
-    /* other specific kind of codecs (generally used for attachments) */
-    CODEC_ID_FIRST_UNKNOWN = 0x18000,           ///< A dummy ID pointing at the start of various fake codecs.
-    CODEC_ID_TTF = 0x18000,
-    CODEC_ID_BINTEXT    = MKBETAG('B','T','X','T'),
-    CODEC_ID_XBIN       = MKBETAG('X','B','I','N'),
-    CODEC_ID_IDF        = MKBETAG( 0 ,'I','D','F'),
-    CODEC_ID_OTF        = MKBETAG( 0 ,'O','T','F'),
-
-    CODEC_ID_PROBE = 0x19000, ///< codec_id is not known (like CODEC_ID_NONE) but lavf should attempt to identify it
-
-    CODEC_ID_MPEG2TS = 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS
-                                * stream (only used by libavformat) */
-    CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems
-                                * stream (only used by libavformat) */
-    CODEC_ID_FFMETADATA = 0x21000,   ///< Dummy codec for streams containing only metadata information.
-
-#endif /* AVCODEC_OLD_CODEC_IDS_H */
@@ -1,195 +0,0 @@
-/*
- * The Video Decode and Presentation API for UNIX (VDPAU) is used for
- * hardware-accelerated decoding of MPEG-1/2, H.264 and VC-1.
- *
- * Copyright (C) 2008 NVIDIA
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VDPAU_H
-#define AVCODEC_VDPAU_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_vdpau
- * Public libavcodec VDPAU header.
- */
-
-
-/**
- * @defgroup lavc_codec_hwaccel_vdpau VDPAU Decoder and Renderer
- * @ingroup lavc_codec_hwaccel
- *
- * VDPAU hardware acceleration has two modules
- * - VDPAU decoding
- * - VDPAU presentation
- *
- * The VDPAU decoding module parses all headers using FFmpeg
- * parsing mechanisms and uses VDPAU for the actual decoding.
- *
- * As per the current implementation, the actual decoding
- * and rendering (API calls) are done as part of the VDPAU
- * presentation (vo_vdpau.c) module.
- *
- * @{
- */
-
-#include <vdpau/vdpau.h>
-#include <vdpau/vdpau_x11.h>
-#include "libavutil/avconfig.h"
-#include "libavutil/attributes.h"
-
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU 1
-#endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU 1
-#endif
-
-#if FF_API_BUFS_VDPAU
-union AVVDPAUPictureInfo {
-    VdpPictureInfoH264        h264;
-    VdpPictureInfoMPEG1Or2    mpeg;
-    VdpPictureInfoVC1          vc1;
-    VdpPictureInfoMPEG4Part2 mpeg4;
-};
-#endif
-
-struct AVCodecContext;
-struct AVFrame;
-
-typedef int (*AVVDPAU_Render2)(struct AVCodecContext *, struct AVFrame *,
-                               const VdpPictureInfo *, uint32_t,
-                               const VdpBitstreamBuffer *);
-
-/**
- * This structure is used to share data between the libavcodec library and
- * the client video application.
- * The user shall allocate the structure via the av_alloc_vdpau_hwaccel
- * function and make it available as
- * AVCodecContext.hwaccel_context. Members can be set by the user once
- * during initialization or through each AVCodecContext.get_buffer()
- * function call. In any case, they must be valid prior to calling
- * decoding functions.
- */
-typedef struct AVVDPAUContext {
-    /**
-     * VDPAU decoder handle
-     *
-     * Set by user.
-     */
-    VdpDecoder decoder;
-
-    /**
-     * VDPAU decoder render callback
-     *
-     * Set by the user.
-     */
-    VdpDecoderRender *render;
-
-#if FF_API_BUFS_VDPAU
-    /**
-     * VDPAU picture information
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    union AVVDPAUPictureInfo info;
-
-    /**
-     * Allocated size of the bitstream_buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_allocated;
-
-    /**
-     * Useful bitstream buffers in the bitstream buffers table.
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    int bitstream_buffers_used;
-
-   /**
-     * Table of bitstream buffers.
-     * The user is responsible for freeing this buffer using av_freep().
-     *
-     * Set by libavcodec.
-     */
-    attribute_deprecated
-    VdpBitstreamBuffer *bitstream_buffers;
-#endif
-    AVVDPAU_Render2 render2;
-} AVVDPAUContext;
-
-/**
- * @brief allocation function for AVVDPAUContext
- *
- * Allows extending the struct without breaking API/ABI
- */
-AVVDPAUContext *av_alloc_vdpaucontext(void);
-
-AVVDPAU_Render2 av_vdpau_hwaccel_get_render2(const AVVDPAUContext *);
-void av_vdpau_hwaccel_set_render2(AVVDPAUContext *, AVVDPAU_Render2);
-
-#if FF_API_CAP_VDPAU
-/** @brief The videoSurface is used for rendering. */
-#define FF_VDPAU_STATE_USED_FOR_RENDER 1
-
-/**
- * @brief The videoSurface is needed for reference/prediction.
- * The codec manipulates this.
- */
-#define FF_VDPAU_STATE_USED_FOR_REFERENCE 2
-
-/**
- * @brief This structure is used as a callback between the FFmpeg
- * decoder (vd_) and presentation (vo_) module.
- * This is used for defining a video frame containing surface,
- * picture parameter, bitstream information etc which are passed
- * between the FFmpeg decoder and its clients.
- */
-struct vdpau_render_state {
-    VdpVideoSurface surface; ///< Used as rendered surface, never changed.
-
-    int state; ///< Holds FF_VDPAU_STATE_* values.
-
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-    /** picture parameter information for all supported codecs */
-    union AVVDPAUPictureInfo info;
-#endif
-
-    /** Describe size/location of the compressed video data.
-        Set to 0 when freeing bitstream_buffers. */
-    int bitstream_buffers_allocated;
-    int bitstream_buffers_used;
-    /** The user is responsible for freeing this buffer using av_freep(). */
-    VdpBitstreamBuffer *bitstream_buffers;
-
-#if !AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-    /** picture parameter information for all supported codecs */
-    union AVVDPAUPictureInfo info;
-#endif
-};
-#endif
-
-/* @}*/
-
-#endif /* AVCODEC_VDPAU_H */
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_xvmc
- * Public libavcodec XvMC header.
- */
-
-#include <X11/extensions/XvMC.h>
-
-#include "avcodec.h"
-
-/**
- * @defgroup lavc_codec_hwaccel_xvmc XvMC
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-struct xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicate that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-};
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_XVMC_H */
@@ -1,76 +0,0 @@
-/*
- * Version macros.
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVFORMAT_VERSION_H
-#define AVFORMAT_VERSION_H
-
-/**
- * @file
- * @ingroup libavf
- * Libavformat version macros
- */
-
-#include "libavutil/avutil.h"
-
-#define LIBAVFORMAT_VERSION_MAJOR 55
-#define LIBAVFORMAT_VERSION_MINOR 19
-#define LIBAVFORMAT_VERSION_MICRO 104
-
-#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
-                                               LIBAVFORMAT_VERSION_MINOR, \
-                                               LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_VERSION     AV_VERSION(LIBAVFORMAT_VERSION_MAJOR,   \
-                                           LIBAVFORMAT_VERSION_MINOR,   \
-                                           LIBAVFORMAT_VERSION_MICRO)
-#define LIBAVFORMAT_BUILD       LIBAVFORMAT_VERSION_INT
-
-#define LIBAVFORMAT_IDENT       "Lavf" AV_STRINGIFY(LIBAVFORMAT_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_ALLOC_OUTPUT_CONTEXT
-#define FF_API_ALLOC_OUTPUT_CONTEXT    (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_FORMAT_PARAMETERS
-#define FF_API_FORMAT_PARAMETERS       (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_NEW_STREAM
-#define FF_API_NEW_STREAM              (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_SET_PTS_INFO
-#define FF_API_SET_PTS_INFO            (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CLOSE_INPUT_FILE
-#define FF_API_CLOSE_INPUT_FILE        (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_READ_PACKET
-#define FF_API_READ_PACKET             (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ASS_SSA
-#define FF_API_ASS_SSA                 (LIBAVFORMAT_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_R_FRAME_RATE
-#define FF_API_R_FRAME_RATE            1
-#endif
-#endif /* AVFORMAT_VERSION_H */
@@ -1,320 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_AVUTIL_H
-#define AVUTIL_AVUTIL_H
-
-/**
- * @file
- * external API header
- */
-
-/**
- * @mainpage
- *
- * @section ffmpeg_intro Introduction
- *
- * This document describes the usage of the different libraries
- * provided by FFmpeg.
- *
- * @li @ref libavc "libavcodec" encoding/decoding library
- * @li @ref lavfi "libavfilter" graph-based frame editing library
- * @li @ref libavf "libavformat" I/O and muxing/demuxing library
- * @li @ref lavd "libavdevice" special devices muxing/demuxing library
- * @li @ref lavu "libavutil" common utility library
- * @li @ref lswr "libswresample" audio resampling, format conversion and mixing
- * @li @ref lpp  "libpostproc" post processing library
- * @li @ref lsws "libswscale" color conversion and scaling library
- *
- * @section ffmpeg_versioning Versioning and compatibility
- *
- * Each of the FFmpeg libraries contains a version.h header, which defines a
- * major, minor and micro version number with the
- * <em>LIBRARYNAME_VERSION_{MAJOR,MINOR,MICRO}</em> macros. The major version
- * number is incremented with backward incompatible changes - e.g. removing
- * parts of the public API, reordering public struct members, etc. The minor
- * version number is incremented for backward compatible API changes or major
- * new features - e.g. adding a new public function or a new decoder. The micro
- * version number is incremented for smaller changes that a calling program
- * might still want to check for - e.g. changing behavior in a previously
- * unspecified situation.
- *
- * FFmpeg guarantees backward API and ABI compatibility for each library as long
- * as its major version number is unchanged. This means that no public symbols
- * will be removed or renamed. Types and names of the public struct members and
- * values of public macros and enums will remain the same (unless they were
- * explicitly declared as not part of the public API). Documented behavior will
- * not change.
- *
- * In other words, any correct program that works with a given FFmpeg snapshot
- * should work just as well without any changes with any later snapshot with the
- * same major versions. This applies to both rebuilding the program against new
- * FFmpeg versions or to replacing the dynamic FFmpeg libraries that a program
- * links against.
- *
- * However, new public symbols may be added and new members may be appended to
- * public structs whose size is not part of public ABI (most public structs in
- * FFmpeg). New macros and enum values may be added. Behavior in undocumented
- * situations may change slightly (and be documented). All those are accompanied
- * by an entry in doc/APIchanges and incrementing either the minor or micro
- * version number.
- */
-
-/**
- * @defgroup lavu Common utility functions
- *
- * @brief
- * libavutil contains the code shared across all the other FFmpeg
- * libraries
- *
- * @note In order to use the functions provided by avutil you must include
- * the specific header.
- *
- * @{
- *
- * @defgroup lavu_crypto Crypto and Hashing
- *
- * @{
- * @}
- *
- * @defgroup lavu_math Maths
- * @{
- *
- * @}
- *
- * @defgroup lavu_string String Manipulation
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_mem Memory Management
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_data Data Structures
- * @{
- *
- * @}
- *
- * @defgroup lavu_audio Audio related
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_error Error Codes
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_log Logging Facility
- *
- * @{
- *
- * @}
- *
- * @defgroup lavu_misc Other
- *
- * @{
- *
- * @defgroup lavu_internal Internal
- *
- * Not exported functions, for internal usage only
- *
- * @{
- *
- * @}
- */
-
-
-/**
- * @addtogroup lavu_ver
- * @{
- */
-
-/**
- * Return the LIBAVUTIL_VERSION_INT constant.
- */
-unsigned avutil_version(void);
-
-/**
- * Return the libavutil build-time configuration.
- */
-const char *avutil_configuration(void);
-
-/**
- * Return the libavutil license.
- */
-const char *avutil_license(void);
-
-/**
- * @}
- */
-
-/**
- * @addtogroup lavu_media Media Type
- * @brief Media Type
- */
-
-enum AVMediaType {
-    AVMEDIA_TYPE_UNKNOWN = -1,  ///< Usually treated as AVMEDIA_TYPE_DATA
-    AVMEDIA_TYPE_VIDEO,
-    AVMEDIA_TYPE_AUDIO,
-    AVMEDIA_TYPE_DATA,          ///< Opaque data information usually continuous
-    AVMEDIA_TYPE_SUBTITLE,
-    AVMEDIA_TYPE_ATTACHMENT,    ///< Opaque data information usually sparse
-    AVMEDIA_TYPE_NB
-};
-
-/**
- * Return a string describing the media_type enum, NULL if media_type
- * is unknown.
- */
-const char *av_get_media_type_string(enum AVMediaType media_type);
-
-/**
- * @defgroup lavu_const Constants
- * @{
- *
- * @defgroup lavu_enc Encoding specific
- *
- * @note those definition should move to avcodec
- * @{
- */
-
-#define FF_LAMBDA_SHIFT 7
-#define FF_LAMBDA_SCALE (1<<FF_LAMBDA_SHIFT)
-#define FF_QP2LAMBDA 118 ///< factor to convert from H.263 QP to lambda
-#define FF_LAMBDA_MAX (256*128-1)
-
-#define FF_QUALITY_SCALE FF_LAMBDA_SCALE //FIXME maybe remove
-
-/**
- * @}
- * @defgroup lavu_time Timestamp specific
- *
- * FFmpeg internal timebase and timestamp definitions
- *
- * @{
- */
-
-/**
- * @brief Undefined timestamp value
- *
- * Usually reported by demuxer that work on containers that do not provide
- * either pts or dts.
- */
-
-#define AV_NOPTS_VALUE          ((int64_t)UINT64_C(0x8000000000000000))
-
-/**
- * Internal time base represented as integer
- */
-
-#define AV_TIME_BASE            1000000
-
-/**
- * Internal time base represented as fractional value
- */
-
-#define AV_TIME_BASE_Q          (AVRational){1, AV_TIME_BASE}
-
-/**
- * @}
- * @}
- * @defgroup lavu_picture Image related
- *
- * AVPicture types, pixel formats and basic image planes manipulation.
- *
- * @{
- */
-
-enum AVPictureType {
-    AV_PICTURE_TYPE_NONE = 0, ///< Undefined
-    AV_PICTURE_TYPE_I,     ///< Intra
-    AV_PICTURE_TYPE_P,     ///< Predicted
-    AV_PICTURE_TYPE_B,     ///< Bi-dir predicted
-    AV_PICTURE_TYPE_S,     ///< S(GMC)-VOP MPEG4
-    AV_PICTURE_TYPE_SI,    ///< Switching Intra
-    AV_PICTURE_TYPE_SP,    ///< Switching Predicted
-    AV_PICTURE_TYPE_BI,    ///< BI type
-};
-
-/**
- * Return a single letter to describe the given picture type
- * pict_type.
- *
- * @param[in] pict_type the picture type @return a single character
- * representing the picture type, '?' if pict_type is unknown
- */
-char av_get_picture_type_char(enum AVPictureType pict_type);
-
-/**
- * @}
- */
-
-#include "common.h"
-#include "error.h"
-#include "version.h"
-#include "mathematics.h"
-#include "rational.h"
-#include "intfloat_readwrite.h"
-#include "log.h"
-#include "pixfmt.h"
-
-/**
- * Return x default pointer in case p is NULL.
- */
-static inline void *av_x_if_null(const void *p, const void *x)
-{
-    return (void *)(intptr_t)(p ? p : x);
-}
-
-/**
- * Compute the length of an integer list.
- *
- * @param elsize  size in bytes of each list element (only 1, 2, 4 or 8)
- * @param term    list terminator (usually 0 or -1)
- * @param list    pointer to the list
- * @return  length of the list, in elements, not counting the terminator
- */
-unsigned av_int_list_length_for_size(unsigned elsize,
-                                     const void *list, uint64_t term) av_pure;
-
-/**
- * Compute the length of an integer list.
- *
- * @param term  list terminator (usually 0 or -1)
- * @param list  pointer to the list
- * @return  length of the list, in elements, not counting the terminator
- */
-#define av_int_list_length(list, term) \
-    av_int_list_length_for_size(sizeof(*(list)), list, term)
-
-/**
- * @}
- * @}
- */
-
-#endif /* AVUTIL_AVUTIL_H */
@@ -1,464 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * common internal and external API header
- */
-
-#ifndef AVUTIL_COMMON_H
-#define AVUTIL_COMMON_H
-
-#include <errno.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <math.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "attributes.h"
-#include "version.h"
-#include "libavutil/avconfig.h"
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_NE(be, le) (be)
-#else
-#   define AV_NE(be, le) (le)
-#endif
-
-//rounded division & shift
-#define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b))
-/* assume b>0 */
-#define ROUNDED_DIV(a,b) (((a)>0 ? (a) + ((b)>>1) : (a) - ((b)>>1))/(b))
-/* assume a>0 and b>0 */
-#define FF_CEIL_RSHIFT(a,b) (!av_builtin_constant_p(b) ? -((-(a)) >> (b)) \
-                                                       : ((a) + (1<<(b)) - 1) >> (b))
-#define FFUDIV(a,b) (((a)>0 ?(a):(a)-(b)+1) / (b))
-#define FFUMOD(a,b) ((a)-(b)*FFUDIV(a,b))
-#define FFABS(a) ((a) >= 0 ? (a) : (-(a)))
-#define FFSIGN(a) ((a) > 0 ? 1 : -1)
-
-#define FFMAX(a,b) ((a) > (b) ? (a) : (b))
-#define FFMAX3(a,b,c) FFMAX(FFMAX(a,b),c)
-#define FFMIN(a,b) ((a) > (b) ? (b) : (a))
-#define FFMIN3(a,b,c) FFMIN(FFMIN(a,b),c)
-
-#define FFSWAP(type,a,b) do{type SWAP_tmp= b; b= a; a= SWAP_tmp;}while(0)
-#define FF_ARRAY_ELEMS(a) (sizeof(a) / sizeof((a)[0]))
-#define FFALIGN(x, a) (((x)+(a)-1)&~((a)-1))
-
-/* misc math functions */
-
-/**
- * Reverse the order of the bits of an 8-bits unsigned integer.
- */
-#if FF_API_AV_REVERSE
-extern attribute_deprecated const uint8_t av_reverse[256];
-#endif
-
-#ifdef HAVE_AV_CONFIG_H
-#   include "config.h"
-#   include "intmath.h"
-#endif
-
-/* Pull in unguarded fallback defines at the end of this file. */
-#include "common.h"
-
-#ifndef av_log2
-av_const int av_log2(unsigned v);
-#endif
-
-#ifndef av_log2_16bit
-av_const int av_log2_16bit(unsigned v);
-#endif
-
-/**
- * Clip a signed integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const int av_clip_c(int a, int amin, int amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed 64bit integer value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, int64_t amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a signed integer value into the 0-255 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint8_t av_clip_uint8_c(int a)
-{
-    if (a&(~0xFF)) return (-a)>>31;
-    else           return a;
-}
-
-/**
- * Clip a signed integer value into the -128,127 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int8_t av_clip_int8_c(int a)
-{
-    if ((a+0x80) & ~0xFF) return (a>>31) ^ 0x7F;
-    else                  return a;
-}
-
-/**
- * Clip a signed integer value into the 0-65535 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const uint16_t av_clip_uint16_c(int a)
-{
-    if (a&(~0xFFFF)) return (-a)>>31;
-    else             return a;
-}
-
-/**
- * Clip a signed integer value into the -32768,32767 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int16_t av_clip_int16_c(int a)
-{
-    if ((a+0x8000) & ~0xFFFF) return (a>>31) ^ 0x7FFF;
-    else                      return a;
-}
-
-/**
- * Clip a signed 64-bit integer value into the -2147483648,2147483647 range.
- * @param a value to clip
- * @return clipped value
- */
-static av_always_inline av_const int32_t av_clipl_int32_c(int64_t a)
-{
-    if ((a+0x80000000u) & ~UINT64_C(0xFFFFFFFF)) return (int32_t)((a>>63) ^ 0x7FFFFFFF);
-    else                                         return (int32_t)a;
-}
-
-/**
- * Clip a signed integer to an unsigned power of two range.
- * @param  a value to clip
- * @param  p bit position to clip at
- * @return clipped value
- */
-static av_always_inline av_const unsigned av_clip_uintp2_c(int a, int p)
-{
-    if (a & ~((1<<p) - 1)) return -a >> 31 & ((1<<p) - 1);
-    else                   return  a;
-}
-
-/**
- * Add two signed 32-bit values with saturation.
- *
- * @param  a one value
- * @param  b another value
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_add32_c(int a, int b)
-{
-    return av_clipl_int32((int64_t)a + b);
-}
-
-/**
- * Add a doubled value to another value with saturation at both stages.
- *
- * @param  a first value
- * @param  b value doubled and added to a
- * @return sum with signed saturation
- */
-static av_always_inline int av_sat_dadd32_c(int a, int b)
-{
-    return av_sat_add32(a, av_sat_add32(b, b));
-}
-
-/**
- * Clip a float value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const float av_clipf_c(float a, float amin, float amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/**
- * Clip a double value into the amin-amax range.
- * @param a value to clip
- * @param amin minimum value of the clip range
- * @param amax maximum value of the clip range
- * @return clipped value
- */
-static av_always_inline av_const double av_clipd_c(double a, double amin, double amax)
-{
-#if defined(HAVE_AV_CONFIG_H) && defined(ASSERT_LEVEL) && ASSERT_LEVEL >= 2
-    if (amin > amax) abort();
-#endif
-    if      (a < amin) return amin;
-    else if (a > amax) return amax;
-    else               return a;
-}
-
-/** Compute ceil(log2(x)).
- * @param x value used to compute ceil(log2(x))
- * @return computed ceiling of log2(x)
- */
-static av_always_inline av_const int av_ceil_log2_c(int x)
-{
-    return av_log2((x - 1) << 1);
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount_c(uint32_t x)
-{
-    x -= (x >> 1) & 0x55555555;
-    x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
-    x = (x + (x >> 4)) & 0x0F0F0F0F;
-    x += x >> 8;
-    return (x + (x >> 16)) & 0x3F;
-}
-
-/**
- * Count number of bits set to one in x
- * @param x value to count bits of
- * @return the number of bits set to one in x
- */
-static av_always_inline av_const int av_popcount64_c(uint64_t x)
-{
-    return av_popcount((uint32_t)x) + av_popcount((uint32_t)(x >> 32));
-}
-
-#define MKTAG(a,b,c,d) ((a) | ((b) << 8) | ((c) << 16) | ((unsigned)(d) << 24))
-#define MKBETAG(a,b,c,d) ((d) | ((c) << 8) | ((b) << 16) | ((unsigned)(a) << 24))
-
-/**
- * Convert a UTF-8 character (up to 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val      Output value, must be an lvalue of type uint32_t.
- * @param GET_BYTE Expression reading one byte from the input.
- *                 Evaluated up to 7 times (4 for the currently
- *                 assigned Unicode range).  With a memory buffer
- *                 input, this could be *ptr++.
- * @param ERROR    Expression to be evaluated on invalid input,
- *                 typically a goto statement.
- *
- * @warning ERROR should not contain a loop control statement which
- * could interact with the internal while loop, and should force an
- * exit from the macro code (e.g. through a goto or a return) in order
- * to prevent undefined results.
- */
-#define GET_UTF8(val, GET_BYTE, ERROR)\
-    val= GET_BYTE;\
-    {\
-        uint32_t top = (val & 128) >> 1;\
-        if ((val & 0xc0) == 0x80 || val >= 0xFE)\
-            ERROR\
-        while (val & top) {\
-            int tmp= GET_BYTE - 128;\
-            if(tmp>>6)\
-                ERROR\
-            val= (val<<6) + tmp;\
-            top <<= 5;\
-        }\
-        val &= (top << 1) - 1;\
-    }
-
-/**
- * Convert a UTF-16 character (2 or 4 bytes) to its 32-bit UCS-4 encoded form.
- *
- * @param val       Output value, must be an lvalue of type uint32_t.
- * @param GET_16BIT Expression returning two bytes of UTF-16 data converted
- *                  to native byte order.  Evaluated one or two times.
- * @param ERROR     Expression to be evaluated on invalid input,
- *                  typically a goto statement.
- */
-#define GET_UTF16(val, GET_16BIT, ERROR)\
-    val = GET_16BIT;\
-    {\
-        unsigned int hi = val - 0xD800;\
-        if (hi < 0x800) {\
-            val = GET_16BIT - 0xDC00;\
-            if (val > 0x3FFU || hi > 0x3FFU)\
-                ERROR\
-            val += (hi<<10) + 0x10000;\
-        }\
-    }\
-
-/**
- * @def PUT_UTF8(val, tmp, PUT_BYTE)
- * Convert a 32-bit Unicode character to its UTF-8 encoded form (up to 4 bytes long).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-8. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint8_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_BYTE.
- * @param PUT_BYTE writes the converted UTF-8 bytes to any proper destination.
- * It could be a function or a statement, and uses tmp as the input byte.
- * For example, PUT_BYTE could be "*output++ = tmp;" PUT_BYTE will be
- * executed up to 4 times for values in the valid UTF-8 range and up to
- * 7 times in the general case, depending on the length of the converted
- * Unicode character.
- */
-#define PUT_UTF8(val, tmp, PUT_BYTE)\
-    {\
-        int bytes, shift;\
-        uint32_t in = val;\
-        if (in < 0x80) {\
-            tmp = in;\
-            PUT_BYTE\
-        } else {\
-            bytes = (av_log2(in) + 4) / 5;\
-            shift = (bytes - 1) * 6;\
-            tmp = (256 - (256 >> bytes)) | (in >> shift);\
-            PUT_BYTE\
-            while (shift >= 6) {\
-                shift -= 6;\
-                tmp = 0x80 | ((in >> shift) & 0x3f);\
-                PUT_BYTE\
-            }\
-        }\
-    }
-
-/**
- * @def PUT_UTF16(val, tmp, PUT_16BIT)
- * Convert a 32-bit Unicode character to its UTF-16 encoded form (2 or 4 bytes).
- * @param val is an input-only argument and should be of type uint32_t. It holds
- * a UCS-4 encoded Unicode character that is to be converted to UTF-16. If
- * val is given as a function it is executed only once.
- * @param tmp is a temporary variable and should be of type uint16_t. It
- * represents an intermediate value during conversion that is to be
- * output by PUT_16BIT.
- * @param PUT_16BIT writes the converted UTF-16 data to any proper destination
- * in desired endianness. It could be a function or a statement, and uses tmp
- * as the input byte.  For example, PUT_BYTE could be "*output++ = tmp;"
- * PUT_BYTE will be executed 1 or 2 times depending on input character.
- */
-#define PUT_UTF16(val, tmp, PUT_16BIT)\
-    {\
-        uint32_t in = val;\
-        if (in < 0x10000) {\
-            tmp = in;\
-            PUT_16BIT\
-        } else {\
-            tmp = 0xD800 | ((in - 0x10000) >> 10);\
-            PUT_16BIT\
-            tmp = 0xDC00 | ((in - 0x10000) & 0x3FF);\
-            PUT_16BIT\
-        }\
-    }\
-
-
-
-#include "mem.h"
-
-#ifdef HAVE_AV_CONFIG_H
-#    include "internal.h"
-#endif /* HAVE_AV_CONFIG_H */
-
-#endif /* AVUTIL_COMMON_H */
-
-/*
- * The following definitions are outside the multiple inclusion guard
- * to ensure they are immediately available in intmath.h.
- */
-
-#ifndef av_ceil_log2
-#   define av_ceil_log2     av_ceil_log2_c
-#endif
-#ifndef av_clip
-#   define av_clip          av_clip_c
-#endif
-#ifndef av_clip64
-#   define av_clip64        av_clip64_c
-#endif
-#ifndef av_clip_uint8
-#   define av_clip_uint8    av_clip_uint8_c
-#endif
-#ifndef av_clip_int8
-#   define av_clip_int8     av_clip_int8_c
-#endif
-#ifndef av_clip_uint16
-#   define av_clip_uint16   av_clip_uint16_c
-#endif
-#ifndef av_clip_int16
-#   define av_clip_int16    av_clip_int16_c
-#endif
-#ifndef av_clipl_int32
-#   define av_clipl_int32   av_clipl_int32_c
-#endif
-#ifndef av_clip_uintp2
-#   define av_clip_uintp2   av_clip_uintp2_c
-#endif
-#ifndef av_sat_add32
-#   define av_sat_add32     av_sat_add32_c
-#endif
-#ifndef av_sat_dadd32
-#   define av_sat_dadd32    av_sat_dadd32_c
-#endif
-#ifndef av_clipf
-#   define av_clipf         av_clipf_c
-#endif
-#ifndef av_clipd
-#   define av_clipd         av_clipd_c
-#endif
-#ifndef av_popcount
-#   define av_popcount      av_popcount_c
-#endif
-#ifndef av_popcount64
-#   define av_popcount64    av_popcount64_c
-#endif
@@ -1,342 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include <limits.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "error.h"
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_mem
- * @{
- */
-
-
-#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-#else
-    #define av_alloc_size(...)
-#endif
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- */
-void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a block of size * nmemb bytes with av_malloc().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_malloc()
- */
-av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_malloc(nmemb * size);
-}
-
-/**
- * Allocate or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param size Size in bytes of the memory block to be allocated or
- * reallocated.
- * @return Pointer to a newly-reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- * @see av_fast_realloc()
- */
-void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
-
-/**
- * Allocate or reallocate a block of memory.
- * This function does the same thing as av_realloc, except:
- * - It takes two arguments and checks the result of the multiplication for
- *   integer overflow.
- * - It frees the input block in case of failure, thus avoiding the memory
- *   leak with the classic "buf = realloc(buf); if (!buf) return -1;".
- */
-void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
-
-/**
- * Allocate or reallocate a block of memory.
- * If *ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param   ptr Pointer to a pointer to a memory block already allocated
- *          with av_realloc(), or pointer to a pointer to NULL.
- *          The pointer is updated on success, or freed on failure.
- * @param   size Size in bytes for the memory block to be allocated or
- *          reallocated
- * @return  Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_reallocp(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-int av_reallocp(void *ptr, size_t size);
-
-/**
- * Allocate or reallocate an array.
- * If ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to a newly-reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Allocate or reallocate an array through a pointer to a pointer.
- * If *ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_realloc(), or pointer to a pointer to NULL.
- * The pointer is updated on success, or freed on failure.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- * @see av_malloc()
- */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a block of nmemb * size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * The allocation will fail if nmemb * size is greater than or equal
- * to INT_MAX.
- * @param nmemb
- * @param size
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- */
-void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
-
-/**
- * Allocate a block of size * nmemb bytes with av_mallocz().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- * @see av_malloc_array()
- */
-av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_mallocz(nmemb * size);
-}
-
-/**
- * Duplicate the string s.
- * @param s string to be duplicated
- * @return Pointer to a newly-allocated string containing a
- * copy of s or NULL if the string cannot be allocated.
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Duplicate the buffer p.
- * @param p buffer to be duplicated
- * @return Pointer to a newly allocated buffer containing a
- * copy of p or NULL if the buffer cannot be allocated.
- */
-void *av_memdup(const void *p, size_t size);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-/**
- * Add an element to a dynamic array.
- *
- * The array to grow is supposed to be an array of pointers to
- * structures, and the element to add must be a pointer to an already
- * allocated structure.
- *
- * The array is reallocated when its size reaches powers of 2.
- * Therefore, the amortized cost of adding an element is constant.
- *
- * In case of success, the pointer to the array is updated in order to
- * point to the new grown array, and the number pointed to by nb_ptr
- * is incremented.
- * In case of failure, the array is freed, *tab_ptr is set to NULL and
- * *nb_ptr is set to 0.
- *
- * @param tab_ptr pointer to the array to grow
- * @param nb_ptr  pointer to the number of elements in the array
- * @param elem    element to add
- * @see av_dynarray2_add()
- */
-void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem);
-
-/**
- * Add an element of size elem_size to a dynamic array.
- *
- * The array is reallocated when its number of elements reaches powers of 2.
- * Therefore, the amortized cost of adding an element is constant.
- *
- * In case of success, the pointer to the array is updated in order to
- * point to the new grown array, and the number pointed to by nb_ptr
- * is incremented.
- * In case of failure, the array is freed, *tab_ptr is set to NULL and
- * *nb_ptr is set to 0.
- *
- * @param tab_ptr   pointer to the array to grow
- * @param nb_ptr    pointer to the number of elements in the array
- * @param elem_size size in bytes of the elements in the array
- * @param elem_data pointer to the data of the element to add. If NULL, the space of
- *                  the new added element is not filled.
- * @return          pointer to the data of the element to copy in the new allocated space.
- *                  If NULL, the new allocated space is left uninitialized."
- * @see av_dynarray_add()
- */
-void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size,
-                       const uint8_t *elem_data);
-
-/**
- * Multiply two size_t values checking for overflow.
- * @return  0 if success, AVERROR(EINVAL) if overflow.
- */
-static inline int av_size_mult(size_t a, size_t b, size_t *r)
-{
-    size_t t = a * b;
-    /* Hack inspired from glibc: only try the division if nelem and elsize
-     * are both greater than sqrt(SIZE_MAX). */
-    if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
-        return AVERROR(EINVAL);
-    *r = t;
-    return 0;
-}
-
-/**
- * Set the maximum size that may me allocated in one block.
- */
-void av_max_alloc(size_t max);
-
-/**
- * deliberately overlapping memcpy implementation
- * @param dst destination buffer
- * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
- * @param cnt number of bytes to copy, must be >= 0
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MEM_H */
@@ -1,175 +0,0 @@
-/*
- * copyright (c) 2006-2012 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OLD_PIX_FMTS_H
-#define AVUTIL_OLD_PIX_FMTS_H
-
-/*
- * This header exists to prevent new pixel formats from being accidentally added
- * to the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVPixelFormat enum instead.
- */
-    PIX_FMT_NONE = AV_PIX_FMT_NONE,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-#if FF_API_VDPAU
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_GRAY8A,    ///< 8bit gray, 8bit alpha
-    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-
-    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
-    //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately
-    //is better
-    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-
-#ifdef AV_PIX_FMT_ABI_GIT_MASTER
-    PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
-
-#ifndef AV_PIX_FMT_ABI_GIT_MASTER
-    PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    PIX_FMT_0RGB=0x123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
-    PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
-    PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
-    PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
-    PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-    PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-
-    PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big endian
-    PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little endian
-    PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big endian
-    PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little endian
-
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-#endif /* AVUTIL_OLD_PIX_FMTS_H */
@@ -1,78 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * timestamp utils, mostly useful for debugging/logging purposes
- */
-
-#ifndef AVUTIL_TIMESTAMP_H
-#define AVUTIL_TIMESTAMP_H
-
-#include "common.h"
-
-#if defined(__cplusplus) && !defined(__STDC_FORMAT_MACROS) && !defined(PRId64)
-#error missing -D__STDC_FORMAT_MACROS / #define __STDC_FORMAT_MACROS
-#endif
-
-#define AV_TS_MAX_STRING_SIZE 32
-
-/**
- * Fill the provided buffer with a string containing a timestamp
- * representation.
- *
- * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
- * @param ts the timestamp to represent
- * @return the buffer in input
- */
-static inline char *av_ts_make_string(char *buf, int64_t ts)
-{
-    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
-    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%"PRId64, ts);
-    return buf;
-}
-
-/**
- * Convenience macro, the return value should be used only directly in
- * function arguments but never stand-alone.
- */
-#define av_ts2str(ts) av_ts_make_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts)
-
-/**
- * Fill the provided buffer with a string containing a timestamp time
- * representation.
- *
- * @param buf a buffer with size in bytes of at least AV_TS_MAX_STRING_SIZE
- * @param ts the timestamp to represent
- * @param tb the timebase of the timestamp
- * @return the buffer in input
- */
-static inline char *av_ts_make_time_string(char *buf, int64_t ts, AVRational *tb)
-{
-    if (ts == AV_NOPTS_VALUE) snprintf(buf, AV_TS_MAX_STRING_SIZE, "NOPTS");
-    else                      snprintf(buf, AV_TS_MAX_STRING_SIZE, "%.6g", av_q2d(*tb) * ts);
-    return buf;
-}
-
-/**
- * Convenience macro, the return value should be used only directly in
- * function arguments but never stand-alone.
- */
-#define av_ts2timestr(ts, tb) av_ts_make_time_string((char[AV_TS_MAX_STRING_SIZE]){0}, ts, tb)
-
-#endif /* AVUTIL_TIMESTAMP_H */
@@ -1,153 +0,0 @@
-/*
- * copyright (c) 2003 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_VERSION_H
-#define AVUTIL_VERSION_H
-
-/**
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-/**
- * @}
- */
-
-/**
- * @defgroup version_utils Library Version Macros
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
- * @}
- */
-
-
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
-/**
- * @defgroup lavu_ver Version and Build diagnostics
- *
- * Macros and function useful to check at compiletime and at runtime
- * which version of libavutil is in use.
- *
- * @{
- */
-
-#define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  48
-#define LIBAVUTIL_VERSION_MICRO 101
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @{
- */
-
-#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
-#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_LLS_PRIVATE
-#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_LLS1
-#define FF_API_LLS1                     (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AVFRAME_LAVC
-#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_VDPAU
-#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
-#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_VERSION_H */
-
@@ -1,62 +0,0 @@
-/*
- * A 32-bit implementation of the XTEA algorithm
- * Copyright (c) 2012 Samuel Pitoiset
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_XTEA_H
-#define AVUTIL_XTEA_H
-
-#include <stdint.h>
-
-/**
- * @defgroup lavu_xtea XTEA
- * @ingroup lavu_crypto
- * @{
- */
-
-typedef struct AVXTEA {
-    uint32_t key[16];
-} AVXTEA;
-
-/**
- * Initialize an AVXTEA context.
- *
- * @param ctx an AVXTEA context
- * @param key a key of 16 bytes used for encryption/decryption
- */
-void av_xtea_init(struct AVXTEA *ctx, const uint8_t key[16]);
-
-/**
- * Encrypt or decrypt a buffer using a previously initialized context.
- *
- * @param ctx an AVXTEA context
- * @param dst destination array, can be equal to src
- * @param src source array, can be equal to dst
- * @param count number of 8 byte blocks
- * @param iv initialization vector for CBC mode, if NULL then ECB will be used
- * @param decrypt 0 for encryption, 1 for decryption
- */
-void av_xtea_crypt(struct AVXTEA *ctx, uint8_t *dst, const uint8_t *src,
-                   int count, uint8_t *iv, int decrypt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_XTEA_H */
@@ -1,104 +0,0 @@
-/*
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_VERSION_H
-#define AVCODEC_VERSION_H
-
-/**
- * @file
- * @ingroup libavc
- * Libavcodec version macros.
- */
-
-#include "libavutil/avutil.h"
-
-#define LIBAVCODEC_VERSION_MAJOR 55
-#define LIBAVCODEC_VERSION_MINOR  39
-#define LIBAVCODEC_VERSION_MICRO 101
-
-#define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
-                                               LIBAVCODEC_VERSION_MINOR, \
-                                               LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_VERSION      AV_VERSION(LIBAVCODEC_VERSION_MAJOR,    \
-                                           LIBAVCODEC_VERSION_MINOR,    \
-                                           LIBAVCODEC_VERSION_MICRO)
-#define LIBAVCODEC_BUILD        LIBAVCODEC_VERSION_INT
-
-#define LIBAVCODEC_IDENT        "Lavc" AV_STRINGIFY(LIBAVCODEC_VERSION)
-
-/**
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- */
-
-#ifndef FF_API_REQUEST_CHANNELS
-#define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_ALLOC_CONTEXT
-#define FF_API_ALLOC_CONTEXT    (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_AVCODEC_OPEN
-#define FF_API_AVCODEC_OPEN     (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-#ifndef FF_API_OLD_DECODE_AUDIO
-#define FF_API_OLD_DECODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_TIMECODE
-#define FF_API_OLD_TIMECODE (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
-
-#ifndef FF_API_OLD_ENCODE_AUDIO
-#define FF_API_OLD_ENCODE_AUDIO (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_OLD_ENCODE_VIDEO
-#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CODEC_ID
-#define FF_API_CODEC_ID          (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_AVCODEC_RESAMPLE
-#define FF_API_AVCODEC_RESAMPLE  (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DEINTERLACE
-#define FF_API_DEINTERLACE       (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_DESTRUCT_PACKET
-#define FF_API_DESTRUCT_PACKET   (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_GET_BUFFER
-#define FF_API_GET_BUFFER        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_MISSING_SAMPLE
-#define FF_API_MISSING_SAMPLE    (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_LOWRES
-#define FF_API_LOWRES            (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_CAP_VDPAU
-#define FF_API_CAP_VDPAU         (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_BUFS_VDPAU
-#define FF_API_BUFS_VDPAU        (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-#ifndef FF_API_VOXWARE
-#define FF_API_VOXWARE           (LIBAVCODEC_VERSION_MAJOR < 56)
-#endif
-
-#endif /* AVCODEC_VERSION_H */
@@ -1,168 +0,0 @@
-/*
- * Copyright (C) 2003 Ivan Kalvachev
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVCODEC_XVMC_H
-#define AVCODEC_XVMC_H
-
-/**
- * @file
- * @ingroup lavc_codec_hwaccel_xvmc
- * Public libavcodec XvMC header.
- */
-
-#include <X11/extensions/XvMC.h>
-
-#include "avcodec.h"
-
-/**
- * @defgroup lavc_codec_hwaccel_xvmc XvMC
- * @ingroup lavc_codec_hwaccel
- *
- * @{
- */
-
-#define AV_XVMC_ID                    0x1DC711C0  /**< special value to ensure that regular pixel routines haven't corrupted the struct
-                                                       the number is 1337 speak for the letters IDCT MCo (motion compensation) */
-
-struct xvmc_pix_fmt {
-    /** The field contains the special constant value AV_XVMC_ID.
-        It is used as a test that the application correctly uses the API,
-        and that there is no corruption caused by pixel routines.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             xvmc_id;
-
-    /** Pointer to the block array allocated by XvMCCreateBlocks().
-        The array has to be freed by XvMCDestroyBlocks().
-        Each group of 64 values represents one data block of differential
-        pixel information (in MoCo mode) or coefficients for IDCT.
-        - application - set the pointer during initialization
-        - libavcodec  - fills coefficients/pixel data into the array
-    */
-    short*          data_blocks;
-
-    /** Pointer to the macroblock description array allocated by
-        XvMCCreateMacroBlocks() and freed by XvMCDestroyMacroBlocks().
-        - application - set the pointer during initialization
-        - libavcodec  - fills description data into the array
-    */
-    XvMCMacroBlock* mv_blocks;
-
-    /** Number of macroblock descriptions that can be stored in the mv_blocks
-        array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_mv_blocks;
-
-    /** Number of blocks that can be stored at once in the data_blocks array.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             allocated_data_blocks;
-
-    /** Indicate that the hardware would interpret data_blocks as IDCT
-        coefficients and perform IDCT on them.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             idct;
-
-    /** In MoCo mode it indicates that intra macroblocks are assumed to be in
-        unsigned format; same as the XVMC_INTRA_UNSIGNED flag.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    int             unsigned_intra;
-
-    /** Pointer to the surface allocated by XvMCCreateSurface().
-        It has to be freed by XvMCDestroySurface() on application exit.
-        It identifies the frame and its state on the video hardware.
-        - application - set during initialization
-        - libavcodec  - unchanged
-    */
-    XvMCSurface*    p_surface;
-
-/** Set by the decoder before calling ff_draw_horiz_band(),
-    needed by the XvMCRenderSurface function. */
-//@{
-    /** Pointer to the surface used as past reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_past_surface;
-
-    /** Pointer to the surface used as future reference
-        - application - unchanged
-        - libavcodec  - set
-    */
-    XvMCSurface*    p_future_surface;
-
-    /** top/bottom field or frame
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    picture_structure;
-
-    /** XVMC_SECOND_FIELD - 1st or 2nd field in the sequence
-        - application - unchanged
-        - libavcodec  - set
-    */
-    unsigned int    flags;
-//}@
-
-    /** Number of macroblock descriptions in the mv_blocks array
-        that have already been passed to the hardware.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may increment it
-                        with filled_mb_block_num or zero both.
-        - libavcodec  - unchanged
-    */
-    int             start_mv_blocks_num;
-
-    /** Number of new macroblock descriptions in the mv_blocks array (after
-        start_mv_blocks_num) that are filled by libavcodec and have to be
-        passed to the hardware.
-        - application - zeroes it on get_buffer() or after successful
-                        ff_draw_horiz_band().
-        - libavcodec  - increment with one of each stored MB
-    */
-    int             filled_mv_blocks_num;
-
-    /** Number of the next free data block; one data block consists of
-        64 short values in the data_blocks array.
-        All blocks before this one have already been claimed by placing their
-        position into the corresponding block description structure field,
-        that are part of the mv_blocks array.
-        - application - zeroes it on get_buffer().
-                        A successful ff_draw_horiz_band() may zero it together
-                        with start_mb_blocks_num.
-        - libavcodec  - each decoded macroblock increases it by the number
-                        of coded blocks it contains.
-    */
-    int             next_free_data_block_num;
-};
-
-/**
- * @}
- */
-
-#endif /* AVCODEC_XVMC_H */
@@ -1,52 +0,0 @@
-/*
- * copyright (c) 2006 Mans Rullgard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_ADLER32_H
-#define AVUTIL_ADLER32_H
-
-#include <stdint.h>
-#include "attributes.h"
-
-/**
- * @defgroup lavu_adler32 Adler32
- * @ingroup lavu_crypto
- * @{
- */
-
-/**
- * Calculate the Adler32 checksum of a buffer.
- *
- * Passing the return value to a subsequent av_adler32_update() call
- * allows the checksum of multiple buffers to be calculated as though
- * they were concatenated.
- *
- * @param adler initial checksum value
- * @param buf   pointer to input buffer
- * @param len   size of input buffer
- * @return      updated checksum
- */
-unsigned long av_adler32_update(unsigned long adler, const uint8_t *buf,
-                                unsigned int len) av_pure;
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_ADLER32_H */
@@ -1,160 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * Macro definitions for various function/variable attributes
- */
-
-#ifndef AVUTIL_ATTRIBUTES_H
-#define AVUTIL_ATTRIBUTES_H
-
-#ifdef __GNUC__
-#    define AV_GCC_VERSION_AT_LEAST(x,y) (__GNUC__ > x || __GNUC__ == x && __GNUC_MINOR__ >= y)
-#else
-#    define AV_GCC_VERSION_AT_LEAST(x,y) 0
-#endif
-
-#ifndef av_always_inline
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_always_inline __attribute__((always_inline)) inline
-#elif defined(_MSC_VER)
-#    define av_always_inline __forceinline
-#else
-#    define av_always_inline inline
-#endif
-#endif
-
-#ifndef av_extern_inline
-#if defined(__ICL) && __ICL >= 1210 || defined(__GNUC_STDC_INLINE__)
-#    define av_extern_inline extern inline
-#else
-#    define av_extern_inline inline
-#endif
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_noinline __attribute__((noinline))
-#elif defined(_MSC_VER)
-#    define av_noinline __declspec(noinline)
-#else
-#    define av_noinline
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_pure __attribute__((pure))
-#else
-#    define av_pure
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,6)
-#    define av_const __attribute__((const))
-#else
-#    define av_const
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-#    define av_cold __attribute__((cold))
-#else
-#    define av_cold
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,1)
-#    define av_flatten __attribute__((flatten))
-#else
-#    define av_flatten
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define attribute_deprecated __attribute__((deprecated))
-#elif defined(_MSC_VER)
-#    define attribute_deprecated __declspec(deprecated)
-#else
-#    define attribute_deprecated
-#endif
-
-/**
- * Disable warnings about deprecated features
- * This is useful for sections of code kept for backward compatibility and
- * scheduled for removal.
- */
-#ifndef AV_NOWARN_DEPRECATED
-#if AV_GCC_VERSION_AT_LEAST(4,6)
-#    define AV_NOWARN_DEPRECATED(code) \
-        _Pragma("GCC diagnostic push") \
-        _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"") \
-        code \
-        _Pragma("GCC diagnostic pop")
-#elif defined(_MSC_VER)
-#    define AV_NOWARN_DEPRECATED(code) \
-        __pragma(warning(push)) \
-        __pragma(warning(disable : 4996)) \
-        code; \
-        __pragma(warning(pop))
-#else
-#    define AV_NOWARN_DEPRECATED(code) code
-#endif
-#endif
-
-
-#if defined(__GNUC__)
-#    define av_unused __attribute__((unused))
-#else
-#    define av_unused
-#endif
-
-/**
- * Mark a variable as used and prevent the compiler from optimizing it
- * away.  This is useful for variables accessed only from inline
- * assembler without the compiler being aware.
- */
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-#    define av_used __attribute__((used))
-#else
-#    define av_used
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,3)
-#   define av_alias __attribute__((may_alias))
-#else
-#   define av_alias
-#endif
-
-#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(__clang__)
-#    define av_uninit(x) x=x
-#else
-#    define av_uninit(x) x
-#endif
-
-#ifdef __GNUC__
-#    define av_builtin_constant_p __builtin_constant_p
-#    define av_printf_format(fmtpos, attrpos) __attribute__((__format__(__printf__, fmtpos, attrpos)))
-#else
-#    define av_builtin_constant_p(x) 0
-#    define av_printf_format(fmtpos, attrpos)
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(2,5)
-#    define av_noreturn __attribute__((noreturn))
-#else
-#    define av_noreturn
-#endif
-
-#endif /* AVUTIL_ATTRIBUTES_H */
@@ -1,342 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-/**
- * @file
- * memory handling functions
- */
-
-#ifndef AVUTIL_MEM_H
-#define AVUTIL_MEM_H
-
-#include <limits.h>
-#include <stdint.h>
-
-#include "attributes.h"
-#include "error.h"
-#include "avutil.h"
-
-/**
- * @addtogroup lavu_mem
- * @{
- */
-
-
-#if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    const t __attribute__ ((aligned (n))) v
-#elif defined(__TI_COMPILER_VERSION__)
-    #define DECLARE_ALIGNED(n,t,v)                      \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        t __attribute__((aligned(n))) v
-    #define DECLARE_ASM_CONST(n,t,v)                    \
-        AV_PRAGMA(DATA_ALIGN(v,n))                      \
-        static const t __attribute__((aligned(n))) v
-#elif defined(__GNUC__)
-    #define DECLARE_ALIGNED(n,t,v)      t __attribute__ ((aligned (n))) v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t av_used __attribute__ ((aligned (n))) v
-#elif defined(_MSC_VER)
-    #define DECLARE_ALIGNED(n,t,v)      __declspec(align(n)) t v
-    #define DECLARE_ASM_CONST(n,t,v)    __declspec(align(n)) static const t v
-#else
-    #define DECLARE_ALIGNED(n,t,v)      t v
-    #define DECLARE_ASM_CONST(n,t,v)    static const t v
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(3,1)
-    #define av_malloc_attrib __attribute__((__malloc__))
-#else
-    #define av_malloc_attrib
-#endif
-
-#if AV_GCC_VERSION_AT_LEAST(4,3)
-    #define av_alloc_size(...) __attribute__((alloc_size(__VA_ARGS__)))
-#else
-    #define av_alloc_size(...)
-#endif
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU).
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- */
-void *av_malloc(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a block of size * nmemb bytes with av_malloc().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_malloc()
- */
-av_alloc_size(1, 2) static inline void *av_malloc_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_malloc(nmemb * size);
-}
-
-/**
- * Allocate or reallocate a block of memory.
- * If ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param size Size in bytes of the memory block to be allocated or
- * reallocated.
- * @return Pointer to a newly-reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- * @see av_fast_realloc()
- */
-void *av_realloc(void *ptr, size_t size) av_alloc_size(2);
-
-/**
- * Allocate or reallocate a block of memory.
- * This function does the same thing as av_realloc, except:
- * - It takes two arguments and checks the result of the multiplication for
- *   integer overflow.
- * - It frees the input block in case of failure, thus avoiding the memory
- *   leak with the classic "buf = realloc(buf); if (!buf) return -1;".
- */
-void *av_realloc_f(void *ptr, size_t nelem, size_t elsize);
-
-/**
- * Allocate or reallocate a block of memory.
- * If *ptr is NULL and size > 0, allocate a new block. If
- * size is zero, free the memory block pointed to by ptr.
- * @param   ptr Pointer to a pointer to a memory block already allocated
- *          with av_realloc(), or pointer to a pointer to NULL.
- *          The pointer is updated on success, or freed on failure.
- * @param   size Size in bytes for the memory block to be allocated or
- *          reallocated
- * @return  Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_reallocp(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-int av_reallocp(void *ptr, size_t size);
-
-/**
- * Allocate or reallocate an array.
- * If ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a memory block already allocated with
- * av_realloc() or NULL.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to a newly-reallocated block or NULL if the block
- * cannot be reallocated or the function is used to free the memory block.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Allocate or reallocate an array through a pointer to a pointer.
- * If *ptr is NULL and nmemb > 0, allocate a new block. If
- * nmemb is zero, free the memory block pointed to by ptr.
- * @param ptr Pointer to a pointer to a memory block already allocated
- * with av_realloc(), or pointer to a pointer to NULL.
- * The pointer is updated on success, or freed on failure.
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Zero on success, an AVERROR error code on failure.
- * @warning Pointers originating from the av_malloc() family of functions must
- *          not be passed to av_realloc(). The former can be implemented using
- *          memalign() (or other functions), and there is no guarantee that
- *          pointers from such functions can be passed to realloc() at all.
- *          The situation is undefined according to POSIX and may crash with
- *          some libc implementations.
- */
-av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc().
- * @param ptr Pointer to the memory block which should be freed.
- * @note ptr = NULL is explicitly allowed.
- * @note It is recommended that you use av_freep() instead.
- * @see av_freep()
- */
-void av_free(void *ptr);
-
-/**
- * Allocate a block of size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * @param size Size in bytes for the memory block to be allocated.
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- * @see av_malloc()
- */
-void *av_mallocz(size_t size) av_malloc_attrib av_alloc_size(1);
-
-/**
- * Allocate a block of nmemb * size bytes with alignment suitable for all
- * memory accesses (including vectors if available on the CPU) and
- * zero all the bytes of the block.
- * The allocation will fail if nmemb * size is greater than or equal
- * to INT_MAX.
- * @param nmemb
- * @param size
- * @return Pointer to the allocated block, NULL if it cannot be allocated.
- */
-void *av_calloc(size_t nmemb, size_t size) av_malloc_attrib;
-
-/**
- * Allocate a block of size * nmemb bytes with av_mallocz().
- * @param nmemb Number of elements
- * @param size Size of the single element
- * @return Pointer to the allocated block, NULL if the block cannot
- * be allocated.
- * @see av_mallocz()
- * @see av_malloc_array()
- */
-av_alloc_size(1, 2) static inline void *av_mallocz_array(size_t nmemb, size_t size)
-{
-    if (!size || nmemb >= INT_MAX / size)
-        return NULL;
-    return av_mallocz(nmemb * size);
-}
-
-/**
- * Duplicate the string s.
- * @param s string to be duplicated
- * @return Pointer to a newly-allocated string containing a
- * copy of s or NULL if the string cannot be allocated.
- */
-char *av_strdup(const char *s) av_malloc_attrib;
-
-/**
- * Duplicate the buffer p.
- * @param p buffer to be duplicated
- * @return Pointer to a newly allocated buffer containing a
- * copy of p or NULL if the buffer cannot be allocated.
- */
-void *av_memdup(const void *p, size_t size);
-
-/**
- * Free a memory block which has been allocated with av_malloc(z)() or
- * av_realloc() and set the pointer pointing to it to NULL.
- * @param ptr Pointer to the pointer to the memory block which should
- * be freed.
- * @see av_free()
- */
-void av_freep(void *ptr);
-
-/**
- * Add an element to a dynamic array.
- *
- * The array to grow is supposed to be an array of pointers to
- * structures, and the element to add must be a pointer to an already
- * allocated structure.
- *
- * The array is reallocated when its size reaches powers of 2.
- * Therefore, the amortized cost of adding an element is constant.
- *
- * In case of success, the pointer to the array is updated in order to
- * point to the new grown array, and the number pointed to by nb_ptr
- * is incremented.
- * In case of failure, the array is freed, *tab_ptr is set to NULL and
- * *nb_ptr is set to 0.
- *
- * @param tab_ptr pointer to the array to grow
- * @param nb_ptr  pointer to the number of elements in the array
- * @param elem    element to add
- * @see av_dynarray2_add()
- */
-void av_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem);
-
-/**
- * Add an element of size elem_size to a dynamic array.
- *
- * The array is reallocated when its number of elements reaches powers of 2.
- * Therefore, the amortized cost of adding an element is constant.
- *
- * In case of success, the pointer to the array is updated in order to
- * point to the new grown array, and the number pointed to by nb_ptr
- * is incremented.
- * In case of failure, the array is freed, *tab_ptr is set to NULL and
- * *nb_ptr is set to 0.
- *
- * @param tab_ptr   pointer to the array to grow
- * @param nb_ptr    pointer to the number of elements in the array
- * @param elem_size size in bytes of the elements in the array
- * @param elem_data pointer to the data of the element to add. If NULL, the space of
- *                  the new added element is not filled.
- * @return          pointer to the data of the element to copy in the new allocated space.
- *                  If NULL, the new allocated space is left uninitialized."
- * @see av_dynarray_add()
- */
-void *av_dynarray2_add(void **tab_ptr, int *nb_ptr, size_t elem_size,
-                       const uint8_t *elem_data);
-
-/**
- * Multiply two size_t values checking for overflow.
- * @return  0 if success, AVERROR(EINVAL) if overflow.
- */
-static inline int av_size_mult(size_t a, size_t b, size_t *r)
-{
-    size_t t = a * b;
-    /* Hack inspired from glibc: only try the division if nelem and elsize
-     * are both greater than sqrt(SIZE_MAX). */
-    if ((a | b) >= ((size_t)1 << (sizeof(size_t) * 4)) && a && t / a != b)
-        return AVERROR(EINVAL);
-    *r = t;
-    return 0;
-}
-
-/**
- * Set the maximum size that may me allocated in one block.
- */
-void av_max_alloc(size_t max);
-
-/**
- * deliberately overlapping memcpy implementation
- * @param dst destination buffer
- * @param back how many bytes back we start (the initial size of the overlapping window), must be > 0
- * @param cnt number of bytes to copy, must be >= 0
- *
- * cnt > back is valid, this will copy the bytes we just copied,
- * thus creating a repeating pattern with a period length of back.
- */
-void av_memcpy_backptr(uint8_t *dst, int back, int cnt);
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_MEM_H */
@@ -1,175 +0,0 @@
-/*
- * copyright (c) 2006-2012 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_OLD_PIX_FMTS_H
-#define AVUTIL_OLD_PIX_FMTS_H
-
-/*
- * This header exists to prevent new pixel formats from being accidentally added
- * to the deprecated list.
- * Do not include it directly. It will be removed on next major bump
- *
- * Do not add new items to this list. Use the AVPixelFormat enum instead.
- */
-    PIX_FMT_NONE = AV_PIX_FMT_NONE,
-    PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    PIX_FMT_XVMC_MPEG2_IDCT,
-    PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-#if FF_API_VDPAU
-    PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-    PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    PIX_FMT_GRAY8A,    ///< 8bit gray, 8bit alpha
-    PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-
-    //the following 10 formats have the disadvantage of needing 1 format for each bit depth, thus
-    //If you want to support multiple bit depths, then using PIX_FMT_YUV420P16* with the bpp stored separately
-    //is better
-    PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-
-#ifdef AV_PIX_FMT_ABI_GIT_MASTER
-    PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big endian
-    PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little endian
-    PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big endian
-    PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little endian
-    PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big endian
-    PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little endian
-
-#ifndef AV_PIX_FMT_ABI_GIT_MASTER
-    PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    PIX_FMT_0RGB=0x123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
-    PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
-    PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
-    PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
-    PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-    PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-
-    PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big endian
-    PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little endian
-    PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big endian
-    PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little endian
-
-    PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-#endif /* AVUTIL_OLD_PIX_FMTS_H */
@@ -1,397 +0,0 @@
-/*
- * copyright (c) 2006 Michael Niedermayer <michaelni@gmx.at>
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_PIXFMT_H
-#define AVUTIL_PIXFMT_H
-
-/**
- * @file
- * pixel format definitions
- *
- */
-
-#include "libavutil/avconfig.h"
-#include "version.h"
-
-#define AVPALETTE_SIZE 1024
-#define AVPALETTE_COUNT 256
-
-/**
- * Pixel format.
- *
- * @note
- * AV_PIX_FMT_RGB32 is handled in an endian-specific manner. An RGBA
- * color is put together as:
- *  (A << 24) | (R << 16) | (G << 8) | B
- * This is stored as BGRA on little-endian CPU architectures and ARGB on
- * big-endian CPUs.
- *
- * @par
- * When the pixel format is palettized RGB (AV_PIX_FMT_PAL8), the palettized
- * image data is stored in AVFrame.data[0]. The palette is transported in
- * AVFrame.data[1], is 1024 bytes long (256 4-byte entries) and is
- * formatted the same as in AV_PIX_FMT_RGB32 described above (i.e., it is
- * also endian-specific). Note also that the individual RGB palette
- * components stored in AVFrame.data[1] should be in the range 0..255.
- * This is important as many custom PAL8 video codecs that were designed
- * to run on the IBM VGA graphics adapter use 6-bit palette components.
- *
- * @par
- * For all the 8bit per pixel formats, an RGB32 palette is in data[1] like
- * for pal8. This palette is filled in automatically by the function
- * allocating the picture.
- *
- * @note
- * Make sure that all newly added big-endian formats have (pix_fmt & 1) == 1
- * and that all newly added little-endian formats have (pix_fmt & 1) == 0.
- * This allows simpler detection of big vs little-endian.
- */
-enum AVPixelFormat {
-    AV_PIX_FMT_NONE = -1,
-    AV_PIX_FMT_YUV420P,   ///< planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    AV_PIX_FMT_YUYV422,   ///< packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    AV_PIX_FMT_RGB24,     ///< packed RGB 8:8:8, 24bpp, RGBRGB...
-    AV_PIX_FMT_BGR24,     ///< packed RGB 8:8:8, 24bpp, BGRBGR...
-    AV_PIX_FMT_YUV422P,   ///< planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    AV_PIX_FMT_YUV444P,   ///< planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    AV_PIX_FMT_YUV410P,   ///< planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    AV_PIX_FMT_YUV411P,   ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    AV_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    AV_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white, in each byte pixels are ordered from the msb to the lsb
-    AV_PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    AV_PIX_FMT_YUVJ420P,  ///< planar YUV 4:2:0, 12bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV420P and setting color_range
-    AV_PIX_FMT_YUVJ422P,  ///< planar YUV 4:2:2, 16bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV422P and setting color_range
-    AV_PIX_FMT_YUVJ444P,  ///< planar YUV 4:4:4, 24bpp, full scale (JPEG), deprecated in favor of PIX_FMT_YUV444P and setting color_range
-    AV_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing
-    AV_PIX_FMT_XVMC_MPEG2_IDCT,
-    AV_PIX_FMT_UYVY422,   ///< packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    AV_PIX_FMT_UYYVYY411, ///< packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    AV_PIX_FMT_BGR8,      ///< packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    AV_PIX_FMT_BGR4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1B 2G 1R(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_BGR4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    AV_PIX_FMT_RGB8,      ///< packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    AV_PIX_FMT_RGB4,      ///< packed RGB 1:2:1 bitstream,  4bpp, (msb)1R 2G 1B(lsb), a byte contains two pixels, the first pixel in the byte is the one composed by the 4 msb bits
-    AV_PIX_FMT_RGB4_BYTE, ///< packed RGB 1:2:1,  8bpp, (msb)1R 2G 1B(lsb)
-    AV_PIX_FMT_NV12,      ///< planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 plane for the UV components, which are interleaved (first byte U and the following byte V)
-    AV_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    AV_PIX_FMT_ARGB,      ///< packed ARGB 8:8:8:8, 32bpp, ARGBARGB...
-    AV_PIX_FMT_RGBA,      ///< packed RGBA 8:8:8:8, 32bpp, RGBARGBA...
-    AV_PIX_FMT_ABGR,      ///< packed ABGR 8:8:8:8, 32bpp, ABGRABGR...
-    AV_PIX_FMT_BGRA,      ///< packed BGRA 8:8:8:8, 32bpp, BGRABGRA...
-
-    AV_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    AV_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    AV_PIX_FMT_YUV440P,   ///< planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    AV_PIX_FMT_YUVJ440P,  ///< planar YUV 4:4:0 full scale (JPEG), deprecated in favor of PIX_FMT_YUV440P and setting color_range
-    AV_PIX_FMT_YUVA420P,  ///< planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_H264,///< H.264 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG1,///< MPEG-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_MPEG2,///< MPEG-2 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_WMV3,///< WMV3 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-    AV_PIX_FMT_VDPAU_VC1, ///< VC-1 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    AV_PIX_FMT_RGB48BE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_RGB48LE,   ///< packed RGB 16:16:16, 48bpp, 16R, 16G, 16B, the 2-byte value for each R/G/B component is stored as little-endian
-
-    AV_PIX_FMT_RGB565BE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), big-endian
-    AV_PIX_FMT_RGB565LE,  ///< packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), little-endian
-    AV_PIX_FMT_RGB555BE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), big-endian, most significant bit to 0
-    AV_PIX_FMT_RGB555LE,  ///< packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), little-endian, most significant bit to 0
-
-    AV_PIX_FMT_BGR565BE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), big-endian
-    AV_PIX_FMT_BGR565LE,  ///< packed BGR 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), little-endian
-    AV_PIX_FMT_BGR555BE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), big-endian, most significant bit to 1
-    AV_PIX_FMT_BGR555LE,  ///< packed BGR 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), little-endian, most significant bit to 1
-
-    AV_PIX_FMT_VAAPI_MOCO, ///< HW acceleration through VA API at motion compensation entry-point, Picture.data[3] contains a vaapi_render_state struct which contains macroblocks as well as various fields extracted from headers
-    AV_PIX_FMT_VAAPI_IDCT, ///< HW acceleration through VA API at IDCT entry-point, Picture.data[3] contains a vaapi_render_state struct which contains fields extracted from headers
-    AV_PIX_FMT_VAAPI_VLD,  ///< HW decoding through VA API, Picture.data[3] contains a vaapi_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-
-    AV_PIX_FMT_YUV420P16LE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P16BE,  ///< planar YUV 4:2:0, 24bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV422P16LE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P16BE,  ///< planar YUV 4:2:2, 32bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P16LE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P16BE,  ///< planar YUV 4:4:4, 48bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-#if FF_API_VDPAU
-    AV_PIX_FMT_VDPAU_MPEG4,  ///< MPEG4 HW decoding with VDPAU, data[0] contains a vdpau_render_state struct which contains the bitstream of the slices as well as various fields extracted from headers
-#endif
-    AV_PIX_FMT_DXVA2_VLD,    ///< HW decoding through DXVA2, Picture.data[3] contains a LPDIRECT3DSURFACE9 pointer
-
-    AV_PIX_FMT_RGB444LE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), little-endian, most significant bits to 0
-    AV_PIX_FMT_RGB444BE,  ///< packed RGB 4:4:4, 16bpp, (msb)4A 4R 4G 4B(lsb), big-endian, most significant bits to 0
-    AV_PIX_FMT_BGR444LE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), little-endian, most significant bits to 1
-    AV_PIX_FMT_BGR444BE,  ///< packed BGR 4:4:4, 16bpp, (msb)4A 4B 4G 4R(lsb), big-endian, most significant bits to 1
-    AV_PIX_FMT_GRAY8A,    ///< 8bit gray, 8bit alpha
-    AV_PIX_FMT_BGR48BE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as big-endian
-    AV_PIX_FMT_BGR48LE,   ///< packed RGB 16:16:16, 48bpp, 16B, 16G, 16R, the 2-byte value for each R/G/B component is stored as little-endian
-
-    /**
-     * The following 12 formats have the disadvantage of needing 1 format for each bit depth.
-     * Notice that each 9/10 bits sample is stored in 16 bits with extra padding.
-     * If you want to support multiple bit depths, then using AV_PIX_FMT_YUV420P16* with the bpp stored separately is better.
-     */
-    AV_PIX_FMT_YUV420P9BE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P9LE, ///< planar YUV 4:2:0, 13.5bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P10BE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P10LE,///< planar YUV 4:2:0, 15bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV422P10BE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P10LE,///< planar YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P9BE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P9LE, ///< planar YUV 4:4:4, 27bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P10BE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P10LE,///< planar YUV 4:4:4, 30bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P9BE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P9LE, ///< planar YUV 4:2:2, 18bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_VDA_VLD,    ///< hardware decoding through VDA
-
-#ifdef AV_PIX_FMT_ABI_GIT_MASTER
-    AV_PIX_FMT_RGBA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    AV_PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    AV_PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    AV_PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    AV_PIX_FMT_GBRP,      ///< planar GBR 4:4:4 24bpp
-    AV_PIX_FMT_GBRP9BE,   ///< planar GBR 4:4:4 27bpp, big-endian
-    AV_PIX_FMT_GBRP9LE,   ///< planar GBR 4:4:4 27bpp, little-endian
-    AV_PIX_FMT_GBRP10BE,  ///< planar GBR 4:4:4 30bpp, big-endian
-    AV_PIX_FMT_GBRP10LE,  ///< planar GBR 4:4:4 30bpp, little-endian
-    AV_PIX_FMT_GBRP16BE,  ///< planar GBR 4:4:4 48bpp, big-endian
-    AV_PIX_FMT_GBRP16LE,  ///< planar GBR 4:4:4 48bpp, little-endian
-
-    /**
-     * duplicated pixel formats for compatibility with libav.
-     * FFmpeg supports these formats since May 8 2012 and Jan 28 2012 (commits f9ca1ac7 and 143a5c55)
-     * Libav added them Oct 12 2012 with incompatible values (commit 6d5600e85)
-     */
-    AV_PIX_FMT_YUVA422P_LIBAV,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-    AV_PIX_FMT_YUVA444P_LIBAV,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-
-    AV_PIX_FMT_YUVA420P9BE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA420P9LE,  ///< planar YUV 4:2:0 22.5bpp, (1 Cr & Cb sample per 2x2 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA422P9BE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA422P9LE,  ///< planar YUV 4:2:2 27bpp, (1 Cr & Cb sample per 2x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA444P9BE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), big-endian
-    AV_PIX_FMT_YUVA444P9LE,  ///< planar YUV 4:4:4 36bpp, (1 Cr & Cb sample per 1x1 Y & A samples), little-endian
-    AV_PIX_FMT_YUVA420P10BE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P10LE, ///< planar YUV 4:2:0 25bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P10BE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P10LE, ///< planar YUV 4:2:2 30bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P10BE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P10LE, ///< planar YUV 4:4:4 40bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA420P16BE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA420P16LE, ///< planar YUV 4:2:0 40bpp, (1 Cr & Cb sample per 2x2 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA422P16BE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA422P16LE, ///< planar YUV 4:2:2 48bpp, (1 Cr & Cb sample per 2x1 Y & A samples, little-endian)
-    AV_PIX_FMT_YUVA444P16BE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, big-endian)
-    AV_PIX_FMT_YUVA444P16LE, ///< planar YUV 4:4:4 64bpp, (1 Cr & Cb sample per 1x1 Y & A samples, little-endian)
-
-    AV_PIX_FMT_VDPAU,     ///< HW acceleration through VDPAU, Picture.data[3] contains a VdpVideoSurface
-
-    AV_PIX_FMT_XYZ12LE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as little-endian, the 4 lower bits are set to 0
-    AV_PIX_FMT_XYZ12BE,      ///< packed XYZ 4:4:4, 36 bpp, (msb) 12X, 12Y, 12Z (lsb), the 2-byte value for each X/Y/Z is stored as big-endian, the 4 lower bits are set to 0
-    AV_PIX_FMT_NV16,         ///< interleaved chroma YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    AV_PIX_FMT_NV20LE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_NV20BE,       ///< interleaved chroma YUV 4:2:2, 20bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-
-#ifndef AV_PIX_FMT_ABI_GIT_MASTER
-    AV_PIX_FMT_RGBA64BE=0x123,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    AV_PIX_FMT_RGBA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16R, 16G, 16B, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-    AV_PIX_FMT_BGRA64BE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as big-endian
-    AV_PIX_FMT_BGRA64LE,  ///< packed RGBA 16:16:16:16, 64bpp, 16B, 16G, 16R, 16A, the 2-byte value for each R/G/B/A component is stored as little-endian
-#endif
-    AV_PIX_FMT_0RGB=0x123+4,      ///< packed RGB 8:8:8, 32bpp, 0RGB0RGB...
-    AV_PIX_FMT_RGB0,      ///< packed RGB 8:8:8, 32bpp, RGB0RGB0...
-    AV_PIX_FMT_0BGR,      ///< packed BGR 8:8:8, 32bpp, 0BGR0BGR...
-    AV_PIX_FMT_BGR0,      ///< packed BGR 8:8:8, 32bpp, BGR0BGR0...
-    AV_PIX_FMT_YUVA444P,  ///< planar YUV 4:4:4 32bpp, (1 Cr & Cb sample per 1x1 Y & A samples)
-    AV_PIX_FMT_YUVA422P,  ///< planar YUV 4:2:2 24bpp, (1 Cr & Cb sample per 2x1 Y & A samples)
-
-    AV_PIX_FMT_YUV420P12BE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P12LE, ///< planar YUV 4:2:0,18bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV420P14BE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), big-endian
-    AV_PIX_FMT_YUV420P14LE, ///< planar YUV 4:2:0,21bpp, (1 Cr & Cb sample per 2x2 Y samples), little-endian
-    AV_PIX_FMT_YUV422P12BE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P12LE, ///< planar YUV 4:2:2,24bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV422P14BE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), big-endian
-    AV_PIX_FMT_YUV422P14LE, ///< planar YUV 4:2:2,28bpp, (1 Cr & Cb sample per 2x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P12BE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P12LE, ///< planar YUV 4:4:4,36bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_YUV444P14BE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), big-endian
-    AV_PIX_FMT_YUV444P14LE, ///< planar YUV 4:4:4,42bpp, (1 Cr & Cb sample per 1x1 Y samples), little-endian
-    AV_PIX_FMT_GBRP12BE,    ///< planar GBR 4:4:4 36bpp, big-endian
-    AV_PIX_FMT_GBRP12LE,    ///< planar GBR 4:4:4 36bpp, little-endian
-    AV_PIX_FMT_GBRP14BE,    ///< planar GBR 4:4:4 42bpp, big-endian
-    AV_PIX_FMT_GBRP14LE,    ///< planar GBR 4:4:4 42bpp, little-endian
-    AV_PIX_FMT_GBRAP,       ///< planar GBRA 4:4:4:4 32bpp
-    AV_PIX_FMT_GBRAP16BE,   ///< planar GBRA 4:4:4:4 64bpp, big-endian
-    AV_PIX_FMT_GBRAP16LE,   ///< planar GBRA 4:4:4:4 64bpp, little-endian
-    AV_PIX_FMT_YUVJ411P,    ///< planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples) full scale (JPEG), deprecated in favor of PIX_FMT_YUV411P and setting color_range
-
-    AV_PIX_FMT_BAYER_BGGR8,    ///< bayer, BGBG..(odd line), GRGR..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_RGGB8,    ///< bayer, RGRG..(odd line), GBGB..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_GBRG8,    ///< bayer, GBGB..(odd line), RGRG..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_GRBG8,    ///< bayer, GRGR..(odd line), BGBG..(even line), 8-bit samples */
-    AV_PIX_FMT_BAYER_BGGR16LE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_BGGR16BE, ///< bayer, BGBG..(odd line), GRGR..(even line), 16-bit samples, big-endian */
-    AV_PIX_FMT_BAYER_RGGB16LE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_RGGB16BE, ///< bayer, RGRG..(odd line), GBGB..(even line), 16-bit samples, big-endian */
-    AV_PIX_FMT_BAYER_GBRG16LE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_GBRG16BE, ///< bayer, GBGB..(odd line), RGRG..(even line), 16-bit samples, big-endian */
-    AV_PIX_FMT_BAYER_GRBG16LE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, little-endian */
-    AV_PIX_FMT_BAYER_GRBG16BE, ///< bayer, GRGR..(odd line), BGBG..(even line), 16-bit samples, big-endian */
-
-    AV_PIX_FMT_NB,        ///< number of pixel formats, DO NOT USE THIS if you want to link with shared libav* because the number of formats might differ between versions
-
-#if FF_API_PIX_FMT
-#include "old_pix_fmts.h"
-#endif
-};
-
-#if AV_HAVE_INCOMPATIBLE_LIBAV_ABI
-#define AV_PIX_FMT_YUVA422P AV_PIX_FMT_YUVA422P_LIBAV
-#define AV_PIX_FMT_YUVA444P AV_PIX_FMT_YUVA444P_LIBAV
-#endif
-
-
-#define AV_PIX_FMT_Y400A AV_PIX_FMT_GRAY8A
-#define AV_PIX_FMT_GBR24P AV_PIX_FMT_GBRP
-
-#if AV_HAVE_BIGENDIAN
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##be
-#else
-#   define AV_PIX_FMT_NE(be, le) AV_PIX_FMT_##le
-#endif
-
-#define AV_PIX_FMT_RGB32   AV_PIX_FMT_NE(ARGB, BGRA)
-#define AV_PIX_FMT_RGB32_1 AV_PIX_FMT_NE(RGBA, ABGR)
-#define AV_PIX_FMT_BGR32   AV_PIX_FMT_NE(ABGR, RGBA)
-#define AV_PIX_FMT_BGR32_1 AV_PIX_FMT_NE(BGRA, ARGB)
-#define AV_PIX_FMT_0RGB32  AV_PIX_FMT_NE(0RGB, BGR0)
-#define AV_PIX_FMT_0BGR32  AV_PIX_FMT_NE(0BGR, RGB0)
-
-#define AV_PIX_FMT_GRAY16 AV_PIX_FMT_NE(GRAY16BE, GRAY16LE)
-#define AV_PIX_FMT_RGB48  AV_PIX_FMT_NE(RGB48BE,  RGB48LE)
-#define AV_PIX_FMT_RGB565 AV_PIX_FMT_NE(RGB565BE, RGB565LE)
-#define AV_PIX_FMT_RGB555 AV_PIX_FMT_NE(RGB555BE, RGB555LE)
-#define AV_PIX_FMT_RGB444 AV_PIX_FMT_NE(RGB444BE, RGB444LE)
-#define AV_PIX_FMT_BGR48  AV_PIX_FMT_NE(BGR48BE,  BGR48LE)
-#define AV_PIX_FMT_BGR565 AV_PIX_FMT_NE(BGR565BE, BGR565LE)
-#define AV_PIX_FMT_BGR555 AV_PIX_FMT_NE(BGR555BE, BGR555LE)
-#define AV_PIX_FMT_BGR444 AV_PIX_FMT_NE(BGR444BE, BGR444LE)
-
-#define AV_PIX_FMT_YUV420P9  AV_PIX_FMT_NE(YUV420P9BE , YUV420P9LE)
-#define AV_PIX_FMT_YUV422P9  AV_PIX_FMT_NE(YUV422P9BE , YUV422P9LE)
-#define AV_PIX_FMT_YUV444P9  AV_PIX_FMT_NE(YUV444P9BE , YUV444P9LE)
-#define AV_PIX_FMT_YUV420P10 AV_PIX_FMT_NE(YUV420P10BE, YUV420P10LE)
-#define AV_PIX_FMT_YUV422P10 AV_PIX_FMT_NE(YUV422P10BE, YUV422P10LE)
-#define AV_PIX_FMT_YUV444P10 AV_PIX_FMT_NE(YUV444P10BE, YUV444P10LE)
-#define AV_PIX_FMT_YUV420P12 AV_PIX_FMT_NE(YUV420P12BE, YUV420P12LE)
-#define AV_PIX_FMT_YUV422P12 AV_PIX_FMT_NE(YUV422P12BE, YUV422P12LE)
-#define AV_PIX_FMT_YUV444P12 AV_PIX_FMT_NE(YUV444P12BE, YUV444P12LE)
-#define AV_PIX_FMT_YUV420P14 AV_PIX_FMT_NE(YUV420P14BE, YUV420P14LE)
-#define AV_PIX_FMT_YUV422P14 AV_PIX_FMT_NE(YUV422P14BE, YUV422P14LE)
-#define AV_PIX_FMT_YUV444P14 AV_PIX_FMT_NE(YUV444P14BE, YUV444P14LE)
-#define AV_PIX_FMT_YUV420P16 AV_PIX_FMT_NE(YUV420P16BE, YUV420P16LE)
-#define AV_PIX_FMT_YUV422P16 AV_PIX_FMT_NE(YUV422P16BE, YUV422P16LE)
-#define AV_PIX_FMT_YUV444P16 AV_PIX_FMT_NE(YUV444P16BE, YUV444P16LE)
-
-#define AV_PIX_FMT_RGBA64 AV_PIX_FMT_NE(RGBA64BE, RGBA64LE)
-#define AV_PIX_FMT_BGRA64 AV_PIX_FMT_NE(BGRA64BE, BGRA64LE)
-#define AV_PIX_FMT_GBRP9     AV_PIX_FMT_NE(GBRP9BE ,    GBRP9LE)
-#define AV_PIX_FMT_GBRP10    AV_PIX_FMT_NE(GBRP10BE,    GBRP10LE)
-#define AV_PIX_FMT_GBRP12    AV_PIX_FMT_NE(GBRP12BE,    GBRP12LE)
-#define AV_PIX_FMT_GBRP14    AV_PIX_FMT_NE(GBRP14BE,    GBRP14LE)
-#define AV_PIX_FMT_GBRP16    AV_PIX_FMT_NE(GBRP16BE,    GBRP16LE)
-#define AV_PIX_FMT_GBRAP16   AV_PIX_FMT_NE(GBRAP16BE,   GBRAP16LE)
-
-#define AV_PIX_FMT_BAYER_BGGR16 AV_PIX_FMT_NE(BAYER_BGGR16BE,    BAYER_BGGR16LE)
-#define AV_PIX_FMT_BAYER_RGGB16 AV_PIX_FMT_NE(BAYER_RGGB16BE,    BAYER_RGGB16LE)
-#define AV_PIX_FMT_BAYER_GBRG16 AV_PIX_FMT_NE(BAYER_GBRG16BE,    BAYER_GBRG16LE)
-#define AV_PIX_FMT_BAYER_GRBG16 AV_PIX_FMT_NE(BAYER_GRBG16BE,    BAYER_GRBG16LE)
-
-
-#define AV_PIX_FMT_YUVA420P9  AV_PIX_FMT_NE(YUVA420P9BE , YUVA420P9LE)
-#define AV_PIX_FMT_YUVA422P9  AV_PIX_FMT_NE(YUVA422P9BE , YUVA422P9LE)
-#define AV_PIX_FMT_YUVA444P9  AV_PIX_FMT_NE(YUVA444P9BE , YUVA444P9LE)
-#define AV_PIX_FMT_YUVA420P10 AV_PIX_FMT_NE(YUVA420P10BE, YUVA420P10LE)
-#define AV_PIX_FMT_YUVA422P10 AV_PIX_FMT_NE(YUVA422P10BE, YUVA422P10LE)
-#define AV_PIX_FMT_YUVA444P10 AV_PIX_FMT_NE(YUVA444P10BE, YUVA444P10LE)
-#define AV_PIX_FMT_YUVA420P16 AV_PIX_FMT_NE(YUVA420P16BE, YUVA420P16LE)
-#define AV_PIX_FMT_YUVA422P16 AV_PIX_FMT_NE(YUVA422P16BE, YUVA422P16LE)
-#define AV_PIX_FMT_YUVA444P16 AV_PIX_FMT_NE(YUVA444P16BE, YUVA444P16LE)
-
-#define AV_PIX_FMT_XYZ12      AV_PIX_FMT_NE(XYZ12BE, XYZ12LE)
-#define AV_PIX_FMT_NV20       AV_PIX_FMT_NE(NV20BE,  NV20LE)
-
-#if FF_API_PIX_FMT
-#define PixelFormat AVPixelFormat
-
-#define PIX_FMT_Y400A AV_PIX_FMT_Y400A
-#define PIX_FMT_GBR24P AV_PIX_FMT_GBR24P
-
-#define PIX_FMT_NE(be, le) AV_PIX_FMT_NE(be, le)
-
-#define PIX_FMT_RGB32   AV_PIX_FMT_RGB32
-#define PIX_FMT_RGB32_1 AV_PIX_FMT_RGB32_1
-#define PIX_FMT_BGR32   AV_PIX_FMT_BGR32
-#define PIX_FMT_BGR32_1 AV_PIX_FMT_BGR32_1
-#define PIX_FMT_0RGB32  AV_PIX_FMT_0RGB32
-#define PIX_FMT_0BGR32  AV_PIX_FMT_0BGR32
-
-#define PIX_FMT_GRAY16 AV_PIX_FMT_GRAY16
-#define PIX_FMT_RGB48  AV_PIX_FMT_RGB48
-#define PIX_FMT_RGB565 AV_PIX_FMT_RGB565
-#define PIX_FMT_RGB555 AV_PIX_FMT_RGB555
-#define PIX_FMT_RGB444 AV_PIX_FMT_RGB444
-#define PIX_FMT_BGR48  AV_PIX_FMT_BGR48
-#define PIX_FMT_BGR565 AV_PIX_FMT_BGR565
-#define PIX_FMT_BGR555 AV_PIX_FMT_BGR555
-#define PIX_FMT_BGR444 AV_PIX_FMT_BGR444
-
-#define PIX_FMT_YUV420P9  AV_PIX_FMT_YUV420P9
-#define PIX_FMT_YUV422P9  AV_PIX_FMT_YUV422P9
-#define PIX_FMT_YUV444P9  AV_PIX_FMT_YUV444P9
-#define PIX_FMT_YUV420P10 AV_PIX_FMT_YUV420P10
-#define PIX_FMT_YUV422P10 AV_PIX_FMT_YUV422P10
-#define PIX_FMT_YUV444P10 AV_PIX_FMT_YUV444P10
-#define PIX_FMT_YUV420P12 AV_PIX_FMT_YUV420P12
-#define PIX_FMT_YUV422P12 AV_PIX_FMT_YUV422P12
-#define PIX_FMT_YUV444P12 AV_PIX_FMT_YUV444P12
-#define PIX_FMT_YUV420P14 AV_PIX_FMT_YUV420P14
-#define PIX_FMT_YUV422P14 AV_PIX_FMT_YUV422P14
-#define PIX_FMT_YUV444P14 AV_PIX_FMT_YUV444P14
-#define PIX_FMT_YUV420P16 AV_PIX_FMT_YUV420P16
-#define PIX_FMT_YUV422P16 AV_PIX_FMT_YUV422P16
-#define PIX_FMT_YUV444P16 AV_PIX_FMT_YUV444P16
-
-#define PIX_FMT_RGBA64 AV_PIX_FMT_RGBA64
-#define PIX_FMT_BGRA64 AV_PIX_FMT_BGRA64
-#define PIX_FMT_GBRP9  AV_PIX_FMT_GBRP9
-#define PIX_FMT_GBRP10 AV_PIX_FMT_GBRP10
-#define PIX_FMT_GBRP12 AV_PIX_FMT_GBRP12
-#define PIX_FMT_GBRP14 AV_PIX_FMT_GBRP14
-#define PIX_FMT_GBRP16 AV_PIX_FMT_GBRP16
-#endif
-
-#endif /* AVUTIL_PIXFMT_H */
@@ -1,153 +0,0 @@
-/*
- * copyright (c) 2003 Fabrice Bellard
- *
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef AVUTIL_VERSION_H
-#define AVUTIL_VERSION_H
-
-/**
- * @defgroup preproc_misc Preprocessor String Macros
- *
- * String manipulation macros
- *
- * @{
- */
-
-#define AV_STRINGIFY(s)         AV_TOSTRING(s)
-#define AV_TOSTRING(s) #s
-
-#define AV_GLUE(a, b) a ## b
-#define AV_JOIN(a, b) AV_GLUE(a, b)
-
-#define AV_PRAGMA(s) _Pragma(#s)
-
-/**
- * @}
- */
-
-/**
- * @defgroup version_utils Library Version Macros
- *
- * Useful to check and match library version in order to maintain
- * backward compatibility.
- *
- * @{
- */
-
-#define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c)
-#define AV_VERSION_DOT(a, b, c) a ##.## b ##.## c
-#define AV_VERSION(a, b, c) AV_VERSION_DOT(a, b, c)
-
-/**
- * @}
- */
-
-
-/**
- * @file
- * @ingroup lavu
- * Libavutil version macros
- */
-
-/**
- * @defgroup lavu_ver Version and Build diagnostics
- *
- * Macros and function useful to check at compiletime and at runtime
- * which version of libavutil is in use.
- *
- * @{
- */
-
-#define LIBAVUTIL_VERSION_MAJOR  52
-#define LIBAVUTIL_VERSION_MINOR  48
-#define LIBAVUTIL_VERSION_MICRO 101
-
-#define LIBAVUTIL_VERSION_INT   AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
-                                               LIBAVUTIL_VERSION_MINOR, \
-                                               LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_VERSION       AV_VERSION(LIBAVUTIL_VERSION_MAJOR,     \
-                                           LIBAVUTIL_VERSION_MINOR,     \
-                                           LIBAVUTIL_VERSION_MICRO)
-#define LIBAVUTIL_BUILD         LIBAVUTIL_VERSION_INT
-
-#define LIBAVUTIL_IDENT         "Lavu" AV_STRINGIFY(LIBAVUTIL_VERSION)
-
-/**
- * @}
- *
- * @defgroup depr_guards Deprecation guards
- * FF_API_* defines may be placed below to indicate public API that will be
- * dropped at a future version bump. The defines themselves are not part of
- * the public API and may change, break or disappear at any time.
- *
- * @{
- */
-
-#ifndef FF_API_GET_BITS_PER_SAMPLE_FMT
-#define FF_API_GET_BITS_PER_SAMPLE_FMT (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_FIND_OPT
-#define FF_API_FIND_OPT                 (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_OLD_AVOPTIONS
-#define FF_API_OLD_AVOPTIONS            (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_PIX_FMT
-#define FF_API_PIX_FMT                  (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_CONTEXT_SIZE
-#define FF_API_CONTEXT_SIZE             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_PIX_FMT_DESC
-#define FF_API_PIX_FMT_DESC             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AV_REVERSE
-#define FF_API_AV_REVERSE               (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AUDIOCONVERT
-#define FF_API_AUDIOCONVERT             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_CPU_FLAG_MMX2
-#define FF_API_CPU_FLAG_MMX2            (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_SAMPLES_UTILS_RETURN_ZERO
-#define FF_API_SAMPLES_UTILS_RETURN_ZERO (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_LLS_PRIVATE
-#define FF_API_LLS_PRIVATE              (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_LLS1
-#define FF_API_LLS1                     (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_AVFRAME_LAVC
-#define FF_API_AVFRAME_LAVC             (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_VDPAU
-#define FF_API_VDPAU                    (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-#ifndef FF_API_GET_CHANNEL_LAYOUT_COMPAT
-#define FF_API_GET_CHANNEL_LAYOUT_COMPAT (LIBAVUTIL_VERSION_MAJOR < 53)
-#endif
-
-/**
- * @}
- */
-
-#endif /* AVUTIL_VERSION_H */
-
--- a/Show More
+++ b/Show More