fixed getters again

2 files changed, 21 insertions, 3 deletions

diff --git a/SmartDeviceLink/SDLVideoStreamingCapability.m b/SmartDeviceLink/SDLVideoStreamingCapability.m
index fa00fc0af..112d0c42a 100644
--- a/SmartDeviceLink/SDLVideoStreamingCapability.m
+++ b/SmartDeviceLink/SDLVideoStreamingCapability.m
@@ -6,6 +6,7 @@
 //  Copyright © 2017 smartdevicelink. All rights reserved.
 //
 
+#import "SDLImageResolution.h"
 #import "SDLNames.h"
 #import "SDLVideoStreamingFormat.h"
 #import "SDLVideoStreamingCapability.h"
@@ -46,7 +47,12 @@
 }
 
 - (SDLImageResolution *)preferredResolution {
-    return [store objectForKey:NAMES_preferredResolution];
+    NSObject *obj = [store objectForKey:NAMES_preferredResolution];
+    if (obj == nil || [obj isKindOfClass:SDLImageResolution.class]) {
+        return (SDLImageResolution *)obj;
+    } else {
+        return [[SDLImageResolution alloc] initWithDictionary:(NSMutableDictionary *)obj];
+    }
 }
 
 - (void)setMaxBitrate:(NSNumber *)maxBitrate {
diff --git a/SmartDeviceLink/SDLVideoStreamingFormat.m b/SmartDeviceLink/SDLVideoStreamingFormat.m
index 7fbab3099..49f7a650c 100644
--- a/SmartDeviceLink/SDLVideoStreamingFormat.m
+++ b/SmartDeviceLink/SDLVideoStreamingFormat.m
@@ -7,7 +7,9 @@
 //
 
 #import "SDLNames.h"
+#import "SDLVideoStreamingCodec.h"
 #import "SDLVideoStreamingFormat.h"
+#import "SDLVideoStreamingProtocol.h"
 
 @implementation SDLVideoStreamingFormat
 
@@ -32,7 +34,12 @@
 }
 
 - (SDLVideoStreamingProtocol *)protocol {
-    return [store objectForKey:NAMES_videoProtocol];
+    NSObject *obj = [store objectForKey:NAMES_videoProtocol];
+    if (obj == nil || [obj isKindOfClass:SDLVideoStreamingProtocol.class]) {
+        return (SDLVideoStreamingProtocol *)obj;
+    } else {
+        return [SDLVideoStreamingProtocol valueOf:(NSString *)obj];
+    }
 }
 
 - (void)setVideoStreamingCodec:(SDLVideoStreamingCodec *)codec {
@@ -44,7 +51,12 @@
 }
 
 - (SDLVideoStreamingCodec *)codec {
-    return [store objectForKey:NAMES_videoCodec];
+    NSObject *obj = [store objectForKey:NAMES_videoCodec];
+    if (obj == nil || [obj isKindOfClass:SDLVideoStreamingCodec.class]) {
+        return (SDLVideoStreamingCodec *)obj;
+    } else {
+        return [SDLVideoStreamingCodec valueOf:(NSString *)obj];
+    }
 }
 
 @end