node-mac-recorder 2.22.5 → 2.22.7

package/package.json

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

package/src/screen_capture_kit.mm

@@ -800,7 +800,10 @@ extern "C" NSString *ScreenCaptureKitCurrentAudioPath(void) {
         AVVideoExpectedSourceFrameRateKey: @(MAX(1, g_targetFPS)),
         AVVideoQualityKey: qualityHint,  // 0.0-1.0, higher is better
         AVVideoProfileLevelKey: AVVideoProfileLevelH264HighAutoLevel,
-        AVVideoH264EntropyModeKey: AVVideoH264EntropyModeCABAC
+        AVVideoH264EntropyModeKey: AVVideoH264EntropyModeCABAC,
+        // Add data rate limits for consistent quality during motion
+        AVVideoAverageNonDroppableFrameRateKey: @(MAX(1, g_targetFPS)),
+        AVVideoMaxKeyFrameIntervalDurationKey: @(1.0)  // Keyframe at least every second
     };
 
     NSDictionary *videoSettings = @{
@@ -1383,11 +1386,46 @@ static void SCKPerformRecordingSetup(NSDictionary *config, SCShareableContent *c
             }
 
             if (targetWindow && targetApp) {
-                MRLog(@"🪟 Recording window: %@ (%ux%u)",
-                      targetWindow.title, (unsigned)targetWindow.frame.size.width, (unsigned)targetWindow.frame.size.height);
+                CGFloat windowLogicalWidth = targetWindow.frame.size.width;
+                CGFloat windowLogicalHeight = targetWindow.frame.size.height;
+
+                // Find display containing this window to get scale factor
+                CGFloat scaleFactor = 1.0;
+                CGPoint windowCenter = CGPointMake(
+                    targetWindow.frame.origin.x + windowLogicalWidth / 2.0,
+                    targetWindow.frame.origin.y + windowLogicalHeight / 2.0
+                );
+                for (SCDisplay *disp in content.displays) {
+                    CGRect dispBounds = CGRectMake(disp.frame.origin.x, disp.frame.origin.y,
+                                                   disp.frame.size.width, disp.frame.size.height);
+                    if (CGRectContainsPoint(dispBounds, windowCenter)) {
+                        NSInteger physW = (NSInteger)CGDisplayPixelsWide(disp.displayID);
+                        NSInteger physH = (NSInteger)CGDisplayPixelsHigh(disp.displayID);
+                        CGFloat scX = (disp.width > 0) ? (CGFloat)physW / (CGFloat)disp.width : 1.0;
+                        CGFloat scY = (disp.height > 0) ? (CGFloat)physH / (CGFloat)disp.height : 1.0;
+                        scaleFactor = MAX(scX, scY);
+                        break;
+                    }
+                }
+                // Fallback: use main display scale factor
+                if (scaleFactor == 1.0 && content.displays.count > 0) {
+                    SCDisplay *mainDisp = content.displays.firstObject;
+                    NSInteger physW = (NSInteger)CGDisplayPixelsWide(mainDisp.displayID);
+                    NSInteger physH = (NSInteger)CGDisplayPixelsHigh(mainDisp.displayID);
+                    CGFloat scX = (mainDisp.width > 0) ? (CGFloat)physW / (CGFloat)mainDisp.width : 1.0;
+                    CGFloat scY = (mainDisp.height > 0) ? (CGFloat)physH / (CGFloat)mainDisp.height : 1.0;
+                    scaleFactor = MAX(scX, scY);
+                }
+
+                NSInteger physicalWindowWidth = (NSInteger)(windowLogicalWidth * scaleFactor);
+                NSInteger physicalWindowHeight = (NSInteger)(windowLogicalHeight * scaleFactor);
+
+                MRLog(@"🪟 Recording window: %@ logical=%ux%u, physical=%ldx%ld, scale=%.2fx",
+                      targetWindow.title, (unsigned)windowLogicalWidth, (unsigned)windowLogicalHeight,
+                      (long)physicalWindowWidth, (long)physicalWindowHeight, scaleFactor);
                 filter = [[SCContentFilter alloc] initWithDesktopIndependentWindow:targetWindow];
-                recordingWidth = (NSInteger)targetWindow.frame.size.width;
-                recordingHeight = (NSInteger)targetWindow.frame.size.height;
+                recordingWidth = physicalWindowWidth;
+                recordingHeight = physicalWindowHeight;
             } else {
                 NSLog(@"❌ Window ID %@ not found", windowId);
                 SCKFailScheduling();
@@ -1421,11 +1459,24 @@ static void SCKPerformRecordingSetup(NSDictionary *config, SCShareableContent *c
             }
 
             if (targetDisplay) {
-                MRLog(@"🖥️ Recording display %u (%dx%d)",
-                      targetDisplay.displayID, (int)targetDisplay.width, (int)targetDisplay.height);
+                // Use physical pixel dimensions for Retina displays (not logical points)
+                CGDirectDisplayID displayID = targetDisplay.displayID;
+                NSInteger physicalWidth = (NSInteger)CGDisplayPixelsWide(displayID);
+                NSInteger physicalHeight = (NSInteger)CGDisplayPixelsHigh(displayID);
+                NSInteger logicalWidth = targetDisplay.width;
+                NSInteger logicalHeight = targetDisplay.height;
+
+                CGFloat scaleX = (logicalWidth > 0) ? (CGFloat)physicalWidth / (CGFloat)logicalWidth : 1.0;
+                CGFloat scaleY = (logicalHeight > 0) ? (CGFloat)physicalHeight / (CGFloat)logicalHeight : 1.0;
+                CGFloat scaleFactor = MAX(scaleX, scaleY);
+
+                MRLog(@"🖥️ Recording display %u: logical=%dx%d, physical=%ldx%ld, scale=%.2fx",
+                      displayID, (int)logicalWidth, (int)logicalHeight,
+                      (long)physicalWidth, (long)physicalHeight, scaleFactor);
+
                 filter = [[SCContentFilter alloc] initWithDisplay:targetDisplay excludingWindows:@[]];
-                recordingWidth = targetDisplay.width;
-                recordingHeight = targetDisplay.height;
+                recordingWidth = physicalWidth;
+                recordingHeight = physicalHeight;
             } else {
                 NSLog(@"❌ No display available");
                 SCKFailScheduling();
@@ -1437,11 +1488,22 @@ static void SCKPerformRecordingSetup(NSDictionary *config, SCShareableContent *c
             CGFloat cropWidth = [captureRect[@"width"] doubleValue];
             CGFloat cropHeight = [captureRect[@"height"] doubleValue];
             if (cropWidth > 0 && cropHeight > 0) {
-                MRLog(@"🔲 Crop area specified: %.0fx%.0f at (%.0f,%.0f)",
-                      cropWidth, cropHeight,
+                // Scale crop dimensions for Retina displays
+                CGFloat cropScaleFactor = 1.0;
+                if (targetDisplay) {
+                    NSInteger physW = (NSInteger)CGDisplayPixelsWide(targetDisplay.displayID);
+                    NSInteger physH = (NSInteger)CGDisplayPixelsHigh(targetDisplay.displayID);
+                    CGFloat scX = (targetDisplay.width > 0) ? (CGFloat)physW / (CGFloat)targetDisplay.width : 1.0;
+                    CGFloat scY = (targetDisplay.height > 0) ? (CGFloat)physH / (CGFloat)targetDisplay.height : 1.0;
+                    cropScaleFactor = MAX(scX, scY);
+                }
+                NSInteger physicalCropWidth = (NSInteger)(cropWidth * cropScaleFactor);
+                NSInteger physicalCropHeight = (NSInteger)(cropHeight * cropScaleFactor);
+                MRLog(@"🔲 Crop area: logical=%.0fx%.0f, physical=%ldx%ld, scale=%.2fx at (%.0f,%.0f)",
+                      cropWidth, cropHeight, (long)physicalCropWidth, (long)physicalCropHeight, cropScaleFactor,
                       [captureRect[@"x"] doubleValue], [captureRect[@"y"] doubleValue]);
-                recordingWidth = (NSInteger)cropWidth;
-                recordingHeight = (NSInteger)cropHeight;
+                recordingWidth = physicalCropWidth;
+                recordingHeight = physicalCropHeight;
             }
         }
 
@@ -1474,6 +1536,13 @@ static void SCKPerformRecordingSetup(NSDictionary *config, SCShareableContent *c
         if (@available(macOS 13.0, *)) {
             streamConfig.queueDepth = 8;
         }
+        if (@available(macOS 14.0, *)) {
+            // Use best capture resolution for maximum quality on Retina displays
+            streamConfig.captureResolution = SCCaptureResolutionBest;
+            // Make stream opaque to avoid alpha channel overhead
+            streamConfig.shouldBeOpaque = YES;
+            MRLog(@"🎯 Using SCCaptureResolutionBest + shouldBeOpaque for maximum quality (macOS 14+)");
+        }
 
         BOOL shouldCaptureMic = includeMicrophone ? [includeMicrophone boolValue] : NO;
         BOOL shouldCaptureSystemAudio = includeSystemAudio ? [includeSystemAudio boolValue] : NO;

package/test-noise-reduction.js

@@ -1,80 +0,0 @@
-const MacRecorder = require('./index.js');
-const path = require('path');
-const fs = require('fs');
-
-// Test output directory
-const outputDir = path.join(__dirname, 'test-output');
-if (!fs.existsSync(outputDir)) {
-    fs.mkdirSync(outputDir, { recursive: true });
-}
-
-const timestamp = Date.now();
-const outputPath = path.join(outputDir, `noise-reduction-test-${timestamp}.mov`);
-
-console.log('🎙️  Starting microphone recording with noise reduction...');
-console.log('📝 Instructions:');
-console.log('   1. Speak into your microphone (normal voice)');
-console.log('   2. Type on your keyboard (heavy typing)');
-console.log('   3. Click your mouse multiple times');
-console.log('   4. Speak again to compare');
-console.log('');
-console.log('⏱️  Recording for 15 seconds...');
-console.log('');
-
-const recorder = new MacRecorder();
-
-recorder.on('recordingStarted', () => {
-    console.log('✅ Recording started!');
-    console.log('🎤 Custom noise reduction is ACTIVE');
-    console.log('');
-    console.log('Starting countdown:');
-
-    let countdown = 15;
-    const interval = setInterval(() => {
-        process.stdout.write(`\r⏱️  ${countdown} seconds remaining...  `);
-        countdown--;
-
-        if (countdown < 0) {
-            clearInterval(interval);
-            process.stdout.write('\r');
-            console.log('⏱️  Time up! Stopping...');
-            console.log('');
-
-            recorder.stopRecording()
-                .then(() => {
-                    console.log('✅ Recording saved to:', outputPath);
-                    console.log('');
-                    console.log('🎧 Play the recording to verify:');
-                    console.log(`   open "${outputPath}"`);
-                    console.log('');
-                    console.log('Expected results:');
-                    console.log('   ✅ Voice should be clear');
-                    console.log('   ✅ Keyboard typing should be significantly reduced');
-                    console.log('   ✅ Mouse clicks should be filtered out');
-                    process.exit(0);
-                })
-                .catch(err => {
-                    console.error('❌ Error stopping:', err);
-                    process.exit(1);
-                });
-        }
-    }, 1000);
-});
-
-recorder.on('stopped', () => {
-    console.log('🛑 Recording stopped');
-});
-
-recorder.on('completed', (result) => {
-    console.log('✅ Recording completed:', result);
-});
-
-// Start recording with microphone
-recorder.startRecording(outputPath, {
-    includeMicrophone: true,
-    includeSystemAudio: false,
-    fps: 1 // Minimal FPS since we're only testing audio
-}).catch(err => {
-    console.error('❌ Failed to start recording:', err);
-    process.exit(1);
-});