Skip to content

Commit

Permalink
Ensure the trim range is valid (#114)
Browse files Browse the repository at this point in the history
  • Loading branch information
sindresorhus committed Aug 7, 2019
1 parent 7234634 commit 78f11c2
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Gifski/TrimmingAVPlayerViewController.swift
Expand Up @@ -57,11 +57,11 @@ final class TrimmingAVPlayerView: AVPlayerView {
// Once we change minimum target to 10.15,
// observe `\.duration` instead of `\.forwardPlaybackEndTime`.
timeRangeObserver = player?.currentItem?.observe(\.forwardPlaybackEndTime, options: .new) { item, _ in
let startTime = item.reversePlaybackEndTime.seconds
let endTime = item.forwardPlaybackEndTime.seconds
if !startTime.isNaN && !endTime.isNaN {
updateClosure(startTime...endTime)
guard let playbackRange = item.playbackRange else {
return
}

updateClosure(playbackRange)
}
}

Expand Down
15 changes: 15 additions & 0 deletions Gifski/util.swift
Expand Up @@ -2515,3 +2515,18 @@ extension NSObject {
return type(of: self).simpleClassName
}
}

extension AVPlayerItem {
/// The playable range of the item.
/// Can be `nil` when the `.duration` is not available, for example, when the asset has not yet been fully loaded or if it's a live stream.
var playbackRange: ClosedRange<Double>? {
guard duration.isNumeric else {
return nil
}

let startTime = reversePlaybackEndTime.isNumeric ? reversePlaybackEndTime.seconds : 0
let endTime = forwardPlaybackEndTime.isNumeric ? forwardPlaybackEndTime.seconds : duration.seconds

return startTime < endTime ? startTime...endTime : endTime...startTime
}
}

0 comments on commit 78f11c2

Please sign in to comment.