Merge branch '4k'

app/build.gradle

@@ -11,8 +11,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 23
 
-        versionName "3.1.13"
+        versionName "3.5-beta4"
-        versionCode = 72
+        versionCode = 73
     }
 
     productFlavors {

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

@@ -221,6 +221,9 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 .enableLocalAudioPlayback(prefConfig.playHostAudio)
                 .setMaxPacketSize(remote ? 1024 : 1292)
                 .setRemote(remote)
+                .setAudioConfiguration(prefConfig.enable51Surround ?
+                        StreamConfiguration.AUDIO_CONFIGURATION_5_1 :
+                        StreamConfiguration.AUDIO_CONFIGURATION_STEREO)
                 .build();
 
         // Initialize the connection

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

@@ -19,12 +19,15 @@ public class PreferenceConfiguration {
     private static final String LIST_MODE_PREF_STRING = "checkbox_list_mode";
     private static final String SMALL_ICONS_PREF_STRING = "checkbox_small_icon_mode";
     private static final String MULTI_CONTROLLER_PREF_STRING = "checkbox_multi_controller";
+    private static final String ENABLE_51_SURROUND_PREF_STRING = "checkbox_51_surround";
     private static final String USB_DRIVER_PREF_SRING = "checkbox_usb_driver";
 
     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 int BITRATE_DEFAULT_4K_30 = 40;
+    private static final int BITRATE_DEFAULT_4K_60 = 80;
 
     private static final String DEFAULT_RES_FPS = "720p60";
     private static final String DEFAULT_DECODER = "auto";
@@ -37,6 +40,7 @@ public class PreferenceConfiguration {
     public static final String DEFAULT_LANGUAGE = "default";
     private static final boolean DEFAULT_LIST_MODE = false;
     private static final boolean DEFAULT_MULTI_CONTROLLER = true;
+    private static final boolean DEFAULT_ENABLE_51_SURROUND = false;
     private static final boolean DEFAULT_USB_DRIVER = true;
 
     public static final int FORCE_HARDWARE_DECODER = -1;
@@ -49,7 +53,7 @@ public class PreferenceConfiguration {
     public int deadzonePercentage;
     public boolean stretchVideo, enableSops, playHostAudio, disableWarnings;
     public String language;
-    public boolean listMode, smallIconMode, multiController, usbDriver;
+    public boolean listMode, smallIconMode, multiController, enable51Surround, usbDriver;
 
     public static int getDefaultBitrate(String resFpsString) {
         if (resFpsString.equals("720p30")) {
@@ -64,6 +68,12 @@ public class PreferenceConfiguration {
         else if (resFpsString.equals("1080p60")) {
             return BITRATE_DEFAULT_1080_60;
         }
+        else if (resFpsString.equals("4K30")) {
+            return BITRATE_DEFAULT_4K_30;
+        }
+        else if (resFpsString.equals("4K60")) {
+            return BITRATE_DEFAULT_4K_60;
+        }
         else {
             // Should never get here
             return DEFAULT_BITRATE;
@@ -140,6 +150,16 @@ public class PreferenceConfiguration {
             config.height = 1080;
             config.fps = 60;
         }
+        else if (str.equals("4K30")) {
+            config.width = 3840;
+            config.height = 2160;
+            config.fps = 30;
+        }
+        else if (str.equals("4K60")) {
+            config.width = 3840;
+            config.height = 2160;
+            config.fps = 60;
+        }
         else {
             // Should never get here
             config.width = 1280;
@@ -161,6 +181,7 @@ public class PreferenceConfiguration {
         config.listMode = prefs.getBoolean(LIST_MODE_PREF_STRING, DEFAULT_LIST_MODE);
         config.smallIconMode = prefs.getBoolean(SMALL_ICONS_PREF_STRING, getDefaultSmallMode(context));
         config.multiController = prefs.getBoolean(MULTI_CONTROLLER_PREF_STRING, DEFAULT_MULTI_CONTROLLER);
+        config.enable51Surround = prefs.getBoolean(ENABLE_51_SURROUND_PREF_STRING, DEFAULT_ENABLE_51_SURROUND);
         config.usbDriver = prefs.getBoolean(USB_DRIVER_PREF_SRING, DEFAULT_USB_DRIVER);
 
         return config;

app/src/main/res/values-it/arrays.xml

@@ -5,6 +5,8 @@
         <item>720p - 60 FPS</item>
         <item>1080p - 30 FPS</item>
         <item>1080p - 60 FPS</item>
+        <item>4K - 30 FPS</item>
+        <item>4K - 60 FPS</item>
     </string-array>
 
     <string-array name="decoder_names">

app/src/main/res/values/arrays.xml

@@ -5,12 +5,16 @@
         <item>720p 60 FPS</item>
         <item>1080p 30 FPS</item>
         <item>1080p 60 FPS</item>
+        <item>4K 30 FPS</item>
+        <item>4K 60 FPS</item>
     </string-array>
     <string-array name="resolution_values" translatable="false">
         <item>720p30</item>
         <item>720p60</item>
         <item>1080p30</item>
         <item>1080p60</item>
+        <item>4K30</item>
+        <item>4K60</item>
     </string-array>
 
     <string-array name="language_names" translatable="false">

app/src/main/res/values/strings.xml

@@ -94,6 +94,10 @@
     <string name="title_checkbox_disable_warnings">Disable warning messages</string>
     <string name="summary_checkbox_disable_warnings">Disable on-screen connection warning messages while streaming</string>
 
+    <string name="category_audio_settings">Audio Settings</string>
+    <string name="title_checkbox_51_surround">Enable 5.1 surround sound</string>
+    <string name="summary_checkbox_51_surround">Uncheck if you experience audio issues. Requires GFE 2.7 or higher.</string>
+
     <string name="category_gamepad_settings">Gamepad Settings</string>
     <string name="title_checkbox_multi_controller">Multiple controller support</string>
     <string name="summary_checkbox_multi_controller">When unchecked, all controllers appear as one</string>

app/src/main/res/xml/preferences.xml

@@ -26,6 +26,13 @@
             android:summary="@string/summary_checkbox_disable_warnings"
             android:defaultValue="false" />
     </PreferenceCategory>
+    <PreferenceCategory android:title="@string/category_audio_settings">
+        <CheckBoxPreference
+            android:key="checkbox_51_surround"
+            android:title="@string/title_checkbox_51_surround"
+            android:summary="@string/summary_checkbox_51_surround"
+            android:defaultValue="false" />
+    </PreferenceCategory>
     <PreferenceCategory android:title="@string/category_gamepad_settings">
         <!--com.limelight.preferences.SeekBarPreference
             android:key="seekbar_deadzone"