railbird/react-native-video
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1518 from FullstackJack/tvos-pip-regression

Browse Source 
Fix tvOS picture-in-picture compilation regression.
This commit is contained in:
Hampton Maxwell 2019-03-12 21:22:23 -07:00 committed by GitHub
commit 9016d19105
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ios/Video/RCTVideo.h
View File

@ -15,6 +15,8 @@
@class RCTEventDispatcher; @class RCTEventDispatcher;
#if __has_include(<react-native-video/RCTVideoCache.h>) #if __has_include(<react-native-video/RCTVideoCache.h>)
@interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate, DVAssetLoaderDelegatesDelegate> @interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate, DVAssetLoaderDelegatesDelegate>
#elif TARGET_OS_TV
@interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate>
#else #else
@interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate, AVPictureInPictureControllerDelegate> @interface RCTVideo : UIView <RCTVideoPlayerViewControllerDelegate, AVPictureInPictureControllerDelegate>
#endif #endif

17
ios/Video/RCTVideo.m
View File

@ -27,8 +27,6 @@ static int const RCTVideoUnset = -1;
AVPlayer *_player; AVPlayer *_player;
AVPlayerItem *_playerItem; AVPlayerItem *_playerItem;
NSDictionary *_source; NSDictionary *_source;
AVPictureInPictureController *_pipController;
void (^__strong _Nonnull _restoreUserInterfaceForPIPStopCompletionHandler)(BOOL);
BOOL _playerItemObserversSet; BOOL _playerItemObserversSet;
BOOL _playerBufferEmpty; BOOL _playerBufferEmpty;
AVPlayerLayer *_playerLayer; AVPlayerLayer *_playerLayer;
@ -79,6 +77,10 @@ static int const RCTVideoUnset = -1;
#if __has_include(<react-native-video/RCTVideoCache.h>) #if __has_include(<react-native-video/RCTVideoCache.h>)
RCTVideoCache * _videoCache; RCTVideoCache * _videoCache;
#endif #endif
#if TARGET_OS_IOS
void (^__strong _Nonnull _restoreUserInterfaceForPIPStopCompletionHandler)(BOOL);
AVPictureInPictureController *_pipController;
#endif
} }
- (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher - (instancetype)initWithEventDispatcher:(RCTEventDispatcher *)eventDispatcher
@ -105,7 +107,9 @@ static int const RCTVideoUnset = -1;
_playWhenInactive = false; _playWhenInactive = false;
_pictureInPicture = false; _pictureInPicture = false;
_ignoreSilentSwitch = @"inherit"; // inherit, ignore, obey _ignoreSilentSwitch = @"inherit"; // inherit, ignore, obey
#if TARGET_OS_IOS
_restoreUserInterfaceForPIPStopCompletionHandler = NULL; _restoreUserInterfaceForPIPStopCompletionHandler = NULL;
#endif
#if __has_include(<react-native-video/RCTVideoCache.h>) #if __has_include(<react-native-video/RCTVideoCache.h>)
_videoCache = [RCTVideoCache sharedInstance]; _videoCache = [RCTVideoCache sharedInstance];
#endif #endif
@ -793,6 +797,7 @@ static int const RCTVideoUnset = -1;
- (void)setPictureInPicture:(BOOL)pictureInPicture - (void)setPictureInPicture:(BOOL)pictureInPicture
{ {
#if TARGET_OS_IOS
if (_pictureInPicture == pictureInPicture) { if (_pictureInPicture == pictureInPicture) {
return; return;
} }
@ -807,8 +812,10 @@ static int const RCTVideoUnset = -1;
[_pipController stopPictureInPicture]; [_pipController stopPictureInPicture];
}); });
} }
#endif
} }
#if TARGET_OS_IOS
- (void)setRestoreUserInterfaceForPIPStopCompletionHandler:(BOOL)restore - (void)setRestoreUserInterfaceForPIPStopCompletionHandler:(BOOL)restore
{ {
if (_restoreUserInterfaceForPIPStopCompletionHandler != NULL) { if (_restoreUserInterfaceForPIPStopCompletionHandler != NULL) {
@ -824,6 +831,7 @@ static int const RCTVideoUnset = -1;
_pipController.delegate = self; _pipController.delegate = self;
} }
} }
#endif
- (void)setIgnoreSilentSwitch:(NSString *)ignoreSilentSwitch - (void)setIgnoreSilentSwitch:(NSString *)ignoreSilentSwitch
{ {
@ -1279,8 +1287,9 @@ static int const RCTVideoUnset = -1;
[self.layer addSublayer:_playerLayer]; [self.layer addSublayer:_playerLayer];
self.layer.needsDisplayOnBoundsChange = YES; self.layer.needsDisplayOnBoundsChange = YES;
#if TARGET_OS_IOS
[self setupPipController]; [self setupPipController];
#endif
} }
} }
@ -1539,6 +1548,7 @@ static int const RCTVideoUnset = -1;
#pragma mark - Picture in Picture #pragma mark - Picture in Picture
#if TARGET_OS_IOS
- (void)pictureInPictureControllerDidStopPictureInPicture:(AVPictureInPictureController *)pictureInPictureController { - (void)pictureInPictureControllerDidStopPictureInPicture:(AVPictureInPictureController *)pictureInPictureController {
if (self.onPictureInPictureStatusChanged) { if (self.onPictureInPictureStatusChanged) {
self.onPictureInPictureStatusChanged(@{ self.onPictureInPictureStatusChanged(@{
@ -1574,5 +1584,6 @@ static int const RCTVideoUnset = -1;
} }
_restoreUserInterfaceForPIPStopCompletionHandler = completionHandler; _restoreUserInterfaceForPIPStopCompletionHandler = completionHandler;
} }
#endif
@end @end