@livedesk/client 0.1.117 → 0.1.118

package/bin/livedesk-client.js

@@ -2508,7 +2508,7 @@ function resolveBundledFfmpegPaths() {
         }
     };
 
-    if (process.platform === 'darwin') {
+    if (process.platform === 'darwin' || process.platform === 'win32') {
         addFfmpegStatic();
         addFfmpegInstaller();
     } else {

package/fast/osx-arm64/MindExec.RemoteAgent.Fast/MacScreenCaptureKitH264.swift

@@ -3,6 +3,7 @@ import CoreGraphics
 import CoreMedia
 import CoreVideo
 import Foundation
+import IOSurface
 import ScreenCaptureKit
 import VideoToolbox
 
@@ -23,6 +24,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
     private var encodedCount: Int = 0
     private var encodedKeyCount: Int = 0
     private var encodedDeltaCount: Int = 0
+    private var loggedInputSurface = false
 
     init(displayIndex: Int, width: Int, height: Int, fps: Int, bitrateKbps: Int) {
         self.displayIndex = max(0, displayIndex)
@@ -56,7 +58,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         configuration.width = width
         configuration.height = height
         configuration.minimumFrameInterval = CMTime(value: 1, timescale: CMTimeScale(fps))
-        configuration.queueDepth = 8
+        configuration.queueDepth = 3
         configuration.showsCursor = false
         configuration.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
 
@@ -76,13 +78,20 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         let encoderSpecification: [CFString: Any] = [
             kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder: true
         ]
+        let imageBufferAttributes: [CFString: Any] = [
+            kCVPixelBufferPixelFormatTypeKey: NSNumber(value: kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange),
+            kCVPixelBufferWidthKey: NSNumber(value: width),
+            kCVPixelBufferHeightKey: NSNumber(value: height),
+            kCVPixelBufferMetalCompatibilityKey: true,
+            kCVPixelBufferIOSurfacePropertiesKey: [:] as CFDictionary
+        ]
         let status = VTCompressionSessionCreate(
             allocator: kCFAllocatorDefault,
             width: Int32(width),
             height: Int32(height),
             codecType: kCMVideoCodecType_H264,
             encoderSpecification: encoderSpecification as CFDictionary,
-            imageBufferAttributes: nil,
+            imageBufferAttributes: imageBufferAttributes as CFDictionary,
             compressedDataAllocator: nil,
             outputCallback: Self.compressionCallback,
             refcon: UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque()),
@@ -93,9 +102,10 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         }
 
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_RealTime, value: kCFBooleanTrue)
+        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality, value: kCFBooleanTrue)
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AllowTemporalCompression, value: kCFBooleanTrue)
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AllowFrameReordering, value: kCFBooleanFalse)
-        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxFrameDelayCount, value: NSNumber(value: 1))
+        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxFrameDelayCount, value: NSNumber(value: 0))
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_ProfileLevel, value: kVTProfileLevel_H264_Baseline_AutoLevel)
         let recoveryKeyInterval = max(1, fps / 2)
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxKeyFrameInterval, value: NSNumber(value: recoveryKeyInterval))
@@ -134,6 +144,12 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         }
 
         frameCount += 1
+        if !loggedInputSurface {
+            loggedInputSurface = true
+            let pixelFormat = CVPixelBufferGetPixelFormatType(imageBuffer)
+            let hasIOSurface = CVPixelBufferGetIOSurface(imageBuffer) != nil
+            fputs("LiveDeskSCK input pixelFormat=\(pixelFormat) iosurface=\(hasIOSurface ? 1 : 0) queueDepth=3 zeroCopyCandidate=\(hasIOSurface ? 1 : 0)\n", stderr)
+        }
         let pts = CMSampleBufferGetPresentationTimeStamp(sampleBuffer)
         let duration = CMTime(value: 1, timescale: CMTimeScale(fps))
         var frameProperties: CFDictionary?

package/fast/osx-x64/MindExec.RemoteAgent.Fast/MacScreenCaptureKitH264.swift

@@ -3,6 +3,7 @@ import CoreGraphics
 import CoreMedia
 import CoreVideo
 import Foundation
+import IOSurface
 import ScreenCaptureKit
 import VideoToolbox
 
@@ -23,6 +24,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
     private var encodedCount: Int = 0
     private var encodedKeyCount: Int = 0
     private var encodedDeltaCount: Int = 0
+    private var loggedInputSurface = false
 
     init(displayIndex: Int, width: Int, height: Int, fps: Int, bitrateKbps: Int) {
         self.displayIndex = max(0, displayIndex)
@@ -56,7 +58,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         configuration.width = width
         configuration.height = height
         configuration.minimumFrameInterval = CMTime(value: 1, timescale: CMTimeScale(fps))
-        configuration.queueDepth = 8
+        configuration.queueDepth = 3
         configuration.showsCursor = false
         configuration.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
 
@@ -76,13 +78,20 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         let encoderSpecification: [CFString: Any] = [
             kVTVideoEncoderSpecification_EnableHardwareAcceleratedVideoEncoder: true
         ]
+        let imageBufferAttributes: [CFString: Any] = [
+            kCVPixelBufferPixelFormatTypeKey: NSNumber(value: kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange),
+            kCVPixelBufferWidthKey: NSNumber(value: width),
+            kCVPixelBufferHeightKey: NSNumber(value: height),
+            kCVPixelBufferMetalCompatibilityKey: true,
+            kCVPixelBufferIOSurfacePropertiesKey: [:] as CFDictionary
+        ]
         let status = VTCompressionSessionCreate(
             allocator: kCFAllocatorDefault,
             width: Int32(width),
             height: Int32(height),
             codecType: kCMVideoCodecType_H264,
             encoderSpecification: encoderSpecification as CFDictionary,
-            imageBufferAttributes: nil,
+            imageBufferAttributes: imageBufferAttributes as CFDictionary,
             compressedDataAllocator: nil,
             outputCallback: Self.compressionCallback,
             refcon: UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque()),
@@ -93,9 +102,10 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         }
 
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_RealTime, value: kCFBooleanTrue)
+        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_PrioritizeEncodingSpeedOverQuality, value: kCFBooleanTrue)
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AllowTemporalCompression, value: kCFBooleanTrue)
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AllowFrameReordering, value: kCFBooleanFalse)
-        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxFrameDelayCount, value: NSNumber(value: 1))
+        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxFrameDelayCount, value: NSNumber(value: 0))
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_ProfileLevel, value: kVTProfileLevel_H264_Baseline_AutoLevel)
         let recoveryKeyInterval = max(1, fps / 2)
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxKeyFrameInterval, value: NSNumber(value: recoveryKeyInterval))
@@ -134,6 +144,12 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         }
 
         frameCount += 1
+        if !loggedInputSurface {
+            loggedInputSurface = true
+            let pixelFormat = CVPixelBufferGetPixelFormatType(imageBuffer)
+            let hasIOSurface = CVPixelBufferGetIOSurface(imageBuffer) != nil
+            fputs("LiveDeskSCK input pixelFormat=\(pixelFormat) iosurface=\(hasIOSurface ? 1 : 0) queueDepth=3 zeroCopyCandidate=\(hasIOSurface ? 1 : 0)\n", stderr)
+        }
         let pts = CMSampleBufferGetPresentationTimeStamp(sampleBuffer)
         let duration = CMTime(value: 1, timescale: CMTimeScale(fps))
         var frameProperties: CFDictionary?

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@livedesk/client",
-  "version": "0.1.117",
+  "version": "0.1.118",
   "description": "LiveDesk local remote client",
   "type": "module",
   "bin": {