Merge pull request #1384 from nickgzzjr/master

Added filterEnabled flag and don't enable filter if source is an hls playlist

ios/Video/RCTVideo.m

@@ -26,6 +26,7 @@ static int const RCTVideoUnset = -1;
 {
   AVPlayer *_player;
   AVPlayerItem *_playerItem;
+  NSDictionary *_source;
   BOOL _playerItemObserversSet;
   BOOL _playerBufferEmpty;
   AVPlayerLayer *_playerLayer;
@@ -70,6 +71,7 @@ static int const RCTVideoUnset = -1;
   NSString * _fullscreenOrientation;
   BOOL _fullscreenPlayerPresented;
   NSString *_filterName;
+  BOOL _filterEnabled;
   UIViewController * _presentingViewController;
 #if __has_include(<react-native-video/RCTVideoCache.h>)
   RCTVideoCache * _videoCache;
@@ -328,6 +330,7 @@ static int const RCTVideoUnset = -1;
 
 - (void)setSrc:(NSDictionary *)source
 {
+  _source = source;
   [self removePlayerLayer];
   [self removePlayerTimeObserver];
   [self removePlayerItemObservers];
@@ -1279,18 +1282,18 @@ static int const RCTVideoUnset = -1;
 
 - (void)setFilter:(NSString *)filterName {
     _filterName = filterName;
-    AVAsset *asset = _playerItem.asset;
-    
-    if (!asset) {
-        return;
-    } else if (!_playerItem.videoComposition && (filterName == nil || [filterName isEqualToString:@""])) {
-        return; // Setting up an empty filter has a cost so avoid whenever possible
-    }
-    // TODO: filters don't work for HLS, check & return
 
+    if (!_filterEnabled) {
+        return;
+    } else if ([[_source objectForKey:@"uri"] rangeOfString:@"m3u8"].location != NSNotFound) {
+        return; // filters don't work for HLS... return
+    } else if (!_playerItem.asset) {
+        return;
+    }
+    
     CIFilter *filter = [CIFilter filterWithName:filterName];
     _playerItem.videoComposition = [AVVideoComposition
-                                    videoCompositionWithAsset:asset
+                                    videoCompositionWithAsset:_playerItem.asset
                                     applyingCIFiltersWithHandler:^(AVAsynchronousCIImageFilteringRequest *_Nonnull request) {
         if (filter == nil) {
             [request finishWithImage:request.sourceImage context:nil];
@@ -1303,6 +1306,10 @@ static int const RCTVideoUnset = -1;
     }];
 }
 
+- (void)setFilterEnabled:(BOOL)filterEnabled {
+  _filterEnabled = filterEnabled;
+}
+
 #pragma mark - React View Management
 
 - (void)insertReactSubview:(UIView *)view atIndex:(NSInteger)atIndex

ios/Video/RCTVideoManager.m

@@ -40,6 +40,7 @@ RCT_EXPORT_VIEW_PROPERTY(fullscreen, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(fullscreenAutorotate, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(fullscreenOrientation, NSString);
 RCT_EXPORT_VIEW_PROPERTY(filter, NSString);
+RCT_EXPORT_VIEW_PROPERTY(filterEnabled, BOOL);
 RCT_EXPORT_VIEW_PROPERTY(progressUpdateInterval, float);
 /* Should support: onLoadStart, onLoad, and onError to stay consistent with Image */
 RCT_EXPORT_VIEW_PROPERTY(onVideoLoadStart, RCTBubblingEventBlock);