Compare serialized Configs.

webrtc/modules/audio_processing/audio_processing_impl.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 224 matching lines @@
 
   noise_suppression_ = new NoiseSuppressionImpl(this, crit_);
   component_list_.push_back(noise_suppression_);
 
   voice_detection_ = new VoiceDetectionImpl(this, crit_);
   component_list_.push_back(voice_detection_);
 
   gain_control_for_new_agc_.reset(new GainControlForNewAgc(gain_control_));
 
   SetExtraOptions(config);
-
-#ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
-  UpdateCurrentConfig();
-#endif
 }
 
 AudioProcessingImpl::~AudioProcessingImpl() {
   {
     CriticalSectionScoped crit_scoped(crit_);
     // Depends on gain_control_ and gain_control_for_new_agc_.
     agc_manager_.reset();
     // Depends on gain_control_.
     gain_control_for_new_agc_.reset();
     while (!component_list_.empty()) {
@@ skipping 290 matching lines @@
 
   ProcessingConfig processing_config = api_format_;
   processing_config.input_stream() = input_config;
   processing_config.output_stream() = output_config;
 
   RETURN_ON_ERR(MaybeInitializeLocked(processing_config));
   assert(processing_config.input_stream().num_frames() ==
          api_format_.input_stream().num_frames());
 
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
-  if (debug_file_->Open() && UpdateCurrentConfig()) {
-    RETURN_ON_ERR(WriteConfigMessage());
-  }
+  if (debug_file_->Open()) {
+    RETURN_ON_ERR(WriteConfigMessageIfChanged());
 
-  if (debug_file_->Open()) {
     event_msg_->set_type(audioproc::Event::STREAM);
     audioproc::Stream* msg = event_msg_->mutable_stream();
     const size_t channel_size =
         sizeof(float) * api_format_.input_stream().num_frames();
     for (int i = 0; i < api_format_.input_stream().num_channels(); ++i)
       msg->add_input_channel(src[i], channel_size);
   }
 #endif
 
   capture_audio_->CopyFrom(src, api_format_.input_stream());
@@ skipping 365 matching lines @@
     if (debug_file_->CloseFile() == -1) {
       return kFileError;
     }
   }
 
   if (debug_file_->OpenFile(filename, false) == -1) {
     debug_file_->CloseFile();
     return kFileError;
   }
 
-  UpdateCurrentConfig();
-  int err = WriteConfigMessage();
-  if (err != kNoError) {
-    return err;
-  }
-
-  err = WriteInitMessage();
-  if (err != kNoError) {
-    return err;
-  }
+  RETURN_ON_ERR(WriteConfigMessageIfChanged());
+  RETURN_ON_ERR(WriteInitMessage());
   return kNoError;
 #else
   return kUnsupportedFunctionError;
 #endif  // WEBRTC_AUDIOPROC_DEBUG_DUMP
 }
 
 int AudioProcessingImpl::StartDebugRecording(FILE* handle) {
   CriticalSectionScoped crit_scoped(crit_);
 
   if (handle == NULL) {
     return kNullPointerError;
   }
 
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
   // Stop any ongoing recording.
   if (debug_file_->Open()) {
     if (debug_file_->CloseFile() == -1) {
       return kFileError;
     }
   }
 
   if (debug_file_->OpenFromFileHandle(handle, true, false) == -1) {
     return kFileError;
   }
 
-  UpdateCurrentConfig();
-  int err = WriteConfigMessage();
-  if (err != kNoError) {
-    return err;
-  }
-
-  err = WriteInitMessage();
-  if (err != kNoError) {
-    return err;
-  }
+  RETURN_ON_ERR(WriteConfigMessageIfChanged());
+  RETURN_ON_ERR(WriteInitMessage());
   return kNoError;
 #else
   return kUnsupportedFunctionError;
 #endif  // WEBRTC_AUDIOPROC_DEBUG_DUMP
 }
 
 int AudioProcessingImpl::StartDebugRecordingForPlatformFile(
     rtc::PlatformFile handle) {
   FILE* stream = rtc::FdopenPlatformFileForWriting(handle);
   return StartDebugRecording(stream);
@@ skipping 257 matching lines @@
   // TODO(ekmeyerson): Add reverse output fields to event_msg_.
 
   int err = WriteMessageToDebugFile();
   if (err != kNoError) {
     return err;
   }
 
   return kNoError;
 }
 
-bool AudioProcessingImpl::UpdateCurrentConfig() {
-  bool changed = false;
+int AudioProcessingImpl::WriteConfigMessageIfChanged() {
+  audioproc::Config config;
+  config.set_aec_enabled(echo_cancellation_->is_enabled());
+  config.set_aec_delay_agnostic(
+      echo_cancellation_->is_delay_agnostic_enabled());
+  config.set_agc_enabled(gain_control_->is_enabled());
+  // More fields...
 
-  // Acoustic echo canceler.
-  {
-    const bool value = echo_cancellation_->is_enabled();
-    if (!config_->has_aec_enabled() || value != config_->aec_enabled()) {
-      config_->set_aec_enabled(value);
-      changed = true;
-    }
-  }
-  {
-    const bool value = echo_cancellation_->is_delay_agnostic_enabled();
-    if (!config_->has_aec_delay_agnostic() ||
-        value != config_->aec_delay_agnostic()) {
-      config_->set_aec_delay_agnostic(value);
-      changed = true;
-    }
-  }
-  {
-    const bool value = echo_cancellation_->is_drift_compensation_enabled();
-    if (!config_->has_aec_drift_compensation() ||
-        value != config_->aec_drift_compensation()) {
-      config_->set_aec_drift_compensation(value);
-      changed = true;
-    }
-  }
-  {
-    const bool value = echo_cancellation_->is_extended_filter_enabled();
-    if (!config_->has_aec_extended_filter() ||
-        value != config_->aec_extended_filter()) {
-      config_->set_aec_extended_filter(value);
-      changed = true;
-    }
-  }
-  {
-    const int value = static_cast<int>(echo_cancellation_->suppression_level());
-    if (!config_->has_aec_suppression_level() ||
-        value != config_->aec_suppression_level()) {
-      config_->set_aec_suppression_level(value);
-      changed = true;
-    }
-  }
+  std::string serialized_config = config.SerializeAsString();
+  if (serialized_config != last_serialized_config_) {
+    last_serialized_config_ = serialized_config;
 
-  // Mobile AEC.
-  {
-    const bool value = echo_control_mobile_->is_enabled();
-    if (!config_->has_aecm_enabled() || value != config_->aecm_enabled()) {
-      config_->set_aecm_enabled(value);
-      changed = true;
-    }
-  }
-  {
-    const bool value = echo_control_mobile_->is_comfort_noise_enabled();
-    if (!config_->has_aecm_comfort_noise() ||
-        value != config_->aecm_comfort_noise()) {
-      config_->set_aecm_comfort_noise(value);
-      changed = true;
-    }
-  }
-  {
-    const int value = static_cast<int>(echo_control_mobile_->routing_mode());
-    if (!config_->has_aecm_routing_mode() ||
-        value != config_->aecm_routing_mode()) {
-      config_->set_aecm_routing_mode(value);
-      changed = true;
-    }
-  }
+    event_msg_->set_type(audioproc::Event::CONFIG);
+    event_msg_->mutable_config()->CopyFrom(config);
 
-  // Automatic gain controller.
-  {
-    const bool value = gain_control_->is_enabled();
-    if (!config_->has_agc_enabled() || value != config_->agc_enabled()) {
-      config_->set_agc_enabled(value);
-      changed = true;
-    }
-  }
-  {
-    const bool value = use_new_agc_;
-    if (!config_->has_agc_experiment() || value != config_->agc_experiment()) {
-      config_->set_agc_experiment(value);
-      changed = true;
-    }
-  }
-  {
-    const int value = static_cast<int>(gain_control_->mode());
-    if (!config_->has_agc_mode() || value != config_->agc_mode()) {
-      config_->set_agc_mode(value);
-      changed = true;
-    }
-  }
-  {
-    const bool value = gain_control_->is_limiter_enabled();
-    if (!config_->has_agc_limiter() || value != config_->agc_limiter()) {
-      config_->set_agc_limiter(value);
-      changed = true;
-    }
-  }
-
-  // High pass filter.
-  {
-    const bool value = high_pass_filter_->is_enabled();
-    if (!config_->has_hpf_enabled() || value != config_->hpf_enabled()) {
-      config_->set_hpf_enabled(value);
-      changed = true;
-    }
-  }
-
-  // Noise suppression.
-  {
-    const bool value = noise_suppression_->is_enabled();
-    if (!config_->has_ns_enabled() || value != config_->ns_enabled()) {
-      config_->set_ns_enabled(value);
-      changed = true;
-    }
-  }
-  {
-    const bool value = transient_suppressor_enabled_;
-    if (!config_->has_ns_experiment() || value != config_->ns_experiment()) {
-      config_->set_ns_experiment(value);
-      changed = true;
-    }
-  }
-  {
-    const int value = static_cast<int>(noise_suppression_->level());
-    if (!config_->has_ns_level() || value != config_->ns_level()) {
-      config_->set_ns_level(value);
-      changed = true;
-    }
-  }
-
-  return changed;
-}
-
-int AudioProcessingImpl::WriteConfigMessage() {
-  event_msg_->set_type(audioproc::Event::CONFIG);
-  event_msg_->mutable_config()->CopyFrom(*config_);
-
-  int err = WriteMessageToDebugFile();
-  if (err != kNoError) {
-    return err;
+    RETURN_ON_ERR(WriteMessageToDebugFile());
   }
 
   return kNoError;
 }
 #endif  // WEBRTC_AUDIOPROC_DEBUG_DUMP
 
 }  // namespace webrtc