Browse Source

打开 16的公倍数

jsonwang 3 years ago
parent
commit
2df76c3ebf
1 changed files with 13 additions and 15 deletions
  1. 13 15
      BFFramework/Classes/PQGPUImage/akfilters/PQImageFilter.swift

+ 13 - 15
BFFramework/Classes/PQGPUImage/akfilters/PQImageFilter.swift

@@ -54,20 +54,6 @@ open class PQImageFilter: PQBaseFilter {
  
         }
 
-        // 保证是16的公倍数
-//                let aptImageSize =  NXAVUtil.aptSize(newImage!.size)
-//                if (!__CGSizeEqualToSize(aptImageSize, newImage!.size))
-//                {
-//
-//                    BFLog(2, message: "原图大小宽度不是16的倍数 \(newImage!.size)")
-//
-//                    newImage = newImage?.nx_scaleToSize(size: aptImageSize)
-//
-//                    BFLog(2, message: "归16后大小 \(newImage!.size)")
-//
-//                }
-
-//
         autoreleasepool {
             if newImage == nil {
                 let filePath = documensDirectory + (mSticker?.locationPath ?? "")
@@ -87,6 +73,18 @@ open class PQImageFilter: PQBaseFilter {
 //            imageTexture = PQGPUImageTools.setupTexture(image: newImage!.cgImage!)
 
         } else { BFLog(2, message: "image filter init error image data is nil!") }
+        
+        
+        // 保证是16的公倍数
+        let aptImageSize =  NXAVUtil.aptSize(newImage!.size)
+        if (!__CGSizeEqualToSize(aptImageSize, newImage!.size))
+        {
+            BFLog(2, message: "原图大小宽度不是16的倍数 \(newImage!.size)")
+            newImage = newImage?.nx_scaleToSize(size: aptImageSize)
+            BFLog(2, message: "归16后大小 \(newImage!.size)")
+
+        }
+
     }
 
 //    override public func newFramebufferAvailable(_ framebuffer: Framebuffer, fromSourceIndex: UInt) {
@@ -132,7 +130,7 @@ open class PQImageFilter: PQBaseFilter {
         // 取纹理坐标
         var textureCoordinates = PQGPUImageTools.getTextureCoordinates(sticker: mSticker!, textureSize: newImage!.size, cannvasSize: inputSize)
 
-        BFLog(2, message: "textureCoordinates is \(textureCoordinates) image size :\(newImage!.size ) cannvasSize:\(inputSize)")
+        BFLog(2, message: "textureCoordinates is \(textureCoordinates) image size :\(newImage!.size ) cannvasSize:\(inputSize)  files path is \(mSticker?.locationPath)")
 
         // imageTexture 有可能被析构导致黑屏
         if imageTexture == 0 && newImage?.cgImage != nil {