Add 4K resolutions

This commit is contained in:
Cameron Gutman 2015-10-23 13:52:09 -07:00
parent ef9a442718
commit 33a0f9c97f
3 changed files with 24 additions and 0 deletions

View File

@ -25,6 +25,8 @@ public class PreferenceConfiguration {
private static final int BITRATE_DEFAULT_720_60 = 10; 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_30 = 10;
private static final int BITRATE_DEFAULT_1080_60 = 20; 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_RES_FPS = "720p60";
private static final String DEFAULT_DECODER = "auto"; private static final String DEFAULT_DECODER = "auto";
@ -64,6 +66,12 @@ public class PreferenceConfiguration {
else if (resFpsString.equals("1080p60")) { else if (resFpsString.equals("1080p60")) {
return BITRATE_DEFAULT_1080_60; 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 { else {
// Should never get here // Should never get here
return DEFAULT_BITRATE; return DEFAULT_BITRATE;
@ -140,6 +148,16 @@ public class PreferenceConfiguration {
config.height = 1080; config.height = 1080;
config.fps = 60; 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 { else {
// Should never get here // Should never get here
config.width = 1280; config.width = 1280;

View File

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

View File

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