Update SDLStreamingVideoLifecycleManager and SDLVideoStreamingCapability based on the feedback from Joel Fischer

2 files changed, 7 insertions, 8 deletions

diff --git a/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m b/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m
index 107aaf5a2..ac0a10db8 100644
--- a/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m
+++ b/SmartDeviceLink/private/SDLStreamingVideoLifecycleManager.m
@@ -48,7 +48,7 @@
 #import "SDLVideoStreamingCapability.h"
 
 static NSUInteger const FramesToSendOnBackground = 30;
-static NSUInteger const defaultFrameRate = 15;
+static NSUInteger const DefaultFrameRate = 15;
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -388,7 +388,7 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N
             if (capability.maxBitrate != nil) {
                 weakSelf.videoEncoderSettings[(__bridge NSString *) kVTCompressionPropertyKey_AverageBitRate] = [[NSNumber alloc] initWithUnsignedLongLong:(capability.maxBitrate.unsignedLongLongValue * 1000)];
             }
-            NSUInteger  preferredFPS = (capability.preferredFPS.integerValue == 0) ? defaultFrameRate : capability.preferredFPS.unsignedIntValue;
+            NSUInteger  preferredFPS = (capability.preferredFPS.unsignedIntValue == 0) ? DefaultFrameRate : capability.preferredFPS.unsignedIntValue;
             SDLLogD(@"videoEncoderSettings = %@", weakSelf.videoEncoderSettings);
             weakSelf.videoEncoderSettings[(__bridge NSString *)kVTCompressionPropertyKey_ExpectedFrameRate] = @(preferredFPS);
             SDLLogD(@"SDLCarWindow#didEnterStateVideoStreamStarting preferredFPS=%lu", (unsigned long)preferredFPS);
@@ -409,8 +409,7 @@ typedef void(^SDLVideoCapabilityResponseHandler)(SDLVideoStreamingCapability *_N
             SDLImageResolution *resolution = [[SDLImageResolution alloc] initWithWidth:(uint16_t)weakSelf.videoScaleManager.displayViewportResolution.width height:(uint16_t)weakSelf.videoScaleManager.displayViewportResolution.height];
             weakSelf.preferredFormats = @[format];
             weakSelf.preferredResolutions = @[resolution];
-            weakSelf.videoEncoderSettings[(__bridge NSString *)kVTCompressionPropertyKey_ExpectedFrameRate] = @(defaultFrameRate);
-            SDLLogD(@"SDLCarWindow#didEnterStateVideoStreamStarting preferredFPS is default value (capability is nil)");
+            weakSelf.videoEncoderSettings[(__bridge NSString *)kVTCompressionPropertyKey_ExpectedFrameRate] = @(DefaultFrameRate);
 
             if (weakSelf.focusableItemManager != nil) {
                 weakSelf.focusableItemManager.enableHapticDataRequests = NO;
diff --git a/SmartDeviceLink/public/SDLVideoStreamingCapability.m b/SmartDeviceLink/public/SDLVideoStreamingCapability.m
index 4ebf6d005..a031bc8ca 100644
--- a/SmartDeviceLink/public/SDLVideoStreamingCapability.m
+++ b/SmartDeviceLink/public/SDLVideoStreamingCapability.m
@@ -17,7 +17,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation SDLVideoStreamingCapability
 
-- (instancetype)initWithPreferredResolution:(nullable SDLImageResolution *)preferredResolution maxBitrate:(int32_t)maxBitrate supportedFormats:(nullable NSArray<SDLVideoStreamingFormat *> *)supportedFormats hapticDataSupported:(BOOL)hapticDataSupported diagonalScreenSize:(float)diagonalScreenSize pixelPerInch:(float)pixelPerInch scale:(float)scale {
+- (instancetype)initWithPreferredResolution:(nullable SDLImageResolution *)preferredResolution maxBitrate:(int32_t)maxBitrate supportedFormats:(nullable NSArray<SDLVideoStreamingFormat *> *)supportedFormats hapticDataSupported:(BOOL)hapticDataSupported diagonalScreenSize:(float)diagonalScreenSize pixelPerInch:(float)pixelPerInch scale:(float)scale preferredFPS:(uint32_t)preferredFPS {
     self = [self init];
     if (!self) {
         return self;
@@ -30,7 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
     self.diagonalScreenSize = @(diagonalScreenSize);
     self.pixelPerInch = @(pixelPerInch);
     self.scale = @(scale);
-    self.preferredFPS = @(15);
+    self.preferredFPS = @(preferredFPS);
 
     return self;
 }
@@ -91,11 +91,11 @@ NS_ASSUME_NONNULL_BEGIN
     return [self.store sdl_objectForName:SDLRPCParameterNameScale ofClass:NSNumber.class error:nil];
 }
 
-- (void)setPreferredFPS:(nullable NSNumber<SDLInt> *)preferredFPS {
+- (void)setPreferredFPS:(nullable NSNumber<SDLUInt> *)preferredFPS {
     [self.store sdl_setObject:preferredFPS forName:SDLRPCParameterNamePreferredFPS];
 }
 
-- (nullable NSNumber<SDLInt> *)preferredFPS {
+- (nullable NSNumber<SDLUInt> *)preferredFPS {
     return [self.store sdl_objectForName:SDLRPCParameterNamePreferredFPS ofClass:NSNumber.class error:nil];
 }