commit 74cf9169240ba6867f7b9f210507c146b37da522
author aluebs@webrtc.org <aluebs@webrtc.org> Wed Sep 03 11:05:01 2014 +0000
committer aluebs@webrtc.org <aluebs@webrtc.org> Wed Sep 03 11:05:01 2014 +0000
tree d16fc6cba51785ae253169b38b246390338e1ee8
parent 48f2568d89c09c4363040cfc3cb63a1df0121955

Fix issues in audioproc for float aecdumps

* The right buffer size is used to dump to file when the output sample rate is different from the input one.
* The percentage of processed chunks is calculated correctly when float data available.

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

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

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

webrtc/modules/audio_processing/test/process_test.cc

diff --git a/webrtc/modules/audio_processing/test/process_test.cc b/webrtc/modules/audio_processing/test/process_test.cc
index 05f4b77..f0dc2cb 100644
--- a/webrtc/modules/audio_processing/test/process_test.cc
+++ b/webrtc/modules/audio_processing/test/process_test.cc
@@ -605,13 +605,14 @@
 
         samples_per_channel = msg.sample_rate() / 100;
         far_frame.sample_rate_hz_ = msg.sample_rate();
-        far_frame.samples_per_channel_ = samples_per_channel;
+        far_frame.samples_per_channel_ = reverse_sample_rate / 100;
         far_frame.num_channels_ = msg.num_reverse_channels();
         near_frame.sample_rate_hz_ = msg.sample_rate();
         near_frame.samples_per_channel_ = samples_per_channel;
         near_frame.num_channels_ = msg.num_input_channels();
-        reverse_cb.reset(new ChannelBuffer<float>(samples_per_channel,
-                                                  msg.num_reverse_channels()));
+        reverse_cb.reset(new ChannelBuffer<float>(
+            far_frame.samples_per_channel_,
+            msg.num_reverse_channels()));
         primary_cb.reset(new ChannelBuffer<float>(samples_per_channel,
                                                   msg.num_input_channels()));
 
@@ -634,7 +635,7 @@
 
         ASSERT_TRUE(msg.has_data() ^ (msg.channel_size() > 0));
         if (msg.has_data()) {
-          ASSERT_EQ(sizeof(int16_t) * samples_per_channel *
+          ASSERT_EQ(sizeof(int16_t) * far_frame.samples_per_channel_ *
               far_frame.num_channels_, msg.data().size());
           memcpy(far_frame.data_, msg.data().data(), msg.data().size());
         } else {
@@ -686,14 +687,16 @@
           memcpy(near_frame.data_,
                  msg.input_data().data(),
                  msg.input_data().size());
+          near_read_bytes += msg.input_data().size();
         } else {
           for (int i = 0; i < msg.input_channel_size(); ++i) {
             primary_cb->CopyFrom(msg.input_channel(i).data(), i);
+            near_read_bytes += msg.input_channel(i).size();
           }
         }
 
-        near_read_bytes += msg.input_data().size();
         if (progress && primary_count % 100 == 0) {
+          near_read_bytes = std::min(near_read_bytes, near_size_bytes);
           printf("%.0f%% complete\r",
               (near_read_bytes * 100.0) / near_size_bytes);
           fflush(stdout);
@@ -769,7 +772,8 @@
           }
         }
 
-        size_t num_samples = samples_per_channel * apm->num_output_channels();
+        size_t num_samples =
+            apm->num_output_channels() * output_sample_rate / 100;
         if (msg.has_input_data()) {
           static FILE* out_file = OpenFile(out_filename, "wb");
           ASSERT_EQ(num_samples, fwrite(near_frame.data_,