-
Notifications
You must be signed in to change notification settings - Fork 32
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
3 changed files
with
76 additions
and
1 deletion.
There are no files selected for viewing
This file contains 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 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,71 @@ | ||
| // | ||
| // Copyright (c) SRG SSR. All rights reserved. | ||
| // | ||
| // License information is available from the LICENSE file. | ||
| // | ||
|
|
||
| @import AVKit; | ||
| @import UIKit; | ||
|
|
||
| @interface SRGDummyPlayerViewController : AVPlayerViewController | ||
|
|
||
| @end | ||
|
|
||
| @implementation SRGDummyPlayerViewController | ||
|
|
||
| - (UIView *)view | ||
| { | ||
| UIView *view = super.view; | ||
| view.hidden = YES; | ||
| return view; | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| @interface SRGPictureInPictureFix : NSObject | ||
|
|
||
| @end | ||
|
|
||
| @implementation SRGPictureInPictureFix | ||
|
|
||
| - (instancetype)init | ||
| { | ||
| if (self = [super init]) { | ||
| [NSNotificationCenter.defaultCenter addObserver:self | ||
| selector:@selector(applicationDidBecomeActive:) | ||
| name:UIApplicationDidBecomeActiveNotification | ||
| object:nil]; | ||
| } | ||
| return self; | ||
| } | ||
|
|
||
| - (void)applicationDidBecomeActive:(NSNotification *)notification | ||
| { | ||
| static dispatch_once_t s_onceToken; | ||
| dispatch_once(&s_onceToken, ^{ | ||
| // iOS 14 regression: Using `AVPictureInPictureController` leaks an `AVPlayer`instance even afer the | ||
| // app released all strong references (reported as FB8561088). | ||
| // Somehow Apple manages to circumvent this issue internally with `AVPlayerViewController` which, if | ||
| // displayed once, ensures proper behavior afterwards. | ||
| SRGDummyPlayerViewController *playerViewController = [[SRGDummyPlayerViewController alloc] init]; | ||
| playerViewController.modalPresentationStyle = UIModalPresentationOverCurrentContext; | ||
| playerViewController.definesPresentationContext = NO; | ||
| playerViewController.player = [AVPlayer new]; | ||
|
|
||
| UIViewController *rootViewController = UIApplication.sharedApplication.keyWindow.rootViewController; | ||
| [rootViewController presentViewController:playerViewController animated:NO completion:^{ | ||
| [rootViewController dismissViewControllerAnimated:NO completion:nil]; | ||
| }]; | ||
| }); | ||
| } | ||
|
|
||
| @end | ||
|
|
||
| static SRGPictureInPictureFix *s_pictureInPictureFix; | ||
|
|
||
| __attribute__ ((constructor)) void SRGPictureInPictureFixInit(void) | ||
| { | ||
| if (@available(iOS 14, tvOS 14, *)) { | ||
| s_pictureInPictureFix = [[SRGPictureInPictureFix alloc] init]; | ||
| } | ||
| } |
This file contains 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