added video sample app with tableview and simple one with 3 video examples

Author: lappp9

AsyncDisplayKit/ASVideoNode.h

@@ -7,13 +7,9 @@ typedef NS_ENUM(NSUInteger, ASVideoGravity) {
   ASVideoGravityResize
 };
 
-// set up boolean to repeat video
-// set up delegate methods to provide play button
-// tapping should play and pause
-
-@interface ASVideoNode : ASDisplayNode
+@interface ASVideoNode : ASDisplayNode<_ASDisplayLayerDelegate>
 @property (atomic, strong, readwrite) AVAsset *asset;
-@property (nonatomic, assign, readwrite) BOOL shouldRepeat;
+@property (nonatomic, assign, readwrite) BOOL shouldAutoPlay;
 @property (atomic) ASVideoGravity gravity;
 @property (atomic) BOOL autorepeat;
 @property (atomic) ASButtonNode *playButton;

AsyncDisplayKit/ASVideoNode.mm

@@ -1,17 +1,25 @@
 
 
 #import "ASVideoNode.h"
+#import "ASDisplayNodeInternal.h"
+#import "ASDisplayNode+Subclasses.h"
+#import "ASDisplayNode+FrameworkPrivate.h"
+
+@interface ASDisplayNode ()
+- (void)setInterfaceState:(ASInterfaceState)newState;
+@end
 
 @interface ASVideoNode () {
   ASDN::RecursiveMutex _lock;
 
   __weak id<ASVideoNodeDatasource> _datasource;
 
-  AVPlayer *_player;
   BOOL _shouldBePlaying;
   AVAsset *_asset;
+  AVPlayerItem *_currentItem;
   ASButtonNode *_playButton;
   ASDisplayNode *_playerNode;
+  ASDisplayNode *_spinner;
 }
 
 @end
@@ -22,18 +30,81 @@ - (instancetype)init {
   if (!(self = [super init])) { return nil; }
 
   _playerNode = [[ASDisplayNode alloc] initWithLayerBlock:^CALayer *{ return [[AVPlayerLayer alloc] init]; }];
+  
   [self addSubnode:_playerNode];
 
   self.gravity = ASVideoGravityResizeAspect;
 
+  [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(restartVideo:) name:AVPlayerItemDidPlayToEndTimeNotification object:nil];
+  
   return self;
 }
 
+- (void)setInterfaceState:(ASInterfaceState)newState
+{
+  [super setInterfaceState:newState];
+  
+  if (!(newState & ASInterfaceStateVisible)) {
+    [self pause];
+    [_spinner removeFromSupernode];
+  } else {
+    if (_shouldBePlaying) {
+      [self play];
+    }
+    if (_spinner) {
+      [self addSubnode:_spinner];
+    }
+  }
+}
+
+- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+  if ([[change objectForKey:@"new"] integerValue] == AVPlayerItemStatusReadyToPlay) {
+    if ([self.subnodes containsObject:_spinner]) {
+      [_spinner removeFromSupernode];
+      _spinner = nil;
+    }
+  }
+  
+  if ([[change objectForKey:@"new"] integerValue] == AVPlayerItemStatusFailed) {
+    
+  }
+}
+
+- (void)restartVideo:(NSNotification *)notification
+{
+  if ( [[[notification object] asset] isEqual:_asset]) {
+    [[((AVPlayerLayer *)_playerNode.layer) player] seekToTime:CMTimeMakeWithSeconds(0, 1)];
+    
+    if (_autorepeat) {
+      [self play];
+    } else {
+      [self pause];
+    }
+  }
+}
+
 - (void)layoutDidFinish
 {
   _playerNode.frame = self.bounds;
 }
 
+- (void)didLoad {
+  [super didLoad];
+  
+  UITapGestureRecognizer *tap = [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(tapped)];
+  [self.view addGestureRecognizer:tap];
+}
+
+- (void)tapped
+{
+  if (_shouldBePlaying) {
+    [self pause];
+  } else {
+    [self play];
+  }
+}
+
 - (instancetype)initWithViewBlock:(ASDisplayNodeViewBlock)viewBlock didLoadBlock:(ASDisplayNodeDidLoadBlock)didLoadBlock
 {
   ASDisplayNodeAssertNotSupported();
@@ -44,13 +115,24 @@ - (void)fetchData
 {
   [super fetchData];
 
+  @try {
+    [_currentItem removeObserver:self forKeyPath:NSStringFromSelector(@selector(status))];
+  }
+  @catch (NSException * __unused exception) {
+    NSLog(@"unnecessary removal in fetch data");
+  }
+
   {
     ASDN::MutexLocker l(_lock);
-    AVPlayerItem *item = [[AVPlayerItem alloc] initWithAsset:_asset];
-    ((AVPlayerLayer *)_playerNode.layer).player = [[AVPlayer alloc] initWithPlayerItem:item];
-    if (_shouldBePlaying) {
-        [[((AVPlayerLayer *)_playerNode.layer) player] play];
-    }
+
+    _currentItem = [[AVPlayerItem alloc] initWithAsset:_asset];
+    [_currentItem addObserver:self forKeyPath:NSStringFromSelector(@selector(status)) options:NSKeyValueObservingOptionInitial | NSKeyValueObservingOptionNew context:NULL];
+
+    [((AVPlayerLayer *)_playerNode.layer).player replaceCurrentItemWithPlayerItem:_currentItem];
+  }
+  
+  if (_shouldAutoPlay) {
+    [self play];
   }
 }
 
@@ -72,14 +154,8 @@ - (void)setPlayButton:(ASButtonNode *)playButton
   _playButton = playButton;
 
   [self addSubnode:playButton];
-  [self.view bringSubviewToFront:playButton.view];
 
-  [_playButton addTarget:self action:@selector(playButtonWasTouchedUpInside) forControlEvents:ASControlNodeEventTouchUpInside];
-}
-
-- (void)playButtonWasTouchedUpInside
-{
-  [self play];
+  [_playButton addTarget:self action:@selector(play) forControlEvents:ASControlNodeEventTouchUpInside];
 }
 
 - (ASButtonNode *)playButton
@@ -106,6 +182,7 @@ - (void)setAsset:(AVAsset *)asset
 
 - (AVAsset *)asset
 {
+  ASDN::MutexLocker l(_lock);
   return _asset;
 }
 
@@ -148,14 +225,43 @@ - (void)play;
 
   [[((AVPlayerLayer *)_playerNode.layer) player] play];
   _shouldBePlaying = YES;
+  _playButton.alpha = 0.0;
+  if ([self ready] && ![self.subnodes containsObject:_spinner]) {
+    _spinner = [[ASDisplayNode alloc] initWithViewBlock:^UIView *{
+      UIActivityIndicatorView *spinnnerView = [[UIActivityIndicatorView alloc] initWithFrame:_playButton.frame];
+      spinnnerView.color = [UIColor whiteColor];
+      [spinnnerView startAnimating];
+
+      return spinnnerView;
+    }];
+    
+    [self addSubnode:_spinner];
+  }
+}
+
+- (BOOL)ready;
+{
+  return [((AVPlayerLayer *)_playerNode.layer) player].currentItem.status != AVPlayerItemStatusReadyToPlay;
 }
 
 - (void)pause;
 {
-  ASDN::MutexLocker l(_lock);
+//  ASDN::MutexLocker l(_lock);
 
   [[((AVPlayerLayer *)_playerNode.layer) player] pause];
   _shouldBePlaying = NO;
+  _playButton.alpha = 1.0;
+}
+
+- (void)dealloc
+{
+  [[NSNotificationCenter defaultCenter] removeObserver:self];
+  @try {
+    [_currentItem removeObserver:self forKeyPath:NSStringFromSelector(@selector(status))];
+  }
+  @catch (NSException * __unused exception) {
+    NSLog(@"unnecessary removal in dealloc");
+  }
 }
 
 @end

examples/Kittens/Sample.xcodeproj/project.pbxproj

@@ -128,6 +128,7 @@
 				05E2127E19D4DB510098F589 /* Frameworks */,
 				05E2127F19D4DB510098F589 /* Resources */,
 				F012A6F39E0149F18F564F50 /* Copy Pods Resources */,
+				A5C135CBCFD74D965DE0D799 /* Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -184,6 +185,21 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		A5C135CBCFD74D965DE0D799 /* Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Embed Pods Frameworks";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		E080B80F89C34A25B3488E26 /* Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

examples/Kittens/Sample.xcworkspace/contents.xcworkspacedata

@@ -25,7 +25,7 @@
 @interface KittenNode ()
 {
   CGSize _kittenSize;
-
+  
   ASNetworkImageNode *_imageNode;
   ASTextNode *_textNode;
   ASDisplayNode *_divider;
@@ -42,7 +42,7 @@ @implementation KittenNode
 + (NSArray *)placeholders
 {
   static NSArray *placeholders = nil;
-
+  
   static dispatch_once_t once;
   dispatch_once(&once, ^{
     placeholders = @[
@@ -68,38 +68,38 @@ + (NSArray *)placeholders
                      @"Sollicitudin feed me et ac in viverra catnip, nunc eat I don't like that food iaculis give me fish.",
                      ];
   });
-
+  
   return placeholders;
 }
 
 - (instancetype)initWithKittenOfSize:(CGSize)size
 {
   if (!(self = [super init]))
     return nil;
-
+  
   _kittenSize = size;
-
+  
   // kitten image, with a solid background colour serving as placeholder
   _imageNode = [[ASNetworkImageNode alloc] init];
   _imageNode.backgroundColor = ASDisplayNodeDefaultPlaceholderColor();
   _imageNode.URL = [NSURL URLWithString:[NSString stringWithFormat:@"https://placekitten.com/%zd/%zd",
-                                                                   (NSInteger)roundl(_kittenSize.width),
-                                                                   (NSInteger)roundl(_kittenSize.height)]];
-//  _imageNode.contentMode = UIViewContentModeCenter;
+                                         (NSInteger)roundl(_kittenSize.width),
+                                         (NSInteger)roundl(_kittenSize.height)]];
+  //  _imageNode.contentMode = UIViewContentModeCenter;
   [_imageNode addTarget:self action:@selector(toggleNodesSwap) forControlEvents:ASControlNodeEventTouchUpInside];
   [self addSubnode:_imageNode];
-
+  
   // lorem ipsum text, plus some nice styling
   _textNode = [[ASTextNode alloc] init];
   _textNode.attributedString = [[NSAttributedString alloc] initWithString:[self kittyIpsum]
                                                                attributes:[self textStyle]];
   [self addSubnode:_textNode];
-
+  
   // hairline cell separator
   _divider = [[ASDisplayNode alloc] init];
   _divider.backgroundColor = [UIColor lightGrayColor];
   [self addSubnode:_divider];
-
+  
   return self;
 }
 
@@ -109,24 +109,24 @@ - (NSString *)kittyIpsum
   u_int32_t ipsumCount = (u_int32_t)[placeholders count];
   u_int32_t location = arc4random_uniform(ipsumCount);
   u_int32_t length = arc4random_uniform(ipsumCount - location);
-
+  
   NSMutableString *string = [placeholders[location] mutableCopy];
   for (u_int32_t i = location + 1; i < location + length; i++) {
     [string appendString:(i % 2 == 0) ? @"\n" : @"  "];
     [string appendString:placeholders[i]];
   }
-
+  
   return string;
 }
 
 - (NSDictionary *)textStyle
 {
   UIFont *font = [UIFont fontWithName:@"HelveticaNeue" size:12.0f];
-
+  
   NSMutableParagraphStyle *style = [[NSParagraphStyle defaultParagraphStyle] mutableCopy];
   style.paragraphSpacing = 0.5 * font.lineHeight;
   style.hyphenationFactor = 1.0;
-
+  
   return @{ NSFontAttributeName: font,
             NSParagraphStyleAttributeName: style };
 }
@@ -164,7 +164,7 @@ - (CGSize)calculateSizeThatFits:(CGSize)constrainedSize
   CGSize imageSize = CGSizeMake(kImageSize, kImageSize);
   CGSize textSize = [_textNode measure:CGSizeMake(constrainedSize.width - kImageSize - 2 * kOuterPadding - kInnerPadding,
                                                   constrainedSize.height)];
-
+  
   // ensure there's room for the text
   CGFloat requiredHeight = MAX(textSize.height, imageSize.height);
   return CGSizeMake(constrainedSize.width, requiredHeight + 2 * kOuterPadding);
@@ -174,9 +174,9 @@ - (void)layout
 {
   CGFloat pixelHeight = 1.0f / [[UIScreen mainScreen] scale];
   _divider.frame = CGRectMake(0.0f, 0.0f, self.calculatedSize.width, pixelHeight);
-
+  
   _imageNode.frame = CGRectMake(kOuterPadding, kOuterPadding, kImageSize, kImageSize);
-
+  
   CGSize textSize = _textNode.calculatedSize;
   _textNode.frame = CGRectMake(kOuterPadding + kImageSize + kInnerPadding, kOuterPadding, textSize.width, textSize.height);
 }

examples/Kittens/Sample/KittenNode.mm

@@ -0,0 +1,3 @@
+source 'https://github.com/CocoaPods/Specs.git'
+platform :ios, '8.0'
+pod 'AsyncDisplayKit', :path => '../..'