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

Side by Side Diff: media/audio/cras/cras_unified.h

Issue 290003002: Remove OnMoreIOData() (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed the media unittests on mac. Created 6 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_resampler.cc ('k') | media/audio/cras/cras_unified.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 // Creates a unified stream based on the cras (ChromeOS audio server) interface. 5 // Creates a unified stream based on the cras (ChromeOS audio server) interface.
6 // 6 //
7 // CrasUnifiedStream object is *not* thread-safe and should only be used 7 // CrasUnifiedStream object is *not* thread-safe and should only be used
8 // from the audio thread. 8 // from the audio thread.
9 9
10 #ifndef MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_ 10 #ifndef MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_
11 #define MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_ 11 #define MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_
12 12
13 #include <cras_client.h> 13 #include <cras_client.h>
14 14
15 #include "base/compiler_specific.h" 15 #include "base/compiler_specific.h"
16 #include "media/audio/audio_io.h" 16 #include "media/audio/audio_io.h"
17 #include "media/audio/audio_parameters.h" 17 #include "media/audio/audio_parameters.h"
18 18
19 namespace media { 19 namespace media {
20 20
21 class AudioManagerCras; 21 class AudioManagerCras;
22 22
23 // Implementation of AudioOuputStream for Chrome OS using the Chrome OS audio 23 // Implementation of AudioOuputStream for Chrome OS using the Chrome OS audio
24 // server. 24 // server.
25 // TODO(dgreid): This class is used for only output, either remove all the
26 // relevant input code and change the class to CrasOutputStream or merge
27 // cras_input.cc into this unified implementation.
25 class MEDIA_EXPORT CrasUnifiedStream : public AudioOutputStream { 28 class MEDIA_EXPORT CrasUnifiedStream : public AudioOutputStream {
26 public: 29 public:
27 // The ctor takes all the usual parameters, plus |manager| which is the 30 // The ctor takes all the usual parameters, plus |manager| which is the
28 // audio manager who is creating this object. 31 // audio manager who is creating this object.
29 CrasUnifiedStream(const AudioParameters& params, AudioManagerCras* manager); 32 CrasUnifiedStream(const AudioParameters& params, AudioManagerCras* manager);
30 33
31 // The dtor is typically called by the AudioManager only and it is usually 34 // The dtor is typically called by the AudioManager only and it is usually
32 // triggered by calling AudioUnifiedStream::Close(). 35 // triggered by calling AudioUnifiedStream::Close().
33 virtual ~CrasUnifiedStream(); 36 virtual ~CrasUnifiedStream();
34 37
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 100
98 // Volume level from 0.0 to 1.0. 101 // Volume level from 0.0 to 1.0.
99 float volume_; 102 float volume_;
100 103
101 // Audio manager that created us. Used to report that we've been closed. 104 // Audio manager that created us. Used to report that we've been closed.
102 AudioManagerCras* manager_; 105 AudioManagerCras* manager_;
103 106
104 // Callback to get audio samples. 107 // Callback to get audio samples.
105 AudioSourceCallback* source_callback_; 108 AudioSourceCallback* source_callback_;
106 109
107 // Container for exchanging data with AudioSourceCallback::OnMoreIOData(). 110 // Container for exchanging data with AudioSourceCallback::OnMoreData().
108 scoped_ptr<AudioBus> input_bus_; 111 scoped_ptr<AudioBus> input_bus_;
109 scoped_ptr<AudioBus> output_bus_; 112 scoped_ptr<AudioBus> output_bus_;
110 113
111 // Direciton of the stream. 114 // Direciton of the stream.
112 CRAS_STREAM_DIRECTION stream_direction_; 115 CRAS_STREAM_DIRECTION stream_direction_;
113 116
114 DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStream); 117 DISALLOW_COPY_AND_ASSIGN(CrasUnifiedStream);
115 }; 118 };
116 119
117 } // namespace media 120 } // namespace media
118 121
119 #endif // MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_ 122 #endif // MEDIA_AUDIO_LINUX_CRAS_UNIFIED_H_
OLDNEW
« no previous file with comments | « media/audio/audio_output_resampler.cc ('k') | media/audio/cras/cras_unified.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698