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

media/audio/simple_sources.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 "media/audio/simple_sources.h"
 
 #include <algorithm>
@@ skipping 92 matching lines @@
       callbacks_(0),
       errors_(0) {
 }
 
 SineWaveAudioSource::~SineWaveAudioSource() {
 }
 
 // The implementation could be more efficient if a lookup table is constructed
 // but it is efficient enough for our simple needs.
 int SineWaveAudioSource::OnMoreData(AudioBus* audio_bus,
-                                    uint32_t total_bytes_delay,
-                                    uint32_t frames_skipped) {
+                                    uint32 total_bytes_delay) {
   base::AutoLock auto_lock(time_lock_);
   callbacks_++;
 
   // The table is filled with s(t) = kint16max*sin(Theta*t),
   // where Theta = 2*PI*fs.
   // We store the discrete time value |t| in a member to ensure that the
   // next pass starts at a correct state.
   int max_frames = cap_ > 0 ?
       std::min(audio_bus->frames(), cap_ - time_state_) : audio_bus->frames();
   for (int i = 0; i < max_frames; ++i)
@@ skipping 62 matching lines @@
       AudioParameters::AUDIO_PCM_LOW_LATENCY,
       GuessChannelLayout(wav_audio_handler_->num_channels()),
       wav_audio_handler_->sample_rate(), wav_audio_handler_->bits_per_sample(),
       params_.frames_per_buffer());
 
   file_audio_converter_.reset(
       new AudioConverter(file_audio_slice, params_, false));
   file_audio_converter_->AddInput(this);
 }
 
-int FileSource::OnMoreData(AudioBus* audio_bus,
-                           uint32_t total_bytes_delay,
-                           uint32_t frames_skipped) {
+int FileSource::OnMoreData(AudioBus* audio_bus, uint32 total_bytes_delay) {
   // Load the file if we haven't already. This load needs to happen on the
   // audio thread, otherwise we'll run on the UI thread on Mac for instance.
   // This will massively delay the first OnMoreData, but we'll catch up.
   if (!wav_audio_handler_)
     LoadWavFile(path_to_wav_file_);
   if (load_failed_)
     return 0;
 
   DCHECK(wav_audio_handler_.get());
 
@@ skipping 28 matching lines @@
                                 params.sample_rate() /
                                 params.frames_per_buffer() /
                                 1000),
       beep_generated_in_buffers_(0),
       beep_period_in_frames_(params.sample_rate() / kBeepFrequency) {
 }
 
 BeepingSource::~BeepingSource() {
 }
 
-int BeepingSource::OnMoreData(AudioBus* audio_bus,
-                              uint32_t total_bytes_delay,
-                              uint32_t frames_skipped) {
+int BeepingSource::OnMoreData(AudioBus* audio_bus, uint32 total_bytes_delay) {
   // Accumulate the time from the last beep.
   interval_from_last_beep_ += base::TimeTicks::Now() - last_callback_time_;
 
   memset(buffer_.get(), 0, buffer_size_);
   bool should_beep = false;
   BeepContext* beep_context = g_beep_context.Pointer();
   if (beep_context->automatic_beep()) {
     base::TimeDelta delta = interval_from_last_beep_ -
         base::TimeDelta::FromMilliseconds(kAutomaticBeepIntervalInMs);
     if (delta > base::TimeDelta()) {
@@ skipping 36 matching lines @@
 }
 
 void BeepingSource::OnError(AudioOutputStream* stream) {
 }
 
 void BeepingSource::BeepOnce() {
   g_beep_context.Pointer()->SetBeepOnce(true);
 }
 
 }  // namespace media