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

fix(ios): fix startPosition, cropStart and cropEnd to handle float values correctly (#3589)

Browse Source 
* refactor(ios): refactor setPlaybackRange function

* fix(ios): fix props to handle float values correctly

- fix startPosition, cropStart, cropEnd

* refactor(ios): apply lint
This commit is contained in:
YangJH 2024-03-22 21:43:46 +09:00 committed by GitHub
parent bfb76e6d15
commit 36bd2e2d71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ios/Video/DataStructures/VideoSource.swift
View File

@ -5,7 +5,7 @@ struct VideoSource {
let isAsset: Bool let isAsset: Bool
let shouldCache: Bool let shouldCache: Bool
let requestHeaders: [String: Any]? let requestHeaders: [String: Any]?
let startPosition: Int64? let startPosition: Float64?
let cropStart: Int64? let cropStart: Int64?
let cropEnd: Int64? let cropEnd: Int64?
// Custom Metadata // Custom Metadata
@ -51,9 +51,9 @@ struct VideoSource {
} else { } else {
self.requestHeaders = nil self.requestHeaders = nil
} }
self.startPosition = json["startPosition"] as? Int64 self.startPosition = json["startPosition"] as? Float64
self.cropStart = json["cropStart"] as? Int64 self.cropStart = (json["cropStart"] as? Float64).flatMap { Int64(round($0)) }
self.cropEnd = json["cropEnd"] as? Int64 self.cropEnd = (json["cropEnd"] as? Float64).flatMap { Int64(round($0)) }
self.title = json["title"] as? String self.title = json["title"] as? String
self.subtitle = json["subtitle"] as? String self.subtitle = json["subtitle"] as? String
self.description = json["description"] as? String self.description = json["description"] as? String

14
ios/Video/RCTVideo.swift
View File

@ -367,7 +367,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
} }
if let startPosition = self._source?.startPosition { if let startPosition = self._source?.startPosition {
self._startPosition = Float64(startPosition) / 1000 self._startPosition = startPosition / 1000
} }
#if USE_VIDEO_CACHING #if USE_VIDEO_CACHING
@ -398,7 +398,7 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
self._playerItem = playerItem self._playerItem = playerItem
self._playerObserver.playerItem = self._playerItem self._playerObserver.playerItem = self._playerItem
self.setPreferredForwardBufferDuration(self._preferredForwardBufferDuration) self.setPreferredForwardBufferDuration(self._preferredForwardBufferDuration)
self.setPlaybackRange(playerItem, withVideoStart: self._source?.cropStart, withVideoEnd: self._source?.cropEnd) self.setPlaybackRange(playerItem, withCropStart: self._source?.cropStart, withCropEnd: self._source?.cropEnd)
self.setFilter(self._filterName) self.setFilter(self._filterName)
if let maxBitRate = self._maxBitRate { if let maxBitRate = self._maxBitRate {
self._playerItem?.preferredPeakBitRate = Double(maxBitRate) self._playerItem?.preferredPeakBitRate = Double(maxBitRate)
@ -740,15 +740,15 @@ class RCTVideo: UIView, RCTVideoPlayerViewControllerDelegate, RCTPlayerObserverH
} }
} }
func setPlaybackRange(_ item: AVPlayerItem!, withVideoStart videoStart: Int64?, withVideoEnd videoEnd: Int64?) { func setPlaybackRange(_ item: AVPlayerItem!, withCropStart cropStart: Int64?, withCropEnd cropEnd: Int64?) {
if videoStart != nil { if let cropStart {
let start = CMTimeMake(value: videoStart!, timescale: 1000) let start = CMTimeMake(value: cropStart, timescale: 1000)
item.reversePlaybackEndTime = start item.reversePlaybackEndTime = start
_pendingSeekTime = Float(CMTimeGetSeconds(start)) _pendingSeekTime = Float(CMTimeGetSeconds(start))
_pendingSeek = true _pendingSeek = true
} }
if videoEnd != nil { if let cropEnd {
item.forwardPlaybackEndTime = CMTimeMake(value: videoEnd!, timescale: 1000) item.forwardPlaybackEndTime = CMTimeMake(value: cropEnd, timescale: 1000)
} }
} }