more fixesfeature/SDL-0058-video-streaming-capabilities-v5.0

7 files changed, 6 insertions, 41 deletions

diff --git a/SmartDeviceLink/SDLVideoStreamingCapability.h b/SmartDeviceLink/SDLVideoStreamingCapability.h
index 9ab7d6fdf..a19ec1a68 100644
--- a/SmartDeviceLink/SDLVideoStreamingCapability.h
+++ b/SmartDeviceLink/SDLVideoStreamingCapability.h
@@ -15,17 +15,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface SDLVideoStreamingCapability : SDLRPCStruct
 
-/**
- * @abstract Constructs a newly allocated SDLVideoStreamingCapability object
- */
-- (instancetype)init;
-
-/**
- * @abstract Constructs a newly allocated SDLVideoStreamingCapability object indicated by the dictionary parameter
- * @param dict The dictionary to use
- */
-- (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
-
 - (instancetype)initWithVideoStreaming:(nullable SDLImageResolution *)preferredResolution maxBitrate:(nullable NSNumber *)maxBitrate supportedFormats:(nullable NSArray<SDLVideoStreamingFormat *> *)supportedFormats;
 /**
  * @abstract The preferred resolution of a video stream for decoding and rendering on HMI, optional
@@ -34,7 +23,9 @@ NS_ASSUME_NONNULL_BEGIN
 
 /**
  * @abstract The maximum bitrate of video stream that is supported, in kbps, optional
+ *
  * minvalue= 0
+ *
  * maxvalue= 2147483647
  */
 @property (nullable, strong, nonatomic) NSNumber<SDLInt> *maxBitrate;
diff --git a/SmartDeviceLink/SDLVideoStreamingCapability.m b/SmartDeviceLink/SDLVideoStreamingCapability.m
index 13cba4f69..cf4d33e98 100644
--- a/SmartDeviceLink/SDLVideoStreamingCapability.m
+++ b/SmartDeviceLink/SDLVideoStreamingCapability.m
@@ -17,18 +17,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation SDLVideoStreamingCapability
 
-- (instancetype)init {
-    if (self = [super init]) {
-    }
-    return self;
-}
-
-- (instancetype)initWithDictionary:(NSMutableDictionary *)dict {
-    if (self = [super initWithDictionary:dict]) {
-    }
-    return self;
-}
-
 - (instancetype)initWithVideoStreaming:(nullable SDLImageResolution *)preferredResolution maxBitrate:(nullable NSNumber *)maxBitrate supportedFormats:(nullable NSArray<SDLVideoStreamingFormat *> *)supportedFormats {
     self = [self init];
     if (!self) {
diff --git a/SmartDeviceLink/SDLVideoStreamingFormat.h b/SmartDeviceLink/SDLVideoStreamingFormat.h
index f5b02b94f..75f0941ee 100644
--- a/SmartDeviceLink/SDLVideoStreamingFormat.h
+++ b/SmartDeviceLink/SDLVideoStreamingFormat.h
@@ -12,12 +12,6 @@ NS_ASSUME_NONNULL_BEGIN
 @interface SDLVideoStreamingFormat : SDLRPCStruct
 
 /**
- * @abstract Constructs a newly allocated SDLVideoStreamingFormat object indicated by the dictionary parameter
- * @param dict The dictionary to use
- */
-- (instancetype)initWithDictionary:(NSMutableDictionary *)dict;
-
-/**
  * @abstract Protocol type, see VideoStreamingProtocol, mandatory
  */
 @property (strong, nonatomic) SDLVideoStreamingProtocol protocol;
diff --git a/SmartDeviceLink/SDLVideoStreamingFormat.m b/SmartDeviceLink/SDLVideoStreamingFormat.m
index 8d3e39f39..d7f018b5d 100644
--- a/SmartDeviceLink/SDLVideoStreamingFormat.m
+++ b/SmartDeviceLink/SDLVideoStreamingFormat.m
@@ -14,14 +14,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @implementation SDLVideoStreamingFormat
 
-- (instancetype)initWithDictionary:(NSMutableDictionary *)dict {
-    self = [super initWithDictionary:dict];
-    if (!self) {
-        return nil;
-    }
-    return self;
-}
-
 - (SDLVideoStreamingProtocol)protocol {
     return [store sdl_objectForName:SDLNameVideoProtocol];
 }
diff --git a/SmartDeviceLink/SDLVideoStreamingProtocol.h b/SmartDeviceLink/SDLVideoStreamingProtocol.h
index a53bc96be..5e909764e 100644
--- a/SmartDeviceLink/SDLVideoStreamingProtocol.h
+++ b/SmartDeviceLink/SDLVideoStreamingProtocol.h
@@ -31,6 +31,6 @@ extern SDLVideoStreamingProtocol const SDLVideoStreamingProtocolRTSP;
 extern SDLVideoStreamingProtocol const SDLVideoStreamingProtocolRTMP;
 
 /**
- * @abstract SDLVideoStreamingProtocol : Webm
+ * @abstract SDLVideoStreamingProtocol : WebM
  */
-extern SDLVideoStreamingProtocol const SDLVideoStreamingProtocolWebm;
+extern SDLVideoStreamingProtocol const SDLVideoStreamingProtocolWebM;
diff --git a/SmartDeviceLink/SDLVideoStreamingProtocol.m b/SmartDeviceLink/SDLVideoStreamingProtocol.m
index f70416efe..c39addd75 100644
--- a/SmartDeviceLink/SDLVideoStreamingProtocol.m
+++ b/SmartDeviceLink/SDLVideoStreamingProtocol.m
@@ -8,4 +8,4 @@ SDLVideoStreamingProtocol const SDLVideoStreamingProtocolRAW = @"RAW";
 SDLVideoStreamingProtocol const SDLVideoStreamingProtocolRTP = @"RTP";
 SDLVideoStreamingProtocol const SDLVideoStreamingProtocolRTSP = @"RTSP";
 SDLVideoStreamingProtocol const SDLVideoStreamingProtocolRTMP = @"RTMP";
-SDLVideoStreamingProtocol const SDLVideoStreamingProtocolWebm = @"WEBM";
+SDLVideoStreamingProtocol const SDLVideoStreamingProtocolWebM = @"WEBM";
diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m
index e9e24fc52..c39cc297f 100644
--- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m
+++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m
@@ -21,7 +21,7 @@ describe(@"Individual Enum Value Tests", ^ {
         expect(SDLVideoStreamingProtocolRAW).to(equal(@"RAW"));
         expect(SDLVideoStreamingProtocolRTMP).to(equal(@"RTMP"));
         expect(SDLVideoStreamingProtocolRTSP).to(equal(@"RTSP"));
-        expect(SDLVideoStreamingProtocolWebm).to(equal(@"WEBM"));
+        expect(SDLVideoStreamingProtocolWebM).to(equal(@"WEBM"));
     });
 });