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

Side by Side Diff: media/audio/audio_output_device.cc

Issue 10823175: Switch AudioRenderSink::Callback to use AudioBus. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Gotta catch'em all! Created 8 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "media/audio/audio_output_device.h" 5 #include "media/audio/audio_output_device.h"
6 6
7 #include "base/debug/trace_event.h" 7 #include "base/debug/trace_event.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
10 #include "base/time.h" 10 #include "base/time.h"
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
259 return; 259 return;
260 } 260 }
261 261
262 // Convert the number of pending bytes in the render buffer 262 // Convert the number of pending bytes in the render buffer
263 // into milliseconds. 263 // into milliseconds.
264 int audio_delay_milliseconds = pending_data / bytes_per_ms_; 264 int audio_delay_milliseconds = pending_data / bytes_per_ms_;
265 265
266 TRACE_EVENT0("audio", "AudioOutputDevice::FireRenderCallback"); 266 TRACE_EVENT0("audio", "AudioOutputDevice::FireRenderCallback");
267 267
268 // Update the audio-delay measurement then ask client to render audio. 268 // Update the audio-delay measurement then ask client to render audio.
269 size_t num_frames = render_callback_->Render(audio_data_, 269 size_t num_frames = render_callback_->Render(
270 audio_parameters_.frames_per_buffer(), audio_delay_milliseconds); 270 audio_bus_.get(), audio_bus_->frames(), audio_delay_milliseconds);
271 271
272 // Interleave, scale, and clip to int. 272 // Interleave, scale, and clip to int.
273 // TODO(crogers/vrk): Figure out a way to avoid the float -> int -> float 273 // TODO(dalecurtis): Remove this when we have float everywhere.
274 // conversions that happen in the <audio> and WebRTC scenarios. 274 InterleaveFloatToInt(
275 InterleaveFloatToInt(audio_data_, shared_memory_.memory(), 275 *audio_bus_.get(), shared_memory_.memory(), audio_bus_->frames(),
276 num_frames, audio_parameters_.bits_per_sample() / 8); 276 audio_parameters_.bits_per_sample() / 8);
277 277
278 // Let the host know we are done. 278 // Let the host know we are done.
279 SetActualDataSizeInBytes(&shared_memory_, memory_length_, 279 SetActualDataSizeInBytes(
280 &shared_memory_, memory_length_,
280 num_frames * audio_parameters_.GetBytesPerFrame()); 281 num_frames * audio_parameters_.GetBytesPerFrame());
281 } 282 }
282 283
283 } // namespace media. 284 } // namespace media.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698