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

Side by Side Diff: media/audio/alsa/alsa_output.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/alsa/alsa_input.cc ('k') | media/audio/alsa/alsa_util.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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 // THREAD SAFETY 5 // THREAD SAFETY
6 // 6 //
7 // AlsaPcmOutputStream object is *not* thread-safe and should only be used 7 // AlsaPcmOutputStream object is *not* thread-safe and should only be used
8 // from the audio thread. We DCHECK on this assumption whenever we can. 8 // from the audio thread. We DCHECK on this assumption whenever we can.
9 // 9 //
10 // SEMANTICS OF Close() 10 // SEMANTICS OF Close()
(...skipping 21 matching lines...) Expand all
32 // view, it will seem that the device has just clogged and stopped requesting 32 // view, it will seem that the device has just clogged and stopped requesting
33 // data. 33 // data.
34 34
35 #include "media/audio/alsa/alsa_output.h" 35 #include "media/audio/alsa/alsa_output.h"
36 36
37 #include <algorithm> 37 #include <algorithm>
38 38
39 #include "base/bind.h" 39 #include "base/bind.h"
40 #include "base/logging.h" 40 #include "base/logging.h"
41 #include "base/stl_util.h" 41 #include "base/stl_util.h"
42 #include "base/time/time.h"
43 #include "base/trace_event/trace_event.h" 42 #include "base/trace_event/trace_event.h"
44 #include "media/audio/alsa/alsa_util.h" 43 #include "media/audio/alsa/alsa_util.h"
45 #include "media/audio/alsa/alsa_wrapper.h" 44 #include "media/audio/alsa/alsa_wrapper.h"
46 #include "media/audio/alsa/audio_manager_alsa.h" 45 #include "media/audio/alsa/audio_manager_alsa.h"
47 #include "media/base/channel_mixer.h" 46 #include "media/base/channel_mixer.h"
48 #include "media/base/data_buffer.h" 47 #include "media/base/data_buffer.h"
49 #include "media/base/seekable_buffer.h" 48 #include "media/base/seekable_buffer.h"
50 49
51 namespace media { 50 namespace media {
52 51
(...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after
793 } 792 }
794 793
795 // Changes the AudioSourceCallback to proxy calls to. Pass in NULL to 794 // Changes the AudioSourceCallback to proxy calls to. Pass in NULL to
796 // release ownership of the currently registered callback. 795 // release ownership of the currently registered callback.
797 void AlsaPcmOutputStream::set_source_callback(AudioSourceCallback* callback) { 796 void AlsaPcmOutputStream::set_source_callback(AudioSourceCallback* callback) {
798 DCHECK(IsOnAudioThread()); 797 DCHECK(IsOnAudioThread());
799 source_callback_ = callback; 798 source_callback_ = callback;
800 } 799 }
801 800
802 } // namespace media 801 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/alsa/alsa_input.cc ('k') | media/audio/alsa/alsa_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698