Merge 24568 - Make audio and video in sync while playback rate != 1.0...

media/filters/audio_renderer_impl.cc

 // Copyright (c) 2009 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 "media/base/filter_host.h"
 #include "media/filters/audio_renderer_impl.h"
 
 namespace media {
 
 // We'll try to fill 4096 samples per buffer, which is roughly ~92ms of audio
@@ skipping 39 matching lines @@
 
 size_t AudioRendererImpl::OnMoreData(AudioOutputStream* stream, void* dest_void,
                                      size_t len, int pending_bytes) {
   // TODO(scherkus): handle end of stream.
   if (!stream_)
     return 0;
 
   // TODO(scherkus): Maybe change OnMoreData to pass in char/uint8 or similar.
   // TODO(fbarchard): Waveout_output_win.h should handle zero length buffers
   //                  without clicking.
+  pending_bytes = static_cast<int>(ceil(pending_bytes * GetPlaybackRate()));
   base::TimeDelta delay =  base::TimeDelta::FromMicroseconds(
       base::Time::kMicrosecondsPerSecond * pending_bytes / bytes_per_second_);
   return FillBuffer(static_cast<uint8*>(dest_void), len, delay);
 }
 
 void AudioRendererImpl::OnClose(AudioOutputStream* stream) {
   // TODO(scherkus): implement OnClose.
   NOTIMPLEMENTED();
 }
 
@@ skipping 27 matching lines @@
   }
   return true;
 }
 
 void AudioRendererImpl::OnStop() {
   if (stream_)
     stream_->Stop();
 }
 
 }  // namespace media