|
@@ -1022,8 +1022,7 @@ extension PQStuckPointEditerController {
|
|
|
}
|
|
|
|
|
|
} else {
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
|
|
|
if section.sectionTimeline!.visionTrack!.getEnableVisionTrackMaterials(type: "video").count == 0, section.sectionTimeline!.visionTrack!.getEnableVisionTrackMaterials(type: "image").count > 0 {
|
|
|
for (index, point) in finallyStuckPoints.enumerated() {
|
|
@@ -1386,21 +1385,11 @@ extension PQStuckPointEditerController {
|
|
|
i = i + 1
|
|
|
}
|
|
|
|
|
|
-
|
|
|
- for (index,point) in stuckPointsTemp.enumerated() {
|
|
|
-
|
|
|
- if(index < LACount + LBCount){
|
|
|
- finallyStuckPoints.append(point)
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if( LACount + LBCount > stuckPointsTemp.count ){
|
|
|
-
|
|
|
- for (index,point) in stuckPointsTemp.enumerated() {
|
|
|
- if(index <= LACount + LBCount - stuckPointsTemp.count){
|
|
|
- finallyStuckPoints.append(Float((stuckPointsTemp.last ?? 0) + point))
|
|
|
- }
|
|
|
- }
|
|
|
+
|
|
|
+ for i in 0...(LACount + LBCount) {
|
|
|
+ let a = stuckPointsTemp[i % stuckPointsTemp.count]
|
|
|
+ let b = Float(i / stuckPointsTemp.count) * (stuckPointsTemp.first ?? 0)
|
|
|
+ finallyStuckPoints.append(a + b)
|
|
|
}
|
|
|
|
|
|
BFLog(message: "计算后的\(realUsedMusicDuration) LACount:\(LACount) LBCount \(LBCount) 估算时长为:\(selectedTotalDuration * 2 / Float64(maxSpeed + minSpeed))")
|
|
@@ -1695,7 +1684,7 @@ extension PQStuckPointEditerController {
|
|
|
|
|
|
|
|
|
createPorjectData()
|
|
|
- BFLog(message: "界面编辑界面时参数 选择素材时长:\(selectedTotalDuration) 选择素材总数:\(selectedDataCount) 选择图片总数\(selectedImageDataCount) 再创建类型:\(reCreateVideoData?.rhythmMode)")
|
|
|
+ BFLog(message: "界面编辑界面时参数 选择素材时长:\(selectedTotalDuration) 选择素材总数:\(selectedDataCount) 选择图片总数\(selectedImageDataCount) 再创建类型:\(String(describing: reCreateVideoData?.rhythmMode))")
|
|
|
|
|
|
|
|
|
|