|
|
@@ -1237,22 +1237,21 @@ extension PQStuckPointEditerController {
|
|
|
// 第二种情况：有视频要进行分割
|
|
|
let clipFilters = clipVideoMerage(section: section, stuckPoints: finallyStuckPoints)
|
|
|
|
|
|
- //
|
|
|
- if(clipFilters.count > finallyStuckPoints.count){
|
|
|
-
|
|
|
+ //数据不一致时要对数据进行二次处理，不是最好方案
|
|
|
+ if(clipFilters.count > finallyStuckPoints.count - 1){
|
|
|
clipPoint(clipNum: clipFilters.count - finallyStuckPoints.count, oldPoints: finallyStuckPoints)
|
|
|
-
|
|
|
|
|
|
- }else if(clipFilters.count < finallyStuckPoints.count){
|
|
|
+ }else if(clipFilters.count < finallyStuckPoints.count - 1){
|
|
|
|
|
|
- while (clipFilters.count < finallyStuckPoints.count) {
|
|
|
+ while (clipFilters.count < finallyStuckPoints.count - 1) {
|
|
|
finallyStuckPoints.removeLast()
|
|
|
}
|
|
|
|
|
|
}
|
|
|
//更新最终使用值
|
|
|
updateTimeInfomation()
|
|
|
-
|
|
|
+ //stikcer段数比clipFilters 数 大于 1才是正确的
|
|
|
+ BFLog(message: "stikcer count is\(clipFilters.count) finallyStuckPoints count is\(finallyStuckPoints.count)")
|
|
|
for (index, point) in finallyStuckPoints.enumerated() {
|
|
|
BFLog(message: "aaaaaindexindeindexxindexindexindex \(index) \(point)")
|
|
|
if index + 1 < finallyStuckPoints.count, index < clipFilters.count {
|
jsonwang