diff --git a/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java b/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java index c44a0ffc..aff958cb 100644 --- a/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java +++ b/app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java @@ -25,6 +25,8 @@ public class PreferenceConfiguration { 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"; @@ -64,6 +66,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 +148,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; diff --git a/app/src/main/res/values-it/arrays.xml b/app/src/main/res/values-it/arrays.xml index 24bbc7b9..f7d470a8 100644 --- a/app/src/main/res/values-it/arrays.xml +++ b/app/src/main/res/values-it/arrays.xml @@ -5,6 +5,8 @@ 720p - 60 FPS 1080p - 30 FPS 1080p - 60 FPS + 4K - 30 FPS + 4K - 60 FPS diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index 44a32405..ec7c150c 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -5,12 +5,16 @@ 720p 60 FPS 1080p 30 FPS 1080p 60 FPS + 4K 30 FPS + 4K 60 FPS 720p30 720p60 1080p30 1080p60 + 4K30 + 4K60