diff options
| author | grunell <grunell@chromium.org> | 2015-12-14 01:52:11 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-14 09:53:19 +0000 |
| commit | db03a8d1128783ff4803364ba616ae5fac8822f7 (patch) | |
| tree | fa0eec2acc5818b93c089bcc37d643e5c13deed1 /chromecast | |
| parent | b4f1d4eb29f6580db9cba6af36f4fd7a0c96f861 (diff) | |
| download | chromium_src-db03a8d1128783ff4803364ba616ae5fac8822f7.zip chromium_src-db03a8d1128783ff4803364ba616ae5fac8822f7.tar.gz chromium_src-db03a8d1128783ff4803364ba616ae5fac8822f7.tar.bz2 | |
Forward the number of skipped frames by the OS in audio playout.
* Only for Mac.
Will be done in follow-up CLs:
* Windows.
* Hooking this up to the AEC.
BUG=560371
Review URL: https://codereview.chromium.org/1487983002
Cr-Commit-Position: refs/heads/master@{#364990}
Diffstat (limited to 'chromecast')
| -rw-r--r-- | chromecast/media/audio/cast_audio_output_stream.cc | 3 | ||||
| -rw-r--r-- | chromecast/media/audio/cast_audio_output_stream_unittest.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chromecast/media/audio/cast_audio_output_stream.cc b/chromecast/media/audio/cast_audio_output_stream.cc index d6fab42..6dac338 100644 --- a/chromecast/media/audio/cast_audio_output_stream.cc +++ b/chromecast/media/audio/cast_audio_output_stream.cc @@ -331,7 +331,8 @@ void CastAudioOutputStream::PushBuffer() { std::max(base::TimeDelta(), next_push_time_ - now); uint32_t bytes_delay = queue_delay.InMicroseconds() * audio_params_.GetBytesPerSecond() / 1000000; - int frame_count = source_callback_->OnMoreData(audio_bus_.get(), bytes_delay); + int frame_count = + source_callback_->OnMoreData(audio_bus_.get(), bytes_delay, 0); VLOG(3) << "frames_filled=" << frame_count << " with latency=" << bytes_delay; DCHECK_EQ(frame_count, audio_bus_->frames()); diff --git a/chromecast/media/audio/cast_audio_output_stream_unittest.cc b/chromecast/media/audio/cast_audio_output_stream_unittest.cc index 35d5955..e946c25 100644 --- a/chromecast/media/audio/cast_audio_output_stream_unittest.cc +++ b/chromecast/media/audio/cast_audio_output_stream_unittest.cc @@ -165,7 +165,8 @@ class FakeAudioSourceCallback // ::media::AudioOutputStream::AudioSourceCallback overrides. int OnMoreData(::media::AudioBus* audio_bus, - uint32 total_bytes_delay) override { + uint32_t total_bytes_delay, + uint32_t frames_skipped) override { audio_bus->Zero(); return audio_bus->frames(); } |