address comments

Author: mykola-mokhnach

WebDriverAgentLib/Routing/FBWebServer.m

@@ -47,6 +47,7 @@ @interface FBWebServer ()
 @property (nonatomic, strong) RoutingHTTPServer *server;
 @property (atomic, assign) BOOL keepAlive;
 @property (nonatomic, nullable) FBTCPSocket *screenshotsBroadcaster;
+@property (nonatomic, nullable, strong) FBMjpegServer *mjpegServer;
 @end
 
 @implementation FBWebServer
@@ -130,21 +131,23 @@ - (void)startHTTPServer
 - (void)initScreenshotsBroadcaster
 {
   [self readMjpegSettingsFromEnv];
-  FBMjpegServer *mjpegServer = [[FBMjpegServer alloc] init];
+  self.mjpegServer = [[FBMjpegServer alloc] init];
   self.screenshotsBroadcaster = [[FBTCPSocket alloc]
                                  initWithPort:(uint16_t)FBConfiguration.mjpegServerPort];
-  self.screenshotsBroadcaster.delegate = mjpegServer;
+  self.screenshotsBroadcaster.delegate = self.mjpegServer;
   NSError *error;
   if (![self.screenshotsBroadcaster startWithError:&error]) {
     [FBLogger logFmt:@"Cannot init screenshots broadcaster service on port %@. Original error: %@", @(FBConfiguration.mjpegServerPort), error.description];
-    [mjpegServer stopStreaming];
+    [self.mjpegServer stopStreaming];
+    self.mjpegServer = nil;
     self.screenshotsBroadcaster = nil;
   }
 }
 
 - (void)stopScreenshotsBroadcaster
 {
   if (nil == self.screenshotsBroadcaster) {
+    self.mjpegServer = nil;
     return;
   }
 
@@ -155,6 +158,7 @@ - (void)stopScreenshotsBroadcaster
   self.screenshotsBroadcaster.delegate = nil;
   [self.screenshotsBroadcaster stop];
   self.screenshotsBroadcaster = nil;
+  self.mjpegServer = nil;
 }
 
 - (void)readMjpegSettingsFromEnv

WebDriverAgentLib/Utilities/FBImageProcessor.m

@@ -66,29 +66,31 @@ - (void)submitImageData:(NSData *)image
 #pragma clang diagnostic ignored "-Wcompletion-handler"
   dispatch_async(self.scalingQueue, ^{
     while (YES) {
-      [self.nextImageLock lock];
-      NSData *nextImageData = self.nextImage;
-      self.nextImage = nil;
-      if (nextImageData == nil) {
-        self.isScalingScheduled = NO;
+      @autoreleasepool {
+        [self.nextImageLock lock];
+        NSData *nextImageData = self.nextImage;
+        self.nextImage = nil;
+        if (nextImageData == nil) {
+          self.isScalingScheduled = NO;
+          [self.nextImageLock unlock];
+          return;
+        }
         [self.nextImageLock unlock];
-        return;
-      }
-      [self.nextImageLock unlock];
 
-      // We do not want this value to be too high because then we get images larger in size than original ones
-      // Although, we also don't want to lose too much of the quality on recompression
-      CGFloat recompressionQuality = MAX(0.9,
-                                         MIN(FBMaxCompressionQuality, FBConfiguration.mjpegServerScreenshotQuality / 100.0));
-      NSData *thumbnailData = [self.class fixedImageDataWithImageData:nextImageData
-                                                        scalingFactor:scalingFactor
-                                                                  uti:UTTypeJPEG
-                                                   compressionQuality:recompressionQuality
-      // iOS always returns screnshots in portrait orientation, but puts the real value into the metadata
-      // Use it with care. See https://github.com/appium/WebDriverAgent/pull/812
-                                                       fixOrientation:FBConfiguration.mjpegShouldFixOrientation
-                                                   desiredOrientation:nil];
-      completionHandler(thumbnailData ?: nextImageData);
+        // We do not want this value to be too high because then we get images larger in size than original ones
+        // Although, we also don't want to lose too much of the quality on recompression
+        CGFloat recompressionQuality = MAX(0.9,
+                                           MIN(FBMaxCompressionQuality, FBConfiguration.mjpegServerScreenshotQuality / 100.0));
+        NSData *thumbnailData = [self.class fixedImageDataWithImageData:nextImageData
+                                                          scalingFactor:scalingFactor
+                                                                    uti:UTTypeJPEG
+                                                     compressionQuality:recompressionQuality
+        // iOS always returns screnshots in portrait orientation, but puts the real value into the metadata
+        // Use it with care. See https://github.com/appium/WebDriverAgent/pull/812
+                                                         fixOrientation:FBConfiguration.mjpegShouldFixOrientation
+                                                     desiredOrientation:nil];
+        completionHandler(thumbnailData ?: nextImageData);
+      }
     }
   });
 #pragma clang diagnostic pop

WebDriverAgentLib/Utilities/FBMjpegServer.m

@@ -27,6 +27,11 @@
 static NSString *const SERVER_NAME = @"WDA MJPEG Server";
 static const char *QUEUE_NAME = "JPEG Screenshots Provider Queue";
 
+static NSUInteger FBNormalizedMjpegFramerate(NSUInteger framerate)
+{
+  return (0 == framerate || framerate > MAX_FPS) ? MAX_FPS : framerate;
+}
+
 
 @interface FBMjpegServer()
 
@@ -89,8 +94,8 @@ - (void)streamScreenshot
   if (!self.isStreaming) {
     return;
   }
-  NSUInteger framerate = FBConfiguration.mjpegServerFramerate;
-  uint64_t timerInterval = (uint64_t)(1.0 / ((0 == framerate || framerate > MAX_FPS) ? MAX_FPS : framerate) * NSEC_PER_SEC);
+  NSUInteger framerate = FBNormalizedMjpegFramerate(FBConfiguration.mjpegServerFramerate);
+  uint64_t timerInterval = (uint64_t)(1.0 / framerate * NSEC_PER_SEC);
   uint64_t timeStarted = clock_gettime_nsec_np(CLOCK_MONOTONIC_RAW);
   @synchronized (self.listeningClients) {
     if (0 == self.listeningClients.count) {
@@ -142,7 +147,7 @@ - (void)sendScreenshot:(NSData *)screenshotData {
     }
     self.sentFramesCount++;
     self.sentBytesCount += chunk.length * self.listeningClients.count;
-    NSUInteger framerate = MAX(1, MIN(MAX_FPS, FBConfiguration.mjpegServerFramerate));
+    NSUInteger framerate = FBNormalizedMjpegFramerate(FBConfiguration.mjpegServerFramerate);
     if (0 == self.sentFramesCount % framerate) {
       [FBLogger verboseLog:[NSString stringWithFormat:@"MJPEG stats: clients=%@ sentFrames=%@ sentBytes=%@",
                             @(self.listeningClients.count),