|
|
@@ -27,7 +27,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
var isSynchroMusicInfoSuccess: Bool = false
|
|
|
/// 当前所有的filter
|
|
|
var filters: Array = Array<ImageProcessingOperation>.init()
|
|
|
- // 选中所有素材的的总时长 再进入编辑界面时已经不包括图片的时长
|
|
|
+ // 选中所有素材的的总时长 再进入编辑界面时已经不包括图片的时长
|
|
|
var selectedTotalDuration: Float64 = 0
|
|
|
// 选择的总数
|
|
|
var selectedDataCount: Int = 0
|
|
|
@@ -1328,27 +1328,22 @@ extension PQStuckPointEditerController {
|
|
|
i = i + 1
|
|
|
}
|
|
|
// 2拼接要使用的卡点信息
|
|
|
-// if(model == .createStickersModelOnlyMusic){
|
|
|
-// sticker.clipCount = LACount
|
|
|
-// }else{
|
|
|
sticker.clipCount = LACount + LBCount
|
|
|
-// }
|
|
|
-
|
|
|
// LACount + LBCount = 0 ? 11s视频x6倍速
|
|
|
if sticker.clipCount == 0 { sticker.clipCount = 1 }
|
|
|
for i in 0 ... sticker.clipCount {
|
|
|
- let index = (i + Int(lastPointIndex ?? 0)) % stuckPointsTemp.count
|
|
|
- var a = stuckPointsTemp[index]
|
|
|
-
|
|
|
-// var b = Float((i + Int(lastPointIndex ?? 0) - 1) / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
|
- // 和下位的差值
|
|
|
-// var b:Float = 0.0
|
|
|
- if i >= stuckPointsTemp.count && (index + 1) < stuckPointsTemp.count {
|
|
|
- BFLog(message: "差值为：\(stuckPointsTemp[index + 1] - a) 最后一位为：\(finallyStuckPoints.last ?? 0.0)")
|
|
|
-
|
|
|
- a = (stuckPointsTemp[index + 1] - a) + (finallyStuckPoints.last ?? 0.0)
|
|
|
+
|
|
|
+ if(i < stuckPointsTemp.count){
|
|
|
+ finallyStuckPoints.append(stuckPointsTemp[i])
|
|
|
+ }else{
|
|
|
+ let duration = (stuckPointsTemp.last ?? 0.0) - (stuckPointsTemp.first ?? 0.0)
|
|
|
+ let index = i % stuckPointsTemp.count
|
|
|
+ if((index + 1) < stuckPointsTemp.count){
|
|
|
+ let a = duration * Float((i / stuckPointsTemp.count)) + stuckPointsTemp[index + 1]
|
|
|
+ finallyStuckPoints.append(a)
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
- finallyStuckPoints.append(a)
|
|
|
}
|
|
|
|
|
|
// 3,多补一个卡点 做 C级 速处理
|
jsonwang