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

Unified Diff: trunk/src/media/audio/virtual_audio_input_stream.cc

Issue 335343004: Revert 277794 "Modifies AudioInputCallback::OnData and use media..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 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/virtual_audio_input_stream.cc
===================================================================
--- trunk/src/media/audio/virtual_audio_input_stream.cc (revision 277811)
+++ trunk/src/media/audio/virtual_audio_input_stream.cc (working copy)
@@ -139,7 +139,14 @@
base::AutoLock scoped_lock(converter_network_lock_);
mixer_.Convert(audio_bus);
}
- callback_->OnData(this, audio_bus, params_.GetBytesPerBuffer(), 1.0);
+ audio_bus->ToInterleaved(params_.frames_per_buffer(),
+ params_.bits_per_sample() / 8,
+ buffer_.get());
+ callback_->OnData(this,
+ buffer_.get(),
+ params_.GetBytesPerBuffer(),
+ params_.GetBytesPerBuffer(),
+ 1.0);
}
void VirtualAudioInputStream::Close() {
« no previous file with comments | « trunk/src/media/audio/pulse/pulse_output.cc ('k') | trunk/src/media/audio/virtual_audio_input_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698