serve-sim 0.1.25 → 0.1.27

package/README.md

@@ -31,7 +31,7 @@ I develop the Expo framework, but this tool is completely agnostic to React Nati
 
 ## Install
 
-Requires macOS with Xcode command line tools (`xcrun simctl`) and Node.js 18+. `bun` is **not** required to run the CLI.
+Requires macOS with Xcode command line tools (`xcrun simctl`) and Node.js 18+. `bun` is **not** required to run the CLI. Camera injection uses a host-side helper built for macOS 14+.
 
 ## CLI
 

package/Sources/SimCameraHelper/build.sh

@@ -9,7 +9,7 @@ BIN="$OUT_DIR/serve-sim-camera-helper"
 
 xcrun --sdk macosx clang \
     -arch arm64 -arch x86_64 \
-    -mmacosx-version-min=12.0 \
+    -mmacosx-version-min=14.0 \
     -isysroot "$SDK" \
     -fobjc-arc -fmodules \
     -framework Foundation \

package/Sources/SimCameraHelper/main.m

@@ -267,20 +267,30 @@ static void RenderPlaceholderFrame(uint8_t *out, uint64_t frameIdx) {
 }
 
 static void StartPlaceholderSource(void) {
+    static uint8_t *buf = NULL;
+    size_t need = (size_t)gWidth * gHeight * 4;
+    if (!buf) buf = calloc(1, need);
+    if (!buf) {
+        fprintf(stderr, "[serve-sim-camera] placeholder buf alloc failed (%zu bytes)\n", need);
+        return;
+    }
+
+    __block uint64_t frameIdx = 0;
+    RenderPlaceholderFrame(buf, frameIdx++);
+    PublishFrame(buf);
+
     gPlaceholderTimer = dispatch_source_create(DISPATCH_SOURCE_TYPE_TIMER, 0, 0,
         dispatch_get_global_queue(QOS_CLASS_USER_INITIATED, 0));
     uint64_t intervalNs = NSEC_PER_SEC / 30;
     dispatch_source_set_timer(gPlaceholderTimer,
-        dispatch_time(DISPATCH_TIME_NOW, 0), intervalNs, intervalNs / 10);
-    static uint8_t *buf = NULL;
-    size_t need = (size_t)gWidth * gHeight * 4;
-    if (!buf) buf = malloc(need);
-    __block uint64_t frameIdx = 0;
+        dispatch_time(DISPATCH_TIME_NOW, (int64_t)intervalNs), intervalNs, intervalNs / 10);
     dispatch_source_set_event_handler(gPlaceholderTimer, ^{
         RenderPlaceholderFrame(buf, frameIdx++);
         PublishFrame(buf);
     });
     dispatch_resume(gPlaceholderTimer);
+    fprintf(stderr, "[serve-sim-camera] placeholder source running @ 30fps (%ux%u, first frame seq=%llu)\n",
+        gWidth, gHeight, (unsigned long long)atomic_load(&gFrameSeq));
 }
 
 static void StopPlaceholderSource(void) {
@@ -364,10 +374,10 @@ static BOOL StartImageSource(NSString *path, NSString **err) {
     CGContextRef ctx = CGBitmapContextCreate(buf, gWidth, gHeight, 8, bpr, cs,
         kCGImageAlphaNoneSkipFirst | kCGBitmapByteOrder32Little);
     CGColorSpaceRelease(cs);
-    // Aspect-fill the source image into the destination buffer.
     size_t iw = CGImageGetWidth(img), ih = CGImageGetHeight(img);
     double sx = (double)gWidth / iw, sy = (double)gHeight / ih;
-    double s = MAX(sx, sy);
+    // Aspect-fit file sources so the full source frame remains visible.
+    double s = MIN(sx, sy);
     double dw = iw * s, dh = ih * s;
     CGContextDrawImage(ctx, CGRectMake((gWidth - dw)/2.0, (gHeight - dh)/2.0, dw, dh), img);
     CGContextRelease(ctx);
@@ -425,7 +435,7 @@ static AVAssetReaderTrackOutput *MakeVideoOutput(AVAssetReader **outReader,
     return out;
 }
 
-// Aspect-fill a source pixel buffer into a transient BGRA buffer sized to
+// Aspect-fit a source pixel buffer into a transient BGRA buffer sized to
 // the shm region. We allocate once per call so the caller is free to free
 // the result without worrying about lifetime sharing.
 static uint8_t *RenderPixelBufferToShmSize(CVPixelBufferRef pb) {
@@ -457,7 +467,8 @@ static uint8_t *RenderPixelBufferToShmSize(CVPixelBufferRef pb) {
     CGDataProviderRelease(dp);
 
     double sx = (double)gWidth / srcW, sy = (double)gHeight / srcH;
-    double s = MAX(sx, sy);
+    // Keep video file playback letterboxed instead of cropping the source.
+    double s = MIN(sx, sy);
     double dw = srcW * s, dh = srcH * s;
     CGContextDrawImage(ctx, CGRectMake((gWidth - dw)/2.0, (gHeight - dh)/2.0, dw, dh), img);
     CGImageRelease(img);
@@ -820,14 +831,6 @@ int main(int argc, const char *argv[]) {
 
         gSourceQueue = dispatch_queue_create("simcam.helper.source", DISPATCH_QUEUE_SERIAL);
 
-        if (socketPath) {
-            if (OpenControlSocket(socketPath) < 0) {
-                fprintf(stderr, "[serve-sim-camera] control socket open failed: %s\n", socketPath);
-            } else {
-                fprintf(stderr, "[serve-sim-camera] control socket %s\n", socketPath);
-            }
-        }
-
         SimCamSourceKind k = ParseSourceName(initialSource);
         if (k == (SimCamSourceKind)-1) {
             fprintf(stderr, "[serve-sim-camera] unknown --source %s, defaulting to placeholder\n",
@@ -841,6 +844,14 @@ int main(int argc, const char *argv[]) {
             (void)SwitchSource(SimCamSourcePlaceholder, nil, NULL);
         }
 
+        if (socketPath) {
+            if (OpenControlSocket(socketPath) < 0) {
+                fprintf(stderr, "[serve-sim-camera] control socket open failed: %s\n", socketPath);
+            } else {
+                fprintf(stderr, "[serve-sim-camera] control socket %s\n", socketPath);
+            }
+        }
+
         signal(SIGINT, HandleSig);
         signal(SIGTERM, HandleSig);
 

package/Sources/SimCameraInjector/SimCamFakes.h

@@ -0,0 +1,86 @@
+#pragma once
+
+#import <AVFoundation/AVFoundation.h>
+#import <CoreMotion/CoreMotion.h>
+
+#pragma mark - Mirror mode
+
+typedef NS_ENUM(NSInteger, SimCamMirrorMode) {
+    SimCamMirrorAuto = 0,
+    SimCamMirrorForceOn,
+    SimCamMirrorForceOff,
+};
+
+SimCamMirrorMode SimCamGetMirrorMode(void);
+void SimCamSetMirrorMode(SimCamMirrorMode m);
+BOOL SimCamShouldMirror(AVCaptureDevicePosition p);
+
+void SimCamReadMirrorModeFromEnv(void);
+
+#pragma mark - Position tag
+
+AVCaptureDevicePosition SimCamPositionOf(id obj);
+void SimCamSetPosition(id obj, AVCaptureDevicePosition p);
+
+#pragma mark - Camera-in-use sticky flag
+
+BOOL SimCamCameraIsInUse(void);
+void SimCamMarkCameraInUse(void);
+void SimCamMarkSessionUsingFakeCamera(id session, BOOL usingFakeCamera);
+
+#pragma mark - AVF runtime-error notification suppression
+
+BOOL SimCamShouldSwallowAVFRuntimeError(NSNotificationName name, id object);
+void SimCamLogSwallowedRuntimeError(NSString *via, id object, NSDictionary *userInfo);
+
+#pragma mark - Fake objects
+
+@interface SimCamWeakRef : NSObject
+@property (nonatomic, weak) id target;
+@end
+
+@interface SimCamFakeFormat : AVCaptureDeviceFormat
+@end
+@interface SimCamFakeDevice : AVCaptureDevice
+@end
+@interface SimCamFakeConnection : AVCaptureConnection
+@end
+@interface SimCamFakeResolvedPhotoSettings : AVCaptureResolvedPhotoSettings
+@end
+
+@interface SimCamFakePhoto : AVCapturePhoto
++ (instancetype)photoFromImage:(CGImageRef)cgImage
+                   jpegQuality:(CGFloat)q
+                      mirrored:(BOOL)mirrored;
+@end
+
+@interface SimCamAttitude : CMAttitude
+@end
+@interface SimCamAccelerometerData : CMAccelerometerData
+@end
+@interface SimCamGyroData : CMGyroData
+@end
+@interface SimCamMagnetometerData : CMMagnetometerData
+@end
+@interface SimCamDeviceMotion : CMDeviceMotion
+@end
+
+#pragma mark - Fake-object factories / caches
+
+AVCaptureDeviceFormat *SimCamSharedFakeFormat(void);
+AVCaptureDevice *SimCamFakeDeviceForPosition(AVCaptureDevicePosition p);
+AVCaptureDeviceInput *SimCamFakeInputForPosition(AVCaptureDevicePosition p);
+
+AVCaptureConnection *SimCamFakeConnectionForOutput(AVCaptureOutput *out);
+
+CMAttitude *SimCamSharedAttitude(void);
+CMAccelerometerData *SimCamSharedAccelerometerData(void);
+CMGyroData *SimCamSharedGyroData(void);
+CMMagnetometerData *SimCamSharedMagnetometerData(void);
+CMDeviceMotion *SimCamSharedDeviceMotion(void);
+
+#pragma mark - Fake-input marking (used by AVCaptureDeviceInput swizzle)
+
+void SimCamMarkFakeInput(id input, AVCaptureDevice *fakeDevice);
+BOOL SimCamIsFakeInput(id input);
+AVCaptureDevice *SimCamFakeInputDevice(id input);