Index: webrtc/modules/audio_processing/test/audio_buffer_tools.cc |
diff --git a/webrtc/modules/audio_processing/test/audio_buffer_tools.cc b/webrtc/modules/audio_processing/test/audio_buffer_tools.cc |
index a8cb09ca6a4b7a3da898163b647c8d42e9ce7d5f..9fcfc71944401270e512760f56ef8dd077afca53 100644 |
--- a/webrtc/modules/audio_processing/test/audio_buffer_tools.cc |
+++ b/webrtc/modules/audio_processing/test/audio_buffer_tools.cc |
@@ -10,10 +10,12 @@ |
#include "webrtc/modules/audio_processing/test/audio_buffer_tools.h" |
+#include <string.h> |
+ |
namespace webrtc { |
namespace test { |
-void SetupFrame(StreamConfig stream_config, |
+void SetupFrame(const StreamConfig& stream_config, |
std::vector<float*>* frame, |
std::vector<float>* frame_samples) { |
frame_samples->resize(stream_config.num_channels() * |
@@ -25,7 +27,7 @@ void SetupFrame(StreamConfig stream_config, |
} |
void CopyVectorToAudioBuffer(const StreamConfig& stream_config, |
- const std::vector<float>& source, |
+ rtc::ArrayView<const float> source, |
AudioBuffer* destination) { |
std::vector<float*> input; |
std::vector<float> input_samples; |
@@ -33,22 +35,20 @@ void CopyVectorToAudioBuffer(const StreamConfig& stream_config, |
SetupFrame(stream_config, &input, &input_samples); |
RTC_DCHECK_EQ(input_samples.size(), source.size()); |
hlundin-webrtc
2016/03/18 07:53:35
Change to CHECK, since this ensures the sanity of
peah-webrtc
2016/03/18 08:48:09
Done.
|
- input_samples = source; |
+ memcpy(input_samples.data(), source.data(), |
+ source.size() * sizeof(source[0])); |
destination->CopyFrom(&input[0], stream_config); |
} |
-std::vector<float> ExtractVectorFromAudioBuffer( |
- const StreamConfig& stream_config, |
- AudioBuffer* source) { |
+void ExtractVectorFromAudioBuffer(const StreamConfig& stream_config, |
+ AudioBuffer* source, |
+ std::vector<float>* destination) { |
std::vector<float*> output; |
- std::vector<float> output_samples; |
- SetupFrame(stream_config, &output, &output_samples); |
+ SetupFrame(stream_config, &output, destination); |
source->CopyTo(stream_config, &output[0]); |
- |
- return output_samples; |
} |
} // namespace test |