This repository was archived by the owner on Feb 22, 2023. It is now read-only.
[video_player] ios picture in picture #6284
Fixed formatting
- Loading branch information
commit 5ca97ca7d4d06b61efd6d1576a846977397858c2
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
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 |
|---|---|---|
|
|
@@ -4,8 +4,8 @@ | |
|
|
||
| #import "FLTVideoPlayerPlugin.h" | ||
| #import <AVFoundation/AVFoundation.h> | ||
| #import <AVKit/AVKit.h> | ||
| #import <GLKit/GLKit.h> | ||
| #import "AVAssetTrackUtils.h" | ||
| #import "messages.g.h" | ||
|
|
||
|
|
@@ -32,7 +32,8 @@ - (void)onDisplayLink:(CADisplayLink *)link { | |
| } | ||
| @end | ||
|
|
||
| @interface FLTVideoPlayer | ||
| : NSObject <FlutterTexture, FlutterStreamHandler, AVPictureInPictureControllerDelegate> | ||
| @property(readonly, nonatomic) AVPlayer *player; | ||
| @property(readonly, nonatomic) AVPlayerItemVideoOutput *videoOutput; | ||
| @property(readonly, nonatomic) CADisplayLink *displayLink; | ||
|
|
@@ -43,7 +44,7 @@ @interface FLTVideoPlayer : NSObject <FlutterTexture, FlutterStreamHandler, AVPi | |
| @property(nonatomic, readonly) BOOL isPlaying; | ||
| @property(nonatomic) BOOL isLooping; | ||
| @property(nonatomic, readonly) BOOL isInitialized; | ||
| @property(nonatomic) AVPlayerLayer *playerLayer; | ||
| @property(nonatomic) bool pictureInPictureEnabled; | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| - (instancetype)initWithURL:(NSURL *)url | ||
| frameUpdater:(FLTFrameUpdater *)frameUpdater | ||
|
|
@@ -62,7 +63,6 @@ - (instancetype)initWithURL:(NSURL *)url | |
| AVPictureInPictureController *_pipController; | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| #endif | ||
|
|
||
| @implementation FLTVideoPlayer | ||
| - (instancetype)initWithAsset:(NSString *)asset frameUpdater:(FLTFrameUpdater *)frameUpdater { | ||
| NSString *path = [[NSBundle mainBundle] pathForResource:asset ofType:nil]; | ||
|
|
@@ -243,24 +243,26 @@ - (instancetype)initWithPlayerItem:(AVPlayerItem *)item | |
| } | ||
|
|
||
| - (void)setPictureInPicture:(BOOL)pictureInPictureEnabled { | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| if (self.pictureInPictureEnabled == pictureInPictureEnabled) { | ||
| return; | ||
| } | ||
|
|
||
| self.pictureInPictureEnabled = pictureInPictureEnabled; | ||
| if (_pipController && self.pictureInPictureEnabled && | ||
| ![_pipController isPictureInPictureActive]) { | ||
| self.playerLayer.opacity = 0.001; | ||
| if (_eventSink != nil) { | ||
| _eventSink(@{@"event" : @"startingPiP"}); | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| [_pipController startPictureInPicture]; | ||
| }); | ||
| } else if (_pipController && !self.pictureInPictureEnabled && | ||
| [_pipController isPictureInPictureActive]) { | ||
| dispatch_async(dispatch_get_main_queue(), ^{ | ||
| [_pipController stopPictureInPicture]; | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| #if TARGET_OS_IOS | ||
|
|
@@ -271,50 +273,56 @@ - (void)setupPipController { | |
| } | ||
vanlooverenkoen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| - (void)usePlayerLayer:(CGRect)frame { | ||
| if (_player) { | ||
| self.playerLayer = [AVPlayerLayer playerLayerWithPlayer:_player]; | ||
| UIViewController *vc = [[[UIApplication sharedApplication] keyWindow] rootViewController]; | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| self.playerLayer.frame = frame; | ||
| self.playerLayer.needsDisplayOnBoundsChange = YES; | ||
| self.playerLayer.opacity = 0; | ||
| [vc.view.layer addSublayer:self.playerLayer]; | ||
| vc.view.layer.needsDisplayOnBoundsChange = YES; | ||
| #if TARGET_OS_IOS | ||
| [self setupPipController]; | ||
| #endif | ||
| } | ||
| } | ||
| #endif | ||
|
|
||
vanlooverenkoen marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| #if TARGET_OS_IOS | ||
| - (void)pictureInPictureControllerDidStopPictureInPicture: | ||
| (AVPictureInPictureController *)pictureInPictureController { | ||
| self.pictureInPictureEnabled = false; | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| self.playerLayer.opacity = 0; | ||
| if (_eventSink != nil) { | ||
| _eventSink(@{@"event" : @"stoppedPiP"}); | ||
| } | ||
| } | ||
|
|
||
| - (void)pictureInPictureControllerDidStartPictureInPicture: | ||
| (AVPictureInPictureController *)pictureInPictureController { | ||
| self.playerLayer.opacity = 0.001; | ||
| if (_eventSink != nil) { | ||
| _eventSink(@{@"event" : @"startingPiP"}); | ||
| } | ||
| [self updatePlayingState]; | ||
| } | ||
|
|
||
| - (void)pictureInPictureControllerWillStopPictureInPicture: | ||
| (AVPictureInPictureController *)pictureInPictureController { | ||
| } | ||
|
|
||
| - (void)pictureInPictureControllerWillStartPictureInPicture: | ||
| (AVPictureInPictureController *)pictureInPictureController { | ||
| } | ||
|
|
||
| - (void)pictureInPictureController:(AVPictureInPictureController *)pictureInPictureController | ||
| failedToStartPictureInPictureWithError:(NSError *)error { | ||
| } | ||
|
|
||
| - (void)pictureInPictureController:(AVPictureInPictureController *)pictureInPictureController | ||
| restoreUserInterfaceForPictureInPictureStopWithCompletionHandler: | ||
| (void (^)(BOOL))completionHandler { | ||
| } | ||
| #endif | ||
|
|
||
|
|
@@ -716,20 +724,21 @@ - (void)setMixWithOthers:(FLTMixWithOthersMessage *)input | |
| } | ||
| } | ||
|
|
||
| - (void)preparePictureInPicture:(FLTPreparePictureInPictureMessage *)input | ||
| error:(FlutterError **)error { | ||
| FLTVideoPlayer *player = self.playersByTextureId[input.textureId]; | ||
|
Member
There was a problem hiding this comment. I recommend checking to see if
Contributor
There was a problem hiding this comment. Populating the output
Contributor
Author
There was a problem hiding this comment. @stuartmorgan is there an example somewhere on how I do that?
Member
There was a problem hiding this comment. Something like: - (BOOL)doesInfoPlistSupportPictureInPicture:(FlutterError **)error {
NSArray *backgroundModes = [NSBundle.mainBundle objectForInfoDictionaryKey:@"UIBackgroundModes"];
if (![backgroundModes isKindOfClass:[NSArray class]] ||
![backgroundModes containsObject:@"audio"]) {
*error = [FlutterError errorWithCode:@"video_player"
message:@"missing audio UIBackgroundModes audio in Info.plist"
details:nil];
return NO;
}
return YES;
}
- (void)startPictureInPicture:(FLTStartPictureInPictureMessage *)input
error:(FlutterError **)error {
if (![self doesInfoPlistSupportPictureInPicture:error]) {
return;
}
FLTVideoPlayer *player = self.playersByTextureId[input.textureId];
[player startOrStopPictureInPicture:YES];
}
- (void)stopPictureInPicture:(FLTStopPictureInPictureMessage *)input error:(FlutterError **)error {
if (![self doesInfoPlistSupportPictureInPicture:error]) {
return;
}
FLTVideoPlayer *player = self.playersByTextureId[input.textureId];
[player startOrStopPictureInPicture:NO];
} |
||
| [player usePlayerLayer:CGRectMake(input.left.floatValue, input.top.floatValue, | ||
| input.width.floatValue, input.height.floatValue)]; | ||
| } | ||
|
|
||
| - (void)setPictureInPicture:(FLTPictureInPictureMessage *)input error:(FlutterError **)error { | ||
| FLTVideoPlayer *player = self.playersByTextureId[input.textureId]; | ||
| [player setPictureInPicture:input.enabled.intValue == 1]; | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| - (nullable NSNumber *)isPictureInPictureSupported: | ||
| (FlutterError *_Nullable __autoreleasing *_Nonnull)error { | ||
vanlooverenkoen marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| return [NSNumber numberWithBool:[AVPictureInPictureController isPictureInPictureSupported]]; | ||
| } | ||
|
|
||
| @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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This fails on the iPhone simulator since it's not supported, and that's what runs in CI. Interestingly, it is supported on the iPad Pro simulator, I confirmed this test passes there. https://stackoverflow.com/questions/68939003/is-picture-in-picture-possible-on-ios-simulator/72326067#comment122853678_68939003
Recommend something like:
@stuartmorgan these tests may be worth running on the iPad simulator as well, since the behavior is different.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have already added the recommended change. Please let me know what I should do to get iPad tests as well