Merge branch 'master' of https://git.yishihui.com/iOS/BFFramework

BFFramework/Classes/PQGPUImage/akfilters/PQMovieFilter.swift

@@ -250,6 +250,8 @@ public class PQMovieFilter: PQBaseFilter {
                 readNextVideoFrame(showTimeStamp: showtimeStamp)
                 
                 framebufferIndex = framebufferIndex + 1
+            }else{
+                FilterLog(message: "movefilter 已经不显示了")
             }
         }
        

BFFramework/Classes/PQGPUImage/akfilters/PQSubTitleFilter.swift

@@ -228,6 +228,8 @@ open class PQSubTitleFilter: BasicOperation {
                                  inputTextures: [texturePropertiesimagetwo])
 
             releaseIncomingFramebuffers()
+        }else{
+            BFLog(message: "subTitleTexture iserror !!!!")
         }
     }
 

BFFramework/Classes/Stuckpoint/ViewModel/PQPlayerViewModel.swift

@@ -58,23 +58,29 @@ open class PQPlayerViewModel: NSObject {
                 // 根据已经选择的贴纸类型创建各自filters
                 for sticker in section.sectionTimeline!.visionTrack!.getEnableVisionTrackMaterials() {
                     autoreleasepool {
+                        
                         sticker.timelineIn = totalDuration + partTotaDuration
                         totalDuration = totalDuration + sticker.aptDuration
                         sticker.timelineOut = totalDuration + partTotaDuration
                         BFLog(message: "创建 filter start :\(sticker.timelineIn) end :\(sticker.timelineOut) type is \(sticker.type)")
-                        if sticker.type == StickerType.IMAGE.rawValue {
-                            let imageFilter = PQImageFilter(sticker: sticker)
-                            filters.append(imageFilter)
-
-                        } else if sticker.type == StickerType.VIDEO.rawValue {
-                            let videoFilter = PQMovieFilter(movieSticker: sticker)
-
-                            filters.append(videoFilter)
-
-                        } else if sticker.type == StickerType.GIF.rawValue {
-                            let gifFilter = PQGifFilter(sticker: sticker)
-                            filters.append(gifFilter)
+                        if(sticker.aptDuration > 0){
+                            if sticker.type == StickerType.IMAGE.rawValue {
+                                let imageFilter = PQImageFilter(sticker: sticker)
+                                filters.append(imageFilter)
+
+                            } else if sticker.type == StickerType.VIDEO.rawValue {
+                                let videoFilter = PQMovieFilter(movieSticker: sticker)
+
+                                filters.append(videoFilter)
+
+                            } else if sticker.type == StickerType.GIF.rawValue {
+                                let gifFilter = PQGifFilter(sticker: sticker)
+                                filters.append(gifFilter)
+                            }
+                        }else{
+                            BFLog(message: "sticker.aptDuration is error create filter error!!! \(sticker.aptDuration )")
                         }
+                 
                     }
                 }