|
@@ -613,6 +613,9 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: speedStuckBtnGifName, ofType: ".gif")!))
|
|
speedStuckBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: speedStuckBtnGifName, ofType: ".gif")!))
|
|
jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: jumpPointBtnGifName, ofType: ".gif")!))
|
|
jumpPointBtnGif.kf.setImage(with: URL(fileURLWithPath: Bundle().BF_mainbundle().path(forResource: jumpPointBtnGifName, ofType: ".gif")!))
|
|
|
|
|
|
|
|
+ speedStuckBtnGif.isHidden = false
|
|
|
|
+ jumpPointBtnGif.isHidden = false
|
|
|
|
+
|
|
settingPlayerView()
|
|
settingPlayerView()
|
|
|
|
|
|
|
|
|
|
@@ -1169,13 +1172,16 @@ extension PQStuckPointEditerController {
|
|
deepCopySticker?.speedRate = tempSpeed
|
|
deepCopySticker?.speedRate = tempSpeed
|
|
|
|
|
|
// 定义临时使用的变量
|
|
// 定义临时使用的变量
|
|
- // 素材分割的开始时间和结束时间
|
|
|
|
- let tempModel_In = lastOutTime
|
|
|
|
- var tempOut = lastOutTime + Float64(tempSpeed) * Float64(finallyStuckPoints[totalClipNum + 1 + clipindex] - finallyStuckPoints[totalClipNum + clipindex])
|
|
|
|
- // 素材显示的开始时间和结束时间
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
+ // 素材显示的开始时间和结束时间
|
|
|
|
+
|
|
let tempTimelineIn = Float64(finallyStuckPoints[totalClipNum + clipindex])
|
|
let tempTimelineIn = Float64(finallyStuckPoints[totalClipNum + clipindex])
|
|
let timelineOut = Float64(finallyStuckPoints[totalClipNum + 1 + clipindex])
|
|
let timelineOut = Float64(finallyStuckPoints[totalClipNum + 1 + clipindex])
|
|
|
|
+
|
|
|
|
+ // 素材分割的开始时间和结束时间
|
|
|
|
+ let tempModel_In = lastOutTime
|
|
|
|
+ var tempOut = lastOutTime + Float64(tempSpeed) * (timelineOut - tempTimelineIn)
|
|
|
|
|
|
// 处理最后一点视频素材不够卡点时长 e.g. 0.3 卡点时长0.5
|
|
// 处理最后一点视频素材不够卡点时长 e.g. 0.3 卡点时长0.5
|
|
if tempOut > CMTimeGetSeconds(asset.duration) {
|
|
if tempOut > CMTimeGetSeconds(asset.duration) {
|