From 4cb0cf7299d4ad0908fa4a435784fcccdcf08ca8 Mon Sep 17 00:00:00 2001 From: BrettyWhite Date: Tue, 1 Aug 2017 10:54:10 -0400 Subject: addressing requested changes --- SmartDeviceLink/SDLHMICapabilities.h | 2 +- SmartDeviceLink/SDLHMICapabilities.m | 2 +- SmartDeviceLink/SDLVideoStreamingCapability.h | 4 ++-- SmartDeviceLink/SDLVideoStreamingCapability.m | 14 +++++++------- SmartDeviceLink/SDLVideoStreamingCodec.h | 4 ++-- SmartDeviceLink/SDLVideoStreamingCodec.m | 2 +- SmartDeviceLink/SDLVideoStreamingProtocol.h | 4 ++-- SmartDeviceLink/SDLVideoStreamingProtocol.m | 2 +- .../RPCSpecs/EnumSpecs/SDLVideoStreamingCodecSpec.m | 2 +- .../RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/SmartDeviceLink/SDLHMICapabilities.h b/SmartDeviceLink/SDLHMICapabilities.h index 7697df44c..6ab29741e 100644 --- a/SmartDeviceLink/SDLHMICapabilities.h +++ b/SmartDeviceLink/SDLHMICapabilities.h @@ -27,7 +27,7 @@ NS_ASSUME_NONNULL_BEGIN Boolean value. Optional. */ -@property (nullable, copy, nonatomic) NSNumber *videoStreaming; +@property (nullable, copy, nonatomic) NSNumber *videoStreaming; @end diff --git a/SmartDeviceLink/SDLHMICapabilities.m b/SmartDeviceLink/SDLHMICapabilities.m index 477ffe8ad..01fd01949 100644 --- a/SmartDeviceLink/SDLHMICapabilities.m +++ b/SmartDeviceLink/SDLHMICapabilities.m @@ -31,7 +31,7 @@ NS_ASSUME_NONNULL_BEGIN [store sdl_setObject:videoStreaming forName:SDLNameVideoStreaming]; } -- (nullable NSNumber *)videoStreaming { +- (nullable NSNumber *)videoStreaming { return [store sdl_objectForName:SDLNameVideoStreaming]; } diff --git a/SmartDeviceLink/SDLVideoStreamingCapability.h b/SmartDeviceLink/SDLVideoStreamingCapability.h index 4bda4940d..9ab7d6fdf 100644 --- a/SmartDeviceLink/SDLVideoStreamingCapability.h +++ b/SmartDeviceLink/SDLVideoStreamingCapability.h @@ -37,12 +37,12 @@ NS_ASSUME_NONNULL_BEGIN * minvalue= 0 * maxvalue= 2147483647 */ -@property (nullable, strong, nonatomic) NSNumber *maxBitrate; +@property (nullable, strong, nonatomic) NSNumber *maxBitrate; /** * @abstract Detailed information on each format supported by this system, in its preferred order, optional */ -@property (nullable, strong, nonatomic) NSMutableArray *supportedFormats; +@property (nullable, strong, nonatomic) NSArray *supportedFormats; @end diff --git a/SmartDeviceLink/SDLVideoStreamingCapability.m b/SmartDeviceLink/SDLVideoStreamingCapability.m index 3e034d913..13cba4f69 100644 --- a/SmartDeviceLink/SDLVideoStreamingCapability.m +++ b/SmartDeviceLink/SDLVideoStreamingCapability.m @@ -37,7 +37,7 @@ NS_ASSUME_NONNULL_BEGIN self.maxBitrate = maxBitrate; self.preferredResolution = preferredResolution; - self.supportedFormats = [supportedFormats mutableCopy]; + self.supportedFormats = supportedFormats; return self; } @@ -47,23 +47,23 @@ NS_ASSUME_NONNULL_BEGIN } - (nullable SDLImageResolution *)preferredResolution { - return [store sdl_objectForName:SDLNamePreferredResolution]; + return [store sdl_objectForName:SDLNamePreferredResolution ofClass:SDLImageResolution.class]; } -- (void)setMaxBitrate:(nullable NSNumber *)maxBitrate { +- (void)setMaxBitrate:(nullable NSNumber *)maxBitrate { [store sdl_setObject:maxBitrate forName:SDLNameMaxBitrate]; } -- (nullable NSNumber *)maxBitrate { +- (nullable NSNumber *)maxBitrate { return [store sdl_objectForName:SDLNameMaxBitrate]; } -- (void)setSupportedFormats:(nullable NSMutableArray *)supportedFormats { +- (void)setSupportedFormats:(nullable NSArray *)supportedFormats { [store sdl_setObject:supportedFormats forName:SDLNameSupportedFormats]; } -- (nullable NSMutableArray *)supportedFormats { - return [store sdl_objectForName:SDLNameSupportedFormats]; +- (nullable NSArray *)supportedFormats { + return [store sdl_objectsForName:SDLNameSupportedFormats ofClass:SDLVideoStreamingFormat.class]; } @end diff --git a/SmartDeviceLink/SDLVideoStreamingCodec.h b/SmartDeviceLink/SDLVideoStreamingCodec.h index f72a8bfaa..8543876b2 100644 --- a/SmartDeviceLink/SDLVideoStreamingCodec.h +++ b/SmartDeviceLink/SDLVideoStreamingCodec.h @@ -21,9 +21,9 @@ extern SDLVideoStreamingCodec const SDLVideoStreamingCodecH264; extern SDLVideoStreamingCodec const SDLVideoStreamingCodecH265; /** - * @abstract SDLVideoStreamingCodec : THEORA + * @abstract SDLVideoStreamingCodec : Theora */ -extern SDLVideoStreamingCodec const SDLVideoStreamingCodecTHEORA; +extern SDLVideoStreamingCodec const SDLVideoStreamingCodecTheora; /** * @abstract SDLVideoStreamingCodec : VP8 diff --git a/SmartDeviceLink/SDLVideoStreamingCodec.m b/SmartDeviceLink/SDLVideoStreamingCodec.m index 0f37bd2f4..6ad66105f 100644 --- a/SmartDeviceLink/SDLVideoStreamingCodec.m +++ b/SmartDeviceLink/SDLVideoStreamingCodec.m @@ -8,6 +8,6 @@ SDLVideoStreamingCodec const SDLVideoStreamingCodecH264 = @"H264"; SDLVideoStreamingCodec const SDLVideoStreamingCodecH265 = @"H265"; -SDLVideoStreamingCodec const SDLVideoStreamingCodecTHEORA = @"THEORA"; +SDLVideoStreamingCodec const SDLVideoStreamingCodecTheora = @"THEORA"; SDLVideoStreamingCodec const SDLVideoStreamingCodecVP8 = @"VP8"; SDLVideoStreamingCodec const SDLVideoStreamingCodecVP9 = @"VP9"; diff --git a/SmartDeviceLink/SDLVideoStreamingProtocol.h b/SmartDeviceLink/SDLVideoStreamingProtocol.h index 26b23f2f5..a53bc96be 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 cebb80234..f70416efe 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/SDLVideoStreamingCodecSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingCodecSpec.m index ce329445f..fb68f70d6 100644 --- a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingCodecSpec.m +++ b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingCodecSpec.m @@ -19,7 +19,7 @@ describe(@"Individual Enum Value Tests", ^ { it(@"Should match internal values", ^ { expect(SDLVideoStreamingCodecH264).to(equal(@"H264")); expect(SDLVideoStreamingCodecH265).to(equal(@"H265")); - expect(SDLVideoStreamingCodecTHEORA).to(equal(@"THEORA")); + expect(SDLVideoStreamingCodecTheora).to(equal(@"THEORA")); expect(SDLVideoStreamingCodecVP8).to(equal(@"VP8")); expect(SDLVideoStreamingCodecVP9).to(equal(@"VP9")); }); diff --git a/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m b/SmartDeviceLinkTests/RPCSpecs/EnumSpecs/SDLVideoStreamingProtocolSpec.m index 89df1fc47..e9e24fc52 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")); }); }); -- cgit v1.2.1