node-mac-recorder 2.21.26 → 2.21.27

package/package.json

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

package/src/audio_recorder.mm

@@ -314,7 +314,7 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
             NSLog(@"❌ Audio writer failed to start: %@", self.writer.error);
             return;
         }
-        [self.writer startSessionAtSourceTime:timestamp];
+        [self.writer startSessionAtSourceTime:kCMTimeZero];
         self.writerStarted = YES;
         self.startTime = timestamp;
     }
@@ -323,9 +323,65 @@ static dispatch_queue_t g_audioCaptureQueue = nil;
         return;
     }
     
-    if (![self.writerInput appendSampleBuffer:sampleBuffer]) {
+    if (CMTIME_IS_INVALID(self.startTime)) {
+        self.startTime = timestamp;
+    }
+    
+    CMSampleBufferRef bufferToAppend = sampleBuffer;
+    CMItemCount timingEntryCount = 0;
+    OSStatus timingStatus = CMSampleBufferGetSampleTimingInfoArray(sampleBuffer, 0, NULL, &timingEntryCount);
+    CMSampleTimingInfo *timingInfo = NULL;
+    
+    if (timingStatus == noErr && timingEntryCount > 0) {
+        timingInfo = (CMSampleTimingInfo *)malloc(sizeof(CMSampleTimingInfo) * timingEntryCount);
+        if (timingInfo) {
+            timingStatus = CMSampleBufferGetSampleTimingInfoArray(sampleBuffer, timingEntryCount, timingInfo, &timingEntryCount);
+            
+            if (timingStatus == noErr) {
+                for (CMItemCount i = 0; i < timingEntryCount; ++i) {
+                    // Shift audio timestamps to begin at t=0 so they align with camera capture
+                    if (CMTIME_IS_VALID(timingInfo[i].presentationTimeStamp)) {
+                        CMTime adjustedPTS = CMTimeSubtract(timingInfo[i].presentationTimeStamp, self.startTime);
+                        if (CMTIME_COMPARE_INLINE(adjustedPTS, <, kCMTimeZero)) {
+                            adjustedPTS = kCMTimeZero;
+                        }
+                        timingInfo[i].presentationTimeStamp = adjustedPTS;
+                    } else {
+                        timingInfo[i].presentationTimeStamp = kCMTimeZero;
+                    }
+                    
+                    if (CMTIME_IS_VALID(timingInfo[i].decodeTimeStamp)) {
+                        CMTime adjustedDTS = CMTimeSubtract(timingInfo[i].decodeTimeStamp, self.startTime);
+                        if (CMTIME_COMPARE_INLINE(adjustedDTS, <, kCMTimeZero)) {
+                            adjustedDTS = kCMTimeZero;
+                        }
+                        timingInfo[i].decodeTimeStamp = adjustedDTS;
+                    }
+                }
+                
+                CMSampleBufferRef adjustedBuffer = NULL;
+                timingStatus = CMSampleBufferCreateCopyWithNewTiming(kCFAllocatorDefault,
+                                                                     sampleBuffer,
+                                                                     timingEntryCount,
+                                                                     timingInfo,
+                                                                     &adjustedBuffer);
+                if (timingStatus == noErr && adjustedBuffer) {
+                    bufferToAppend = adjustedBuffer;
+                }
+            }
+            
+            free(timingInfo);
+            timingInfo = NULL;
+        }
+    }
+    
+    if (![self.writerInput appendSampleBuffer:bufferToAppend]) {
         NSLog(@"⚠️ Failed appending audio buffer: %@", self.writer.error);
     }
+    
+    if (bufferToAppend != sampleBuffer) {
+        CFRelease(bufferToAppend);
+    }
 }
 
 @end

package/src/camera_recorder.mm

@@ -837,10 +837,10 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
     if (!self.writerStarted) {
         if (self.assetWriter.status == AVAssetWriterStatusUnknown) {
             if ([self.assetWriter startWriting]) {
-                [self.assetWriter startSessionAtSourceTime:timestamp];
+                [self.assetWriter startSessionAtSourceTime:kCMTimeZero];
                 self.writerStarted = YES;
                 self.firstSampleTime = timestamp;
-                MRLog(@"✅ Camera writer started");
+                MRLog(@"✅ Camera writer started (zero-based timeline)");
             } else {
                 MRLog(@"❌ CameraRecorder: Failed to start asset writer: %@", self.assetWriter.error);
                 self.isRecording = NO;
@@ -862,13 +862,26 @@ static BOOL MRIsContinuityCamera(AVCaptureDevice *device) {
         return;
     }
     
+    if (CMTIME_IS_INVALID(self.firstSampleTime)) {
+        self.firstSampleTime = timestamp;
+    }
+    
+    CMTime relativeTimestamp = timestamp;
+    if (CMTIME_IS_VALID(self.firstSampleTime)) {
+        // Align camera frames to a zero-based timeline so multi-track compositions stay in sync
+        relativeTimestamp = CMTimeSubtract(timestamp, self.firstSampleTime);
+        if (CMTIME_COMPARE_INLINE(relativeTimestamp, <, kCMTimeZero)) {
+            relativeTimestamp = kCMTimeZero;
+        }
+    }
+    
     CVPixelBufferRetain(pixelBuffer);
-    BOOL appended = [self.pixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:timestamp];
+    BOOL appended = [self.pixelBufferAdaptor appendPixelBuffer:pixelBuffer withPresentationTime:relativeTimestamp];
     CVPixelBufferRelease(pixelBuffer);
     
     if (!appended) {
         MRLog(@"⚠️ CameraRecorder: Failed to append camera frame at time %.2f (status %ld)",
-              CMTimeGetSeconds(timestamp), (long)self.assetWriter.status);
+              CMTimeGetSeconds(relativeTimestamp), (long)self.assetWriter.status);
         if (self.assetWriter.status == AVAssetWriterStatusFailed) {
             MRLog(@"❌ CameraRecorder writer failure: %@", self.assetWriter.error);
             self.isRecording = NO;