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

Side by Side Diff: media/audio/audio_manager_base.h

Issue 61203008: Attempt to fix audio wedges by restarting all streams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix mock. Created 7 years 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
« no previous file with comments | « media/audio/audio_manager.h ('k') | media/audio/audio_manager_base.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 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 5 #ifndef MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
6 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 6 #define MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
7 7
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE; 108 virtual AudioParameters GetDefaultOutputStreamParameters() OVERRIDE;
109 virtual AudioParameters GetOutputStreamParameters( 109 virtual AudioParameters GetOutputStreamParameters(
110 const std::string& device_id) OVERRIDE; 110 const std::string& device_id) OVERRIDE;
111 111
112 virtual AudioParameters GetInputStreamParameters( 112 virtual AudioParameters GetInputStreamParameters(
113 const std::string& device_id) OVERRIDE; 113 const std::string& device_id) OVERRIDE;
114 114
115 virtual std::string GetAssociatedOutputDeviceID( 115 virtual std::string GetAssociatedOutputDeviceID(
116 const std::string& input_device_id) OVERRIDE; 116 const std::string& input_device_id) OVERRIDE;
117 117
118 virtual void FixWedgedAudio() OVERRIDE;
119
118 protected: 120 protected:
119 AudioManagerBase(); 121 AudioManagerBase();
120 122
121 // Shuts down the audio thread and releases all the audio output dispatchers 123 // Shuts down the audio thread and releases all the audio output dispatchers
122 // on the audio thread. All audio streams should be freed before Shutdown() 124 // on the audio thread. All audio streams should be freed before Shutdown()
123 // is called. This must be called in the destructor of every AudioManagerBase 125 // is called. This must be called in the destructor of every AudioManagerBase
124 // implementation. 126 // implementation.
125 void Shutdown(); 127 void Shutdown();
126 128
127 void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; } 129 void SetMaxOutputStreamsAllowed(int max) { max_num_output_streams_ = max; }
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
190 // Map of cached AudioOutputDispatcher instances. Must only be touched 192 // Map of cached AudioOutputDispatcher instances. Must only be touched
191 // from the audio thread (no locking). 193 // from the audio thread (no locking).
192 AudioOutputDispatchers output_dispatchers_; 194 AudioOutputDispatchers output_dispatchers_;
193 195
194 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase); 196 DISALLOW_COPY_AND_ASSIGN(AudioManagerBase);
195 }; 197 };
196 198
197 } // namespace media 199 } // namespace media
198 200
199 #endif // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_ 201 #endif // MEDIA_AUDIO_AUDIO_MANAGER_BASE_H_
OLDNEW
« no previous file with comments | « media/audio/audio_manager.h ('k') | media/audio/audio_manager_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698