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

Unified Diff: trunk/src/media/audio/pulse/pulse_input.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
« no previous file with comments | « trunk/src/media/audio/pulse/pulse_input.h ('k') | trunk/src/media/audio/pulse/pulse_output.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/audio/pulse/pulse_input.cc
===================================================================
--- trunk/src/media/audio/pulse/pulse_input.cc (revision 277811)
+++ trunk/src/media/audio/pulse/pulse_input.cc (working copy)
@@ -34,8 +34,6 @@
context_state_changed_(false) {
DCHECK(mainloop);
DCHECK(context);
- CHECK(params_.IsValid());
- audio_bus_ = AudioBus::Create(params_);
}
PulseAudioInputStream::~PulseAudioInputStream() {
@@ -274,11 +272,8 @@
int packet_size = params_.GetBytesPerBuffer();
while (buffer_->forward_bytes() >= packet_size) {
buffer_->Read(audio_data_buffer_.get(), packet_size);
- audio_bus_->FromInterleaved(audio_data_buffer_.get(),
- audio_bus_->frames(),
- params_.bits_per_sample() / 8);
- callback_->OnData(
- this, audio_bus_.get(), hardware_delay, normalized_volume);
+ callback_->OnData(this, audio_data_buffer_.get(), packet_size,
+ hardware_delay, normalized_volume);
if (buffer_->forward_bytes() < packet_size)
break;
« no previous file with comments | « trunk/src/media/audio/pulse/pulse_input.h ('k') | trunk/src/media/audio/pulse/pulse_output.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698