diff options
| author | grunell <grunell@chromium.org> | 2015-12-17 00:24:06 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-12-17 08:25:00 +0000 |
| commit | c03d9fa3fb213991e0e2abbcff8f66e5cfc55eeb (patch) | |
| tree | 5e32e1015d9e081b0f59eea2c8ff24acbc748526 /chromecast | |
| parent | 7f48f0a4073d7ec74eea40aa85a9ebfa506236ce (diff) | |
| download | chromium_src-c03d9fa3fb213991e0e2abbcff8f66e5cfc55eeb.zip chromium_src-c03d9fa3fb213991e0e2abbcff8f66e5cfc55eeb.tar.gz chromium_src-c03d9fa3fb213991e0e2abbcff8f66e5cfc55eeb.tar.bz2 | |
Revert of Forward the number of skipped frames by the OS in audio playout. (patchset #10 id:180001 of https://codereview.chromium.org/1487983002/ )
Reason for revert:
Causes crackling sound on all ChromeOS boards.
Original issue's description:
> 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
>
> Committed: https://crrev.com/db03a8d1128783ff4803364ba616ae5fac8822f7
> Cr-Commit-Position: refs/heads/master@{#364990}
TBR=tommi@chromium.org,dalecurtis@chromium.org,olka@chromium.org,gunsch@chromium.org,ckehoe@chromium.org,dtseng@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=560371, 570060
Review URL: https://codereview.chromium.org/1538463002
Cr-Commit-Position: refs/heads/master@{#365783}
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, 2 insertions, 4 deletions
diff --git a/chromecast/media/audio/cast_audio_output_stream.cc b/chromecast/media/audio/cast_audio_output_stream.cc index 6dac338..d6fab42 100644 --- a/chromecast/media/audio/cast_audio_output_stream.cc +++ b/chromecast/media/audio/cast_audio_output_stream.cc @@ -331,8 +331,7 @@ 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, 0); + int frame_count = source_callback_->OnMoreData(audio_bus_.get(), bytes_delay); 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 e946c25..35d5955 100644 --- a/chromecast/media/audio/cast_audio_output_stream_unittest.cc +++ b/chromecast/media/audio/cast_audio_output_stream_unittest.cc @@ -165,8 +165,7 @@ class FakeAudioSourceCallback // ::media::AudioOutputStream::AudioSourceCallback overrides. int OnMoreData(::media::AudioBus* audio_bus, - uint32_t total_bytes_delay, - uint32_t frames_skipped) override { + uint32 total_bytes_delay) override { audio_bus->Zero(); return audio_bus->frames(); } |