diff options
| author | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-18 20:49:14 +0000 |
|---|---|---|
| committer | acolwell@chromium.org <acolwell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-18 20:51:14 +0000 |
| commit | 17d5186cef8688997c98457d2eeea86e4060023c (patch) | |
| tree | f35299a66f6700e75a72300af93655bc028d458d /media/audio/cras/cras_unified.cc | |
| parent | 0ce108b7f87098120a1188d5d1dce826c7d11575 (diff) | |
| download | chromium_src-17d5186cef8688997c98457d2eeea86e4060023c.zip chromium_src-17d5186cef8688997c98457d2eeea86e4060023c.tar.gz chromium_src-17d5186cef8688997c98457d2eeea86e4060023c.tar.bz2 | |
Remove AudioBuffersState class.
The AudioBuffersState object doesn't appear to be necessary anymore.
Most code either completely ignores this information or doesn't actually
care about the difference between pending_bytes and hardware_delay_bytes.
Also usually only one of the 2 fields was actually being used at a time.
This change removes the class and simply uses an int that represent the
total number of delay bytes.
BUG=125685
Review URL: https://codereview.chromium.org/467833002
Cr-Commit-Position: refs/heads/master@{#290359}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@290359 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/cras/cras_unified.cc')
| -rw-r--r-- | media/audio/cras/cras_unified.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/audio/cras/cras_unified.cc b/media/audio/cras/cras_unified.cc index 25af383..232fee1 100644 --- a/media/audio/cras/cras_unified.cc +++ b/media/audio/cras/cras_unified.cc @@ -358,8 +358,7 @@ uint32 CrasUnifiedStream::ReadWriteAudio(size_t frames, total_delay_bytes += GetBytesLatency(latency_ts); int frames_filled = source_callback_->OnMoreData( - output_bus_.get(), - AudioBuffersState(0, total_delay_bytes)); + output_bus_.get(), total_delay_bytes); output_bus_->ToInterleaved(frames_filled, bytes_per_sample, output_samples); @@ -376,7 +375,7 @@ uint32 CrasUnifiedStream::WriteAudio(size_t frames, cras_client_calc_playback_latency(sample_ts, &latency_ts); int frames_filled = source_callback_->OnMoreData( - output_bus_.get(), AudioBuffersState(0, GetBytesLatency(latency_ts))); + output_bus_.get(), GetBytesLatency(latency_ts)); // Note: If this ever changes to output raw float the data must be clipped and // sanitized since it may come from an untrusted source such as NaCl. |