@nativescript/canvas-media 2.0.27 → 2.0.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nativescript/canvas-media",
-  "version": "2.0.27",
+  "version": "2.0.29",
   "description": "Canvas media",
   "main": "index",
   "typings": "index.d.ts",

package/platforms/ios/src/NSCAudioHelper.m

@@ -3,7 +3,9 @@
 //  CanvasMedia
 //
 #import "NSCAudioHelper.h"
-#import <MobileCoreServices/MobileCoreServices.h>
+#if __has_include(<UniformTypeIdentifiers/UniformTypeIdentifiers.h>)
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
+#endif
 #import "NSCAudioView.h"
 
 @implementation NSCAudioHelper {
@@ -614,17 +616,15 @@
     }
     mime = [mime stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
 
-    @try {
-        CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, (__bridge CFStringRef)mime, NULL);
-        if (uti) {
-            if (UTTypeConformsTo(uti, kUTTypeAudio) || UTTypeConformsTo(uti, kUTTypeAudiovisualContent) || UTTypeConformsTo(uti, kUTTypeMovie)) {
-                CFRelease(uti);
-                if ([mime containsString:@"ogg"] || [mime containsString:@"webm"] || [mime containsString:@"opus"]) return @"maybe";
-                return @"probably";
-            }
-            CFRelease(uti);
+#if __has_include(<UniformTypeIdentifiers/UniformTypeIdentifiers.h>)
+    if (@available(iOS 14.0, *)) {
+        UTType *utType = [UTType typeWithMIMEType:mime];
+        if (utType && ([utType conformsToType:UTTypeAudio] || [utType conformsToType:UTTypeAudiovisualContent] || [utType conformsToType:UTTypeMovie])) {
+            if ([mime containsString:@"ogg"] || [mime containsString:@"webm"] || [mime containsString:@"opus"]) return @"maybe";
+            return @"probably";
         }
-    } @catch (NSException *ex) {}
+    }
+#endif
 
     if ([mime containsString:@"mp3"] || [mime containsString:@"mpeg"] || [mime containsString:@"wav"] || [mime containsString:@"aac"] || [mime containsString:@"m4a"] || [mime containsString:@"flac"]) return @"probably";
     if ([mime containsString:@"ogg"] || [mime containsString:@"opus"] || [mime containsString:@"webm"]) return @"maybe";

package/platforms/ios/src/NSCAudioView.m

@@ -127,14 +127,17 @@
 }
 
 - (void)setPlaying:(BOOL)playing {
+    __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
         UIImage *img = nil;
-        if (playing ? _customPauseImage : _customPlayImage) {
-            img = playing ? _customPauseImage : _customPlayImage;
+        if (playing ? strongSelf->_customPauseImage : strongSelf->_customPlayImage) {
+            img = playing ? strongSelf->_customPauseImage : strongSelf->_customPlayImage;
             if (img) {
                 UIImage *templ = [img imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-                [_playButton setImage:templ forState:UIControlStateNormal];
-                if (_iconTintColor) _playButton.tintColor = _iconTintColor;
+                [strongSelf->_playButton setImage:templ forState:UIControlStateNormal];
+                if (strongSelf->_iconTintColor) strongSelf->_playButton.tintColor = strongSelf->_iconTintColor;
                 return;
             }
         }
@@ -143,62 +146,71 @@
             img = [UIImage systemImageNamed:(playing ? @"pause.fill" : @"play.fill")];
             if (img) {
                 UIImage *templ = [img imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-                [_playButton setImage:templ forState:UIControlStateNormal];
-                if (_iconTintColor) _playButton.tintColor = _iconTintColor;
+                [strongSelf->_playButton setImage:templ forState:UIControlStateNormal];
+                if (strongSelf->_iconTintColor) strongSelf->_playButton.tintColor = strongSelf->_iconTintColor;
                 return;
             }
         }
 			
-        UIColor *c = _iconTintColor ?: [UIColor blackColor];
-        UIImage *fallback = playing ? [self _pauseIconWithSize:CGSizeMake(40,40) color:c] : [self _playIconWithSize:CGSizeMake(40,40) color:c];
+        UIColor *c = strongSelf->_iconTintColor ?: [UIColor blackColor];
+        UIImage *fallback = playing ? [strongSelf _pauseIconWithSize:CGSizeMake(40,40) color:c] : [strongSelf _playIconWithSize:CGSizeMake(40,40) color:c];
         if (fallback) {
-            [_playButton setImage:[fallback imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal];
-            if (_iconTintColor) _playButton.tintColor = _iconTintColor;
+            [strongSelf->_playButton setImage:[fallback imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateNormal];
+            if (strongSelf->_iconTintColor) strongSelf->_playButton.tintColor = strongSelf->_iconTintColor;
         }
     });
 }
 
 - (void)setPlayImage:(UIImage *)image {
     _customPlayImage = image;
+    __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
         BOOL playing = NO;
-        if (_helper) {
-            playing = ([_helper state] == NSCPlayerStatePlaying);
+        if (strongSelf->_helper) {
+            playing = ([strongSelf->_helper state] == NSCPlayerStatePlaying);
         }
-        if (!playing && _customPlayImage) {
-            UIImage *img = [_customPlayImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-            [_playButton setImage:img forState:UIControlStateNormal];
-            if (_iconTintColor) _playButton.tintColor = _iconTintColor;
+        if (!playing && strongSelf->_customPlayImage) {
+            UIImage *img = [strongSelf->_customPlayImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+            [strongSelf->_playButton setImage:img forState:UIControlStateNormal];
+            if (strongSelf->_iconTintColor) strongSelf->_playButton.tintColor = strongSelf->_iconTintColor;
         }
     });
 }
 
 - (void)setPauseImage:(UIImage *)image {
     _customPauseImage = image;
+    __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
         BOOL playing = NO;
-        if (_helper) {
-            playing = ([_helper state] == NSCPlayerStatePlaying);
+        if (strongSelf->_helper) {
+            playing = ([strongSelf->_helper state] == NSCPlayerStatePlaying);
         }
-        if (playing && _customPauseImage) {
-            UIImage *img = [_customPauseImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
-            [_playButton setImage:img forState:UIControlStateNormal];
-            if (_iconTintColor) _playButton.tintColor = _iconTintColor;
+        if (playing && strongSelf->_customPauseImage) {
+            UIImage *img = [strongSelf->_customPauseImage imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+            [strongSelf->_playButton setImage:img forState:UIControlStateNormal];
+            if (strongSelf->_iconTintColor) strongSelf->_playButton.tintColor = strongSelf->_iconTintColor;
         }
     });
 }
 
 - (void)setIconTintColor:(UIColor *)color {
     _iconTintColor = color;
+    __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
-        if (_iconTintColor) {
-            _playButton.tintColor = _iconTintColor;
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
+        if (strongSelf->_iconTintColor) {
+            strongSelf->_playButton.tintColor = strongSelf->_iconTintColor;
         }
         BOOL playing = NO;
-        if (_helper) {
-            playing = ([_helper state] == NSCPlayerStatePlaying);
+        if (strongSelf->_helper) {
+            playing = ([strongSelf->_helper state] == NSCPlayerStatePlaying);
         }
-        [self setPlaying:playing];
+        [strongSelf setPlaying:playing];
     });
 }
 
@@ -243,17 +255,20 @@
 }
 
 - (void)setDuration:(double)seconds {
+    __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
-        _slider.minimumValue = 0;
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
+        strongSelf->_slider.minimumValue = 0;
         if (seconds > 0) {
-            _slider.maximumValue = (float)seconds;
+            strongSelf->_slider.maximumValue = (float)seconds;
         } else {
-            _slider.maximumValue = 1.0f;
+            strongSelf->_slider.maximumValue = 1.0f;
         }
-        _durationSeconds = seconds;
-        _slider.enabled = (!isnan(seconds) && seconds > 0);
-        if (_slider.value > _slider.maximumValue) _slider.value = _slider.maximumValue;
-        [self updateTimeLabelWithCurrent:_slider.value duration:_durationSeconds];
+        strongSelf->_durationSeconds = seconds;
+        strongSelf->_slider.enabled = (!isnan(seconds) && seconds > 0);
+        if (strongSelf->_slider.value > strongSelf->_slider.maximumValue) strongSelf->_slider.value = strongSelf->_slider.maximumValue;
+        [strongSelf updateTimeLabelWithCurrent:strongSelf->_slider.value duration:strongSelf->_durationSeconds];
     });
 }
 

package/platforms/ios/src/NSCVideoHelper.m

@@ -5,7 +5,9 @@
 //  Created by Osei Fortune on 20/05/2025.
 //
 #import "NSCVideoHelper.h"
-#import <MobileCoreServices/MobileCoreServices.h>
+#if __has_include(<UniformTypeIdentifiers/UniformTypeIdentifiers.h>)
+#import <UniformTypeIdentifiers/UniformTypeIdentifiers.h>
+#endif
 #import "NSCVideoHelper+Internal.h"
 
 @implementation NSCVideoHelper {
@@ -79,21 +81,30 @@
     __weak typeof(self) weakSelf = self;
     [self.asset loadValuesAsynchronouslyForKeys:keys completionHandler:^{
         dispatch_async(dispatch_get_main_queue(), ^{
-					__strong typeof(self) strongSelf = weakSelf;
-					if (!strongSelf) return;
-					
-            AVAssetTrack *videoTrack = [[weakSelf.asset tracksWithMediaType:AVMediaTypeVideo] firstObject];
-					strongSelf->_videoSize = videoTrack.naturalSize;
+            __strong typeof(weakSelf) strongSelf = weakSelf;
+            if (!strongSelf) return;
+
+            AVAssetTrack *videoTrack = [[strongSelf.asset tracksWithMediaType:AVMediaTypeVideo] firstObject];
+            strongSelf->_videoSize = videoTrack ? videoTrack.naturalSize : CGSizeZero;
 
-            float fps = videoTrack.nominalFrameRate ?: 30.0;
+            float fps = (videoTrack && videoTrack.nominalFrameRate > 0) ? videoTrack.nominalFrameRate : 30.0f;
             CMTime interval = CMTimeMake(1, (int32_t)fps);
-            weakSelf.playbackFramesObserver = [weakSelf.player addPeriodicTimeObserverForInterval:interval queue:nil usingBlock:^(CMTime time) {
-                if (weakSelf.state == NSCPlayerStatePlaying) {
-                    [weakSelf.listener onVideoFrameCallback];
+
+            if (strongSelf.playbackFramesObserver) {
+                [strongSelf.player removeTimeObserver:strongSelf.playbackFramesObserver];
+                strongSelf.playbackFramesObserver = nil;
+            }
+
+            __weak typeof(strongSelf) weakFrameSelf = strongSelf;
+            strongSelf.playbackFramesObserver = [strongSelf.player addPeriodicTimeObserverForInterval:interval queue:nil usingBlock:^(CMTime time) {
+                __strong typeof(weakFrameSelf) frameSelf = weakFrameSelf;
+                if (!frameSelf) return;
+                if (frameSelf.state == NSCPlayerStatePlaying) {
+                    [frameSelf.listener onVideoFrameCallback];
                 }
             }];
 
-            AVPlayerItem *item = [AVPlayerItem playerItemWithAsset:weakSelf.asset];
+            AVPlayerItem *item = [AVPlayerItem playerItemWithAsset:strongSelf.asset];
 
             strongSelf->_currentItem = item;
 
@@ -112,10 +123,11 @@
             [item addObserver:strongSelf forKeyPath:@"status" options:NSKeyValueObservingOptionNew context:nil];
             [item addObserver:strongSelf forKeyPath:@"loadedTimeRanges" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial context:nil];
 
+            __weak typeof(strongSelf) weakPlayEndSelf = strongSelf;
             strongSelf->_playEndNotificationId = [[NSNotificationCenter defaultCenter]
                                                  addObserverForName:AVPlayerItemDidPlayToEndTimeNotification
                                                  object:item queue:nil usingBlock:^(NSNotification *note) {
-                __strong typeof(strongSelf) innerSelf = strongSelf;
+                __strong typeof(weakPlayEndSelf) innerSelf = weakPlayEndSelf;
                 if (!innerSelf) return;
                 if (innerSelf->_isLoop) {
                     [innerSelf->_player seekToTime:kCMTimeZero];
@@ -133,27 +145,6 @@
             if (strongSelf.autoplay) {
                 [strongSelf play];
             }
-
-            [item addObserver:strongSelf forKeyPath:@"status" options:NSKeyValueObservingOptionNew context:nil];
-            [item addObserver:strongSelf forKeyPath:@"loadedTimeRanges" options:NSKeyValueObservingOptionNew | NSKeyValueObservingOptionInitial context:nil];
-
-					strongSelf->_playEndNotificationId = [[NSNotificationCenter defaultCenter]
-                                                 addObserverForName:AVPlayerItemDidPlayToEndTimeNotification
-                                                 object:item queue:nil usingBlock:^(NSNotification *note) {
-                if (weakSelf != NULL && weakSelf.isLoop) {
-                    [weakSelf.player seekToTime:kCMTimeZero];
-                    [weakSelf.player play];
-                    weakSelf.state = NSCPlayerStatePlaying;
-                    [weakSelf.listener onStateChange:NSCPlayerStatePlaying];
-                }
-            }];
-
-            [weakSelf.player replaceCurrentItemWithPlayerItem:item];
-            weakSelf.readyState = NSCPlayerReadyStateHaveMetadata;
-            [weakSelf performSelectorOnMainThread:@selector(_scheduleFirstFrameCheck) withObject:nil waitUntilDone:NO];
-            if (weakSelf.autoplay) {
-                [weakSelf play];
-            }
         });
     }];
 }
@@ -219,17 +210,15 @@
     }
     mime = [mime stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
 
-    @try {
-        CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassMIMEType, (__bridge CFStringRef)mime, NULL);
-        if (uti) {
-            if (UTTypeConformsTo(uti, kUTTypeVideo) || UTTypeConformsTo(uti, kUTTypeAudiovisualContent)) {
-                CFRelease(uti);
-                if ([mime containsString:@"webm"] || [mime containsString:@"vp8"] || [mime containsString:@"vp9"] || [mime containsString:@"ogg"]) return @"maybe";
-                return @"probably";
-            }
-            CFRelease(uti);
+#if __has_include(<UniformTypeIdentifiers/UniformTypeIdentifiers.h>)
+    if (@available(iOS 14.0, *)) {
+        UTType *utType = [UTType typeWithMIMEType:mime];
+        if (utType && ([utType conformsToType:UTTypeVideo] || [utType conformsToType:UTTypeAudiovisualContent])) {
+            if ([mime containsString:@"webm"] || [mime containsString:@"vp8"] || [mime containsString:@"vp9"] || [mime containsString:@"ogg"]) return @"maybe";
+            return @"probably";
         }
-    } @catch (NSException *ex) {}
+    }
+#endif
 
     if ([mime containsString:@"mp4"] || [mime containsString:@"mpeg"] || [mime containsString:@"h264"] || [mime containsString:@"video/mp4"]) return @"probably";
     if ([mime containsString:@"webm"] || [mime containsString:@"vp8"] || [mime containsString:@"vp9"] || [mime containsString:@"video/webm"]) return @"maybe";
@@ -320,46 +309,49 @@
 }
 
 - (void)load {
+    __weak typeof(self) weakSelf = self;
     dispatch_async(dispatch_get_main_queue(), ^{
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if (!strongSelf) return;
         @try {
-            [self pause];
+            [strongSelf pause];
 
-            if (self.playbackTimeObserver) {
-                [self.player removeTimeObserver:self.playbackTimeObserver];
-                self.playbackTimeObserver = nil;
+            if (strongSelf.playbackTimeObserver) {
+                [strongSelf.player removeTimeObserver:strongSelf.playbackTimeObserver];
+                strongSelf.playbackTimeObserver = nil;
             }
 
-            if (self.playbackFramesObserver) {
-                [self.player removeTimeObserver:self.playbackFramesObserver];
-                self.playbackFramesObserver = nil;
+            if (strongSelf.playbackFramesObserver) {
+                [strongSelf.player removeTimeObserver:strongSelf.playbackFramesObserver];
+                strongSelf.playbackFramesObserver = nil;
             }
 
-            if (_playEndNotificationId) {
-                [[NSNotificationCenter defaultCenter] removeObserver:_playEndNotificationId];
-                _playEndNotificationId = nil;
+            if (strongSelf->_playEndNotificationId) {
+                [[NSNotificationCenter defaultCenter] removeObserver:strongSelf->_playEndNotificationId];
+                strongSelf->_playEndNotificationId = nil;
             }
 
-            if (self.currentItem) {
+            if (strongSelf.currentItem) {
                 @try {
-                    [self.currentItem removeObserver:self forKeyPath:@"status"];
+                    [strongSelf.currentItem removeObserver:strongSelf forKeyPath:@"status"];
                 } @catch (NSException *exception) {}
                 @try {
-                    [self.currentItem removeObserver:self forKeyPath:@"loadedTimeRanges"];
+                    [strongSelf.currentItem removeObserver:strongSelf forKeyPath:@"loadedTimeRanges"];
                 } @catch (NSException *exception) {}
             }
 
-            if (self.assetOutput) {
-                [self.assetOutput setDelegate:nil queue:NULL];
+            if (strongSelf.assetOutput) {
+                [strongSelf.assetOutput setDelegate:nil queue:NULL];
             }
 
-            [self.player replaceCurrentItemWithPlayerItem:nil];
+            [strongSelf.player replaceCurrentItemWithPlayerItem:nil];
 
-            self.loadedDataFired = NO;
+            strongSelf.loadedDataFired = NO;
 
-            if (self.currentSrc && self.currentSrc.length > 0) {
-                NSString *src = [self.currentSrc copy];
-                self.currentSrc = nil;
-                [self setSrc:src];
+            if (strongSelf.currentSrc && strongSelf.currentSrc.length > 0) {
+                NSString *src = [strongSelf.currentSrc copy];
+                strongSelf.currentSrc = nil;
+                [strongSelf setSrc:src];
             }
         } @catch (NSException *ex) {
             NSLog(@"NSCVideoHelper load() error: %@", ex);