Improve locking situation in ASVideoPlayerNode #1042
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 |
|---|---|---|
|
|
@@ -209,10 +209,8 @@ - (AVAsset *)asset | |
| - (void)didLoad | ||
| { | ||
| [super didLoad]; | ||
|
|
||
| [self createControls]; | ||
| } | ||
|
|
||
| - (void)didEnterPreloadState | ||
|
|
@@ -284,15 +282,23 @@ - (void)createControls | |
|
|
||
| if (_delegateFlags.delegateCustomControls && _delegateFlags.delegateLayoutSpecForControls) { | ||
| NSDictionary *customControls = [_delegate videoPlayerNodeCustomControls:self]; | ||
| std::vector<ASDisplayNode *> subnodes; | ||
| for (id key in customControls) { | ||
| id node = customControls[key]; | ||
| if (![node isKindOfClass:[ASDisplayNode class]]) { | ||
| continue; | ||
| } | ||
|
|
||
| subnodes.push_back(node); | ||
| [_cachedControls setObject:node forKey:key]; | ||
| } | ||
|
|
||
| { | ||
| ASUnlockScope(self); | ||
| for (var subnode : subnodes) { | ||
| [self addSubnode:subnode]; | ||
| } | ||
| } | ||
|
There was a problem hiding this comment. We can avoid a pair of lock and unlock calls if we add subnodes outside of the outmost lock scope. There was a problem hiding this comment. Talked to @maicki offline. Let's leave this as is since my suggested approach is a bit more complicated and in case of early return(s), the vector will not be used. |
||
| } | ||
| } | ||
|
|
||
|
|
@@ -315,14 +321,22 @@ - (NSArray *)createDefaultControlElementArray | |
|
|
||
| - (void)removeControls | ||
| { | ||
| ASLockScope(self); | ||
|
|
||
| // Grab the cached controls for removing it | ||
| NSMutableDictionary *cachedControls = [_cachedControls copy]; | ||
|
|
||
| { | ||
| ASUnlockScope(self); | ||
| for (ASDisplayNode *node in [cachedControls objectEnumerator]) { | ||
| [node removeFromSupernode]; | ||
| } | ||
| } | ||
|
|
||
| [self __locked_cleanCachedControls]; | ||
|
There was a problem hiding this comment. I think it's safe to do this before calling |
||
| } | ||
|
|
||
| - (void)__locked_cleanCachedControls | ||
|
There was a problem hiding this comment. Also, should we use 1 underscore at the beginning of this method's name (i.e |
||
| { | ||
| [_cachedControls removeAllObjects]; | ||
|
|
||
|
|
@@ -355,7 +369,10 @@ - (void)_locked_createPlaybackButton | |
| [_cachedControls setObject:_playbackButtonNode forKey:@(ASVideoPlayerNodeControlTypePlaybackButton)]; | ||
| } | ||
|
|
||
| { | ||
| ASUnlockScope(self); | ||
| [self addSubnode:_playbackButtonNode]; | ||
| } | ||
| } | ||
|
|
||
| - (void)_locked_createFullScreenButton | ||
|
|
@@ -374,7 +391,10 @@ - (void)_locked_createFullScreenButton | |
| [_cachedControls setObject:_fullScreenButtonNode forKey:@(ASVideoPlayerNodeControlTypeFullScreenButton)]; | ||
| } | ||
|
|
||
| { | ||
| ASUnlockScope(self); | ||
| [self addSubnode:_fullScreenButtonNode]; | ||
| } | ||
| } | ||
|
|
||
| - (void)_locked_createElapsedTextField | ||
|
|
@@ -389,7 +409,10 @@ - (void)_locked_createElapsedTextField | |
|
|
||
| [_cachedControls setObject:_elapsedTextNode forKey:@(ASVideoPlayerNodeControlTypeElapsedText)]; | ||
| } | ||
| { | ||
| ASUnlockScope(self); | ||
| [self addSubnode:_elapsedTextNode]; | ||
| } | ||
| } | ||
|
|
||
| - (void)_locked_createDurationTextField | ||
|
|
@@ -405,7 +428,10 @@ - (void)_locked_createDurationTextField | |
| [_cachedControls setObject:_durationTextNode forKey:@(ASVideoPlayerNodeControlTypeDurationText)]; | ||
| } | ||
| [self updateDurationTimeLabel]; | ||
| { | ||
| ASUnlockScope(self); | ||
| [self addSubnode:_durationTextNode]; | ||
| } | ||
| } | ||
|
|
||
| - (void)_locked_createScrubber | ||
|
|
@@ -450,8 +476,10 @@ - (void)_locked_createScrubber | |
|
|
||
| [_cachedControls setObject:_scrubberNode forKey:@(ASVideoPlayerNodeControlTypeScrubber)]; | ||
| } | ||
| { | ||
| ASUnlockScope(self); | ||
| [self addSubnode:_scrubberNode]; | ||
| } | ||
| } | ||
|
|
||
| - (void)_locked_createControlFlexGrowSpacer | ||
|
|
@@ -623,7 +651,6 @@ - (void)showSpinner | |
| ASLockScopeSelf(); | ||
|
|
||
| if (!_spinnerNode) { | ||
| __weak __typeof__(self) weakSelf = self; | ||
| _spinnerNode = [[ASDisplayNode alloc] initWithViewBlock:^UIView *{ | ||
| __typeof__(self) strongSelf = weakSelf; | ||
|
|
@@ -644,9 +671,11 @@ - (void)showSpinner | |
| }]; | ||
|
|
||
| _spinnerNode.style.preferredSize = CGSizeMake(44.0, 44.0); | ||
|
There was a problem hiding this comment. The spinner can be removed and added on different threads we may should grab the |
||
| { | ||
| ASUnlockScope(self); | ||
| [self addSubnode:_spinnerNode]; | ||
| [self setNeedsLayout]; | ||
| } | ||
| } | ||
| [(UIActivityIndicatorView *)_spinnerNode.view startAnimating]; | ||
| } | ||
|
|
@@ -658,7 +687,10 @@ - (void)removeSpinner | |
| if (!_spinnerNode) { | ||
| return; | ||
| } | ||
| { | ||
|
There was a problem hiding this comment. We may should grab the There was a problem hiding this comment. Let's do this at the end so we don't need to re-acquire the lock. |
||
| ASUnlockScope(self); | ||
| [_spinnerNode removeFromSupernode]; | ||
| } | ||
| _spinnerNode = nil; | ||
| } | ||
|
|
||
|
|
||
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.
In general we should avoid calling delegates with the lock held. May not worth address in this PR though.