diff --git a/example/lib/main.dart b/example/lib/main.dart index 1affee1..bc382f4 100644 --- a/example/lib/main.dart +++ b/example/lib/main.dart @@ -65,7 +65,7 @@ class _MyAppState extends State { Uint8List mockPicture(int width, int height) { final pic = List.generate(width * height * 4, (index) { - return (index + 1) % 4 == 0 ? 1 : random.nextInt(255); + return random.nextInt(255); }); return Uint8List.fromList(pic); } diff --git a/macos/Classes/TextRgba.swift b/macos/Classes/TextRgba.swift index f2dba86..42bbc58 100644 --- a/macos/Classes/TextRgba.swift +++ b/macos/Classes/TextRgba.swift @@ -34,22 +34,19 @@ public final class TextRgba: NSObject, FlutterTexture { self.data = data.withUnsafeBytes { buffer in var pixelBufferCopy: CVPixelBuffer! // macOS only support 32BGRA currently. - let result = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_32BGRA, nil, &pixelBufferCopy) + let result = CVPixelBufferCreate(kCFAllocatorDefault, width, height, kCVPixelFormatType_32BGRA, [ + kCVPixelBufferPixelFormatTypeKey: kCVPixelFormatType_32BGRA, + kCVPixelBufferMetalCompatibilityKey: true, + kCVPixelBufferOpenGLCompatibilityKey: true + ] as CFDictionary, &pixelBufferCopy) guard result == kCVReturnSuccess else { return nil } CVPixelBufferLockBaseAddress(pixelBufferCopy, []) - defer {CVPixelBufferUnlockBaseAddress(pixelBufferCopy, [])} - var source = buffer.baseAddress! - - for plane in 0 ..< CVPixelBufferGetPlaneCount(pixelBufferCopy) { - let dest = CVPixelBufferGetBaseAddressOfPlane(pixelBufferCopy, plane) - let height = CVPixelBufferGetHeightOfPlane(pixelBufferCopy, plane) - let bytesPerRow = CVPixelBufferGetBytesPerRowOfPlane(pixelBufferCopy, plane) - let planceSize = height * bytesPerRow - memcpy(dest, source, planceSize) - source += planceSize - } + let source = buffer.baseAddress! + let ptr = CVPixelBufferGetBaseAddress(pixelBufferCopy!)! + memcpy(ptr, source, data.count) + CVPixelBufferUnlockBaseAddress(pixelBufferCopy, []) return pixelBufferCopy } self.width = width