Refactor ParseArrayGeometry to use standard Chromium facilities.

content/renderer/media/media_stream_audio_processor.cc

Index: content/renderer/media/media_stream_audio_processor.cc
diff --git a/content/renderer/media/media_stream_audio_processor.cc b/content/renderer/media/media_stream_audio_processor.cc
index a1a8e1578643e8c50f2578069d876895ff1e2dd2..372859095fe99b1fce7e294590ed2241ee6f0048 100644
--- a/content/renderer/media/media_stream_audio_processor.cc
+++ b/content/renderer/media/media_stream_audio_processor.cc
@@ -93,6 +93,31 @@ bool IsBeamformingEnabled(const MediaAudioConstraints& audio_constraints) {
          audio_constraints.GetProperty(MediaAudioConstraints::kGoogBeamforming);
 }
 
+void ConfigureBeamforming(webrtc::Config* config,
+                          const std::string& geometry_str) {
+  std::vector<webrtc::Point> geometry = ParseArrayGeometry(geometry_str);
+#if defined(OS_CHROMEOS)
+  if (geometry.size() == 0) {

[emircan, 2015/08/03 18:06:22]

std::vector::empty() can be used here.

[ajm, 2015/08/04 01:16:35]

Done.

+    const std::string board = base::SysInfo::GetLsbReleaseBoard();

[emircan, 2015/08/03 18:06:22]

const std::string& board can avoid a copy.

[ajm, 2015/08/04 01:16:35]

I don't think this can avoid a copy. GetLsbReleaseBoard() returns a std::string
by value. Assigning to a reference here must bind it to a temporary. Whether a
copy occurs comes down to whether RVO takes place or not in the construction of
that temporary.

Do you agree?

+    if (board.find("nyan_kitty") != std::string::npos) {
+      geometry.push_back(webrtc::Point(-0.03f, 0.f, 0.f));
+      geometry.push_back(webrtc::Point(0.03f, 0.f, 0.f));
+    } else if (board.find("peach_pi") != std::string::npos) {
+      geometry.push_back(webrtc::Point(-0.025f, 0.f, 0.f));
+      geometry.push_back(webrtc::Point(0.025f, 0.f, 0.f));
+    } else if (board.find("samus") != std::string::npos) {
+      geometry.push_back(webrtc::Point(-0.032f, 0.f, 0.f));
+      geometry.push_back(webrtc::Point(0.032f, 0.f, 0.f));
+    } else if (board.find("swanky") != std::string::npos) {
+      geometry.push_back(webrtc::Point(-0.026f, 0.f, 0.f));
+      geometry.push_back(webrtc::Point(0.026f, 0.f, 0.f));
+    }
+  }
+#endif
+  config->Set<webrtc::Beamforming>(
+      new webrtc::Beamforming(geometry.size() > 1, geometry));
+}
+
 }  // namespace
 
 // Wraps AudioBus to provide access to the array of channel pointers, since this
@@ -484,8 +509,9 @@ void MediaStreamAudioProcessor::InitializeAudioProcessingModule(
   if (IsDelayAgnosticAecEnabled())
     config.Set<webrtc::DelayAgnostic>(new webrtc::DelayAgnostic(true));
   if (goog_beamforming) {
-    ConfigureBeamforming(&config, audio_constraints.GetPropertyAsString(
-        MediaAudioConstraints::kGoogArrayGeometry));
+    ConfigureBeamforming(&config,
+                         audio_constraints.GetPropertyAsString(
+                             MediaAudioConstraints::kGoogArrayGeometry));
   }
 
   // Create and configure the webrtc::AudioProcessing.
@@ -529,50 +555,6 @@ void MediaStreamAudioProcessor::InitializeAudioProcessingModule(
   RecordProcessingState(AUDIO_PROCESSING_ENABLED);
 }
 
-void MediaStreamAudioProcessor::ConfigureBeamforming(
-    webrtc::Config* config,
-    const std::string& geometry_str) const {
-  std::vector<webrtc::Point> geometry = ParseArrayGeometry(geometry_str);
-#if defined(OS_CHROMEOS)
-  if (geometry.size() == 0) {
-    const std::string board = base::SysInfo::GetLsbReleaseBoard();
-    if (board.find("nyan_kitty") != std::string::npos) {
-      geometry.push_back(webrtc::Point(-0.03f, 0.f, 0.f));
-      geometry.push_back(webrtc::Point(0.03f, 0.f, 0.f));
-    } else if (board.find("peach_pi") != std::string::npos) {
-      geometry.push_back(webrtc::Point(-0.025f, 0.f, 0.f));
-      geometry.push_back(webrtc::Point(0.025f, 0.f, 0.f));
-    } else if (board.find("samus") != std::string::npos) {
-      geometry.push_back(webrtc::Point(-0.032f, 0.f, 0.f));
-      geometry.push_back(webrtc::Point(0.032f, 0.f, 0.f));
-    } else if (board.find("swanky") != std::string::npos) {
-      geometry.push_back(webrtc::Point(-0.026f, 0.f, 0.f));
-      geometry.push_back(webrtc::Point(0.026f, 0.f, 0.f));
-    }
-  }
-#endif
-  config->Set<webrtc::Beamforming>(new webrtc::Beamforming(geometry.size() > 1,
-                                                           geometry));
-}
-
-std::vector<webrtc::Point> MediaStreamAudioProcessor::ParseArrayGeometry(
-    const std::string& geometry_str) const {
-  std::vector<webrtc::Point> result;
-  std::vector<float> values;
-  std::istringstream str(geometry_str);
-  std::copy(std::istream_iterator<float>(str),
-            std::istream_iterator<float>(),
-            std::back_inserter(values));
-  if (values.size() % 3 == 0) {
-    for (size_t i = 0; i < values.size(); i += 3) {
-      result.push_back(webrtc::Point(values[i + 0],
-                                     values[i + 1],
-                                     values[i + 2]));
-    }
-  }
-  return result;
-}
-
 void MediaStreamAudioProcessor::InitializeCaptureFifo(
     const media::AudioParameters& input_format) {
   DCHECK(main_thread_checker_.CalledOnValidThread());