moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2026-04-13 19:36:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 360p resolution support

Browse Source
This commit is contained in:
Cameron Gutman
2018-05-28 13:50:20 -07:00
parent e498736af6
commit 812f3f3717
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Limelight/ViewControllers/SettingsViewController.m
View File

@@ -73,13 +73,16 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
_bitrate = [currentSettings.bitrate integerValue];
NSInteger framerate = [currentSettings.framerate integerValue] == 30 ? 0 : 1;
NSInteger resolution;
if ([currentSettings.height integerValue] == 720) {
if ([currentSettings.height integerValue] == 360) {
resolution = 0;
} else if ([currentSettings.height integerValue] == 1080) {
} else if ([currentSettings.height integerValue] == 720) {
resolution = 1;
} else if ([currentSettings.height integerValue] == 1080) {
resolution = 2;
} else {
resolution = 0;
resolution = 1;
}
NSInteger onscreenControls = [currentSettings.onscreenControls integerValue];
NSInteger streamingRemotely = [currentSettings.streamingRemotely integerValue];
[self.remoteSelector setSelectedSegmentIndex:streamingRemotely];
@@ -108,13 +111,22 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
defaultBitrate = 20000;
}
// 720p60 and 1080p30 are 10 Mbps
else if (frameRate == 60 || resHeight == 1080) {
else if ((frameRate == 60 && resHeight == 720) ||
(frameRate == 30 && resHeight == 1080)) {
defaultBitrate = 10000;
}
// 720p30 is 5 Mbps
else {
else if (resHeight == 720) {
defaultBitrate = 5000;
}
// 360p60 is 2 Mbps
else if (frameRate == 60 && resHeight == 360) {
defaultBitrate = 2000;
}
// 360p30 is 1 Mbps
else {
defaultBitrate = 1000;
}
_bitrate = defaultBitrate;
[self.bitrateSlider setValue:defaultBitrate / BITRATE_INTERVAL animated:YES];
@@ -141,11 +153,13 @@ static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
}
- (NSInteger) getChosenStreamHeight {
return [self.resolutionSelector selectedSegmentIndex] == 0 ? 720 : 1080;
const int resolutionTable[] = { 360, 720, 1080 };
return resolutionTable[[self.resolutionSelector selectedSegmentIndex]];
}
- (NSInteger) getChosenStreamWidth {
return [self getChosenStreamHeight] == 720 ? 1280 : 1920;
// Assumes fixed 16:9 aspect ratio
return ([self getChosenStreamHeight] * 16) / 9;
}
- (void) saveSettings {