Revert of Forward the number of skipped frames by the OS in audio playout.

media/audio/simple_sources_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.
 
 #include <limits>
 
 #include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 10 matching lines @@
   static const uint32 samples = 1024;
   static const uint32 bytes_per_sample = 2;
   static const int freq = 200;
 
   AudioParameters params(
         AudioParameters::AUDIO_PCM_LINEAR, CHANNEL_LAYOUT_MONO,
         AudioParameters::kTelephoneSampleRate, bytes_per_sample * 8, samples);
 
   SineWaveAudioSource source(1, freq, params.sample_rate());
   scoped_ptr<AudioBus> audio_bus = AudioBus::Create(params);
-  source.OnMoreData(audio_bus.get(), 0, 0);
+  source.OnMoreData(audio_bus.get(), 0);
   EXPECT_EQ(1, source.callbacks());
   EXPECT_EQ(0, source.errors());
 
   uint32 half_period = AudioParameters::kTelephoneSampleRate / (freq * 2);
 
   // Spot test positive incursion of sine wave.
   EXPECT_NEAR(0, audio_bus->channel(0)[0],
               std::numeric_limits<float>::epsilon());
   EXPECT_FLOAT_EQ(0.15643446f, audio_bus->channel(0)[1]);
   EXPECT_LT(audio_bus->channel(0)[1], audio_bus->channel(0)[2]);
   EXPECT_LT(audio_bus->channel(0)[2], audio_bus->channel(0)[3]);
   // Spot test negative incursion of sine wave.
   EXPECT_NEAR(0, audio_bus->channel(0)[half_period],
               std::numeric_limits<float>::epsilon());
   EXPECT_FLOAT_EQ(-0.15643446f, audio_bus->channel(0)[half_period + 1]);
   EXPECT_GT(audio_bus->channel(0)[half_period + 1],
             audio_bus->channel(0)[half_period + 2]);
   EXPECT_GT(audio_bus->channel(0)[half_period + 2],
             audio_bus->channel(0)[half_period + 3]);
 }
 
 TEST(SimpleSources, SineWaveAudioCapped) {
   SineWaveAudioSource source(1, 200, AudioParameters::kTelephoneSampleRate);
 
   static const int kSampleCap = 100;
   source.CapSamples(kSampleCap);
 
   scoped_ptr<AudioBus> audio_bus = AudioBus::Create(1, 2 * kSampleCap);
-  EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), kSampleCap);
+  EXPECT_EQ(source.OnMoreData(
+      audio_bus.get(), 0), kSampleCap);
   EXPECT_EQ(1, source.callbacks());
-  EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), 0);
+  EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0), 0);
   EXPECT_EQ(2, source.callbacks());
   source.Reset();
-  EXPECT_EQ(source.OnMoreData(audio_bus.get(), 0, 0), kSampleCap);
+  EXPECT_EQ(source.OnMoreData(
+      audio_bus.get(), 0), kSampleCap);
   EXPECT_EQ(3, source.callbacks());
   EXPECT_EQ(0, source.errors());
 }
 
 TEST(SimpleSources, OnError) {
   SineWaveAudioSource source(1, 200, AudioParameters::kTelephoneSampleRate);
   source.OnError(NULL);
   EXPECT_EQ(1, source.errors());
   source.OnError(NULL);
   EXPECT_EQ(2, source.errors());
@@ skipping 12 matching lines @@
   temp.Close();
 
   // Create AudioParameters which match those in the WAV data.
   AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR,
                          CHANNEL_LAYOUT_STEREO, 48000, 16, kNumFrames);
   scoped_ptr<AudioBus> audio_bus = AudioBus::Create(2, kNumFrames);
   audio_bus->Zero();
 
   // Create a FileSource that reads this file.
   FileSource source(params, temp_path);
-  EXPECT_EQ(kNumFrames, source.OnMoreData(audio_bus.get(), 0, 0));
+  EXPECT_EQ(kNumFrames, source.OnMoreData(audio_bus.get(), 0));
 
   // Convert the test data (little-endian) into floats and compare.
   const int kFirstSampleIndex = 12 + 8 + 16 + 8;
   int16_t data[2];
   data[0] = kTestAudioData[kFirstSampleIndex];
   data[0] |= (kTestAudioData[kFirstSampleIndex + 1] << 8);
   data[1] = kTestAudioData[kFirstSampleIndex + 2];
   data[1] |= (kTestAudioData[kFirstSampleIndex + 3] << 8);
 
   // The first frame should hold the WAV data.
@@ skipping 15 matching lines @@
                          CHANNEL_LAYOUT_STEREO, 48000, 16, 10);
   scoped_ptr<AudioBus> audio_bus = AudioBus::Create(2, 10);
   audio_bus->Zero();
 
   // Create a FileSource that reads this file.
   base::FilePath path;
   path = path.Append(FILE_PATH_LITERAL("does"))
              .Append(FILE_PATH_LITERAL("not"))
              .Append(FILE_PATH_LITERAL("exist"));
   FileSource source(params, path);
-  EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0, 0));
+  EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0));
 
   // Confirm all frames are zero-padded.
   for (int channel = 0; channel < audio_bus->channels(); ++channel) {
     for (int frame = 0; frame < audio_bus->frames(); ++frame) {
       EXPECT_FLOAT_EQ(0.0, audio_bus->channel(channel)[frame]);
     }
   }
 }
 
 TEST(SimpleSources, FileSourceCorruptTestDataFails) {
@@ skipping 13 matching lines @@
   temp.Close();
 
   // Create AudioParameters which match those in the WAV data.
   AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR,
                          CHANNEL_LAYOUT_STEREO, 48000, 16, kNumFrames);
   scoped_ptr<AudioBus> audio_bus = AudioBus::Create(2, kNumFrames);
   audio_bus->Zero();
 
   // Create a FileSource that reads this file.
   FileSource source(params, temp_path);
-  EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0, 0));
+  EXPECT_EQ(0, source.OnMoreData(audio_bus.get(), 0));
 
   // Confirm all frames are zero-padded.
   for (int channel = 0; channel < audio_bus->channels(); ++channel) {
     for (int frame = 0; frame < audio_bus->frames(); ++frame) {
       EXPECT_FLOAT_EQ(0.0, audio_bus->channel(channel)[frame]);
     }
   }
 }
 
 }  // namespace media