node-mac-recorder 2.21.54 → 2.22.2

package/.claude/settings.local.json

@@ -48,7 +48,8 @@
       "Bash(grep:*)",
       "Bash(timeout 10 ffprobe:*)",
       "Bash(ffmpeg:*)",
-      "Bash(timeout 30 node:*)"
+      "Bash(timeout 30 node:*)",
+      "Bash(MAC_RECORDER_DEBUG=1 node test-camera-audio-sync.js:*)"
     ],
     "deny": [],
     "ask": []

package/index.js

@@ -1119,12 +1119,15 @@ class MacRecorder extends EventEmitter {
 				try {
 					console.log('🛑 SYNC: Stopping screen recording');
 					const stopLimit = elapsedSeconds > 0 ? elapsedSeconds : 0;
+					console.log(`📊 DEBUG: elapsedSeconds=${elapsedSeconds.toFixed(3)}, stopLimit=${stopLimit.toFixed(3)}`);
+					console.log(`📊 DEBUG: typeof nativeBinding.stopRecording = ${typeof nativeBinding.stopRecording}`);
+					console.log(`📊 DEBUG: nativeBinding.stopRecording = ${nativeBinding.stopRecording}`);
 					success = nativeBinding.stopRecording(stopLimit);
 					if (success) {
 						console.log('✅ SYNC: Screen recording stopped');
 					}
 				} catch (nativeError) {
-					// console.log('Native stop failed:', nativeError.message);
+					console.log('⚠️ Native stop failed:', nativeError.message);
 					success = true; // Assume success to avoid throwing
 				}
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-mac-recorder",
-	"version": "2.21.54",
+	"version": "2.22.2",
 	"description": "Native macOS screen recording package for Node.js applications",
 	"main": "index.js",
 	"keywords": [

package/src/camera_recorder.mm

@@ -451,10 +451,11 @@ static void MRCameraRemoveFileIfExists(NSString *path) {
 
     MRLog(@"🎥 Camera recording dimensions: %zux%zu", width, height);
 
-    // H.264 video settings (matching current quality)
-    NSInteger bitrate = (NSInteger)(width * height * 24);  // 24fps target
-    bitrate = MAX(bitrate, 5 * 1000 * 1000);   // Min 5 Mbps
-    bitrate = MIN(bitrate, 30 * 1000 * 1000);  // Max 30 Mbps
+    // H.264 video settings - optimized for smaller file size
+    // Using lower bitrate multiplier for camera (2x instead of 24x) to reduce file size
+    NSInteger bitrate = (NSInteger)(width * height * 2);
+    bitrate = MAX(bitrate, 1 * 1000 * 1000);   // Min 1 Mbps
+    bitrate = MIN(bitrate, 6 * 1000 * 1000);   // Max 6 Mbps (significantly reduced from 30)
 
     NSDictionary *compressionProps = @{
         AVVideoAverageBitRateKey: @(bitrate),
@@ -586,6 +587,39 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
         adjustedTimestamp = kCMTimeZero;
     }
 
+    // LIP SYNC FIX: Check stopLimit OR elapsed time to drop frames after recording duration
+    // This prevents camera from recording longer than audio
+    double frameTime = CMTimeGetSeconds(adjustedTimestamp);
+    double stopLimit = MRSyncGetStopLimitSeconds();
+    double videoTolerance = 0.05;  // 50ms tolerance for video frames (larger than audio's 20ms)
+
+    // CRITICAL FIX: Also check elapsed time since recording started
+    // This works even if stopLimit hasn't been set yet
+    double elapsedTime = (g_cameraStartTimestamp > 0) ? (CFAbsoluteTimeGetCurrent() - g_cameraStartTimestamp) : 0;
+    double maxDuration = (stopLimit > 0) ? stopLimit : elapsedTime + 1.0;  // Use stopLimit if available, else allow 1s more
+
+    // DEBUG: Log every 30th frame
+    static int frameCounter = 0;
+    frameCounter++;
+    if (frameCounter % 30 == 0) {
+        MRLog(@"📹 Camera frame #%d: frameTime=%.3fs, elapsedTime=%.3fs, stopLimit=%.3fs, maxDuration=%.3fs",
+              frameCounter, frameTime, elapsedTime, stopLimit, maxDuration);
+    }
+
+    // Drop frame if it exceeds stopLimit (when set) or if elapsed time is suspiciously long
+    if (stopLimit > 0 && frameTime > stopLimit + videoTolerance) {
+        MRLog(@"🛑 Camera dropping frame #%d: frameTime %.3fs > stopLimit %.3fs + tolerance",
+              frameCounter, frameTime, stopLimit);
+        return;
+    }
+
+    // Safety check: Drop frames if recording has been going for too long (failsafe)
+    if (elapsedTime > maxDuration + 1.0) {  // Allow 1s grace period
+        MRLog(@"🛑 Camera dropping frame #%d: elapsed %.3fs > maxDuration %.3fs (failsafe)",
+              frameCounter, elapsedTime, maxDuration);
+        return;
+    }
+
     // Get pixel buffer from sample
     CVPixelBufferRef pixelBuffer = CMSampleBufferGetImageBuffer(sampleBuffer);
     if (!pixelBuffer) {
@@ -872,6 +906,14 @@ didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
 
         // Finalize writer (audio_recorder.mm pattern)
         if (self.writer && self.writerStarted) {
+            // LIP SYNC FIX: End session at stopLimit to trim excess frames
+            double stopLimit = MRSyncGetStopLimitSeconds();
+            if (stopLimit > 0) {
+                CMTime endTime = CMTimeMakeWithSeconds(stopLimit, 600);
+                [self.writer endSessionAtSourceTime:endTime];
+                MRLog(@"🎯 Camera writer session ended at %.3fs (stopLimit)", stopLimit);
+            }
+
             if (self.writerInput) {
                 [self.writerInput markAsFinished];
             }

package/src/mac_recorder.mm

@@ -786,14 +786,23 @@ Napi::Value StopRecording(const Napi::CallbackInfo& info) {
     }
 
     if (requestedStopLimit > 0) {
+        MRLog(@"🎯 SYNC FIX: Setting stopLimit = %.3f seconds", requestedStopLimit);
         MRStoreActiveStopLimit(requestedStopLimit);
         MRSyncSetStopLimitSeconds(requestedStopLimit);
     } else {
+        MRLog(@"⚠️ SYNC FIX: stopLimit NOT set (requestedStopLimit = %.3f)", requestedStopLimit);
         MRStoreActiveStopLimit(-1.0);
         MRSyncSetStopLimitSeconds(-1.0);
     }
     MRResetRecordingStartTimestamp();
-    
+
+    // LIP SYNC FIX: Wait 150ms for camera/audio delegates to see stopLimit and drop excess frames
+    if (requestedStopLimit > 0 && (isCameraRecording() || isStandaloneAudioRecording())) {
+        MRLog(@"⏳ LIP SYNC: Waiting 150ms for delegates to process stopLimit...");
+        [NSThread sleepForTimeInterval:0.15];
+        MRLog(@"✅ LIP SYNC: Delegate processing time complete");
+    }
+
     // Try ScreenCaptureKit first
     if (@available(macOS 12.3, *)) {
         if ([ScreenCaptureKitRecorder isRecording]) {