[video_player] Improve macOS frame management #5078
Factor out display link code for easier use
- Loading branch information
commit a1d46cbab6723fda88586bedf9b8e2c82c8886b3
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import <Foundation/Foundation.h> | ||
|
|
||
| // A cross-platform display link abstraction. | ||
| @interface FVPDisplayLink : NSObject | ||
|
|
||
| /** | ||
| * Whether the display link is currently running (i.e., firing events). | ||
| * | ||
| * Defaults to NO. | ||
| */ | ||
| @property(nonatomic, assign) BOOL running; | ||
|
|
||
| /** | ||
| * Initializes a display link that calls the given callback when fired. | ||
| * | ||
| * The display link starts paused, so must be started, by setting 'running' to YES, before the callback will fire. | ||
| */ | ||
| - (instancetype)initWithCallback:(void (^)(void))callback NS_DESIGNATED_INITIALIZER; | ||
|
|
||
| - (instancetype)init NS_UNAVAILABLE; | ||
|
|
||
| @end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import "../FVPDisplayLink.h" | ||
|
|
||
| #import <CoreAnimation/CoreAnimation.h> | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| /** A proxy object to act as a CADisplayLink target, to avoid retain loops. */ | ||
stuartmorgan-g marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| @interface FVPDisplayLinkTarget : NSObject | ||
| @property(nonatomic) (void (^)(void))callback; | ||
|
|
||
| /** Initializes a target object that runs the given callback when onDisplayLink: is called. */ | ||
| - (instancetype)initWithCallback:(void (^)(void))callback; | ||
|
|
||
| /** Method to be called when a CADisplayLink fires. */ | ||
| - (void)onDisplayLink:(CADisplayLink *)link; | ||
| @end | ||
|
|
||
| @implementation FVPDisplayLinkTarget | ||
| - (instancetype)initWithCallback:(void (^)(void))callback { | ||
| self = [super init]; | ||
| if (self) { | ||
| _callback = callback; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)onDisplayLink:(CADisplayLink *)link { | ||
| self.callback(); | ||
| } | ||
| @end | ||
|
|
||
| #pragma mark - | ||
|
|
||
| @interface FVPDisplayLink() | ||
| // The underlying display link implementation. | ||
| @property(nonatomic) CADisplayLink *displayLink; | ||
| @property(nonatomic) FVPDisplayLinkTarget *target; | ||
| @end | ||
|
|
||
| @implementation FVPDisplayLink | ||
|
|
||
| - (instancetype)initWithCallback:(void (^)(void))callback { | ||
| self = [super init]; | ||
| if (self) { | ||
| _target = [[FVPDisplayLinkTarget alloc] initWithCallback:callback]; | ||
| _displayLink = [CADisplayLink displayLinkWithTarget:_target | ||
| selector:@selector(onDisplayLink:)]; | ||
| [_displayLink addToRunLoop:[NSRunLoop currentRunLoop] forMode:NSRunLoopCommonModes]; | ||
| _displayLink.paused = YES; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)dealloc { | ||
| [_displayLink invalidate]; | ||
| } | ||
|
|
||
| - (void)setRunning:(BOOL)running { | ||
| self.displayLink.paused = !running; | ||
stuartmorgan-g marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| @end | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| // Copyright 2013 The Flutter Authors. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #import "../FVPDisplayLink.h" | ||
|
|
||
| #import <CoreVideo/CoreVideo.h> | ||
| #import <Foundation/Foundation.h> | ||
|
|
||
| @interface FVPDisplayLink() | ||
| // The underlying display link implementation. | ||
| @property(nonatomic, assign) CVDisplayLinkRef displayLink; | ||
| // A dispatch source to move display link callbacks to the main thread. | ||
| @property(nonatomic, strong) dispatch_source_t displayLinkSource; | ||
| @end | ||
|
|
||
| static CVReturn DisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTimeStamp *now, | ||
| const CVTimeStamp *outputTime, CVOptionFlags flagsIn, | ||
| CVOptionFlags *flagsOut, void *displayLinkSource) { | ||
| // Trigger the main-thread dispatch queue, to drive the callback there. | ||
| __weak dispatch_source_t source = (__bridge dispatch_source_t)displayLinkSource; | ||
| dispatch_source_merge_data(source, 1); | ||
| return kCVReturnSuccess; | ||
| } | ||
|
|
||
| @implementation FVPDisplayLink | ||
|
|
||
| - (instancetype)initWithCallback:(void (^)(void))callback { | ||
| self = [super init]; | ||
| if (self) { | ||
| // Create and start the main-thread dispatch queue to drive frameUpdater. | ||
| _displayLinkSource = | ||
| dispatch_source_create(DISPATCH_SOURCE_TYPE_DATA_ADD, 0, 0, dispatch_get_main_queue()); | ||
| dispatch_source_set_event_handler(_displayLinkSource, ^() { | ||
| @autoreleasepool { | ||
| callback(); | ||
| } | ||
| }); | ||
| dispatch_resume(_displayLinkSource); | ||
| if (CVDisplayLinkCreateWithActiveCGDisplays(&_displayLink) == kCVReturnSuccess) { | ||
| CVDisplayLinkSetOutputCallback(_displayLink, &DisplayLinkCallback, | ||
| (__bridge void *)(_displayLinkSource)); | ||
| } | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)dealloc { | ||
| CVDisplayLinkStop(_displayLink); | ||
| CVDisplayLinkRelease(_displayLink); | ||
| _displayLink = NULL; | ||
|
|
||
| dispatch_source_cancel(_displayLinkSource); | ||
| } | ||
|
|
||
| - (void)setRunning:(BOOL)running { | ||
| if (running) { | ||
| // TODO(stuartmorgan): Move this to init + a screen change listener; this won't correctly | ||
| // handle windows being dragged to another screen until the next pause/play cycle. | ||
| NSScreen *screen = self.registrar.view.window.screen; | ||
| if (screen) { | ||
| CGDirectDisplayID viewDisplayID = | ||
| (CGDirectDisplayID)[screen.deviceDescription[@"NSScreenNumber"] unsignedIntegerValue]; | ||
| CVDisplayLinkSetCurrentCGDisplay(self.displayLink, viewDisplayID); | ||
| } | ||
| CVDisplayLinkStart(self.displayLink); | ||
| } else { | ||
| CVDisplayLinkStop(self.displayLink); | ||
| } | ||
| } | ||
|
|
||
| @end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,7 +14,9 @@ Downloaded by pub (not CocoaPods). | |
| s.author = { 'Flutter Dev Team' => '[email protected]' } | ||
| s.source = { :http => 'https://github.com/flutter/packages/tree/main/packages/video_player/video_player_avfoundation' } | ||
| s.documentation_url = 'https://pub.dev/packages/video_player' | ||
| s.source_files = 'Classes/*' | ||
| s.ios.source_files = 'Classes/ios/*' | ||
| s.osx.source_files = 'Classes/macos/*' | ||
| s.public_header_files = 'Classes/**/*.h' | ||
| s.ios.dependency 'Flutter' | ||
| s.osx.dependency 'FlutterMacOS' | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.