AudioBus: Add a ToInterleavedFloat() method to AudioBus

content/renderer/media/audio_track_recorder.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/audio_track_recorder.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 59 matching lines @@
   }
   // If |result| in {0,1}, do nothing; the documentation says that a return
   // value of zero or one means the packet does not need to be transmitted.
   // Otherwise, we have an error.
   DLOG_IF(ERROR, result < 0) << " encode failed: " << opus_strerror(result);
   return false;
 }
 
 // Interleaves |audio_bus| channels() of floats into a single output linear
 // |buffer|.
-// TODO(mcasas) https://crbug.com/580391 use AudioBus::ToInterleavedFloat().
 void ToInterleaved(media::AudioBus* audio_bus, float* buffer) {
-  for (int ch = 0; ch < audio_bus->channels(); ++ch) {
-    const float* src = audio_bus->channel(ch);
-    const float* const src_end = src + audio_bus->frames();
-    float* dest = buffer + ch;
-    for (; src < src_end; ++src, dest += audio_bus->channels())
-      *dest = *src;
-  }
+  audio_bus->ToInterleavedFloat(0, 0, audio_bus->frames(),

[mcasas, 2016/03/09 00:24:18]

Please inline this call and remove ToInterleave()
altogether.

[eklavyamirani, 2016/03/15 03:48:13]

Done.

+                                audio_bus->channels(), buffer);
 }
 
 }  // anonymous namespace
 
 // Nested class encapsulating opus-related encoding details. It contains an
 // AudioConverter to adapt incoming data to the format Opus likes to have.
 // AudioEncoder is created and destroyed on ATR's main thread (usually the main
 // render thread) but otherwise should operate entirely on |encoder_thread_|,
 // which is owned by AudioTrackRecorder. Be sure to delete |encoder_thread_|
 // before deleting the AudioEncoder using it.
@@ skipping 230 matching lines @@
   scoped_ptr<media::AudioBus> audio_data =
       media::AudioBus::Create(audio_bus.channels(), audio_bus.frames());
   audio_bus.CopyTo(audio_data.get());
 
   encoder_thread_.task_runner()->PostTask(
       FROM_HERE, base::Bind(&AudioEncoder::EncodeAudio, encoder_,
                             base::Passed(&audio_data), capture_time));
 }
 
 }  // namespace content