ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-11 05:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ASVideoNode] Change superclass to ASNetworkImageNode so that it can be its own placeholder (#1710)

Browse Source 
* [ASVideoNode] Change superclass to ASNetworkImageNode so that ASVideoNode can be its own placeholder
- remove _placeholderImageNode property of ASVideoNode (use self.image now instead)
- move layoutSpecThatFits: code to calculateSizeThatFits: & layout: methods as ASImageNode uses calculateSizeThatFits:

* [ASVideoNode] Tweaks to the definition of the delegate protocols to integrate with ASNetworkImageNode (superclass)
This commit is contained in:
Hannah Troisi
2016-06-05 18:18:52 -07:00
committed by appleguy
parent 4804f429b9
commit 52d58992da
4 changed files with 46 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
AsyncDisplayKit/ASVideoNode.mm
View File

@@ -71,8 +71,6 @@ static NSString * const kStatus = @"status";
int32_t _periodicTimeObserverTimescale;
CMTime _timeObserverInterval;
ASImageNode *_placeholderImageNode; // TODO: Make ASVideoNode an ASImageNode subclass; remove this.
ASDisplayNode *_playerNode;
NSString *_gravity;
}
@@ -151,7 +149,7 @@ static NSString * const kStatus = @"status";
self.player = [AVPlayer playerWithPlayerItem:playerItem];
}
if (_placeholderImageNode.image == nil) {
if (self.image == nil) {
[self generatePlaceholderImage];
}
@@ -193,33 +191,34 @@ static NSString * const kStatus = @"status";
[notificationCenter removeObserver:self name:AVPlayerItemNewErrorLogEntryNotification object:playerItem];
}
- (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
- (void)layout
{
// All subnodes should taking the whole node frame
CGSize maxSize = constrainedSize.max;
if (!CGSizeEqualToSize(self.preferredFrameSize, CGSizeZero)) {
maxSize = self.preferredFrameSize;
}
// Prevent crashes through if infinite width or height
if (isinf(maxSize.width) || isinf(maxSize.height)) {
ASDisplayNodeAssert(NO, @"Infinite width or height in ASVideoNode");
maxSize = CGSizeZero;
}
// Stretch out play button, placeholder image player node to the max size
NSMutableArray *children = [NSMutableArray array];
[super layout];
// The _playerNode wraps AVPlayerLayer, and therefore should extend across the entire bounds.
_playerNode.frame = self.bounds;
}
if (_placeholderImageNode) {
_placeholderImageNode.preferredFrameSize = maxSize;
[children addObject:_placeholderImageNode];
}
if (_playerNode) {
_playerNode.preferredFrameSize = maxSize;
[children addObject:_playerNode];
}
return [ASStaticLayoutSpec staticLayoutSpecWithChildren:children];
- (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
{
ASDN::MutexLocker l(_videoLock);
CGSize calculatedSize = constrainedSize;
// if a preferredFrameSize is set, call the superclass to return that instead of using the image size.
if (CGSizeEqualToSize(self.preferredFrameSize, CGSizeZero) == NO)
calculatedSize = self.preferredFrameSize;
// Prevent crashes through if infinite width or height
if (isinf(calculatedSize.width) || isinf(calculatedSize.height)) {
ASDisplayNodeAssert(NO, @"Infinite width or height in ASVideoNode");
calculatedSize = CGSizeZero;
}
if (_playerNode) {
_playerNode.preferredFrameSize = calculatedSize;
[_playerNode measure:calculatedSize];
}
return calculatedSize;
}
- (void)generatePlaceholderImage
@@ -265,23 +264,10 @@ static NSString * const kStatus = @"status";
- (void)setVideoPlaceholderImage:(UIImage *)image
{
ASDN::MutexLocker l(_videoLock);
if (_placeholderImageNode == nil && image != nil) {
_placeholderImageNode = [[ASImageNode alloc] init];
_placeholderImageNode.layerBacked = YES;
_placeholderImageNode.contentMode = ASContentModeFromVideoGravity(_gravity);
if (image != nil) {
self.contentMode = ASContentModeFromVideoGravity(_gravity);
}
_placeholderImageNode.image = image;
ASPerformBlockOnMainThread(^{
ASDN::MutexLocker l(_videoLock);
if (_placeholderImageNode != nil) {
[self insertSubnode:_placeholderImageNode atIndex:0];
[self setNeedsLayout];
}
});
self.image = image;
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
@@ -296,7 +282,7 @@ static NSString * const kStatus = @"status";
if ([change[NSKeyValueChangeNewKey] integerValue] == AVPlayerItemStatusReadyToPlay) {
self.playerState = ASVideoNodePlayerStateReadyToPlay;
// If we don't yet have a placeholder image update it now that we should have data available for it
if (_placeholderImageNode.image == nil) {
if (self.image == nil) {
[self generatePlaceholderImage];
}
}
@@ -393,7 +379,6 @@ static NSString * const kStatus = @"status";
self.player = nil;
self.currentItem = nil;
_placeholderImageNode.image = nil;
}
}
@@ -496,7 +481,7 @@ static NSString * const kStatus = @"status";
if (_playerNode.isNodeLoaded) {
((AVPlayerLayer *)_playerNode.layer).videoGravity = gravity;
}
_placeholderImageNode.contentMode = ASContentModeFromVideoGravity(gravity);
self.contentMode = ASContentModeFromVideoGravity(gravity);
_gravity = gravity;
}
@@ -637,11 +622,6 @@ static NSString * const kStatus = @"status";
}
#pragma mark - Internal Properties
- (ASImageNode *)placeholderImageNode
{
ASDN::MutexLocker l(_videoLock);
return _placeholderImageNode;
}
- (AVPlayerItem *)currentItem
{