Reduce jitter from uneven SincResampler buffer size requests.

media/base/sinc_resampler_unittest.cc

 // Copyright (c) 2012 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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include <cmath>
 
 #include "base/bind.h"
@@ skipping 37 matching lines @@
 }
 
 // Test requesting multiples of ChunkSize() frames results in the proper number
 // of callbacks.
 TEST(SincResamplerTest, ChunkedResample) {
   MockSource mock_source;
 
   // Choose a high ratio of input to output samples which will result in quick
   // exhaustion of SincResampler's internal buffers.
   SincResampler resampler(
-      kSampleRateRatio,
+      kSampleRateRatio, SincResampler::kDefaultBlockSize,
       base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
 
   static const int kChunks = 2;
   int max_chunk_size = resampler.ChunkSize() * kChunks;
   scoped_ptr<float[]> resampled_destination(new float[max_chunk_size]);
 
   // Verify requesting ChunkSize() frames causes a single callback.
   EXPECT_CALL(mock_source, ProvideInput(_, _))
       .Times(1).WillOnce(ClearBuffer());
   resampler.Resample(resampled_destination.get(), resampler.ChunkSize());
 
   // Verify requesting kChunks * ChunkSize() frames causes kChunks callbacks.
   testing::Mock::VerifyAndClear(&mock_source);
   EXPECT_CALL(mock_source, ProvideInput(_, _))
       .Times(kChunks).WillRepeatedly(ClearBuffer());
   resampler.Resample(resampled_destination.get(), max_chunk_size);
 }
 
 // Test flush resets the internal state properly.
 TEST(SincResamplerTest, Flush) {
   MockSource mock_source;
   SincResampler resampler(
-      kSampleRateRatio,
+      kSampleRateRatio, SincResampler::kDefaultBlockSize,
       base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
   scoped_ptr<float[]> resampled_destination(new float[resampler.ChunkSize()]);
 
   // Fill the resampler with junk data.
   EXPECT_CALL(mock_source, ProvideInput(_, _))
       .Times(1).WillOnce(FillBuffer());
   resampler.Resample(resampled_destination.get(), resampler.ChunkSize() / 2);
   ASSERT_NE(resampled_destination[0], 0);
 
   // Flush and request more data, which should all be zeros now.
   resampler.Flush();
   testing::Mock::VerifyAndClear(&mock_source);
   EXPECT_CALL(mock_source, ProvideInput(_, _))
       .Times(1).WillOnce(ClearBuffer());
   resampler.Resample(resampled_destination.get(), resampler.ChunkSize() / 2);
   for (int i = 0; i < resampler.ChunkSize() / 2; ++i)
     ASSERT_FLOAT_EQ(resampled_destination[i], 0);
 }
 
 // Test flush resets the internal state properly.
 TEST(SincResamplerTest, DISABLED_SetRatioBench) {
   MockSource mock_source;
   SincResampler resampler(
-      kSampleRateRatio,
+      kSampleRateRatio, SincResampler::kDefaultBlockSize,
       base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
 
   base::TimeTicks start = base::TimeTicks::HighResNow();
   for (int i = 1; i < 10000; ++i)
     resampler.SetRatio(1.0 / i);
   double total_time_c_ms =
       (base::TimeTicks::HighResNow() - start).InMillisecondsF();
   printf("SetRatio() took %.2fms.\n", total_time_c_ms);
 }
 
@@ skipping 10 matching lines @@
 // will be tested by the parameterized SincResampler tests below.
 #if defined(CONVOLVE_FUNC)
 TEST(SincResamplerTest, Convolve) {
 #if defined(ARCH_CPU_X86_FAMILY)
   ASSERT_TRUE(base::CPU().has_sse());
 #endif
 
   // Initialize a dummy resampler.
   MockSource mock_source;
   SincResampler resampler(
-      kSampleRateRatio,
+      kSampleRateRatio, SincResampler::kDefaultBlockSize,
       base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
 
   // The optimized Convolve methods are slightly more precise than Convolve_C(),
   // so comparison must be done using an epsilon.
   static const double kEpsilon = 0.00000005;
 
   // Use a kernel from SincResampler as input and kernel data, this has the
   // benefit of already being properly sized and aligned for Convolve_SSE().
   double result = resampler.Convolve_C(
       resampler.kernel_storage_.get(), resampler.kernel_storage_.get(),
@@ skipping 14 matching lines @@
 }
 #endif
 
 // Benchmark for the various Convolve() methods.  Make sure to build with
 // branding=Chrome so that DCHECKs are compiled out when benchmarking.  Original
 // benchmarks were run with --convolve-iterations=50000000.
 TEST(SincResamplerTest, ConvolveBenchmark) {
   // Initialize a dummy resampler.
   MockSource mock_source;
   SincResampler resampler(
-      kSampleRateRatio,
+      kSampleRateRatio, SincResampler::kDefaultBlockSize,
       base::Bind(&MockSource::ProvideInput, base::Unretained(&mock_source)));
 
   // Retrieve benchmark iterations from command line.
   int convolve_iterations = 10;
   std::string iterations(CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
       kConvolveIterations));
   if (!iterations.empty())
     base::StringToInt(iterations, &convolve_iterations);
 
   printf("Benchmarking %d iterations:\n", convolve_iterations);
@@ skipping 128 matching lines @@
 
   // Nyquist frequency for the input sampling rate.
   double input_nyquist_freq = 0.5 * input_rate_;
 
   // Source for data to be resampled.
   SinusoidalLinearChirpSource resampler_source(
       input_rate_, input_samples, input_nyquist_freq);
 
   const double io_ratio = input_rate_ / static_cast<double>(output_rate_);
   SincResampler resampler(
-      io_ratio,
+      io_ratio, SincResampler::kDefaultBlockSize,
       base::Bind(&SinusoidalLinearChirpSource::ProvideInput,
                  base::Unretained(&resampler_source)));
 
   // Force an update to the sample rate ratio to ensure dyanmic sample rate
   // changes are working correctly.
   scoped_ptr<float[]> kernel(new float[SincResampler::kKernelStorageSize]);
   memcpy(kernel.get(), resampler.get_kernel_for_testing(),
          SincResampler::kKernelStorageSize);
   resampler.SetRatio(M_PI);
   ASSERT_NE(0, memcmp(kernel.get(), resampler.get_kernel_for_testing(),
@@ skipping 103 matching lines @@
         std::tr1::make_tuple(11025, 192000, kResamplingRMSError, -62.61),
         std::tr1::make_tuple(16000, 192000, kResamplingRMSError, -63.14),
         std::tr1::make_tuple(22050, 192000, kResamplingRMSError, -62.42),
         std::tr1::make_tuple(32000, 192000, kResamplingRMSError, -63.38),
         std::tr1::make_tuple(44100, 192000, kResamplingRMSError, -62.63),
         std::tr1::make_tuple(48000, 192000, kResamplingRMSError, -73.44),
         std::tr1::make_tuple(96000, 192000, kResamplingRMSError, -73.52),
         std::tr1::make_tuple(192000, 192000, kResamplingRMSError, -73.52)));
 
 }  // namespace media