diff --git a/macos/Classes/TextRgba.swift b/macos/Classes/TextRgba.swift index 18f19b0..9737716 100644 --- a/macos/Classes/TextRgba.swift +++ b/macos/Classes/TextRgba.swift @@ -6,8 +6,9 @@ // // Modified by the Kitedesk fork (2026, T-4204): frames go into the // IOSurface-backed buffers of a pool, which does not hand out again the -// buffers last handed to the engine; rows are copied one by one when their -// stride differs from the pixel buffer's. +// buffers last handed to the engine, and are copied outside the queue the +// raster thread waits on; rows are copied one by one when their stride +// differs from the pixel buffer's. // import Foundation @@ -21,7 +22,7 @@ import CoreVideo private var width: Int = 0 private var height: Int = 0 private let queue = DispatchQueue(label: "text_rgba_sync_queue") - // Buffers of width x height. + // Buffers of width x height. With data, width, height and handed, guarded by queue. private var pool: CVPixelBufferPool? // The buffers last handed to the engine, the newest last: not written again. private var handed: [CVPixelBuffer] = [] @@ -57,17 +58,13 @@ import CoreVideo guard width > 0 && height > 0 && len >= stride * height else { return false } - if (pool == nil || self.width != width || self.height != height) { - pool = TextRgba.newPool(width: width, height: height) - self.width = width - self.height = height - } var pixelBufferCopy: CVPixelBuffer? - guard let pool = pool, + guard let pool = poolOf(width: width, height: height), CVPixelBufferPoolCreatePixelBuffer(kCFAllocatorDefault, pool, &pixelBufferCopy) == kCVReturnSuccess else { return false } + // Outside the queue: the raster thread waits on it for the newest frame. CVPixelBufferLockBaseAddress(pixelBufferCopy!, []) let ptr = CVPixelBufferGetBaseAddress(pixelBufferCopy!)! let bytesPerRow = CVPixelBufferGetBytesPerRow(pixelBufferCopy!) @@ -79,8 +76,10 @@ import CoreVideo } } CVPixelBufferUnlockBaseAddress(pixelBufferCopy!, []) - self.data = pixelBufferCopy - if textureId != -1 && self.data != nil { + queue.sync { + self.data = pixelBufferCopy + } + if textureId != -1 { registry?.textureFrameAvailable(textureId) return true } else { @@ -88,11 +87,21 @@ import CoreVideo } } - @objc public func markFrameAvaliableRaw(buffer: UnsafePointer, len: Int, width: Int, height: Int, stride_align: Int) -> Bool { + // The pool of buffers of width x height, a new one for a new size. + private func poolOf(width: Int, height: Int) -> CVPixelBufferPool? { queue.sync { - _markFrameAvaliable(buffer: buffer, len: len, width: width, height: height, stride_align: stride_align) + if (pool == nil || self.width != width || self.height != height) { + pool = TextRgba.newPool(width: width, height: height) + self.width = width + self.height = height + } + return pool } } + + @objc public func markFrameAvaliableRaw(buffer: UnsafePointer, len: Int, width: Int, height: Int, stride_align: Int) -> Bool { + _markFrameAvaliable(buffer: buffer, len: len, width: width, height: height, stride_align: stride_align) + } private static func newPool(width: Int, height: Int) -> CVPixelBufferPool? {