@livedesk/client 0.1.84 → 0.1.85

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

@@ -12,6 +12,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
     private let width: Int
     private let height: Int
     private let fps: Int
+    private let bitrateKbps: Int
     private let queue = DispatchQueue(label: "dev.livedesk.screencapturekit.frames", qos: .userInteractive)
     private let writeLock = NSLock()
     private var stream: SCStream?
@@ -19,11 +20,12 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
     private var frameCount: Int = 0
     private var encodedCount: Int = 0
 
-    init(displayIndex: Int, width: Int, height: Int, fps: Int) {
+    init(displayIndex: Int, width: Int, height: Int, fps: Int, bitrateKbps: Int) {
         self.displayIndex = max(0, displayIndex)
         self.width = max(2, width)
         self.height = max(2, height)
         self.fps = max(1, fps)
+        self.bitrateKbps = max(500, bitrateKbps)
         super.init()
     }
 
@@ -50,7 +52,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         self.stream = stream
         try await stream.startCapture()
 
-        fputs("LiveDeskSCK started displayIndex=\(displayIndex) displayID=\(display.displayID) size=\(width)x\(height) fps=\(fps)\n", stderr)
+        fputs("LiveDeskSCK started displayIndex=\(displayIndex) displayID=\(display.displayID) size=\(width)x\(height) fps=\(fps) bitrateKbps=\(bitrateKbps)\n", stderr)
         while !Task.isCancelled {
             try await Task.sleep(nanoseconds: 1_000_000_000)
         }
@@ -80,7 +82,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxKeyFrameInterval, value: NSNumber(value: 1))
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration, value: NSNumber(value: max(0.001, 1.0 / Double(fps))))
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_ExpectedFrameRate, value: NSNumber(value: fps))
-        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AverageBitRate, value: NSNumber(value: max(3_500_000, width * height * fps / 4)))
+        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AverageBitRate, value: NSNumber(value: bitrateKbps * 1000))
         VTCompressionSessionPrepareToEncodeFrames(session)
         compressionSession = session
     }
@@ -257,9 +259,10 @@ struct LiveDeskSCKMain {
         let width = intArg("--width", default: 960)
         let height = intArg("--height", default: 540)
         let fps = intArg("--fps", default: 30)
+        let bitrateKbps = intArg("--bitrate-kbps", default: max(3500, width * height * fps / 4000))
 
         do {
-            let encoder = LiveDeskScreenCaptureKitEncoder(displayIndex: displayIndex, width: width, height: height, fps: fps)
+            let encoder = LiveDeskScreenCaptureKitEncoder(displayIndex: displayIndex, width: width, height: height, fps: fps, bitrateKbps: bitrateKbps)
             try await encoder.start()
         } catch {
             fputs("LiveDeskSCK failed: \(error)\n", stderr)

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

@@ -12,6 +12,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
     private let width: Int
     private let height: Int
     private let fps: Int
+    private let bitrateKbps: Int
     private let queue = DispatchQueue(label: "dev.livedesk.screencapturekit.frames", qos: .userInteractive)
     private let writeLock = NSLock()
     private var stream: SCStream?
@@ -19,11 +20,12 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
     private var frameCount: Int = 0
     private var encodedCount: Int = 0
 
-    init(displayIndex: Int, width: Int, height: Int, fps: Int) {
+    init(displayIndex: Int, width: Int, height: Int, fps: Int, bitrateKbps: Int) {
         self.displayIndex = max(0, displayIndex)
         self.width = max(2, width)
         self.height = max(2, height)
         self.fps = max(1, fps)
+        self.bitrateKbps = max(500, bitrateKbps)
         super.init()
     }
 
@@ -50,7 +52,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         self.stream = stream
         try await stream.startCapture()
 
-        fputs("LiveDeskSCK started displayIndex=\(displayIndex) displayID=\(display.displayID) size=\(width)x\(height) fps=\(fps)\n", stderr)
+        fputs("LiveDeskSCK started displayIndex=\(displayIndex) displayID=\(display.displayID) size=\(width)x\(height) fps=\(fps) bitrateKbps=\(bitrateKbps)\n", stderr)
         while !Task.isCancelled {
             try await Task.sleep(nanoseconds: 1_000_000_000)
         }
@@ -80,7 +82,7 @@ final class LiveDeskScreenCaptureKitEncoder: NSObject, SCStreamOutput, SCStreamD
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxKeyFrameInterval, value: NSNumber(value: 1))
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_MaxKeyFrameIntervalDuration, value: NSNumber(value: max(0.001, 1.0 / Double(fps))))
         VTSessionSetProperty(session, key: kVTCompressionPropertyKey_ExpectedFrameRate, value: NSNumber(value: fps))
-        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AverageBitRate, value: NSNumber(value: max(3_500_000, width * height * fps / 4)))
+        VTSessionSetProperty(session, key: kVTCompressionPropertyKey_AverageBitRate, value: NSNumber(value: bitrateKbps * 1000))
         VTCompressionSessionPrepareToEncodeFrames(session)
         compressionSession = session
     }
@@ -257,9 +259,10 @@ struct LiveDeskSCKMain {
         let width = intArg("--width", default: 960)
         let height = intArg("--height", default: 540)
         let fps = intArg("--fps", default: 30)
+        let bitrateKbps = intArg("--bitrate-kbps", default: max(3500, width * height * fps / 4000))
 
         do {
-            let encoder = LiveDeskScreenCaptureKitEncoder(displayIndex: displayIndex, width: width, height: height, fps: fps)
+            let encoder = LiveDeskScreenCaptureKitEncoder(displayIndex: displayIndex, width: width, height: height, fps: fps, bitrateKbps: bitrateKbps)
             try await encoder.start()
         } catch {
             fputs("LiveDeskSCK failed: \(error)\n", stderr)

package/package.json

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