Merge pull request #2 from mobile-platform/video

Bumble: Adjust video size and frame rate

Author: fr0l-bmbl

Server/CBXConstants.h

@@ -12,7 +12,7 @@ static NSUInteger const CBX_DEFAULT_MJPEG_PORT = 27754;
 
 static NSUInteger FBMjpegServerScreenshotQuality = 100;
 static NSUInteger FBMjpegServerFramerate = 5;
-static NSUInteger FBScreenshotQuality = 1;  
+static NSUInteger FBScreenshotQuality = 1;
 static NSUInteger FBMjpegScalingFactor = 50;
 
 static NSString *const CBXWebServerErrorDomain = @"sh.calaba.xcuitest-server";

Server/FBMjpegServer.m

@@ -22,13 +22,18 @@
 static const NSUInteger MAX_FPS = 60;
 static NSString *const SERVER_NAME = @"WDA MJPEG Server";
 static const char *QUEUE_NAME = "JPEG Screenshots Provider Queue";
+static const CGFloat COMPRESSION_QUALITY = 0.8;
+static const CGFloat SCREENSHOT_MAX_WIDTH = 450.0;
+static const uint64_t SCREENSHOT_INTERVAL = (uint64_t)(0.2 * NSEC_PER_SEC);
 
 @interface FBMjpegServer()
 
 @property (nonatomic, readonly) dispatch_queue_t backgroundQueue;
 @property (nonatomic, readonly) NSMutableArray<GCDAsyncSocket *> *listeningClients;
 @property (nonatomic, readonly) mach_timebase_info_data_t timebaseInfo;
 @property (nonatomic, readonly) CBXScreenshooter *screenshooter;
+@property (nonatomic, readonly) CGSize scaledSize;
+
 @end
 
 @implementation FBMjpegServer
@@ -49,10 +54,17 @@ - (instancetype)init
                                                         compression:1.0f
                                                      typeIdentifier:@"JPEG" //(__bridge id)kUTTypeJPEG
     ];
+
+    UIImage *image = [UIImage imageWithData:[_screenshooter getScreenshotData]];
+    CGFloat screenWidth = image.size.width;
+    CGFloat screenHeight = image.size.height;
+    CGFloat scalingFactor = (screenWidth > SCREENSHOT_MAX_WIDTH) ? SCREENSHOT_MAX_WIDTH / screenWidth : 1.0;
+    _scaledSize = CGSizeMake(screenWidth * scalingFactor, screenHeight * scalingFactor);
   }
   return self;
 }
 
+
 - (void)scheduleNextScreenshotWithInterval:(uint64_t)timerInterval timeStarted:(uint64_t)timeStarted
 {
   uint64_t timeElapsed = mach_absolute_time() - timeStarted;
@@ -71,27 +83,19 @@ - (void)scheduleNextScreenshotWithInterval:(uint64_t)timerInterval timeStarted:(
 
 - (void)streamScreenshot
 {
-  NSUInteger framerate = FBMjpegServerFramerate;
-  uint64_t timerInterval = (uint64_t)(1.0 / ((0 == framerate || framerate > MAX_FPS) ? MAX_FPS : framerate) * NSEC_PER_SEC);
   uint64_t timeStarted = mach_absolute_time();
   @synchronized (self.listeningClients) {
     if (0 == self.listeningClients.count) {
-      [self scheduleNextScreenshotWithInterval:timerInterval timeStarted:timeStarted];
+      [self scheduleNextScreenshotWithInterval:SCREENSHOT_INTERVAL timeStarted:timeStarted];
       return;
     }
   }
 
   @try {
-      NSData *screenShotData = [_screenshooter getScreenshotData];
-      CGFloat scalingFactor = 50 / 100.0;
-      CGFloat compressionQuality = 0.8;
-
-      UIImage *image = [UIImage imageWithData:screenShotData];
-      CGSize scaledSize = CGSizeMake(image.size.width * scalingFactor, image.size.height * scalingFactor);
-
+      UIImage *image = [UIImage imageWithData:[_screenshooter getScreenshotData]];
       dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
       __block UIImage *scaledImage = nil;
-      [image prepareThumbnailOfSize:scaledSize completionHandler:^(UIImage * _Nullable thumbnail) {
+      [image prepareThumbnailOfSize:self.scaledSize completionHandler:^(UIImage * _Nullable thumbnail) {
         scaledImage = thumbnail;
         dispatch_semaphore_signal(semaphore);
       }];
@@ -100,7 +104,7 @@ - (void)streamScreenshot
       if (nil == scaledImage) {
           NSLog(@"Screenshot exception: Failed to scale image using prepareThumbnailOfSize");
       } else {
-        NSData *scaledImageData = UIImageJPEGRepresentation(scaledImage, compressionQuality);
+        NSData *scaledImageData = UIImageJPEGRepresentation(scaledImage, COMPRESSION_QUALITY);
           if (nil == scaledImageData) {
             NSLog(@"Screenshot exception: Failed to scale image using UIImageJPEGRepresentation");
           } else {
@@ -111,7 +115,7 @@ - (void)streamScreenshot
     NSLog(@"Screenshot exception: %@, %@", exception.name, exception.reason);
   }
 
-  [self scheduleNextScreenshotWithInterval:timerInterval timeStarted:timeStarted];
+  [self scheduleNextScreenshotWithInterval:SCREENSHOT_INTERVAL timeStarted:timeStarted];
 }
 
 - (void)sendScreenshot:(NSData *)screenshotData {