Video control frame payloads use enums instead of regular strings

1 files changed, 9 insertions, 7 deletions

diff --git a/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m b/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m
index 013f36dd2..47ed8301a 100644
--- a/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m
+++ b/SmartDeviceLink/SDLControlFramePayloadVideoStartService.m
@@ -10,6 +10,8 @@
 
 #import "bson_object.h"
 #import "SDLControlFramePayloadConstants.h"
+#import "SDLVideoStreamingCodec.h"
+#import "SDLVideoStreamingProtocol.h"
 
 
 NS_ASSUME_NONNULL_BEGIN
@@ -18,14 +20,14 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (assign, nonatomic, readwrite) int32_t height;
 @property (assign, nonatomic, readwrite) int32_t width;
-@property (copy, nonatomic, readwrite) NSString *videoProtocol;
-@property (copy, nonatomic, readwrite) NSString *videoCodec;
+@property (copy, nonatomic, readwrite, nullable) SDLVideoStreamingCodec *videoCodec;
+@property (copy, nonatomic, readwrite, nullable) SDLVideoStreamingProtocol *videoProtocol;
 
 @end
 
 @implementation SDLControlFramePayloadVideoStartService
 
-- (instancetype)initWithVideoHeight:(int32_t)height width:(int32_t)width protocol:(NSString *)protocol codec:(NSString *)codec {
+- (instancetype)initWithVideoHeight:(int32_t)height width:(int32_t)width protocol:(nullable SDLVideoStreamingProtocol *)protocol codec:(nullable SDLVideoStreamingCodec *)codec {
     self = [super init];
     if (!self) return nil;
 
@@ -71,11 +73,11 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     if (self.videoProtocol != nil) {
-        bson_object_put_string(&payloadObject, SDLControlFrameVideoProtocolKey, (char *)self.videoProtocol.UTF8String);
+        bson_object_put_string(&payloadObject, SDLControlFrameVideoProtocolKey, (char *)self.videoProtocol.value.UTF8String);
     }
 
     if (self.videoCodec != nil) {
-        bson_object_put_string(&payloadObject, SDLControlFrameVideoCodecKey, (char *)self.videoCodec.UTF8String);
+        bson_object_put_string(&payloadObject, SDLControlFrameVideoCodecKey, (char *)self.videoCodec.value.UTF8String);
     }
 
     BytePtr bsonData = bson_object_to_bytes(&payloadObject);
@@ -94,12 +96,12 @@ NS_ASSUME_NONNULL_BEGIN
 
     char *utf8String = bson_object_get_string(&payloadObject, SDLControlFrameVideoProtocolKey);
     if (utf8String != NULL) {
-        self.videoProtocol = [NSString stringWithUTF8String:utf8String];
+        self.videoProtocol = [SDLVideoStreamingProtocol valueOf:[NSString stringWithUTF8String:utf8String]];
     }
 
     utf8String = bson_object_get_string(&payloadObject, SDLControlFrameVideoCodecKey);
     if (utf8String != NULL) {
-        self.videoCodec = [NSString stringWithUTF8String:utf8String];
+        self.videoProtocol = [SDLVideoStreamingProtocol valueOf:[NSString stringWithUTF8String:utf8String]];
     }
 
     bson_object_deinitialize(&payloadObject);