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}
diff --git a/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m b/webrtc/examples/objc/AppRTCMobile/ios/ARDMainViewController.m
index 3edb55c..593c6a2 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 @@
- (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 57d507b..eba99d7 100644
--- a/webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsModel+Private.h
+++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsModel+Private.h
@@ -9,13 +9,13 @@
*/
#import <Foundation/Foundation.h>
-#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 2f963e0..9c8b5c5 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 @@
* @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 0299301..61b5c50 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 @@
return @[ @"640x480", @"960x540", @"1280x720" ];
}
-@interface ARDMediaConstraintsModel () {
- ARDMediaConstraintsSettingsStore *_settingsStore;
+@interface ARDSettingsModel () {
+ ARDSettingsStore *_settingsStore;
}
@end
-@implementation ARDMediaConstraintsModel
+@implementation ARDSettingsModel
- (NSArray<NSString *> *)availableVideoResoultionsMediaConstraints {
return videoResolutionsStaticValues();
@@ -48,9 +48,9 @@
#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 83e4a07..1541e2d 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 90%
rename from webrtc/examples/objc/AppRTCMobile/ios/ARDMediaConstraintsSettingsStore.m
rename to webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsStore.m
index c8fb206..6b3642e 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 91b9fc9..f979655 100644
--- a/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h
+++ b/webrtc/examples/objc/AppRTCMobile/ios/ARDSettingsViewController.h
@@ -10,7 +10,7 @@
#import <UIKit/UIKit.h>
-@class ARDMediaConstraintsModel;
+@class ARDSettingsModel;
NS_ASSUME_NONNULL_BEGIN
/**
@@ -22,10 +22,10 @@
* 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 63f5c43..0abcc1e 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 @@
};
@interface ARDSettingsViewController () {
- ARDMediaConstraintsModel *_mediaConstraintsModel;
+ ARDSettingsModel *_settingsModel;
}
@end
@@ -27,10 +27,10 @@
@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 @@
#pragma mark - Data source
- (NSArray<NSString *> *)mediaConstraintsArray {
- return _mediaConstraintsModel.availableVideoResoultionsMediaConstraints;
+ return _settingsModel.availableVideoResoultionsMediaConstraints;
}
#pragma mark -
@@ -65,7 +65,7 @@
}
- (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 @@
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 d400889..5e05866 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 e4a25b9..5be8b6b 100644
--- a/webrtc/examples/objc/AppRTCMobile/tests/ARDMediaConstraintsModelTests.mm
+++ b/webrtc/examples/objc/AppRTCMobile/tests/ARDSettingsModelTests.mm
@@ -10,14 +10,14 @@
#import <Foundation/Foundation.h>
#import <OCMock/OCMock.h>
-#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];
}