|
@@ -1293,26 +1293,19 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
|
|
|
if tempOut > CMTimeGetSeconds(asset.duration) {
|
|
|
- BFLog(message: "最后一点视频素材不够卡点时长要做变速C处理 差\(tempOut - CMTimeGetSeconds(asset.duration))")
|
|
|
|
|
|
let lastAssetDuration = CMTimeGetSeconds(asset.duration) - lastOutTime
|
|
|
let pointDuration = timelineOut - tempTimelineIn
|
|
|
|
|
|
let needSpeed = lastAssetDuration / pointDuration
|
|
|
-
|
|
|
- if tempSpeed >= 1 {
|
|
|
- if needSpeed >= 0.4 * Double(tempSpeed) {
|
|
|
- deepCopySticker?.speedRate = Float(needSpeed)
|
|
|
- }
|
|
|
- } else {
|
|
|
- if needSpeed >= 0.4 * Double(tempSpeed) && needSpeed >= 0.2 {
|
|
|
- deepCopySticker?.speedRate = Float(needSpeed)
|
|
|
- } else {
|
|
|
- continue
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
+
|
|
|
+ BFLog(message: "最后一点视频素材不够卡点时长要做变速C处理 差\(tempOut - CMTimeGetSeconds(asset.duration)) \(needSpeed)")
|
|
|
+ deepCopySticker?.speedRate = Float(needSpeed)
|
|
|
tempOut = CMTimeGetSeconds(asset.duration)
|
|
|
+ if(needSpeed == 0){
|
|
|
+ BFLog(message: "needSpeed is 0 出现在时长和卡点正好相等")
|
|
|
+ continue
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
deepCopySticker?.model_in = tempModel_In
|
|
@@ -1481,12 +1474,6 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
var tempMaxSpeed: Float = 1
|
|
|
var tempMinSpeed: Float = 1
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
if model == .createStickersModelSpeed {
|
|
|
|
|
|
if model == .createStickersModelSpeed && selectedDataCount != selectedImageDataCount {
|
|
@@ -1566,6 +1553,7 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
|
|
|
if useAssestDurationTemp < assetDuration {
|
|
|
+
|
|
|
|
|
|
var tempSpeed: Float = 1.0
|
|
|
if model == .createStickersModelSpeed {
|
|
@@ -1598,6 +1586,7 @@ extension PQStuckPointEditerController {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+ */
|
|
|
}else {
|
|
|
|
|
|
finallyStuckPoints.removeLast()
|