railbird/react-native-video
10
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'official/master'

Browse Source
This commit is contained in:
Yavor Ivanov
2023-02-13 15:39:22 +02:00
parent a56b4d148c 437a043427
commit 3266eb2d67
12 changed files with 152 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ios/Video/Features/RCTResourceLoaderDelegate.swift
View File

@@ -44,7 +44,7 @@ class RCTResourceLoaderDelegate: NSObject, AVAssetResourceLoaderDelegate, URLSes
}
func resourceLoader(_ resourceLoader:AVAssetResourceLoader, didCancel loadingRequest:AVAssetResourceLoadingRequest) {
NSLog("didCancelLoadingRequest")
RCTLog("didCancelLoadingRequest")
}
func setLicenseResult(_ license:String!) {

11
ios/Video/Features/RCTVideoUtils.swift
View File

@@ -111,10 +111,14 @@ enum RCTVideoUtils {
title = value as! String
}
let language:String! = currentOption?.extendedLanguageTag ?? ""
let selectedOption: AVMediaSelectionOption? = player.currentItem?.currentMediaSelection.selectedMediaOption(in: group!)
let audioTrack = [
"index": NSNumber(value: i),
"title": title,
"language": language
"language": language ?? "",
"selected": currentOption?.displayName == selectedOption?.displayName
] as [String : Any]
audioTracks.add(audioTrack)
}
@@ -137,10 +141,13 @@ enum RCTVideoUtils {
title = value as! String
}
let language:String! = currentOption?.extendedLanguageTag ?? ""
let selectedOpt = player.currentItem?.currentMediaSelection
let selectedOption: AVMediaSelectionOption? = player.currentItem?.currentMediaSelection.selectedMediaOption(in: group!)
let textTrack = TextTrack([
"index": NSNumber(value: i),
"title": title,
"language": language
"language": language,
"selected": currentOption?.displayName == selectedOption?.displayName
])
textTracks.append(textTrack)
}

8
ios/Video/RCTVideo.swift
View File

@@ -1017,6 +1017,8 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
}
if _videoLoadStarted {
let audioTracks = RCTVideoUtils.getAudioTrackInfo(_player)
let textTracks = RCTVideoUtils.getTextTrackInfo(_player).map(\.json)
onVideoLoad?(["duration": NSNumber(value: duration),
"currentTime": NSNumber(value: Float(CMTimeGetSeconds(_playerItem.currentTime()))),
"canPlayReverse": NSNumber(value: _playerItem.canPlayReverse),
@@ -1030,8 +1032,8 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
"height": width != nil ? NSNumber(value: height!) : "undefinded",
"orientation": orientation
],
"audioTracks": RCTVideoUtils.getAudioTrackInfo(_player),
"textTracks": _textTracks ?? RCTVideoUtils.getTextTrackInfo(_player),
"audioTracks": audioTracks,
"textTracks": textTracks,
"target": reactTag as Any])
}
_videoLoadStarted = false
@@ -1090,7 +1092,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
let newRect = change.newValue
if !oldRect!.equalTo(newRect!) {
if newRect!.equalTo(UIScreen.main.bounds) {
NSLog("in fullscreen")
RCTLog("in fullscreen")
self.reactViewController().view.frame = UIScreen.main.bounds
self.reactViewController().view.setNeedsLayout()

14
ios/Video/RCTVideoSwiftLog/RCTVideoSwiftLog.swift
View File

@@ -25,29 +25,31 @@
* way into one or the other eventually. Feel free to reuse it as desired.
*/
let logHeader: String = "RNV:"
func RCTLogError(_ message: String, _ file: String=#file, _ line: UInt=#line) {
RCTVideoSwiftLog.error(message, file: file, line: line)
RCTVideoSwiftLog.error(logHeader + message, file: file, line: line)
}
func RCTLogWarn(_ message: String, _ file: String=#file, _ line: UInt=#line) {
RCTVideoSwiftLog.warn(message, file: file, line: line)
RCTVideoSwiftLog.warn(logHeader + message, file: file, line: line)
}
func RCTLogInfo(_ message: String, _ file: String=#file, _ line: UInt=#line) {
RCTVideoSwiftLog.info(message, file: file, line: line)
RCTVideoSwiftLog.info(logHeader + message, file: file, line: line)
}
func RCTLog(_ message: String, _ file: String=#file, _ line: UInt=#line) {
RCTVideoSwiftLog.log(message, file: file, line: line)
RCTVideoSwiftLog.log(logHeader + message, file: file, line: line)
}
func RCTLogTrace(_ message: String, _ file: String=#file, _ line: UInt=#line) {
RCTVideoSwiftLog.trace(message, file: file, line: line)
RCTVideoSwiftLog.trace(logHeader + message, file: file, line: line)
}
func DebugLog(_ message: String) {
#if DEBUG
print(message)
print(logHeader + message)
#endif
}

6
ios/VideoCaching/RCTVideoCache.m
View File

@@ -30,7 +30,7 @@
options.useDirectorySeparation = NO;
#ifdef DEBUG
options.debugOutput = ^(NSString *string) {
NSLog(@"Video Cache: %@", string);
RCTLog(@"Video Cache: %@", string);
};
#endif
[self createTemporaryPath];
@@ -48,7 +48,7 @@
error:&error];
#ifdef DEBUG
if (!success || error) {
NSLog(@"Error while! %@", error);
RCTLog(@"Error while! %@", error);
}
#endif
}
@@ -64,7 +64,7 @@
[self.videoCache storeData:data forKey:key locked:NO withCallback:^(SPTPersistentCacheResponse * _Nonnull response) {
if (response.error) {
#ifdef DEBUG
NSLog(@"An error occured while saving the video into the cache: %@", [response.error localizedDescription]);
RCTLog(@"An error occured while saving the video into the cache: %@", [response.error localizedDescription]);
#endif
handler(NO);
return;