fix(ios): call onLoadStart earlier (#3750)

This commit is contained in:
Krzysztof Moch 2024-05-13 21:32:51 +02:00 committed by GitHub
parent 9716f4cb36
commit b3f08f6c99
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 30 additions and 17 deletions

View File

@ -935,7 +935,7 @@ PODS:
- React-Mapbuffer (0.74.0): - React-Mapbuffer (0.74.0):
- glog - glog
- React-debug - React-debug
- react-native-video (6.0.0-rc.0): - react-native-video (6.0.0-rc.1):
- DoubleConversion - DoubleConversion
- glog - glog
- hermes-engine - hermes-engine
@ -949,7 +949,7 @@ PODS:
- React-featureflags - React-featureflags
- React-graphics - React-graphics
- React-ImageManager - React-ImageManager
- react-native-video/Video (= 6.0.0-rc.0) - react-native-video/Video (= 6.0.0-rc.1)
- React-NativeModulesApple - React-NativeModulesApple
- React-RCTFabric - React-RCTFabric
- React-rendererdebug - React-rendererdebug
@ -957,7 +957,7 @@ PODS:
- ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/bridging
- ReactCommon/turbomodule/core - ReactCommon/turbomodule/core
- Yoga - Yoga
- react-native-video/Video (6.0.0-rc.0): - react-native-video/Video (6.0.0-rc.1):
- DoubleConversion - DoubleConversion
- glog - glog
- hermes-engine - hermes-engine
@ -1421,7 +1421,7 @@ SPEC CHECKSUMS:
React-jsitracing: 72dce571a387f9d085482142837222c31a8d6c3a React-jsitracing: 72dce571a387f9d085482142837222c31a8d6c3a
React-logger: 03f2f7b955cfe24593a2b8c9705c23e142d1ad24 React-logger: 03f2f7b955cfe24593a2b8c9705c23e142d1ad24
React-Mapbuffer: 1ab3316cb736411bc641311b4b71e75099ae56ad React-Mapbuffer: 1ab3316cb736411bc641311b4b71e75099ae56ad
react-native-video: 3262598f55f8632e5d4dae90ba63d9d6e09bd563 react-native-video: 6bcf0049420848ecf85a46bc5ab3225022843fe6
React-nativeconfig: fef0a46effa630d72f137636a990d7df2f6a5f7c React-nativeconfig: fef0a46effa630d72f137636a990d7df2f6a5f7c
React-NativeModulesApple: 8257dd73991f2e410b9c9d12801691439a0dc821 React-NativeModulesApple: 8257dd73991f2e410b9c9d12801691439a0dc821
React-perflogger: 271f1111779fef70f9502d1d38da5132e5585230 React-perflogger: 271f1111779fef70f9502d1d38da5132e5585230

View File

@ -81,6 +81,12 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
} }
} }
private var _isBuffering = false {
didSet {
onVideoBuffer?(["isBuffering": _isBuffering, "target": reactTag as Any])
}
}
/* IMA Ads */ /* IMA Ads */
private var _adTagUrl: String? private var _adTagUrl: String?
#if USE_GOOGLE_IMA #if USE_GOOGLE_IMA
@ -375,6 +381,17 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
throw NSError(domain: "", code: 0, userInfo: nil) throw NSError(domain: "", code: 0, userInfo: nil)
} }
// Perform on next run loop, otherwise onVideoLoadStart is nil
onVideoLoadStart?([
"src": [
"uri": _source?.uri ?? NSNull(),
"type": _source?.type ?? NSNull(),
"isNetwork": NSNumber(value: _source?.isNetwork ?? false),
],
"drm": _drm?.json ?? NSNull(),
"target": reactTag,
])
if let uri = source.uri, uri.starts(with: "ph://") { if let uri = source.uri, uri.starts(with: "ph://") {
let photoAsset = await RCTVideoUtils.preparePHAsset(uri: uri) let photoAsset = await RCTVideoUtils.preparePHAsset(uri: uri)
return await playerItemPrepareText(asset: photoAsset, assetOptions: nil, uri: source.uri ?? "") return await playerItemPrepareText(asset: photoAsset, assetOptions: nil, uri: source.uri ?? "")
@ -467,16 +484,6 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
_imaAdsManager.setUpAdsLoader() _imaAdsManager.setUpAdsLoader()
} }
#endif #endif
// Perform on next run loop, otherwise onVideoLoadStart is nil
onVideoLoadStart?([
"src": [
"uri": _source?.uri ?? NSNull(),
"type": _source?.type ?? NSNull(),
"isNetwork": NSNumber(value: _source?.isNetwork ?? false),
],
"drm": _drm?.json ?? NSNull(),
"target": reactTag,
])
isSetSourceOngoing = false isSetSourceOngoing = false
applyNextSource() applyNextSource()
} }
@ -1296,7 +1303,9 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
} }
func handleReadyForDisplay(changeObject _: Any, change _: NSKeyValueObservedChange<Bool>) { func handleReadyForDisplay(changeObject _: Any, change _: NSKeyValueObservedChange<Bool>) {
onVideoBuffer?(["isBuffering": false, "target": reactTag as Any]) if _isBuffering {
_isBuffering = false
}
onReadyForDisplay?([ onReadyForDisplay?([
"target": reactTag, "target": reactTag,
]) ])
@ -1430,12 +1439,16 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
} }
func handlePlaybackBufferKeyEmpty(playerItem _: AVPlayerItem, change _: NSKeyValueObservedChange<Bool>) { func handlePlaybackBufferKeyEmpty(playerItem _: AVPlayerItem, change _: NSKeyValueObservedChange<Bool>) {
onVideoBuffer?(["isBuffering": true, "target": reactTag as Any]) if !_isBuffering {
_isBuffering = true
}
} }
// Continue playing (or not if paused) after being paused due to hitting an unbuffered zone. // Continue playing (or not if paused) after being paused due to hitting an unbuffered zone.
func handlePlaybackLikelyToKeepUp(playerItem _: AVPlayerItem, change _: NSKeyValueObservedChange<Bool>) { func handlePlaybackLikelyToKeepUp(playerItem _: AVPlayerItem, change _: NSKeyValueObservedChange<Bool>) {
onVideoBuffer?(["isBuffering": false, "target": reactTag as Any]) if _isBuffering {
_isBuffering = false
}
} }
func handleTimeControlStatusChange(player: AVPlayer, change: NSKeyValueObservedChange<AVPlayer.TimeControlStatus>) { func handleTimeControlStatusChange(player: AVPlayer, change: NSKeyValueObservedChange<AVPlayer.TimeControlStatus>) {