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

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

Issue 1133363002: Getting rid of duplicate includes from media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_dispatcher_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/basictypes.h"
8 #include "base/threading/thread_restrictions.h" 7 #include "base/threading/thread_restrictions.h"
9 #include "base/time/time.h" 8 #include "base/time/time.h"
10 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
11 #include "media/audio/audio_output_controller.h" 10 #include "media/audio/audio_output_controller.h"
12 #include "media/base/limits.h" 11 #include "media/base/limits.h"
13 12
14 namespace media { 13 namespace media {
15 14
16 // Takes care of invoking the render callback on the audio thread. 15 // Takes care of invoking the render callback on the audio thread.
17 // An instance of this class is created for each capture stream in 16 // An instance of this class is created for each capture stream in
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 TRACE_EVENT_ASYNC_END0("audio", "StartingPlayback", this); 305 TRACE_EVENT_ASYNC_END0("audio", "StartingPlayback", this);
307 } 306 }
308 307
309 // Update the audio-delay measurement then ask client to render audio. Since 308 // Update the audio-delay measurement then ask client to render audio. Since
310 // |output_bus_| is wrapping the shared memory the Render() call is writing 309 // |output_bus_| is wrapping the shared memory the Render() call is writing
311 // directly into the shared memory. 310 // directly into the shared memory.
312 render_callback_->Render(output_bus_.get(), audio_delay_milliseconds); 311 render_callback_->Render(output_bus_.get(), audio_delay_milliseconds);
313 } 312 }
314 313
315 } // namespace media. 314 } // namespace media.
OLDNEW
« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_dispatcher_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698