Prechádzať zdrojové kódy

适配创作工具的 进场和退场时间

jsonwang 3 rokov pred
rodič
commit
b14dbd8eab

+ 3 - 2
BFFramework/Classes/PQGPUImage/akfilters/PQImageFilter.swift

@@ -126,7 +126,7 @@ open class PQImageFilter: PQBaseFilter {
 
         BFLog(2, message: " image filter 当前时间: \(currTime) \(newImage!.size)")
 
-//        if currTime >= mSticker!.timelineIn && currTime <= mSticker!.timelineOut {
+        if currTime >= mSticker!.timelineIn && currTime <= mSticker!.timelineOut {
         BFLog(2, message: " 显示图片当前时间: \(currTime) 开始时间:\(mSticker!.timelineIn) 结束时间:\(mSticker!.timelineOut)  \(String(describing: newImage?.size))")
         // 取纹理坐标
         var textureCoordinates = PQGPUImageTools.getTextureCoordinates(sticker: mSticker!, textureSize: newImage!.size, cannvasSize: inputSize)
@@ -169,6 +169,7 @@ open class PQImageFilter: PQBaseFilter {
                              vertexBufferObject: PQGPUImageTools.NXGenerateVBO(for: verticesPoint),
                              
                              inputTextures: [texturePropertiesimagetwo])
-        releaseIncomingFramebuffers()
+            releaseIncomingFramebuffers()
+        }
     }
 }

+ 2 - 1
BFFramework/Classes/PQGPUImage/akfilters/PQMovieFilter.swift

@@ -346,7 +346,7 @@ class PQMovieFilter: PQBaseFilter {
         if CMTimeGetSeconds(targetTimeStamp) >= CMTimeGetSeconds(showTimeStamp)  && CMTimeGetSeconds(targetTimeStamp) != 0 {
 
         // 最后一帧的PTS > 要显示的目标时间 就不从解码器要数据,直接返回 view 不刷新 只有慢速时会调用
-//        if CMTimeGetSeconds(targetTimeStamp) >= CMTimeGetSeconds(showTimeStamp) + (stickerInfo?.model_in ?? 0) && CMTimeGetSeconds(targetTimeStamp) != 0 {
+        if CMTimeGetSeconds(targetTimeStamp) >= CMTimeGetSeconds(showTimeStamp) + (stickerInfo?.model_in ?? 0) && CMTimeGetSeconds(targetTimeStamp) != 0 {
             BFLog(2, message: "28797speedRate  目标显示时间 \(String(format: "%.6f", (CMTimeGetSeconds(showTimeStamp)))) 最后显示的时间 \(String(format: "%.6f", CMTimeGetSeconds(targetTimeStamp))) 裁剪开始时间:\(String(describing: moveSticker?.model_in)) speedRate is \(stickerInfo!.speedRate)")
             return
         }
@@ -431,6 +431,7 @@ class PQMovieFilter: PQBaseFilter {
                 }
             }
         }
+        }
     }
 
     /// 渲染帧数据