commit ec0c58c6bf4c5c5950023731eea5d024e3fa5743
author aluebs@webrtc.org <aluebs@webrtc.org> Thu Aug 28 10:43:09 2014 +0000
committer aluebs@webrtc.org <aluebs@webrtc.org> Thu Aug 28 10:43:09 2014 +0000
tree 032a5dc8bad47b48e71829aee6ac6a4acf6d8f3d
parent 21d508bae9306ba17df92dbe487eb5116e9023f6

Fix the different samples per channel in aecdump

BUG=webrtc:3359
R=bjornv@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/15299004

git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@6996 4adac7df-926f-26a2-2b94-8c16560cd09d

modules/audio_processing/audio_processing_impl.cc

diff --git a/modules/audio_processing/audio_processing_impl.cc b/modules/audio_processing/audio_processing_impl.cc
index cc2b5c0..9d7f1ec 100644
--- a/modules/audio_processing/audio_processing_impl.cc
+++ b/modules/audio_processing/audio_processing_impl.cc
@@ -367,7 +367,8 @@
   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) * samples_per_channel;
+    const size_t channel_size =
+        sizeof(float) * fwd_in_format_.samples_per_channel();
     for (int i = 0; i < fwd_in_format_.num_channels(); ++i)
       msg->add_input_channel(src[i], channel_size);
   }
@@ -384,7 +385,8 @@
 #ifdef WEBRTC_AUDIOPROC_DEBUG_DUMP
   if (debug_file_->Open()) {
     audioproc::Stream* msg = event_msg_->mutable_stream();
-    const size_t channel_size = sizeof(float) * samples_per_channel;
+    const size_t channel_size =
+        sizeof(float) * fwd_out_format_.samples_per_channel();
     for (int i = 0; i < fwd_proc_format_.num_channels(); ++i)
       msg->add_output_channel(dest[i], channel_size);
     RETURN_ON_ERR(WriteMessageToDebugFile());
@@ -533,7 +535,8 @@
   if (debug_file_->Open()) {
     event_msg_->set_type(audioproc::Event::REVERSE_STREAM);
     audioproc::ReverseStream* msg = event_msg_->mutable_reverse_stream();
-    const size_t channel_size = sizeof(float) * samples_per_channel;
+    const size_t channel_size =
+        sizeof(float) * rev_in_format_.samples_per_channel();
     for (int i = 0; i < num_channels; ++i)
       msg->add_channel(data[i], channel_size);
     RETURN_ON_ERR(WriteMessageToDebugFile());