Fix thread sync

Reformat Metal files Rewrite Metal render loop to not use DisplayLink so we can use the amazing afterMinimumDuration API call Improve frame drop algorithm Misc fixes to HDR <-> SDR switching, deprecation warning cleanup Fix AVSB mode Fix renderingBackend selected value Add Rendering Backend setting to iPhone Let users choose which renderer to use. Refactor metrics into a singleton Fix tvOS build Port moonlight-qt's Metal renderer Bump imgui to latest Misc tweaks and refactoring Switch iOS to use Opus float32 audio, in line with other clients. It was already being sent from the server as float32, so this is simply decoding it with less loss of dynamic range. Give FrameQueue a faster data structure and full test coverage. Remove pts frame pacing, it's not a fit for iOS. Don't allow very transparent opacity for middle stats overlay box Change wording to select button instead of remote button Add tvOS gesture for double-clicking remote button to show/hide stats Remove kVTDecodeFrame_1xRealTimePlayback, this was found to seriously impact decode times Move decode time stat out of async block Enabe FQ logging Misc cleanup/fixes iPad: 26 will require UIRequiresFullScreen to be false, and for all orientations to be supported Updated iPhone and iPad settings panels Add setting for graph opacity. Enable stats and graphs to be toggled via two finger swipe Fix wait time in displaylink, fix settings spacing, stats fixes Settings for frame queue size, graphs. Misc refactoring and cleanup Bump moonlight-common-c Improve logging readability Fix host frametime and frame queue stats to be recorded during input not output. Show min/max/avg decode time Add bytes per frame graph Started on settings changes, both modes working very well Misc refactoring, move graphs around, both pacing functions working well Set frameDropTarget to 2 always Use raw RTP timestamps without converting to floating point for even more accurate playback Standard frame pacing: remove +3 logic Switch to NSRunLoopCommonModes for displayLink Add frame pacing algorithm based on moonlight-qt's Pacer class as a simpler baseline Switch to os_unfair_lock, misc tweaks Large refactor that now uses VTDecompressionSession based on PR535 from felipejfc. This now allows more control over queue size and allows dropping arbitrary frames, but introduces a lot of new problems bump moonlight-common-c to fix 32-bit rollover issue LiWait timing graph Add displaylink interval graph Graphs checkpoint ImGui graph working checkpoint ImGui working checkpoint Add pending frames to stats, add a define for verbose logging DisplayLink WIP Add imgui & implot modules Frame pacing: alternate method based on thieman's pullFrames thread Frame pacing: simplify displayLink, support passing targetTimestamp down to the sample buffer Point to my common-c with some timing changes. Add stats gestures: 2-finger swipe down to show stats, and 2-finger swipe up to hide Limit refresh rate to 60 when in low power mode Display screen refresh rate in stats overlay, remove decode time and explain why it can't be measured Adjust the refresh rate of the display to match the stream framerate and improve battery life Don't use presentationTimeMs when creating CMSampleTimingInfo Fix overlayView build for iOS Refactor CADisplayLink callback for improved frame delivery. Support a user-configurable buffered frame count. [opt] Use UILabel for stats overlay
2025-07-11 21:02:13 +08:00
parent 51e915b598
commit df2b67ac99
61 changed files with 6080 additions and 458 deletions
@@ -31,7 +31,8 @@
@property (strong, nonatomic) IBOutlet UISegmentedControl *codecSelector;
@property (strong, nonatomic) IBOutlet UISegmentedControl *yuv444Selector;
@property (strong, nonatomic) IBOutlet UISegmentedControl *hdrSelector;
-@property (strong, nonatomic) IBOutlet UISegmentedControl *framePacingSelector;
+@property (strong, nonatomic) IBOutlet UILabel *frameQueueSizeLabel;
+@property (strong, nonatomic) IBOutlet UISlider *frameQueueSizeSlider;
@property (strong, nonatomic) IBOutlet UISegmentedControl *btMouseSelector;
@property (strong, nonatomic) IBOutlet UISegmentedControl *reverseMouseWheelDirectionSelector;
@property (strong, nonatomic) IBOutlet UISegmentedControl *statsOverlaySelector;
@@ -61,6 +62,10 @@

@property (strong, nonatomic) IBOutlet UISegmentedControl *externalDisplayModeSelector;
@property (strong, nonatomic) IBOutlet UISegmentedControl *localMousePointerModeSelector;
+@property (strong, nonatomic) IBOutlet UILabel *enableGraphsLabel;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *enableGraphsSelector;
+@property (strong, nonatomic) IBOutlet UIStepper *graphOpacityStepper;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *renderingBackendSelector;

 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunguarded-availability"
@@ -22,6 +22,8 @@
    bool justEnteredSettingsViewDoNotOpenOscLayoutTool;
    uint16_t oscLayoutFingers;
    CustomEdgeSlideGestureRecognizer *slideToCloseSettingsViewRecognizer;
+    NSInteger _frameQueueSize;
+    NSInteger _graphOpacity;
 }

@dynamic overrideUserInterfaceStyle;
@@ -199,7 +201,7 @@ BOOL isCustomResolution(CGSize res) {
    }
    
    for (int i = 0; i < RESOLUTION_TABLE_CUSTOM_INDEX; i++) {
-        
+
        if ((res.width == resolutionTable[i].width && res.height == resolutionTable[i].height) || (res.height == resolutionTable[i].width && res.width == resolutionTable[i].height)) {
            return NO;
        }
@@ -215,7 +217,7 @@ BOOL isCustomResolution(CGSize res) {
 - (bool)isFullScreenRequired {
    NSDictionary *infoDictionary = [[NSBundle mainBundle] infoDictionary];
    NSNumber *requiresFullScreen = infoDictionary[@"UIRequiresFullScreen"];
-    
+
    if (requiresFullScreen != nil) {
        return [requiresFullScreen boolValue];
    }
@@ -240,7 +242,7 @@ BOOL isCustomResolution(CGSize res) {
        appWindowHeight = bounds.size.height * screenScale;
    }
    bool needSwapWidthAndHeight = appWindowWidth > appWindowHeight;
-    
+
    resolutionTable[4] = CGSizeMake(safeAreaWidth, appWindowHeight);

    for(uint8_t i=0;i<7;i++){
@@ -340,7 +342,7 @@ BOOL isCustomResolution(CGSize res) {
 - (void)viewDidLoad {
    //[self pushDownExistingWidgets];
    //[self addExitButtonOnTop];
-    
+
    self->slideToCloseSettingsViewRecognizer = [[CustomEdgeSlideGestureRecognizer alloc] initWithTarget:self action:@selector(edgeSwiped)];
    slideToCloseSettingsViewRecognizer.edges = UIRectEdgeLeft;
    slideToCloseSettingsViewRecognizer.normalizedThresholdDistance = 0.0;
@@ -349,13 +351,13 @@ BOOL isCustomResolution(CGSize res) {
    slideToCloseSettingsViewRecognizer.delaysTouchesBegan = NO;
    slideToCloseSettingsViewRecognizer.delaysTouchesEnded = NO;
    [self.view addGestureRecognizer:slideToCloseSettingsViewRecognizer];
-    
+
    justEnteredSettingsViewDoNotOpenOscLayoutTool = true;
    [[NSNotificationCenter defaultCenter] addObserver:self
                                             selector:@selector(deviceOrientationDidChange) // handle orientation change since i made portrait mode available
                                                 name:UIDeviceOrientationDidChangeNotification
                                               object:nil];
-    
+
    // Always run settings in dark mode because we want the light fonts
    if (@available(iOS 13.0, tvOS 13.0, *)) {
        self.overrideUserInterfaceStyle = UIUserInterfaceStyleDark;
@@ -366,6 +368,8 @@ BOOL isCustomResolution(CGSize res) {
    
    // Ensure we pick a bitrate that falls exactly onto a slider notch
    _bitrate = bitrateTable[[self getSliderValueForBitrate:[currentSettings.bitrate intValue]]];
+    _frameQueueSize = [currentSettings.frameQueueSize intValue];
+    _graphOpacity = [currentSettings.graphOpacity intValue];

    // Get the size of the screen with and without safe area insets
    UIWindow *window = UIApplication.sharedApplication.windows.firstObject;
@@ -379,20 +383,26 @@ BOOL isCustomResolution(CGSize res) {
    UITapGestureRecognizer *resolutionDisplayViewTap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(resolutionDisplayViewTapped:)];
    [self.resolutionDisplayView addGestureRecognizer:resolutionDisplayViewTap];
    
-    resolutionTable[0] = CGSizeMake(640, 360);
-    resolutionTable[1] = CGSizeMake(1280, 720);
-    resolutionTable[2] = CGSizeMake(1920, 1080);
+    resolutionTable[0] = CGSizeMake(1280, 720);
+    resolutionTable[1] = CGSizeMake(1920, 1080);
+    resolutionTable[2] = CGSizeMake(2560, 1440);
    resolutionTable[3] = CGSizeMake(3840, 2160);
    resolutionTable[4] = CGSizeMake(safeAreaWidth, fullScreenHeight);
    resolutionTable[5] = CGSizeMake(fullScreenWidth, fullScreenHeight);
    resolutionTable[6] = CGSizeMake([currentSettings.width integerValue], [currentSettings.height integerValue]); // custom initial value
    [self updateResolutionTable];
-    
+
    // Don't populate the custom entry unless we have a custom resolution
    if (!isCustomResolution(resolutionTable[6])) {
        resolutionTable[6] = CGSizeMake(0, 0);
    }
-    
+
+    // Customize framerate list for ProMotion devices
+    if ([[UIScreen mainScreen] maximumFramesPerSecond] >= 90) {
+        [self.framerateSelector setEnabled:YES forSegmentAtIndex:2]; // enable 90
+        [self.framerateSelector setEnabled:YES forSegmentAtIndex:3]; // enable 120
+    }
+
    NSInteger framerate;
    switch ([currentSettings.framerate integerValue]) {
        case 30:
@@ -402,9 +412,12 @@ BOOL isCustomResolution(CGSize res) {
        case 60:
            framerate = 1;
            break;
-        case 120:
+        case 90:
            framerate = 2;
            break;
+        case 120:
+            framerate = 3;
+            break;
    }

    NSInteger resolution = currentSettings.resolutionSelected.integerValue;
@@ -412,17 +425,6 @@ BOOL isCustomResolution(CGSize res) {
        resolution = 0;
    }

-    // Only show the 120 FPS option if we have a > 60-ish Hz display
-    bool enable120Fps = false;
-    if (@available(iOS 10.3, tvOS 10.3, *)) {
-        if ([UIScreen mainScreen].maximumFramesPerSecond > 62) {
-            enable120Fps = true;
-        }
-    }
-    if (!enable120Fps) {
-        [self.framerateSelector removeSegmentAtIndex:2 animated:NO];
-    }
-
    // Disable codec selector segments for unsupported codecs
 #if defined(__IPHONE_16_0) || defined(__TVOS_16_0)
    if (!VTIsHardwareDecodeSupported(kCMVideoCodecType_AV1))
@@ -463,12 +465,26 @@ BOOL isCustomResolution(CGSize res) {
    else {
        [self.hdrSelector setSelectedSegmentIndex:currentSettings.enableHdr ? 1 : 0];
    }
-    
+
    [self.yuv444Selector setSelectedSegmentIndex:currentSettings.enableYUV444 ? 1 : 0];
    [self.statsOverlaySelector setSelectedSegmentIndex:currentSettings.statsOverlayLevel.intValue];
+    NSInteger renderingBackend = [currentSettings.renderingBackend integerValue];
+    [self.renderingBackendSelector setSelectedSegmentIndex:renderingBackend];
+    [self.enableGraphsSelector setSelectedSegmentIndex:currentSettings.enableGraphs ? 1 : 0];
+    [self.enableGraphsSelector addTarget:self action:@selector(enableGraphsChanged) forControlEvents:UIControlEventValueChanged];
+    [self enableGraphsChanged];
+    [self.graphOpacityStepper setMinimumValue:0];
+    [self.graphOpacityStepper setMaximumValue:100];
+    [self.graphOpacityStepper setValue:_graphOpacity];
+    [self.graphOpacityStepper addTarget:self action:@selector(graphOpacityStepperMoved) forControlEvents:UIControlEventValueChanged];
+    [self updateGraphOpacityText];
    [self.btMouseSelector setSelectedSegmentIndex:currentSettings.btMouseSupport ? 1 : 0];
    [self.optimizeSettingsSelector setSelectedSegmentIndex:currentSettings.optimizeGames ? 1 : 0];
-    [self.framePacingSelector setSelectedSegmentIndex:currentSettings.useFramePacing ? 1 : 0];
+    [self.frameQueueSizeSlider setMinimumValue:1];
+    [self.frameQueueSizeSlider setMaximumValue:5];
+    [self.frameQueueSizeSlider setValue:_frameQueueSize];
+    [self.frameQueueSizeSlider addTarget:self action:@selector(frameQueueSizeSliderMoved) forControlEvents:UIControlEventValueChanged];
+    [self updateFrameQueueSizeText];
    [self.multiControllerSelector setSelectedSegmentIndex:currentSettings.multiController ? 1 : 0];
    [self.swapABXYButtonsSelector setSelectedSegmentIndex:currentSettings.swapABXYButtons ? 1 : 0];
    [self.audioOnPCSelector setSelectedSegmentIndex:currentSettings.playAudioOnPC ? 1 : 0];
@@ -485,20 +501,20 @@ BOOL isCustomResolution(CGSize res) {
    [self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged];
    [self updateBitrateText];
    [self updateResolutionDisplayViewText];
-    
+
    // Unlock Display Orientation setting
    bool unlockDisplayOrientationSelectorEnabled = [self isFullScreenRequired];//need "requires fullscreen" enabled in the app bunddle to make runtime orientation limitation woring
    if(unlockDisplayOrientationSelectorEnabled) [self.unlockDisplayOrientationSelector setSelectedSegmentIndex:currentSettings.unlockDisplayOrientation ? 1 : 0];
    else [self.unlockDisplayOrientationSelector setSelectedSegmentIndex:1]; // can't lock screen orientation in this mode = Display Orientation always unlocked
    [self.unlockDisplayOrientationSelector setEnabled:unlockDisplayOrientationSelectorEnabled];

-    
+
    // lift streamview setting
    [self.liftStreamViewForKeyboardSelector setSelectedSegmentIndex:currentSettings.liftStreamViewForKeyboard ? 1 : 0];// Load old setting
-    
+
    // showkeyboard toolbar setting
    [self.showKeyboardToolbarSelector setSelectedSegmentIndex:currentSettings.showKeyboardToolbar ? 1 : 0];// Load old setting
-    
+
    // reverse mouse wheel direction setting
    [self.reverseMouseWheelDirectionSelector setSelectedSegmentIndex:currentSettings.reverseMouseWheelDirection ? 1 : 0];// Load old setting

@@ -512,11 +528,11 @@ BOOL isCustomResolution(CGSize res) {
    [self.slideToMenuDistanceSlider setValue:currentSettings.slideToSettingsDistance.floatValue];
    [self.slideToMenuDistanceSlider addTarget:self action:@selector(slideToMenuDistanceSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved.
    [self slideToMenuDistanceSliderMoved];
-    

-    
+
+
    //TouchMode & OSC Related Settings:
-    
+
    // pointer veloc setting, will be enable/disabled by touchMode
    [self.pointerVelocityModeDividerSlider setValue: (uint8_t)(currentSettings.pointerVelocityModeDivider.floatValue * 100) animated:YES]; // Load old setting.
    [self.pointerVelocityModeDividerSlider addTarget:self action:@selector(pointerVelocityModeDividerSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved.
@@ -526,13 +542,13 @@ BOOL isCustomResolution(CGSize res) {
    [self.touchPointerVelocityFactorSlider setValue: [self map_SliderValue_fromVelocFactor: currentSettings.touchPointerVelocityFactor.floatValue] animated:YES]; // Load old setting.
    [self.touchPointerVelocityFactorSlider addTarget:self action:@selector(touchPointerVelocityFactorSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved.
    [self touchPointerVelocityFactorSliderMoved];
-    
+
    // init relative touch mouse pointer veloc setting,  will be enable/disabled by touchMode
    [self.mousePointerVelocityFactorSlider setValue:[self map_SliderValue_fromVelocFactor: currentSettings.mousePointerVelocityFactor.floatValue] animated:YES]; // Load old setting.
    [self.mousePointerVelocityFactorSlider addTarget:self action:@selector(mousePointerVelocityFactorSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved.
    [self mousePointerVelocityFactorSliderMoved];
-    
-    
+
+
    // these settings will be affected by onscreenControl & touchMode, must be loaded before them.
    // NSLog(@"osc tool fingers setting test: %d", currentSettings.oscLayoutToolFingers.intValue);
    self->oscLayoutFingers = (uint16_t)currentSettings.oscLayoutToolFingers.intValue; // load old setting of oscLayoutFingers
@@ -546,7 +562,7 @@ BOOL isCustomResolution(CGSize res) {
    [self.onscreenControlSelector addTarget:self action:@selector(onscreenControlChanged) forControlEvents:UIControlEventValueChanged];
    [self onscreenControlChanged];
    [self.largerStickLR1Selector setSelectedSegmentIndex:currentSettings.largerStickLR1 ? 1 : 0]; // load old setting of largerStickLR1
-    
+
    // tap exclusion area size for custom OSC, must be loaded before touchMode & osc selector.
    [self.oscTapExlusionAreaSizeSlider setValue:currentSettings.oscTapExlusionAreaSize.floatValue * 100 animated:YES]; // Load old setting.
    [self.oscTapExlusionAreaSizeSlider addTarget:self action:@selector(oscTapExlusionAreaSizeSliderMoved) forControlEvents:(UIControlEventValueChanged)]; // Update label display when slider is being moved.
@@ -559,7 +575,7 @@ BOOL isCustomResolution(CGSize res) {
    [self.touchModeSelector addTarget:self action:@selector(touchModeChanged) forControlEvents:UIControlEventValueChanged];
    [self touchModeChanged];

-    
+
    // init CustomOSC stuff
    /* sets a reference to the correct 'LayoutOnScreenControlsViewController' depending on whether the user is on an iPhone or iPad */
    self.layoutOnScreenControlsVC = [[LayoutOnScreenControlsViewController alloc] init];
@@ -603,16 +619,16 @@ BOOL isCustomResolution(CGSize res) {
    UIAlertController *alertController = [UIAlertController alertControllerWithTitle:[LocalizationHelper localizedStringForKey:@"Rebase in Stream View"]
                                                                             message:[LocalizationHelper localizedStringForKey:@"Tap %d fingers to change layout in stream view, or change the number of fingers required to:", self->oscLayoutFingers]
                                                                      preferredStyle:UIAlertControllerStyleAlert];
-    
+
    [alertController addTextFieldWithConfigurationHandler:^(UITextField *textField) {
        textField.placeholder = [LocalizationHelper localizedStringForKey:@"%d", self->oscLayoutFingers];
        textField.keyboardType = UIKeyboardTypeNumberPad;
    }];
-    
+
    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"Cancel"]
                                                           style:UIAlertActionStyleCancel
                                                         handler:nil];
-    
+
    UIAlertAction *okAction = [UIAlertAction actionWithTitle:[LocalizationHelper localizedStringForKey:@"OK"]
                                                       style:UIAlertActionStyleDefault
                                                     handler:^(UIAlertAction *action) {
@@ -625,16 +641,16 @@ BOOL isCustomResolution(CGSize res) {
                                                         } else {
                                                             NSLog(@"OK button tapped with no change");
                                                         }
-                                                         
+
                                                         // Continue execution after the alert is dismissed
                                                         if (!self->_mainFrameViewController.settingsExpandedInStreamView) {
                                                             [self invokeOscLayout]; // Don't open osc layout tool immediately during streaming
                                                         }
-                                                         
+
                                                        [self.onscreenControllerLabel setText:[LocalizationHelper localizedStringForKey: @"Tap %d Fingers to Change OSC Layout in Stream View", self->oscLayoutFingers]]; //update the osc label
                                                        [self keyboardToggleFingerNumSliderMoved]; //update keyboard toggle number;
                                                     }];
-    
+
    [alertController addAction:cancelAction];
    [alertController addAction:okAction];
    [self presentViewController:alertController animated:YES completion:nil];
@@ -649,7 +665,7 @@ BOOL isCustomResolution(CGSize res) {


 - (void)onscreenControlChanged{
-    
+
    BOOL isIPhone = ([UIDevice currentDevice].userInterfaceIdiom == UIUserInterfaceIdiomPhone);
    if (isIPhone) {
        UIStoryboard *storyboard = [UIStoryboard storyboardWithName:@"iPhone" bundle:nil];
@@ -660,7 +676,7 @@ BOOL isCustomResolution(CGSize res) {
        self.layoutOnScreenControlsVC = [storyboard instantiateViewControllerWithIdentifier:@"LayoutOnScreenControlsViewController"];
        self.layoutOnScreenControlsVC.modalPresentationStyle = UIModalPresentationFullScreen;
    }
-    
+
    bool customOscEnabled = [self isOnScreenControllerOrButtonEnabled] && [self.onscreenControlSelector selectedSegmentIndex] == OnScreenControlsLevelCustom;
    // [self widget:self.keyboardToggleFingerNumSlider setEnabled:!customOscEnabled];
    [self widget:self.oscTapExlusionAreaSizeSlider setEnabled:customOscEnabled];
@@ -747,10 +763,10 @@ BOOL isCustomResolution(CGSize res) {
    bool oscSelectorEnabled = [self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == ABSOLUTE_TOUCH;
    bool customOscEnabled = [self isOnScreenControllerOrButtonEnabled] && [self.onscreenControlSelector selectedSegmentIndex] == OnScreenControlsLevelCustom;
    bool isNativeTouch = [self.touchModeSelector selectedSegmentIndex] == PURE_NATIVE_TOUCH || [self.touchModeSelector selectedSegmentIndex] == REGULAR_NATIVE_TOUCH;
-    
+
    [self.onscreenControlSelector setEnabled:oscSelectorEnabled];
    [self.largerStickLR1Selector setEnabled:oscSelectorEnabled]; // this selector stay aligned with oscSelector
-    
+
    [self widget:self.pointerVelocityModeDividerSlider setEnabled:isNativeTouch]; // pointer velocity scaling works only in native touch mode.
    [self widget:self.touchPointerVelocityFactorSlider setEnabled:isNativeTouch]; // pointer velocity scaling works only in native touch mode.
    [self widget:self.mousePointerVelocityFactorSlider setEnabled:[self.touchModeSelector selectedSegmentIndex] == RELATIVE_TOUCH]; // mouse velocity scaling works only in relative touch mode.
@@ -828,7 +844,7 @@ BOOL isCustomResolution(CGSize res) {
    }

    defaultBitrate = round(resolutionFactor * frameRateFactor) * 1000;
-    _bitrate = MIN(defaultBitrate, 100000);
+    _bitrate = MIN(defaultBitrate, 150000);
    [self.bitrateSlider setValue:[self getSliderValueForBitrate:_bitrate] animated:YES];
    
    [self updateBitrateText];
@@ -966,14 +982,14 @@ BOOL isCustomResolution(CGSize res) {
 - (void) keyboardToggleFingerNumSliderMoved{
    // bool oscEnabled = [self isOnScreenControllerOrButtonEnabled];
    bool customOscEnabled = [self isOnScreenControllerOrButtonEnabled] && [self.onscreenControlSelector selectedSegmentIndex] == OnScreenControlsLevelCustom;
-    
+
    CGFloat sliderValue = self.keyboardToggleFingerNumSlider.value;
    if(customOscEnabled){
        // exclude self->oscLayoutFingers when custom osc is enabled
        if(sliderValue > self->oscLayoutFingers - 1 && sliderValue < self->oscLayoutFingers) [self.keyboardToggleFingerNumSlider setValue: self->oscLayoutFingers - 1];
        if(sliderValue >= self->oscLayoutFingers && sliderValue < self->oscLayoutFingers + 1) [self.keyboardToggleFingerNumSlider setValue: self->oscLayoutFingers + 1];
    }
-        
+
    sliderValue = self.keyboardToggleFingerNumSlider.value;
    if(sliderValue > 10.5f) [self.keyboardToggleFingerNumLabel setText:[LocalizationHelper localizedStringForKey:@"Local Keyboard Toggle Disabled"]];
    else [self.keyboardToggleFingerNumLabel setText:[LocalizationHelper localizedStringForKey:@"To Toggle Local Keyboard: Tap %d Fingers", (uint16_t)sliderValue]]; // Initiate label display, exclude 5 fingers.
@@ -1002,6 +1018,8 @@ BOOL isCustomResolution(CGSize res) {
        case 1:
            return 60;
        case 2:
+            return 90;
+        case 3:
            return 120;
        default:
            abort();
@@ -1050,6 +1068,30 @@ BOOL isCustomResolution(CGSize res) {
    return resolutionTable[[self.resolutionSelector selectedSegmentIndex]].width;
 }

+- (void) frameQueueSizeSliderMoved {
+    assert(self.frameQueueSizeSlider.value >= 0 && self.frameQueueSizeSlider.value <= 5);
+    _frameQueueSize = (int)self.frameQueueSizeSlider.value;
+    [self updateFrameQueueSizeText];
+}
+
+- (void) updateFrameQueueSizeText {
+    [self.frameQueueSizeLabel setText:[NSString stringWithFormat:@"Frames to buffer: %ld", _frameQueueSize ]];
+}
+
+- (void) enableGraphsChanged {
+    [self.graphOpacityStepper setEnabled:[self.enableGraphsSelector selectedSegmentIndex] == 1 ? YES : NO];
+}
+
+- (void) graphOpacityStepperMoved {
+    assert(self.graphOpacityStepper.value >= 0 && self.graphOpacityStepper.value <= 100);
+    _graphOpacity = (int)self.graphOpacityStepper.value;
+    [self updateGraphOpacityText];
+}
+
+- (void) updateGraphOpacityText {
+    [self.enableGraphsLabel setText:[NSString stringWithFormat:@"Performance Graphs - Opacity: %ld%%", _graphOpacity ]];
+}
+
 - (void) saveSettings {
    DataManager* dataMan = [[DataManager alloc] init];
    NSInteger framerate = [self getChosenFrameRate];
@@ -1073,6 +1115,7 @@ BOOL isCustomResolution(CGSize res) {
    BOOL largerStickLR1 = [self.largerStickLR1Selector selectedSegmentIndex] == 1;
    BOOL liftStreamViewForKeyboard = [self.liftStreamViewForKeyboardSelector selectedSegmentIndex] == 1;
    BOOL showKeyboardToolbar = [self.showKeyboardToolbarSelector selectedSegmentIndex] == 1;
+    NSInteger renderingBackend = [self.renderingBackendSelector selectedSegmentIndex];
    BOOL optimizeGames = [self.optimizeSettingsSelector selectedSegmentIndex] == 1;
    BOOL multiController = [self.multiControllerSelector selectedSegmentIndex] == 1;
    BOOL swapABXYButtons = [self.swapABXYButtonsSelector selectedSegmentIndex] == 1;
@@ -1085,6 +1128,8 @@ BOOL isCustomResolution(CGSize res) {
    NSInteger touchMode = [self.touchModeSelector selectedSegmentIndex];
    NSInteger statsOverlayLevel = [self.statsOverlaySelector selectedSegmentIndex];
    BOOL statsOverlayEnabled = statsOverlayLevel != 0;
+    BOOL statsOverlay = [self.statsOverlaySelector selectedSegmentIndex] == 1;
+    BOOL enableGraphs = [self.enableGraphsSelector selectedSegmentIndex] == 1;
    BOOL enableHdr = [self.hdrSelector selectedSegmentIndex] == 1;
    BOOL unlockDisplayOrientation = [self.unlockDisplayOrientationSelector selectedSegmentIndex] == 1;
    NSInteger resolutionSelected = [self.resolutionSelector selectedSegmentIndex];
@@ -1117,16 +1162,20 @@ BOOL isCustomResolution(CGSize res) {
                      preferredCodec:preferredCodec
                           enableYUV444:enableYUV444
                      useFramePacing:useFramePacing
+                      frameQueueSize:_frameQueueSize
                           enableHdr:enableHdr
                      btMouseSupport:btMouseSupport
                   // absoluteTouchMode:absoluteTouchMode
                           touchMode:touchMode
                   statsOverlayLevel:statsOverlayLevel
-                        statsOverlayEnabled:statsOverlayEnabled
                       unlockDisplayOrientation:unlockDisplayOrientation
                  resolutionSelected:resolutionSelected
                 externalDisplayMode:externalDisplayMode
                           localMousePointerMode:localMousePointerMode];
+                        statsOverlay:statsOverlay
+                        enableGraphs:enableGraphs
+                        graphOpacity:_graphOpacity
+                    renderingBackend:renderingBackend];
 }

 - (void)didReceiveMemoryWarning {
@@ -0,0 +1,714 @@
+//
+//  StreamFrameViewController.m
+//  Moonlight
+//
+//  Created by Diego Waxemberg on 1/18/14.
+//  Copyright (c) 2015 Moonlight Stream. All rights reserved.
+//
+
+#import "StreamFrameViewController.h"
+#import "MainFrameViewController.h"
+#import "VideoDecoderRenderer.h"
+#import "StreamManager.h"
+#import "ControllerSupport.h"
+#import "DataManager.h"
+
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <arpa/inet.h>
+#include <Limelight.h>
+
+#if TARGET_OS_TV
+#import <AVFoundation/AVDisplayCriteria.h>
+#import <AVKit/AVDisplayManager.h>
+#import <AVKit/UIWindow.h>
+#endif
+
+@interface AVDisplayCriteria()
+@property(readonly) int videoDynamicRange;
+@property(readonly, nonatomic) float refreshRate;
+- (id)initWithRefreshRate:(float)arg1 videoDynamicRange:(int)arg2;
+@end
+
+@implementation StreamFrameViewController {
+    ControllerSupport *_controllerSupport;
+    StreamManager *_streamMan;
+    TemporarySettings *_settings;
+    NSTimer *_inactivityTimer;
+    NSTimer *_statsUpdateTimer;
+    UITapGestureRecognizer *_menuTapGestureRecognizer;
+    UITapGestureRecognizer *_menuDoubleTapGestureRecognizer;
+    UITapGestureRecognizer *_playPauseTapGestureRecognizer;
+    UITextView *_overlayView;
+    UILabel *_stageLabel;
+    UILabel *_tipLabel;
+    UIActivityIndicatorView *_spinner;
+    StreamView *_streamView;
+    UIScrollView *_scrollView;
+    BOOL _userIsInteracting;
+    CGSize _keyboardSize;
+    
+#if !TARGET_OS_TV
+    UIScreenEdgePanGestureRecognizer *_exitSwipeRecognizer;
+#endif
+}
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+    
+#if !TARGET_OS_TV
+    [[self revealViewController] setPrimaryViewController:self];
+#endif
+}
+
+#if TARGET_OS_TV
+- (void)controllerPauseButtonPressed:(id)sender { }
+- (void)controllerPauseButtonDoublePressed:(id)sender {
+    Log(LOG_I, @"Menu double-pressed -- backing out of stream");
+    [self returnToMainFrame];
+}
+- (void)controllerPlayPauseButtonPressed:(id)sender {
+    Log(LOG_I, @"Play/Pause button pressed -- backing out of stream");
+    [self returnToMainFrame];
+}
+#endif
+
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    
+    [self.navigationController setNavigationBarHidden:YES animated:YES];
+    
+    [UIApplication sharedApplication].idleTimerDisabled = YES;
+    
+    _settings = [[[DataManager alloc] init] getSettings];
+    
+    _stageLabel = [[UILabel alloc] init];
+    [_stageLabel setUserInteractionEnabled:NO];
+    [_stageLabel setText:[NSString stringWithFormat:@"Starting %@...", self.streamConfig.appName]];
+    [_stageLabel sizeToFit];
+    _stageLabel.textAlignment = NSTextAlignmentCenter;
+    _stageLabel.textColor = [UIColor whiteColor];
+    _stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2);
+    
+    _spinner = [[UIActivityIndicatorView alloc] init];
+    [_spinner setUserInteractionEnabled:NO];
+#if TARGET_OS_TV
+    [_spinner setActivityIndicatorViewStyle:UIActivityIndicatorViewStyleWhiteLarge];
+#else
+    [_spinner setActivityIndicatorViewStyle:UIActivityIndicatorViewStyleWhite];
+#endif
+    [_spinner sizeToFit];
+    [_spinner startAnimating];
+    _spinner.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2 - _stageLabel.frame.size.height - _spinner.frame.size.height);
+    
+    _controllerSupport = [[ControllerSupport alloc] initWithConfig:self.streamConfig delegate:self];
+    _inactivityTimer = nil;
+    
+    _streamView = [[StreamView alloc] initWithFrame:self.view.frame];
+    [_streamView setupStreamView:_controllerSupport interactionDelegate:self config:self.streamConfig];
+    
+#if TARGET_OS_TV
+    if (!_menuTapGestureRecognizer || !_menuDoubleTapGestureRecognizer || !_playPauseTapGestureRecognizer) {
+        _menuTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(controllerPauseButtonPressed:)];
+        _menuTapGestureRecognizer.allowedPressTypes = @[@(UIPressTypeMenu)];
+
+        _playPauseTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(controllerPlayPauseButtonPressed:)];
+        _playPauseTapGestureRecognizer.allowedPressTypes = @[@(UIPressTypePlayPause)];
+        
+        _menuDoubleTapGestureRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(controllerPauseButtonDoublePressed:)];
+        _menuDoubleTapGestureRecognizer.numberOfTapsRequired = 2;
+        [_menuTapGestureRecognizer requireGestureRecognizerToFail:_menuDoubleTapGestureRecognizer];
+        _menuDoubleTapGestureRecognizer.allowedPressTypes = @[@(UIPressTypeMenu)];
+    }
+    
+    [self.view addGestureRecognizer:_menuTapGestureRecognizer];
+    [self.view addGestureRecognizer:_menuDoubleTapGestureRecognizer];
+    [self.view addGestureRecognizer:_playPauseTapGestureRecognizer];
+
+#else
+    _exitSwipeRecognizer = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(edgeSwiped)];
+    _exitSwipeRecognizer.edges = UIRectEdgeLeft;
+    _exitSwipeRecognizer.delaysTouchesBegan = NO;
+    _exitSwipeRecognizer.delaysTouchesEnded = NO;
+    
+    [self.view addGestureRecognizer:_exitSwipeRecognizer];
+#endif
+    
+    _tipLabel = [[UILabel alloc] init];
+    [_tipLabel setUserInteractionEnabled:NO];
+    
+#if TARGET_OS_TV
+    [_tipLabel setText:@"Tip: Tap the Play/Pause button on the Apple TV Remote to disconnect from your PC"];
+#else
+    [_tipLabel setText:@"Tip: Swipe from the left edge to disconnect from your PC"];
+#endif
+    
+    [_tipLabel sizeToFit];
+    _tipLabel.textColor = [UIColor whiteColor];
+    _tipLabel.textAlignment = NSTextAlignmentCenter;
+    _tipLabel.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height * 0.9);
+    
+    _streamMan = [[StreamManager alloc] initWithConfig:self.streamConfig
+                                            renderView:_streamView
+                                   connectionCallbacks:self];
+    NSOperationQueue* opQueue = [[NSOperationQueue alloc] init];
+    [opQueue addOperation:_streamMan];
+    
+    [[NSNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(applicationWillResignActive:)
+                                                 name:UIApplicationWillResignActiveNotification
+                                               object:nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(applicationDidBecomeActive:)
+                                                 name: UIApplicationDidBecomeActiveNotification
+                                               object: nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(applicationDidEnterBackground:)
+                                                 name: UIApplicationDidEnterBackgroundNotification
+                                               object: nil];
+
+#if 0
+    // FIXME: This doesn't work reliably on iPad for some reason. Showing and hiding the keyboard
+    // several times in a row will not correctly restore the state of the UIScrollView.
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(keyboardWillShow:)
+                                                 name: UIKeyboardWillShowNotification
+                                               object: nil];
+    
+    [[NSNotificationCenter defaultCenter] addObserver: self
+                                             selector: @selector(keyboardWillHide:)
+                                                 name: UIKeyboardWillHideNotification
+                                               object: nil];
+#endif
+    
+    // Only enable scroll and zoom in absolute touch mode
+    if (_settings.absoluteTouchMode) {
+        _scrollView = [[UIScrollView alloc] initWithFrame:self.view.frame];
+#if !TARGET_OS_TV
+        [_scrollView.panGestureRecognizer setMinimumNumberOfTouches:2];
+#endif
+        [_scrollView setShowsHorizontalScrollIndicator:NO];
+        [_scrollView setShowsVerticalScrollIndicator:NO];
+        [_scrollView setDelegate:self];
+        [_scrollView setMaximumZoomScale:10.0f];
+        
+        // Add StreamView inside a UIScrollView for absolute mode
+        [_scrollView addSubview:_streamView];
+        [self.view addSubview:_scrollView];
+    }
+    else {
+        // Add StreamView directly in relative mode
+        [self.view addSubview:_streamView];
+    }
+    
+    [self.view addSubview:_stageLabel];
+    [self.view addSubview:_spinner];
+    [self.view addSubview:_tipLabel];
+}
+
+- (UIView *)viewForZoomingInScrollView:(UIScrollView *)scrollView {
+    return _streamView;
+}
+
+- (void)willMoveToParentViewController:(UIViewController *)parent {
+    // Only cleanup when we're being destroyed
+    if (parent == nil) {
+        [_controllerSupport cleanup];
+        [UIApplication sharedApplication].idleTimerDisabled = NO;
+        [_streamMan stopStream];
+        if (_inactivityTimer != nil) {
+            [_inactivityTimer invalidate];
+            _inactivityTimer = nil;
+        }
+        [[NSNotificationCenter defaultCenter] removeObserver:self];
+    }
+}
+
+#if 0
+- (void)keyboardWillShow:(NSNotification *)notification {
+    _keyboardSize = [[[notification userInfo] objectForKey:UIKeyboardFrameBeginUserInfoKey] CGRectValue].size;
+
+    [UIView animateWithDuration:0.3 animations:^{
+        CGRect frame = self->_scrollView.frame;
+        frame.size.height -= self->_keyboardSize.height;
+        self->_scrollView.frame = frame;
+    }];
+}
+
+-(void)keyboardWillHide:(NSNotification *)notification {
+    // NOTE: UIKeyboardFrameEndUserInfoKey returns a different keyboard size
+    // than UIKeyboardFrameBeginUserInfoKey, so it's unsuitable for use here
+    // to undo the changes made by keyboardWillShow.
+    
+    [UIView animateWithDuration:0.3 animations:^{
+        CGRect frame = self->_scrollView.frame;
+        frame.size.height += self->_keyboardSize.height;
+        self->_scrollView.frame = frame;
+    }];
+}
+#endif
+
+- (void)updateStatsOverlay {
+    NSString* overlayText = [self->_streamMan getStatsOverlayText];
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self updateOverlayText:overlayText];
+    });
+}
+
+- (void)updateOverlayText:(NSString*)text {
+    if (_overlayView == nil) {
+        _overlayView = [[UITextView alloc] init];
+#if !TARGET_OS_TV
+        [_overlayView setEditable:NO];
+#endif
+        [_overlayView setUserInteractionEnabled:NO];
+        [_overlayView setSelectable:NO];
+        [_overlayView setScrollEnabled:NO];
+        
+        // HACK: If not using stats overlay, center the text
+        if (_statsUpdateTimer == nil) {
+            [_overlayView setTextAlignment:NSTextAlignmentCenter];
+        }
+        
+        [_overlayView setTextColor:[UIColor lightGrayColor]];
+        [_overlayView setBackgroundColor:[UIColor blackColor]];
+#if TARGET_OS_TV
+        [_overlayView setFont:[UIFont systemFontOfSize:24]];
+#else
+        [_overlayView setFont:[UIFont systemFontOfSize:12]];
+#endif
+        [_overlayView setAlpha:0.5];
+        [self.view addSubview:_overlayView];
+    }
+    
+    if (text != nil) {
+        // We set our bounds to the maximum width in order to work around a bug where
+        // sizeToFit interacts badly with the UITextView's line breaks, causing the
+        // width to get smaller and smaller each time as more line breaks are inserted.
+        [_overlayView setBounds:CGRectMake(self.view.frame.origin.x,
+                                           _overlayView.frame.origin.y,
+                                           self.view.frame.size.width,
+                                           _overlayView.frame.size.height)];
+        [_overlayView setText:text];
+        [_overlayView sizeToFit];
+        [_overlayView setCenter:CGPointMake(self.view.frame.size.width / 2, _overlayView.frame.size.height / 2)];
+        [_overlayView setHidden:NO];
+    }
+    else {
+        [_overlayView setHidden:YES];
+    }
+}
+
+- (void) returnToMainFrame {
+    // Reset display mode back to default
+    [self updatePreferredDisplayMode:NO];
+    
+    [_statsUpdateTimer invalidate];
+    _statsUpdateTimer = nil;
+    
+    [self.navigationController popToRootViewControllerAnimated:YES];
+}
+
+// This will fire if the user opens control center or gets a low battery message
+- (void)applicationWillResignActive:(NSNotification *)notification {
+    if (_inactivityTimer != nil) {
+        [_inactivityTimer invalidate];
+    }
+    
+#if !TARGET_OS_TV
+    // Terminate the stream if the app is inactive for 60 seconds
+    Log(LOG_I, @"Starting inactivity termination timer");
+    _inactivityTimer = [NSTimer scheduledTimerWithTimeInterval:60
+                                                      target:self
+                                                    selector:@selector(inactiveTimerExpired:)
+                                                    userInfo:nil
+                                                     repeats:NO];
+#endif
+}
+
+- (void)inactiveTimerExpired:(NSTimer*)timer {
+    Log(LOG_I, @"Terminating stream after inactivity");
+
+    [self returnToMainFrame];
+    
+    _inactivityTimer = nil;
+}
+
+- (void)applicationDidBecomeActive:(NSNotification *)notification {
+    // Stop the background timer, since we're foregrounded again
+    if (_inactivityTimer != nil) {
+        Log(LOG_I, @"Stopping inactivity timer after becoming active again");
+        [_inactivityTimer invalidate];
+        _inactivityTimer = nil;
+    }
+}
+
+// This fires when the home button is pressed
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+    Log(LOG_I, @"Terminating stream immediately for backgrounding");
+
+    if (_inactivityTimer != nil) {
+        [_inactivityTimer invalidate];
+        _inactivityTimer = nil;
+    }
+    
+    [self returnToMainFrame];
+}
+
+- (void)edgeSwiped {
+    Log(LOG_I, @"User swiped to end stream");
+    
+    [self returnToMainFrame];
+}
+
+- (void) connectionStarted {
+    Log(LOG_I, @"Connection started");
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Leave the spinner spinning until it's obscured by
+        // the first frame of video.
+        self->_stageLabel.hidden = YES;
+        self->_tipLabel.hidden = YES;
+        
+        [self->_streamView showOnScreenControls];
+        
+        [self->_controllerSupport connectionEstablished];
+        
+        if (self->_settings.statsOverlay) {
+            self->_statsUpdateTimer = [NSTimer scheduledTimerWithTimeInterval:1.0f
+                                                                       target:self
+                                                                     selector:@selector(updateStatsOverlay)
+                                                                     userInfo:nil
+                                                                      repeats:YES];
+        }
+    });
+}
+
+- (void)connectionTerminated:(int)errorCode {
+    Log(LOG_I, @"Connection terminated: %d", errorCode);
+    
+    unsigned int portFlags = LiGetPortFlagsFromTerminationErrorCode(errorCode);
+    unsigned int portTestResults = LiTestClientConnectivity(CONN_TEST_SERVER, 443, portFlags);
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Allow the display to go to sleep now
+        [UIApplication sharedApplication].idleTimerDisabled = NO;
+        
+        NSString* title;
+        NSString* message;
+        
+        if (portTestResults != ML_TEST_RESULT_INCONCLUSIVE && portTestResults != 0) {
+            title = @"Connection Error";
+            message = @"Your device's network connection is blocking Moonlight. Streaming may not work while connected to this network.";
+        }
+        else {
+            switch (errorCode) {
+                case ML_ERROR_GRACEFUL_TERMINATION:
+                    [self returnToMainFrame];
+                    return;
+                    
+                case ML_ERROR_NO_VIDEO_TRAFFIC:
+                    title = @"Connection Error";
+                    message = @"No video received from host.";
+                    if (portFlags != 0) {
+                        char failingPorts[256];
+                        LiStringifyPortFlags(portFlags, "\n", failingPorts, sizeof(failingPorts));
+                        message = [message stringByAppendingString:[NSString stringWithFormat:@"\n\nCheck your firewall and port forwarding rules for port(s):\n%s", failingPorts]];
+                    }
+                    break;
+                    
+                case ML_ERROR_NO_VIDEO_FRAME:
+                    title = @"Connection Error";
+                    message = @"Your network connection isn't performing well. Reduce your video bitrate setting or try a faster connection.";
+                    break;
+                    
+                case ML_ERROR_UNEXPECTED_EARLY_TERMINATION:
+                case ML_ERROR_PROTECTED_CONTENT:
+                    title = @"Connection Error";
+                    message = @"Something went wrong on your host PC when starting the stream.\n\nMake sure you don't have any DRM-protected content open on your host PC. You can also try restarting your host PC.\n\nIf the issue persists, try reinstalling your GPU drivers and GeForce Experience.";
+                    break;
+                    
+                case ML_ERROR_FRAME_CONVERSION:
+                    title = @"Connection Error";
+                    message = @"The host PC reported a fatal video encoding error.\n\nTry disabling HDR mode, changing the streaming resolution, or changing your host PC's display resolution.";
+                    break;
+                    
+                default:
+                {
+                    NSString* errorString;
+                    if (abs(errorCode) > 1000) {
+                        // We'll assume large errors are hex values
+                        errorString = [NSString stringWithFormat:@"%08X", (uint32_t)errorCode];
+                    }
+                    else {
+                        // Smaller values will just be printed as decimal (probably errno.h values)
+                        errorString = [NSString stringWithFormat:@"%d", errorCode];
+                    }
+                    
+                    title = @"Connection Terminated";
+                    message = [NSString stringWithFormat: @"The connection was terminated\n\nError code: %@", errorString];
+                    break;
+                }
+            }
+        }
+        
+        UIAlertController* conTermAlert = [UIAlertController alertControllerWithTitle:title
+                                                                              message:message
+                                                                       preferredStyle:UIAlertControllerStyleAlert];
+        [Utils addHelpOptionToDialog:conTermAlert];
+        [conTermAlert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+            [self returnToMainFrame];
+        }]];
+        [self presentViewController:conTermAlert animated:YES completion:nil];
+    });
+
+    [_streamMan stopStream];
+}
+
+- (void) stageStarting:(const char*)stageName {
+    Log(LOG_I, @"Starting %s", stageName);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString* lowerCase = [NSString stringWithFormat:@"%s in progress...", stageName];
+        NSString* titleCase = [[[lowerCase substringToIndex:1] uppercaseString] stringByAppendingString:[lowerCase substringFromIndex:1]];
+        [self->_stageLabel setText:titleCase];
+        [self->_stageLabel sizeToFit];
+        self->_stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self->_stageLabel.center.y);
+    });
+}
+
+- (void) stageComplete:(const char*)stageName {
+}
+
+- (void) stageFailed:(const char*)stageName withError:(int)errorCode portTestFlags:(int)portTestFlags {
+    Log(LOG_I, @"Stage %s failed: %d", stageName, errorCode);
+    
+    unsigned int portTestResults = LiTestClientConnectivity(CONN_TEST_SERVER, 443, portTestFlags);
+
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Allow the display to go to sleep now
+        [UIApplication sharedApplication].idleTimerDisabled = NO;
+        
+        NSString* message = [NSString stringWithFormat:@"%s failed with error %d", stageName, errorCode];
+        if (portTestFlags != 0) {
+            char failingPorts[256];
+            LiStringifyPortFlags(portTestFlags, "\n", failingPorts, sizeof(failingPorts));
+            message = [message stringByAppendingString:[NSString stringWithFormat:@"\n\nCheck your firewall and port forwarding rules for port(s):\n%s", failingPorts]];
+        }
+        if (portTestResults != ML_TEST_RESULT_INCONCLUSIVE && portTestResults != 0) {
+            message = [message stringByAppendingString:@"\n\nYour device's network connection is blocking Moonlight. Streaming may not work while connected to this network."];
+        }
+        
+        UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Connection Failed"
+                                                                       message:message
+                                                                preferredStyle:UIAlertControllerStyleAlert];
+        [Utils addHelpOptionToDialog:alert];
+        [alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+            [self returnToMainFrame];
+        }]];
+        [self presentViewController:alert animated:YES completion:nil];
+    });
+    
+    [_streamMan stopStream];
+}
+
+- (void) launchFailed:(NSString*)message {
+    Log(LOG_I, @"Launch failed: %@", message);
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        // Allow the display to go to sleep now
+        [UIApplication sharedApplication].idleTimerDisabled = NO;
+        
+        UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Connection Error"
+                                                                       message:message
+                                                                preferredStyle:UIAlertControllerStyleAlert];
+        [Utils addHelpOptionToDialog:alert];
+        [alert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+            [self returnToMainFrame];
+        }]];
+        [self presentViewController:alert animated:YES completion:nil];
+    });
+}
+
+- (void)rumble:(unsigned short)controllerNumber lowFreqMotor:(unsigned short)lowFreqMotor highFreqMotor:(unsigned short)highFreqMotor {
+    Log(LOG_I, @"Rumble on gamepad %d: %04x %04x", controllerNumber, lowFreqMotor, highFreqMotor);
+    
+    [_controllerSupport rumble:controllerNumber lowFreqMotor:lowFreqMotor highFreqMotor:highFreqMotor];
+}
+
+- (void) rumbleTriggers:(uint16_t)controllerNumber leftTrigger:(uint16_t)leftTrigger rightTrigger:(uint16_t)rightTrigger {
+    Log(LOG_I, @"Trigger rumble on gamepad %d: %04x %04x", controllerNumber, leftTrigger, rightTrigger);
+    
+    [_controllerSupport rumbleTriggers:controllerNumber leftTrigger:leftTrigger rightTrigger:rightTrigger];
+}
+
+- (void) setMotionEventState:(uint16_t)controllerNumber motionType:(uint8_t)motionType reportRateHz:(uint16_t)reportRateHz {
+    Log(LOG_I, @"Set motion state on gamepad %d: %02x %u Hz", controllerNumber, motionType, reportRateHz);
+    
+    [_controllerSupport setMotionEventState:controllerNumber motionType:motionType reportRateHz:reportRateHz];
+}
+
+- (void) setControllerLed:(uint16_t)controllerNumber r:(uint8_t)r g:(uint8_t)g b:(uint8_t)b {
+    Log(LOG_I, @"Set controller LED on gamepad %d: l%02x%02x%02x", controllerNumber, r, g, b);
+    
+    [_controllerSupport setControllerLed:controllerNumber r:r g:g b:b];
+}
+
+- (void)connectionStatusUpdate:(int)status {
+    Log(LOG_W, @"Connection status update: %d", status);
+
+    // The stats overlay takes precedence over these warnings
+    if (_statsUpdateTimer != nil) {
+        return;
+    }
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        switch (status) {
+            case CONN_STATUS_OKAY:
+                [self updateOverlayText:nil];
+                break;
+                
+            case CONN_STATUS_POOR:
+                if (self->_streamConfig.bitRate > 5000) {
+                    [self updateOverlayText:@"Slow connection to PC\nReduce your bitrate"];
+                }
+                else {
+                    [self updateOverlayText:@"Poor connection to PC"];
+                }
+                break;
+        }
+    });
+}
+
+- (void) updatePreferredDisplayMode:(BOOL)streamActive {
+#if TARGET_OS_TV
+    if (@available(tvOS 11.2, *)) {
+        UIWindow* window = [[[UIApplication sharedApplication] delegate] window];
+        AVDisplayManager* displayManager = [window avDisplayManager];
+        
+        // This logic comes from Kodi and MrMC
+        if (streamActive) {
+            int dynamicRange;
+            
+            if (LiGetCurrentHostDisplayHdrMode()) {
+                dynamicRange = 2; // HDR10
+            }
+            else {
+                dynamicRange = 0; // SDR
+            }
+            
+            AVDisplayCriteria* displayCriteria = [[AVDisplayCriteria alloc] initWithRefreshRate:[_settings.framerate floatValue]
+                                                                              videoDynamicRange:dynamicRange];
+            displayManager.preferredDisplayCriteria = displayCriteria;
+        }
+        else {
+            // Switch back to the default display mode
+            displayManager.preferredDisplayCriteria = nil;
+        }
+    }
+#endif
+}
+
+- (void) setHdrMode:(bool)enabled {
+    Log(LOG_I, @"HDR is now: %s", enabled ? "active" : "inactive");
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self updatePreferredDisplayMode:YES];
+    });
+}
+
+- (void) videoContentShown {
+    [_spinner stopAnimating];
+    [self.view setBackgroundColor:[UIColor blackColor]];
+}
+
+- (void)didReceiveMemoryWarning
+{
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+- (void)gamepadPresenceChanged {
+#if !TARGET_OS_TV
+    if (@available(iOS 11.0, *)) {
+        [self setNeedsUpdateOfHomeIndicatorAutoHidden];
+    }
+#endif
+}
+
+- (void)mousePresenceChanged {
+#if !TARGET_OS_TV
+    if (@available(iOS 14.0, *)) {
+        [self setNeedsUpdateOfPrefersPointerLocked];
+    }
+#endif
+}
+
+- (void) streamExitRequested {
+    Log(LOG_I, @"Gamepad combo requested stream exit");
+    
+    [self returnToMainFrame];
+}
+
+- (void)userInteractionBegan {
+    // Disable hiding home bar when user is interacting.
+    // iOS will force it to be shown anyway, but it will
+    // also discard our edges deferring system gestures unless
+    // we willingly give up home bar hiding preference.
+    _userIsInteracting = YES;
+#if !TARGET_OS_TV
+    if (@available(iOS 11.0, *)) {
+        [self setNeedsUpdateOfHomeIndicatorAutoHidden];
+    }
+#endif
+}
+
+- (void)userInteractionEnded {
+    // Enable home bar hiding again if conditions allow
+    _userIsInteracting = NO;
+#if !TARGET_OS_TV
+    if (@available(iOS 11.0, *)) {
+        [self setNeedsUpdateOfHomeIndicatorAutoHidden];
+    }
+#endif
+}
+
+#if !TARGET_OS_TV
+// Require a confirmation when streaming to activate a system gesture
+- (UIRectEdge)preferredScreenEdgesDeferringSystemGestures {
+    return UIRectEdgeAll;
+}
+
+- (BOOL)prefersHomeIndicatorAutoHidden {
+    if ([_controllerSupport getConnectedGamepadCount] > 0 &&
+        [_streamView getCurrentOscState] == OnScreenControlsLevelOff &&
+        _userIsInteracting == NO) {
+        // Autohide the home bar when a gamepad is connected
+        // and the on-screen controls are disabled. We can't
+        // do this all the time because any touch on the display
+        // will cause the home indicator to reappear, and our
+        // preferredScreenEdgesDeferringSystemGestures will also
+        // be suppressed (leading to possible errant exits of the
+        // stream).
+        return YES;
+    }
+    
+    return NO;
+}
+
+- (BOOL)shouldAutorotate {
+    return YES;
+}
+
+- (BOOL)prefersPointerLocked {
+    // Pointer lock breaks the UIKit mouse APIs, which is a problem because
+    // GCMouse is horribly broken on iOS 14.0 for certain mice. Only lock
+    // the cursor if there is a GCMouse present.
+    return [GCMouse mice].count > 0;
+}
+#endif
+
+@end