Skip to content
This repository has been archived by the owner on May 16, 2024. It is now read-only.

Correctly release player instance #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions ios/Video/RCTVideo.m
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,11 @@ -(void)removePlayerTimeObserver
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
[self removePlayerLayer];
[self removePlayerItemObservers];
[_player removeObserver:self forKeyPath:playbackRate context:nil];
[_player removeObserver:self forKeyPath:externalPlaybackActive context: nil];
[self removePlayerLayer];
_player = nil;
}

#pragma mark - App lifecycle handlers
Expand Down Expand Up @@ -360,9 +361,11 @@ - (void)removePlayerItemObservers
- (void)setSrc:(NSDictionary *)source
{
_source = source;
[self removePlayerLayer];
[self removePlayerTimeObserver];
[self removePlayerItemObservers];
[self removePlayerLayer];
_player = nil;

dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t) 0), dispatch_get_main_queue(), ^{

// perform on next run loop, otherwise other passed react-props may not be set
Expand Down Expand Up @@ -1615,9 +1618,6 @@ - (void)removeFromSuperview
[_player removeObserver:self forKeyPath:externalPlaybackActive context:nil];
_isExternalPlaybackActiveObserverRegistered = NO;
}
_player = nil;

[self removePlayerLayer];

[_playerViewController.contentOverlayView removeObserver:self forKeyPath:@"frame"];
[_playerViewController removeObserver:self forKeyPath:readyForDisplayKeyPath];
Expand All @@ -1632,6 +1632,9 @@ - (void)removeFromSuperview
_eventDispatcher = nil;
[[NSNotificationCenter defaultCenter] removeObserver:self];

[self removePlayerLayer];
_player = nil;

[super removeFromSuperview];
}

Expand Down
4 changes: 4 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
{
"name": "Hampton Maxwell",
"email": "[email protected]"
},
{
"name": "Marc Rousavy",
"email": "[email protected]"
}
],
"repository": {
Expand Down