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 /components/audio_modem | |
| 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 'components/audio_modem')
| -rw-r--r-- | components/audio_modem/audio_player_impl.cc | 3 | ||||
| -rw-r--r-- | components/audio_modem/audio_player_impl.h | 3 | ||||
| -rw-r--r-- | components/audio_modem/audio_player_unittest.cc | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/components/audio_modem/audio_player_impl.cc b/components/audio_modem/audio_player_impl.cc index cd52f05..22fd723 100644 --- a/components/audio_modem/audio_player_impl.cc +++ b/components/audio_modem/audio_player_impl.cc @@ -134,8 +134,7 @@ void AudioPlayerImpl::FinalizeOnAudioThread() { } int AudioPlayerImpl::OnMoreData(media::AudioBus* dest, - uint32_t /* total_bytes_delay */, - uint32_t /* frames_skipped */) { + uint32 /* total_bytes_delay */) { base::AutoLock al(state_lock_); // Continuously play our samples till explicitly told to stop. const int leftover_frames = samples_->frames() - frame_index_; diff --git a/components/audio_modem/audio_player_impl.h b/components/audio_modem/audio_player_impl.h index 51dba1d..145dab6 100644 --- a/components/audio_modem/audio_player_impl.h +++ b/components/audio_modem/audio_player_impl.h @@ -58,8 +58,7 @@ class AudioPlayerImpl final // AudioOutputStream::AudioSourceCallback overrides: // Following methods could be called from *ANY* thread. - int OnMoreData(media::AudioBus* dest, uint32_t total_bytes_delay, - uint32_t frames_skipped) override; + int OnMoreData(media::AudioBus* dest, uint32 total_bytes_delay) override; void OnError(media::AudioOutputStream* stream) override; // Flushes the audio loop, making sure that any queued operations are diff --git a/components/audio_modem/audio_player_unittest.cc b/components/audio_modem/audio_player_unittest.cc index 7b1baa9..5d43d01 100644 --- a/components/audio_modem/audio_player_unittest.cc +++ b/components/audio_modem/audio_player_unittest.cc @@ -51,7 +51,7 @@ class TestAudioOutputStream : public media::AudioOutputStream { // Call back into the player to get samples that it wants us to play. scoped_ptr<media::AudioBus> dest = media::AudioBus::Create(1, default_frame_count_); - frames = callback_->OnMoreData(dest.get(), 0, 0); + frames = callback_->OnMoreData(dest.get(), 0); total_frames += frames; // Send the samples given to us by the player to the gather callback. caller_loop_->task_runner()->PostTask( |