Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: trunk/src/media/audio/android/audio_android_unittest.cc

Issue 487543002: Revert 290359 "Remove AudioBuffersState class." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: trunk/src/media/audio/android/audio_android_unittest.cc
===================================================================
--- trunk/src/media/audio/android/audio_android_unittest.cc (revision 290374)
+++ trunk/src/media/audio/android/audio_android_unittest.cc (working copy)
@@ -123,7 +123,7 @@
}
// We clear the data bus to ensure that the test does not cause noise.
-static int RealOnMoreData(AudioBus* dest, int total_bytes_delay) {
+static int RealOnMoreData(AudioBus* dest, AudioBuffersState buffers_state) {
dest->Zero();
return dest->frames();
}
@@ -178,7 +178,7 @@
// Use samples read from a data file and fill up the audio buffer
// provided to us in the callback.
virtual int OnMoreData(AudioBus* audio_bus,
- int total_bytes_delay) OVERRIDE {
+ AudioBuffersState buffers_state) OVERRIDE {
bool stop_playing = false;
int max_size =
audio_bus->frames() * audio_bus->channels() * kBytesPerSample;
@@ -354,7 +354,7 @@
// AudioOutputStream::AudioSourceCallback implementation
virtual int OnMoreData(AudioBus* dest,
- int total_bytes_delay) OVERRIDE {
+ AudioBuffersState buffers_state) OVERRIDE {
const int size_in_bytes =
(params_.bits_per_sample() / 8) * dest->frames() * dest->channels();
EXPECT_EQ(size_in_bytes, params_.GetBytesPerBuffer());
« no previous file with comments | « trunk/src/media/audio/alsa/alsa_output_unittest.cc ('k') | trunk/src/media/audio/android/opensles_output.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698