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

Side by Side Diff: media/audio/pulse/audio_manager_pulse.cc

Issue 1864483002: Forward output glitch information from stream WebRTC log (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Finished up for review. Created 4 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
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 #include "media/audio/pulse/audio_manager_pulse.h" 5 #include "media/audio/pulse/audio_manager_pulse.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/environment.h" 8 #include "base/environment.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
137 137
138 // TODO(xians): add support for querying native channel layout for pulse. 138 // TODO(xians): add support for querying native channel layout for pulse.
139 return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, 139 return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY,
140 CHANNEL_LAYOUT_STEREO, GetNativeSampleRate(), 16, 140 CHANNEL_LAYOUT_STEREO, GetNativeSampleRate(), 16,
141 buffer_size); 141 buffer_size);
142 } 142 }
143 143
144 AudioOutputStream* AudioManagerPulse::MakeLinearOutputStream( 144 AudioOutputStream* AudioManagerPulse::MakeLinearOutputStream(
145 const AudioParameters& params) { 145 const AudioParameters& params) {
146 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 146 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
147 return MakeOutputStream(params, AudioDeviceDescription::kDefaultDeviceId); 147 return MakeOutputStream(params, AudioDeviceDescription::kDefaultDeviceId,
148 StatisticsCallback());
148 } 149 }
149 150
150 AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream( 151 AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream(
151 const AudioParameters& params, 152 const AudioParameters& params,
152 const std::string& device_id) { 153 const std::string& device_id,
154 const StatisticsCallback& statistics_callback) {
153 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 155 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
154 return MakeOutputStream(params, device_id.empty() 156 return MakeOutputStream(
155 ? AudioDeviceDescription::kDefaultDeviceId 157 params,
156 : device_id); 158 device_id.empty() ? AudioDeviceDescription::kDefaultDeviceId : device_id,
159 statistics_callback);
157 } 160 }
158 161
159 AudioInputStream* AudioManagerPulse::MakeLinearInputStream( 162 AudioInputStream* AudioManagerPulse::MakeLinearInputStream(
160 const AudioParameters& params, const std::string& device_id) { 163 const AudioParameters& params, const std::string& device_id) {
161 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 164 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
162 return MakeInputStream(params, device_id); 165 return MakeInputStream(params, device_id);
163 } 166 }
164 167
165 AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream( 168 AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream(
166 const AudioParameters& params, const std::string& device_id) { 169 const AudioParameters& params, const std::string& device_id) {
(...skipping 22 matching lines...) Expand all
189 int user_buffer_size = GetUserBufferSize(); 192 int user_buffer_size = GetUserBufferSize();
190 if (user_buffer_size) 193 if (user_buffer_size)
191 buffer_size = user_buffer_size; 194 buffer_size = user_buffer_size;
192 195
193 return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, 196 return AudioParameters(AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
194 sample_rate, bits_per_sample, buffer_size); 197 sample_rate, bits_per_sample, buffer_size);
195 } 198 }
196 199
197 AudioOutputStream* AudioManagerPulse::MakeOutputStream( 200 AudioOutputStream* AudioManagerPulse::MakeOutputStream(
198 const AudioParameters& params, 201 const AudioParameters& params,
199 const std::string& device_id) { 202 const std::string& device_id,
203 const StatisticsCallback& statistics_callback) {
200 DCHECK(!device_id.empty()); 204 DCHECK(!device_id.empty());
201 return new PulseAudioOutputStream(params, device_id, this); 205 return new PulseAudioOutputStream(params, device_id, this);
202 } 206 }
203 207
204 AudioInputStream* AudioManagerPulse::MakeInputStream( 208 AudioInputStream* AudioManagerPulse::MakeInputStream(
205 const AudioParameters& params, const std::string& device_id) { 209 const AudioParameters& params, const std::string& device_id) {
206 return new PulseAudioInputStream(this, device_id, params, 210 return new PulseAudioInputStream(this, device_id, params,
207 input_mainloop_, input_context_); 211 input_mainloop_, input_context_);
208 } 212 }
209 213
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
333 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context, 337 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context,
334 const pa_server_info* info, 338 const pa_server_info* info,
335 void* user_data) { 339 void* user_data) {
336 AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data); 340 AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data);
337 341
338 manager->native_input_sample_rate_ = info->sample_spec.rate; 342 manager->native_input_sample_rate_ = info->sample_spec.rate;
339 pa_threaded_mainloop_signal(manager->input_mainloop_, 0); 343 pa_threaded_mainloop_signal(manager->input_mainloop_, 0);
340 } 344 }
341 345
342 } // namespace media 346 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698