Fix: Applied Suggested Changes

Applied changes suggested by @jcm93 and @PatTheMav

Co-authored-by: PatTheMav <patthemav+github@gmail.com>
Co-authored-by: jcm <6864788+jcm93@users.noreply.github.com>

Author: 3 people

plugins/mac-capture/mac-audio.c

@@ -444,10 +444,7 @@ static OSStatus input_callback(void *data, AudioUnitRenderActionFlags *action_fl
 		mach_timebase_info(&info);
 		factor = ((double)info.numer) / info.denom;
 	}
-	if (info.numer != info.denom)
-		audio.timestamp = (uint64_t)(factor * (double)ts_data->mHostTime);
-	else
-		audio.timestamp = ts_data->mHostTime;
+	audio.timestamp = AudioConvertHostTimeToNanos(ts_data->mHostTime);
 
 	obs_source_output_audio(ca->source, &audio);
 

plugins/mac-capture/mac-sck-common.m

@@ -275,12 +275,15 @@ bool build_application_list(struct screen_capture *sc, obs_properties_t *props)
                     needs_to_update_properties = true;
                 }
             } else {
-                size_t width = CVPixelBufferGetWidth(image_buffer);
-                size_t height = CVPixelBufferGetHeight(image_buffer);
+                int width = CVPixelBufferGetWidth(image_buffer);
+                int height = CVPixelBufferGetHeight(image_buffer);
 
-                if (((size_t)sc->frame.size.width != width) || ((size_t)sc->frame.size.height != height)) {
-                    sc->frame.size.width = (CGFloat)width;
-                    sc->frame.size.height = (CGFloat)height;
+                int frameWidth = (int) sc->frame.size.width;
+                int frameHeight = (int) sc->frame.size.height;
+
+                if ((frameWidth != width) || (frameHeight != height)) {
+                    sc->frame.size.width = width;
+                    sc->frame.size.height = height;
                     needs_to_update_properties = true;
                 }
             }

plugins/mac-syphon/syphon.m

@@ -630,10 +630,13 @@ static void syphon_video_tick(void *data, float seconds)
     if (s->crop)
         crop = &s->crop_rect;
 
+    float origin_x = (float) crop->origin.x;
+    float origin_y = (float) (s->height - crop->origin.y);
+    float end_x = (float) (s->width - crop->size.width);
+    float end_y = (float) crop->size.height;
+
     obs_enter_graphics();
-    build_sprite_rect(gs_vertexbuffer_get_data(s->vertbuffer), (float) crop->origin.x,
-                      (float) s->height - (float) crop->origin.y, (float) s->width - (float) crop->size.width,
-                      (float) crop->size.height);
+    build_sprite_rect(gs_vertexbuffer_get_data(s->vertbuffer), origin_x, origin_y, end_x, end_y);
     obs_leave_graphics();
 }
 

plugins/mac-videotoolbox/encoder.c

@@ -539,12 +539,13 @@ static OSStatus create_encoder(struct vt_encoder *enc)
 					     kVTCompressionPropertyKey_AllowFrameReordering,
 					     kVTCompressionPropertyKey_ProfileLevel};
 
-		SInt32 key_frame_interval = (SInt32)((float)enc->keyint * ((float)enc->fps_num / (float)enc->fps_den));
-		float expected_framerate = (float)enc->fps_num / (float)enc->fps_den;
+		int actual_frame_rate = enc->fps_num / enc->fps_den;
+		int key_frame_interval = enc->keyint * actual_frame_rate;
+
 		CFNumberRef MaxKeyFrameInterval =
-			CFNumberCreate(kCFAllocatorDefault, kCFNumberSInt32Type, &key_frame_interval);
+			CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &key_frame_interval);
 		CFNumberRef ExpectedFrameRate =
-			CFNumberCreate(kCFAllocatorDefault, kCFNumberFloat32Type, &expected_framerate);
+			CFNumberCreate(kCFAllocatorDefault, kCFNumberIntType, &actual_frame_rate);
 		CFTypeRef AllowFrameReordering = enc->bframes ? kCFBooleanTrue : kCFBooleanFalse;
 
 		video_t *video = obs_encoder_video(enc->encoder);

plugins/mac-virtualcam/src/dal-plugin/CMSampleBufferUtils.mm

@@ -19,7 +19,8 @@ CMSampleTimingInfo CMSampleTimingInfoForTimestamp(uint64_t timestampNanos, uint3
     CMTimeScale scale = 600;
     CMSampleTimingInfo timing;
     timing.duration = CMTimeMake(fpsDenominator * scale, fpsNumerator * scale);
-    timing.presentationTimeStamp = CMTimeMakeWithSeconds((double)timestampNanos / (double) NSEC_PER_SEC, scale);
+    CMTime timestamp = CMTimeMake(timestampNanos, NSEC_PER_SEC);
+    timing.presentationTimeStamp = CMTimeConvertScale(timestamp, scale, kCMTimeRoundingMethod_QuickTime);
     timing.decodeTimeStamp = kCMTimeInvalid;
     return timing;
 }

plugins/mac-virtualcam/src/dal-plugin/OBSDALStream.mm

@@ -123,12 +123,12 @@ - (NSSize)testCardSize
 {
     if (NSEqualSizes(_testCardSize, NSZeroSize)) {
         NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
-        NSInteger width = [[defaults objectForKey:kTestCardWidthKey] integerValue];
-        NSInteger height = [[defaults objectForKey:kTestCardHeightKey] integerValue];
+        double width = [[defaults objectForKey:kTestCardWidthKey] doubleValue];
+        double height = [[defaults objectForKey:kTestCardHeightKey] doubleValue];
         if (width == 0 || height == 0) {
             _testCardSize = NSMakeSize(DEFAULT_WIDTH, DEFAULT_HEIGHT);
         } else {
-            _testCardSize = NSMakeSize((double)width, (double)height);
+            _testCardSize = NSMakeSize(width, height);
         }
     }
     return _testCardSize;
@@ -238,9 +238,9 @@ - (CVPixelBufferRef)createPixelBufferWithTestAnimation
     NSParameterAssert(pxdata != NULL);
 
     CGColorSpaceRef rgbColorSpace = CGColorSpaceCreateDeviceRGB();
-    CGContextRef context = CGBitmapContextCreate(pxdata, width, height, 8,
-                                                 CVPixelBufferGetBytesPerRowOfPlane(pxbuffer, 0), rgbColorSpace,
-                                                 ((int)kCGImageAlphaPremultipliedFirst) | ((int)kCGImageByteOrder32Big));
+    CGContextRef context =
+        CGBitmapContextCreate(pxdata, width, height, 8, CVPixelBufferGetBytesPerRowOfPlane(pxbuffer, 0), rgbColorSpace,
+                              (CGBitmapInfo) kCGImageAlphaPremultipliedFirst | kCGImageByteOrder32Big);
     CFRelease(rgbColorSpace);
     NSParameterAssert(context);
 
@@ -249,7 +249,8 @@ - (CVPixelBufferRef)createPixelBufferWithTestAnimation
 
     NSRect rect = NSMakeRect(0, 0, self.testCardImage.size.width, self.testCardImage.size.height);
     CGImageRef image = [self.testCardImage CGImageForProposedRect:&rect context:nsContext hints:nil];
-    CGContextDrawImage(context, CGRectMake(0, 0, (double)CGImageGetWidth(image), (double)CGImageGetHeight(image)), image);
+    CGContextDrawImage(context, CGRectMake(0, 0, (double) CGImageGetWidth(image), (double) CGImageGetHeight(image)),
+                       image);
 
     //	DrawDialWithFrame(
     //		NSMakeRect(0, 0, width, height),