Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

[video_player] [iOS] Fixed a memory leak in the video player plugin. #1660

Merged
cyanglaz merged 13 commits into from
Jul 29, 2019
Merged

[video_player] [iOS] Fixed a memory leak in the video player plugin. #1660

Changes from 2 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6c5c142
[video_player] [iOS] Fixed a memory leak in the video player plugin.
shihchanghsiungsonos May 30, 2019
fb7fb82
Fix format issue
shihchanghsiungsonos May 30, 2019
ef51441
Merge branch 'master' of github.com:flutter/plugins into pull-request-2
shihchanghsiungsonos Jul 15, 2019
c7bfc2d
Merge branch 'master' of github.com:flutter/plugins into pull-request-2
shihchanghsiungsonos Jul 15, 2019
e822967
[video_player] [iOS] Fixed a memory leak in the video player plugin.
shihchanghsiungsonos Jul 15, 2019
cbc1d45
Merge branch 'master' of github.com:flutter/plugins into pull-request-2
shihchanghsiungsonos Jul 15, 2019
16bd875
[video_player] [iOS] Fixed a memory leak in the video player plugin.
shihchanghsiungsonos Jul 15, 2019
348014c
Merge branch 'master' of github.com:flutter/plugins into pull-request-2
shihchanghsiungsonos Jul 16, 2019
7049698
bump version to 0.10.1+5
shihchanghsiungsonos Jul 16, 2019
bbf5440
Merge branch 'master' of github.com:flutter/plugins into pull-request-2
shihchanghsiungsonos Jul 16, 2019
a9df1ae
Update with cyanglaz's feedback
shihchanghsiungsonos Jul 16, 2019
029be7d
Merge branch 'master' into pull-request-2
Jul 29, 2019
01e04c7
Update pubspec.yaml
Jul 29, 2019
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
8 changes: 4 additions & 4 deletions packages/video_player/ios/Classes/VideoPlayerPlugin.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ @interface FLTVideoPlayer : NSObject <FlutterTexture, FlutterStreamHandler>
@property(nonatomic, readonly) bool isPlaying;
@property(nonatomic) bool isLooping;
@property(nonatomic, readonly) bool isInitialized;
@property(nonatomic, assign) id notificationObserverId;
- (instancetype)initWithURL:(NSURL*)url frameUpdater:(FLTFrameUpdater*)frameUpdater;
- (void)play;
- (void)pause;
Expand Down Expand Up @@ -82,14 +83,13 @@ - (void)addObservers:(AVPlayerItem*)item {
options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew
context:playbackBufferFullContext];

[[NSNotificationCenter defaultCenter] addObserverForName:AVPlayerItemDidPlayToEndTimeNotification
_notificationObserverId = [[NSNotificationCenter defaultCenter] addObserverForName:AVPlayerItemDidPlayToEndTimeNotification
Copy link
Contributor

@cyanglaz cyanglaz Jul 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It might be cleaner to just use the addObserver:self here since we are just using mainQueue. This way we can separate the observing implementation out of the addObservers method.

object:[_player currentItem]
queue:[NSOperationQueue mainQueue]
usingBlock:^(NSNotification* note) {
if (self->_isLooping) {
AVPlayerItem* p = [note object];
[p seekToTime:kCMTimeZero
completionHandler:nil];
[p seekToTime:kCMTimeZero];
Copy link
Contributor

@cyanglaz cyanglaz Jul 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It seems not related.

} else {
if (self->_eventSink) {
self->_eventSink(@{@"event" : @"completed"});
Expand Down Expand Up @@ -395,7 +395,7 @@ - (void)dispose {
forKeyPath:@"playbackBufferFull"
context:playbackBufferFullContext];
[_player replaceCurrentItemWithPlayerItem:nil];
[[NSNotificationCenter defaultCenter] removeObserver:self];
[[NSNotificationCenter defaultCenter] removeObserver:_notificationObserverId];
Copy link
Contributor

@cyanglaz cyanglaz Jul 9, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This can be unchanged if we use the addObserver: method as I mentioned in the other comment.

[_eventChannel setStreamHandler:nil];
}

Expand Down