From 2256e04fa8302279d76d276e7da3cef7712f6eb2 Mon Sep 17 00:00:00 2001 From: denicija Date: Wed, 9 Nov 2016 06:26:18 -0800 Subject: [PATCH] Rename media constraints model and store. ARDMediaConstraintsModel -> ARDSettingsModel ARDMediaConstraintsSettingsStore -> ARDSettingsStore ARDMediaConstraintsModelTests -> ARDSettingsModelTests Both classes will be used to storing other settings as well, so we need a more appropriate naming. BUG=webrtc:6654 Review-Url: https://codereview.webrtc.org/2479153002 Cr-Commit-Position: refs/heads/master@{#15002} --- webrtc/examples/BUILD.gn | 9 +++--- .../AppRTCMobile/ios/ARDMainViewController.m | 5 +-- ...l+Private.h => ARDSettingsModel+Private.h} | 8 ++--- ...aConstraintsModel.h => ARDSettingsModel.h} | 7 ++-- ...aConstraintsModel.m => ARDSettingsModel.m} | 14 ++++---- ...intsSettingsStore.h => ARDSettingsStore.h} | 4 +-- ...intsSettingsStore.m => ARDSettingsStore.m} | 4 +-- .../ios/ARDSettingsViewController.h | 6 ++-- .../ios/ARDSettingsViewController.m | 14 ++++---- .../ios/ARDVideoCallViewController.m | 6 ++-- ...ModelTests.mm => ARDSettingsModelTests.mm} | 32 +++++++++---------- 11 files changed, 55 insertions(+), 54 deletions(-) rename webrtc/examples/objc/AppRTCMobile/ios/{ARDMediaConstraintsModel+Private.h => ARDSettingsModel+Private.h} (78%) rename webrtc/examples/objc/AppRTCMobile/ios/{ARDMediaConstraintsModel.h => ARDSettingsModel.h} (92%) rename webrtc/examples/objc/AppRTCMobile/ios/{ARDMediaConstraintsModel.m => ARDSettingsModel.m} (89%) rename webrtc/examples/objc/AppRTCMobile/ios/{ARDMediaConstraintsSettingsStore.h => ARDSettingsStore.h} (87%) rename webrtc/examples/objc/AppRTCMobile/ios/{ARDMediaConstraintsSettingsStore.m => ARDSettingsStore.m} (91%) rename webrtc/examples/objc/AppRTCMobile/tests/{ARDMediaConstraintsModelTests.mm => ARDSettingsModelTests.mm} (77%) diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn index 8a71895d39..76adf298c4 100644 --- a/webrtc/examples/BUILD.gn +++ b/webrtc/examples/BUILD.gn @@ -241,10 +241,11 @@ if (is_ios || (is_mac && target_cpu != "x86")) { "objc/AppRTCMobile/ios/ARDMainView.m", "objc/AppRTCMobile/ios/ARDMainViewController.h", "objc/AppRTCMobile/ios/ARDMainViewController.m", - "objc/AppRTCMobile/ios/ARDMediaConstraintsModel.h", - "objc/AppRTCMobile/ios/ARDMediaConstraintsModel.m", - "objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.h", - "objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.m", + "objc/AppRTCMobile/ios/ARDSettingsModel+Private.h", + "objc/AppRTCMobile/ios/ARDSettingsModel.h", + "objc/AppRTCMobile/ios/ARDSettingsModel.m", + "objc/AppRTCMobile/ios/ARDSettingsStore.h", + "objc/AppRTCMobile/ios/ARDSettingsStore.m", "objc/AppRTCMobile/ios/ARDSettingsViewController.h", "objc/AppRTCMobile/ios/ARDSettingsViewController.m", "objc/AppRTCMobile/ios/ARDStatsView.h", diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m index 3edb55cd98..593c6a27f8 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m @@ -19,7 +19,7 @@ #import "ARDAppClient.h" #import "ARDMainView.h" -#import "ARDMediaConstraintsModel.h" +#import "ARDSettingsModel.h" #import "ARDSettingsViewController.h" #import "ARDVideoCallViewController.h" @@ -173,7 +173,8 @@ static NSString *const barButtonImageString = @"ic_settings_black_24dp.png"; - (void)showSettings:(id)sender { ARDSettingsViewController *settingsController = [[ARDSettingsViewController alloc] initWithStyle:UITableViewStyleGrouped - mediaConstraintsModel:[[ARDMediaConstraintsModel alloc] init]]; + settingsModel:[[ARDSettingsModel alloc] init]]; + UINavigationController *navigationController = [[UINavigationController alloc] initWithRootViewController:settingsController]; [self presentViewControllerAsModal:navigationController]; diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel+Private.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel+Private.h similarity index 78% rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel+Private.h rename to webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel+Private.h index 57d507b814..eba99d7245 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel+Private.h +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel+Private.h @@ -9,13 +9,13 @@ */ #import -#import "ARDMediaConstraintsModel.h" +#import "ARDSettingsModel.h" -@class ARDMediaConstraintsSettingsStore; +@class ARDSettingsStore; NS_ASSUME_NONNULL_BEGIN -@interface ARDMediaConstraintsModel () -- (ARDMediaConstraintsSettingsStore *)settingsStore; +@interface ARDSettingsModel () +- (ARDSettingsStore *)settingsStore; - (nullable NSString *)currentVideoResolutionWidthFromStore; - (nullable NSString *)currentVideoResolutionHeightFromStore; @end diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.h similarity index 92% rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel.h rename to webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.h index 2f963e0361..9c8b5c5f62 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel.h +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.h @@ -12,16 +12,16 @@ NS_ASSUME_NONNULL_BEGIN /** - * Model class for user defined media constraints. + * Model class for user defined settings. * - * Currently used for streaming media constraints only. + * Currently used for streaming media constraints and bitrate only. * In future audio media constraints support can be added as well. * Offers list of avaliable video resolutions that can construct streaming media constraint. * Exposes methods for reading and storing media constraints from persistent store. * Also translates current user defined media constraint into RTCMediaConstraints * dictionary. */ -@interface ARDMediaConstraintsModel : NSObject +@interface ARDSettingsModel : NSObject /** * Returns array of available capture resoultions. @@ -55,6 +55,5 @@ NS_ASSUME_NONNULL_BEGIN * @return NSDictionary with RTC width and height parameters */ - (nullable NSDictionary *)currentMediaConstraintFromStoreAsRTCDictionary; - @end NS_ASSUME_NONNULL_END diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m similarity index 89% rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel.m rename to webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m index 0299301525..61b5c506bd 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel.m +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel.m @@ -8,8 +8,8 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "ARDMediaConstraintsModel+Private.h" -#import "ARDMediaConstraintsSettingsStore.h" +#import "ARDSettingsModel+Private.h" +#import "ARDSettingsStore.h" #import "WebRTC/RTCMediaConstraints.h" NS_ASSUME_NONNULL_BEGIN @@ -17,12 +17,12 @@ static NSArray *videoResolutionsStaticValues() { return @[ @"640x480", @"960x540", @"1280x720" ]; } -@interface ARDMediaConstraintsModel () { - ARDMediaConstraintsSettingsStore *_settingsStore; +@interface ARDSettingsModel () { + ARDSettingsStore *_settingsStore; } @end -@implementation ARDMediaConstraintsModel +@implementation ARDSettingsModel - (NSArray *)availableVideoResoultionsMediaConstraints { return videoResolutionsStaticValues(); @@ -48,9 +48,9 @@ static NSArray *videoResolutionsStaticValues() { #pragma mark - Testable -- (ARDMediaConstraintsSettingsStore *)settingsStore { +- (ARDSettingsStore *)settingsStore { if (!_settingsStore) { - _settingsStore = [[ARDMediaConstraintsSettingsStore alloc] init]; + _settingsStore = [[ARDSettingsStore alloc] init]; } return _settingsStore; } diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsStore.h similarity index 87% rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.h rename to webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsStore.h index 83e4a073ca..1541e2d63a 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.h +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsStore.h @@ -13,11 +13,11 @@ NS_ASSUME_NONNULL_BEGIN /** - * Light-weight persistent store for media constraints user settings. + * Light-weight persistent store for user settings. * * It will persist between application launches and application updates. */ -@interface ARDMediaConstraintsSettingsStore : NSObject +@interface ARDSettingsStore : NSObject /** * Returns current video resolution media constraint string stored in the store. diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsStore.m similarity index 91% rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.m rename to webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsStore.m index c8fb206575..6b3642e006 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.m +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsStore.m @@ -8,13 +8,13 @@ * be found in the AUTHORS file in the root of the source tree. */ -#import "ARDMediaConstraintsSettingsStore.h" +#import "ARDSettingsStore.h" static NSString *const kUserDefaultsMediaConstraintsKey = @"rtc_video_resolution_media_constraints_key"; NS_ASSUME_NONNULL_BEGIN -@implementation ARDMediaConstraintsSettingsStore +@implementation ARDSettingsStore - (nullable NSString *)videoResolutionConstraintsSetting { return [[NSUserDefaults standardUserDefaults] objectForKey:kUserDefaultsMediaConstraintsKey]; diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h index 91b9fc94a5..f979655c89 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h @@ -10,7 +10,7 @@ #import -@class ARDMediaConstraintsModel; +@class ARDSettingsModel; NS_ASSUME_NONNULL_BEGIN /** @@ -22,10 +22,10 @@ NS_ASSUME_NONNULL_BEGIN * Creates new instance. * * @param style the table view style that should be used - * @param mediaConstraintsModel model class for the media constraints settings. + * @param settingsModel model class for the user settings. */ - (instancetype)initWithStyle:(UITableViewStyle)style - mediaConstraintsModel:(ARDMediaConstraintsModel *)mediaConstraintsModel; + settingsModel:(ARDSettingsModel *)settingsModel; #pragma mark - Unavailable diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m index 63f5c43483..0abcc1efbb 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.m @@ -9,7 +9,7 @@ */ #import "ARDSettingsViewController.h" -#import "ARDMediaConstraintsModel.h" +#import "ARDSettingsModel.h" NS_ASSUME_NONNULL_BEGIN @@ -19,7 +19,7 @@ typedef NS_ENUM(int, ARDSettingsSections) { }; @interface ARDSettingsViewController () { - ARDMediaConstraintsModel *_mediaConstraintsModel; + ARDSettingsModel *_settingsModel; } @end @@ -27,10 +27,10 @@ typedef NS_ENUM(int, ARDSettingsSections) { @implementation ARDSettingsViewController - (instancetype)initWithStyle:(UITableViewStyle)style - mediaConstraintsModel:(ARDMediaConstraintsModel *)mediaConstraintsModel { + settingsModel:(ARDSettingsModel *)settingsModel { self = [super initWithStyle:style]; if (self) { - _mediaConstraintsModel = mediaConstraintsModel; + _settingsModel = settingsModel; } return self; } @@ -51,7 +51,7 @@ typedef NS_ENUM(int, ARDSettingsSections) { #pragma mark - Data source - (NSArray *)mediaConstraintsArray { - return _mediaConstraintsModel.availableVideoResoultionsMediaConstraints; + return _settingsModel.availableVideoResoultionsMediaConstraints; } #pragma mark - @@ -65,7 +65,7 @@ typedef NS_ENUM(int, ARDSettingsSections) { } - (void)selectCurrentlyStoredOrDefaultMediaConstraints { - NSString *currentSelection = [_mediaConstraintsModel currentVideoResoultionConstraintFromStore]; + NSString *currentSelection = [_settingsModel currentVideoResoultionConstraintFromStore]; NSUInteger indexOfSelection = [[self mediaConstraintsArray] indexOfObject:currentSelection]; NSIndexPath *pathToBeSelected = [NSIndexPath indexPathForRow:indexOfSelection inSection:0]; @@ -177,7 +177,7 @@ typedef NS_ENUM(int, ARDSettingsSections) { cell.accessoryType = UITableViewCellAccessoryCheckmark; NSString *mediaConstraintsString = self.mediaConstraintsArray[indexPath.row]; - [_mediaConstraintsModel storeVideoResoultionConstraint:mediaConstraintsString]; + [_settingsModel storeVideoResoultionConstraint:mediaConstraintsString]; } - (NSIndexPath *)tableView:(UITableView *)tableView diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m index d4008894d6..5e058662b0 100644 --- a/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m +++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDVideoCallViewController.m @@ -13,7 +13,7 @@ #import "webrtc/modules/audio_device/ios/objc/RTCAudioSession.h" #import "ARDAppClient.h" -#import "ARDMediaConstraintsModel.h" +#import "ARDSettingsModel.h" #import "ARDVideoCallView.h" #import "WebRTC/RTCAVFoundationVideoSource.h" #import "WebRTC/RTCDispatcher.h" @@ -46,10 +46,10 @@ if (self = [super init]) { _delegate = delegate; _client = [[ARDAppClient alloc] initWithDelegate:self]; - ARDMediaConstraintsModel *mediaConstraintsModel = [[ARDMediaConstraintsModel alloc] init]; + ARDSettingsModel *settingsModel = [[ARDSettingsModel alloc] init]; RTCMediaConstraints *cameraConstraints = [[RTCMediaConstraints alloc] initWithMandatoryConstraints:nil - optionalConstraints:[mediaConstraintsModel + optionalConstraints:[settingsModel currentMediaConstraintFromStoreAsRTCDictionary]]; [_client setCameraConstraints:cameraConstraints]; [_client connectToRoomWithId:room diff --git a/webrtc/examples/objc/AppRTCMobile/tests/ARDMediaConstraintsModelTests.mm b/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm similarity index 77% rename from webrtc/examples/objc/AppRTCMobile/tests/ARDMediaConstraintsModelTests.mm rename to webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm index e4a25b94d8..5be8b6b5be 100644 --- a/webrtc/examples/objc/AppRTCMobile/tests/ARDMediaConstraintsModelTests.mm +++ b/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm @@ -10,14 +10,14 @@ #import #import -#import "ARDMediaConstraintsModel+Private.h" -#import "ARDMediaConstraintsSettingsStore.h" +#import "ARDSettingsModel+Private.h" +#import "ARDSettingsStore.h" #import "WebRTC/RTCMediaConstraints.h" #include "webrtc/base/gunit.h" -@interface ARDMediaConstraintsModelTests : NSObject { - ARDMediaConstraintsModel *_model; +@interface ARDSettingsModelTests : NSObject { + ARDSettingsModel *_model; } - (void)testStoringInavlidConstraintReturnsNo; @@ -27,18 +27,18 @@ @end -@implementation ARDMediaConstraintsModelTests +@implementation ARDSettingsModelTests - (instancetype)init { self = [super init]; if (self) { - _model = [[ARDMediaConstraintsModel alloc] init]; + _model = [[ARDSettingsModel alloc] init]; } return self; } - (id)setupMockStoreWithMediaConstraintString:(NSString *)constraintString { - id storeMock = [OCMockObject mockForClass:[ARDMediaConstraintsSettingsStore class]]; + id storeMock = [OCMockObject mockForClass:[ARDSettingsStore class]]; [([[storeMock stub] andReturn:constraintString]) videoResolutionConstraintsSetting]; id partialMock = [OCMockObject partialMockForObject:_model]; @@ -116,43 +116,43 @@ } @end -class ARDMediaConstraintsModelTest : public ::testing::Test { +class ARDSettingsModelTest : public ::testing::Test { protected: - ARDMediaConstraintsModelTests *test; - ARDMediaConstraintsModelTest() { test = [[ARDMediaConstraintsModelTests alloc] init]; } + ARDSettingsModelTests *test; + ARDSettingsModelTest() { test = [[ARDSettingsModelTests alloc] init]; } }; -TEST_F(ARDMediaConstraintsModelTest, DefaultMediaFromStore) { +TEST_F(ARDSettingsModelTest, DefaultMediaFromStore) { @autoreleasepool { [test testDefaultMediaFromStore]; } } -TEST_F(ARDMediaConstraintsModelTest, StoringInvalidConstraintsReturnsNo) { +TEST_F(ARDSettingsModelTest, StoringInvalidConstraintsReturnsNo) { @autoreleasepool { [test testStoringInavlidConstraintReturnsNo]; } } -TEST_F(ARDMediaConstraintsModelTest, WidthConstraintFromStore) { +TEST_F(ARDSettingsModelTest, WidthConstraintFromStore) { @autoreleasepool { [test testWidthConstraintFromStore]; } } -TEST_F(ARDMediaConstraintsModelTest, HeightConstraintFromStore) { +TEST_F(ARDSettingsModelTest, HeightConstraintFromStore) { @autoreleasepool { [test testHeightConstraintFromStore]; } } -TEST_F(ARDMediaConstraintsModelTest, ConstratintIsNil) { +TEST_F(ARDSettingsModelTest, ConstratintIsNil) { @autoreleasepool { [test testConstraintComponentIsNilWhenInvalidConstraintString]; } } -TEST_F(ARDMediaConstraintsModelTest, DictionaryIsNil) { +TEST_F(ARDSettingsModelTest, DictionaryIsNil) { @autoreleasepool { [test testConstraintsDictionaryIsNilWhenInvalidConstraintString]; }