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

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

Issue 2023943002: Revert of Forward output glitch information from stream WebRTC log (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 int buffer_size = user_buffer_size ? 135 int buffer_size = user_buffer_size ?
136 user_buffer_size : kDefaultInputBufferSize; 136 user_buffer_size : kDefaultInputBufferSize;
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 const LogCallback& log_callback) {
147 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 146 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
148 return MakeOutputStream(params, AudioDeviceDescription::kDefaultDeviceId); 147 return MakeOutputStream(params, AudioDeviceDescription::kDefaultDeviceId);
149 } 148 }
150 149
151 AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream( 150 AudioOutputStream* AudioManagerPulse::MakeLowLatencyOutputStream(
152 const AudioParameters& params, 151 const AudioParameters& params,
153 const std::string& device_id, 152 const std::string& device_id) {
154 const LogCallback& log_callback) {
155 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 153 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
156 return MakeOutputStream(params, device_id.empty() 154 return MakeOutputStream(params, device_id.empty()
157 ? AudioDeviceDescription::kDefaultDeviceId 155 ? AudioDeviceDescription::kDefaultDeviceId
158 : device_id); 156 : device_id);
159 } 157 }
160 158
161 AudioInputStream* AudioManagerPulse::MakeLinearInputStream( 159 AudioInputStream* AudioManagerPulse::MakeLinearInputStream(
162 const AudioParameters& params, 160 const AudioParameters& params, const std::string& device_id) {
163 const std::string& device_id,
164 const LogCallback& log_callback) {
165 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 161 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
166 return MakeInputStream(params, device_id); 162 return MakeInputStream(params, device_id);
167 } 163 }
168 164
169 AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream( 165 AudioInputStream* AudioManagerPulse::MakeLowLatencyInputStream(
170 const AudioParameters& params, 166 const AudioParameters& params, const std::string& device_id) {
171 const std::string& device_id,
172 const LogCallback& log_callback) {
173 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 167 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
174 return MakeInputStream(params, device_id); 168 return MakeInputStream(params, device_id);
175 } 169 }
176 170
177 AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters( 171 AudioParameters AudioManagerPulse::GetPreferredOutputStreamParameters(
178 const std::string& output_device_id, 172 const std::string& output_device_id,
179 const AudioParameters& input_params) { 173 const AudioParameters& input_params) {
180 // TODO(tommi): Support |output_device_id|. 174 // TODO(tommi): Support |output_device_id|.
181 VLOG_IF(0, !output_device_id.empty()) << "Not implemented!"; 175 VLOG_IF(0, !output_device_id.empty()) << "Not implemented!";
182 176
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
339 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context, 333 void AudioManagerPulse::SampleRateInfoCallback(pa_context* context,
340 const pa_server_info* info, 334 const pa_server_info* info,
341 void* user_data) { 335 void* user_data) {
342 AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data); 336 AudioManagerPulse* manager = reinterpret_cast<AudioManagerPulse*>(user_data);
343 337
344 manager->native_input_sample_rate_ = info->sample_spec.rate; 338 manager->native_input_sample_rate_ = info->sample_spec.rate;
345 pa_threaded_mainloop_signal(manager->input_mainloop_, 0); 339 pa_threaded_mainloop_signal(manager->input_mainloop_, 0);
346 } 340 }
347 341
348 } // namespace media 342 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/pulse/audio_manager_pulse.h ('k') | media/audio/win/audio_low_latency_input_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698