Expose apm config (#163)

Author: hiroshihorie

sdk/BUILD.gn

@@ -1482,6 +1482,7 @@ if (is_ios || is_mac) {
           "objc/components/audio/RTCAudioProcessingModule.h",
           "objc/components/audio/RTCDefaultAudioProcessingModule.h",
           "objc/components/audio/RTCAudioCustomProcessingDelegate.h",
+          "objc/components/audio/RTCAudioProcessingConfig.h",
         ]
 
         if (target_environment != "xrdevice" && target_environment != "xrsimulator") {
@@ -1656,6 +1657,7 @@ if (is_ios || is_mac) {
           "objc/components/audio/RTCAudioProcessingModule.h",
           "objc/components/audio/RTCDefaultAudioProcessingModule.h",
           "objc/components/audio/RTCAudioCustomProcessingDelegate.h",
+          "objc/components/audio/RTCAudioProcessingConfig.h",
         ]
         if (!build_with_chromium) {
           sources += [

sdk/objc/components/audio/RTCAudioProcessingConfig+Private.h

@@ -22,6 +22,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface RTC_OBJC_TYPE (RTCAudioProcessingConfig)()
 
+- (instancetype)initWithNativeAudioProcessingConfig:(webrtc::AudioProcessing::Config)config;
+
 @property(nonatomic, readonly) webrtc::AudioProcessing::Config nativeAudioProcessingConfig;
 
 @end

sdk/objc/components/audio/RTCAudioProcessingConfig.h

@@ -22,8 +22,14 @@ NS_ASSUME_NONNULL_BEGIN
 RTC_OBJC_EXPORT
 @interface RTC_OBJC_TYPE (RTCAudioProcessingConfig) : NSObject 
 
-@property(nonatomic, assign) BOOL echoCancellerEnabled;
-@property(nonatomic, assign) BOOL echoCancellerMobileMode;
+@property(nonatomic, assign) BOOL isEchoCancellationEnabled;
+@property(nonatomic, assign) BOOL isEchoCancellationMobileMode;
+
+@property(nonatomic, assign) BOOL isNoiseSuppressionEnabled;
+@property(nonatomic, assign) BOOL isHighpassFilterEnabled;
+
+@property(nonatomic, assign) BOOL isAutoGainControl1Enabled;
+@property(nonatomic, assign) BOOL isAutoGainControl2Enabled;
 
 
 @end

sdk/objc/components/audio/RTCAudioProcessingConfig.mm

@@ -24,26 +24,73 @@ @implementation RTC_OBJC_TYPE (RTCAudioProcessingConfig) {
 
 // config.echo_canceller.enabled
 
-- (BOOL)echoCancellerEnabled {
+- (BOOL)isEchoCancellationEnabled {
   return _config.echo_canceller.enabled;
 }
 
-- (void)setEchoCancellerEnabled:(BOOL)value {
+- (void)setIsEchoCancellationEnabled:(BOOL)value {
   _config.echo_canceller.enabled = value;
 }
 
 // config.echo_canceller.mobile_mode
 
-- (BOOL)echoCancellerMobileMode {
+- (BOOL)isEchoCancellationMobileMode {
   return _config.echo_canceller.mobile_mode;
 }
 
-- (void)setEchoCancellerMobileMode:(BOOL)value {
+- (void)setIsEchoCancellationMobileMode:(BOOL)value {
   _config.echo_canceller.mobile_mode = value;
 }
 
+// config.noise_suppression.enabled
+
+- (BOOL)isNoiseSuppressionEnabled {
+  return _config.noise_suppression.enabled;
+}
+
+- (void)setIsNoiseSuppressionEnabled:(BOOL)value {
+  _config.noise_suppression.enabled = value;
+}
+
+// config.high_pass_filter.enabled
+
+- (BOOL)isHighpassFilterEnabled {
+  return _config.high_pass_filter.enabled;
+}
+
+- (void)setIsHighpassFilterEnabled:(BOOL)value {
+  _config.high_pass_filter.enabled = value;
+}
+
+// config.gain_controller1.enabled
+
+- (BOOL)isAutoGainControl1Enabled {
+  return _config.gain_controller1.enabled;
+}
+
+- (void)setIsAutoGainControl1Enabled:(BOOL)value {
+  _config.gain_controller1.enabled = value;
+}
+
+// config.gain_controller2.enabled
+
+- (BOOL)isAutoGainControl2Enabled {
+  return _config.gain_controller2.enabled;
+}
+
+- (void)setIsAutoGainControl2Enabled:(BOOL)value {
+  _config.gain_controller2.enabled = value;
+}
+
 #pragma mark - Private
 
+- (instancetype)initWithNativeAudioProcessingConfig:(webrtc::AudioProcessing::Config)config {
+  if (self = [super init]) {
+    _config = config;
+  }
+  return self;
+}
+
 - (webrtc::AudioProcessing::Config)nativeAudioProcessingConfig {
   return _config;
 }

sdk/objc/components/audio/RTCAudioProcessingModule.h

@@ -24,9 +24,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 RTC_OBJC_EXPORT @protocol RTC_OBJC_TYPE (RTCAudioProcessingModule)<NSObject>
 
-- (void)applyConfig: (RTC_OBJC_TYPE(RTCAudioProcessingConfig) *)config;
-
-// TODO: Implement...
+@property(nonatomic, assign) RTC_OBJC_TYPE(RTCAudioProcessingConfig) * config;
 
 @end
 

sdk/objc/components/audio/RTCDefaultAudioProcessingModule.h

@@ -32,7 +32,7 @@ RTC_OBJC_EXPORT
    renderPreProcessingDelegate: (nullable id<RTC_OBJC_TYPE(RTCAudioCustomProcessingDelegate)>)renderPreProcessingDelegate
    NS_SWIFT_NAME(init(config:capturePostProcessingDelegate:renderPreProcessingDelegate:)) NS_DESIGNATED_INITIALIZER;
 
-- (void)applyConfig:(RTC_OBJC_TYPE(RTCAudioProcessingConfig) *)config;
+@property(nonatomic, assign) RTC_OBJC_TYPE(RTCAudioProcessingConfig) * config;
 
 // Dynamically update delegates at runtime
 

sdk/objc/components/audio/RTCDefaultAudioProcessingModule.mm

@@ -83,7 +83,12 @@ - (void)setRenderPreProcessingDelegate:
 
 #pragma mark - RTCAudioProcessingModule protocol
 
-- (void)applyConfig:(RTC_OBJC_TYPE(RTCAudioProcessingConfig) *)config {
+- (RTC_OBJC_TYPE(RTCAudioProcessingConfig) *)config {
+  webrtc::AudioProcessing::Config nativeConfig = _nativeAudioProcessingModule->GetConfig();
+  return [[RTC_OBJC_TYPE(RTCAudioProcessingConfig) alloc] initWithNativeAudioProcessingConfig: nativeConfig];
+}
+
+- (void)setConfig:(RTC_OBJC_TYPE(RTCAudioProcessingConfig) *)config {
   _nativeAudioProcessingModule->ApplyConfig(config.nativeAudioProcessingConfig);
 }