From 3357b3882ba442cfbad14830c15c2da0d337d0c8 Mon Sep 17 00:00:00 2001 From: Cameron Gutman Date: Wed, 22 Oct 2014 00:04:58 -0400 Subject: [PATCH] Use different bitrates for each stream configuration --- Limelight/Stream/StreamManager.m | 1 - Limelight/ViewControllers/MainFrameViewController.m | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Limelight/Stream/StreamManager.m b/Limelight/Stream/StreamManager.m index 8713082..42bb489 100644 --- a/Limelight/Stream/StreamManager.m +++ b/Limelight/Stream/StreamManager.m @@ -25,7 +25,6 @@ _callbacks = callbacks; _config.riKey = [Utils randomBytes:16]; _config.riKeyId = arc4random(); - _config.bitRate = 10000; return self; } diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m index 6c1dd61..91dbec6 100644 --- a/Limelight/ViewControllers/MainFrameViewController.m +++ b/Limelight/ViewControllers/MainFrameViewController.m @@ -114,29 +114,29 @@ static StreamConfiguration* streamConfig; streamConfig.width = 1280; streamConfig.height = 720; streamConfig.frameRate = 30; + streamConfig.bitRate = 5000; break; + default: case 1: streamConfig.width = 1280; streamConfig.height = 720; streamConfig.frameRate = 60; + streamConfig.bitRate = 10000; break; case 2: streamConfig.width = 1920; streamConfig.height = 1080; streamConfig.frameRate = 30; + streamConfig.bitRate = 10000; break; case 3: streamConfig.width = 1920; streamConfig.height = 1080; streamConfig.frameRate = 60; - break; - default: - streamConfig.width = 1280; - streamConfig.height = 720; - streamConfig.frameRate = 60; + streamConfig.bitRate = 20000; break; } - NSLog(@"StreamConfig: %@, %d, %dx%dx%d", streamConfig.host, streamConfig.hostAddr, streamConfig.width, streamConfig.height, streamConfig.frameRate); + NSLog(@"StreamConfig: %@, %d, %dx%dx%d at %d Mbps", streamConfig.host, streamConfig.hostAddr, streamConfig.width, streamConfig.height, streamConfig.frameRate, streamConfig.bitRate); [self performSegueWithIdentifier:@"createStreamFrame" sender:self]; }