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

Side by Side Diff: media/audio/audio_input_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_input_controller.cc ('k') | media/audio/audio_output_controller.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_input_device.h" 5 #include "media/audio/audio_input_device.h"
6 6
7 #include "base/basictypes.h"
8 #include "base/bind.h" 7 #include "base/bind.h"
9 #include "base/memory/scoped_vector.h" 8 #include "base/memory/scoped_vector.h"
10 #include "base/threading/thread_restrictions.h" 9 #include "base/threading/thread_restrictions.h"
11 #include "base/time/time.h" 10 #include "base/time/time.h"
12 #include "media/audio/audio_manager_base.h" 11 #include "media/audio/audio_manager_base.h"
13 #include "media/base/audio_bus.h" 12 #include "media/base/audio_bus.h"
14 13
15 namespace media { 14 namespace media {
16 15
17 // The number of shared memory buffer segments indicated to browser process 16 // The number of shared memory buffer segments indicated to browser process
(...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 // and update the audio-delay measurement. 315 // and update the audio-delay measurement.
317 int audio_delay_milliseconds = pending_data / bytes_per_ms_; 316 int audio_delay_milliseconds = pending_data / bytes_per_ms_;
318 capture_callback_->Capture( 317 capture_callback_->Capture(
319 audio_bus, audio_delay_milliseconds, volume, key_pressed); 318 audio_bus, audio_delay_milliseconds, volume, key_pressed);
320 319
321 if (++current_segment_id_ >= total_segments_) 320 if (++current_segment_id_ >= total_segments_)
322 current_segment_id_ = 0; 321 current_segment_id_ = 0;
323 } 322 }
324 323
325 } // namespace media 324 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_input_controller.cc ('k') | media/audio/audio_output_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698