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

Side by Side Diff: media/audio/android/audio_manager_android.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 (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 #include "media/audio/android/audio_manager_android.h" 5 #include "media/audio/android/audio_manager_android.h"
6 6
7 #include "base/android/build_info.h" 7 #include "base/android/build_info.h"
8 #include "base/android/context_utils.h" 8 #include "base/android/context_utils.h"
9 #include "base/android/jni_array.h" 9 #include "base/android/jni_array.h"
10 #include "base/android/jni_string.h" 10 #include "base/android/jni_string.h"
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 buffer_size = user_buffer_size; 156 buffer_size = user_buffer_size;
157 157
158 AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout, 158 AudioParameters params(AudioParameters::AUDIO_PCM_LOW_LATENCY, channel_layout,
159 GetNativeOutputSampleRate(), 16, buffer_size); 159 GetNativeOutputSampleRate(), 16, buffer_size);
160 params.set_effects(effects); 160 params.set_effects(effects);
161 return params; 161 return params;
162 } 162 }
163 163
164 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream( 164 AudioOutputStream* AudioManagerAndroid::MakeAudioOutputStream(
165 const AudioParameters& params, 165 const AudioParameters& params,
166 const std::string& device_id) { 166 const std::string& device_id,
167 const StatisticsCallback& statistics_callback) {
167 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); 168 DCHECK(GetTaskRunner()->BelongsToCurrentThread());
168 AudioOutputStream* stream = 169 AudioOutputStream* stream =
169 AudioManagerBase::MakeAudioOutputStream(params, std::string()); 170 AudioManagerBase::MakeAudioOutputStream(params, std::string());
170 streams_.insert(static_cast<OpenSLESOutputStream*>(stream)); 171 streams_.insert(static_cast<OpenSLESOutputStream*>(stream));
171 return stream; 172 return stream;
172 } 173 }
173 174
174 AudioInputStream* AudioManagerAndroid::MakeAudioInputStream( 175 AudioInputStream* AudioManagerAndroid::MakeAudioInputStream(
175 const AudioParameters& params, const std::string& device_id) { 176 const AudioParameters& params, const std::string& device_id) {
176 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); 177 DCHECK(GetTaskRunner()->BelongsToCurrentThread());
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 211
211 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream( 212 AudioOutputStream* AudioManagerAndroid::MakeLinearOutputStream(
212 const AudioParameters& params) { 213 const AudioParameters& params) {
213 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format()); 214 DCHECK_EQ(AudioParameters::AUDIO_PCM_LINEAR, params.format());
214 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); 215 DCHECK(GetTaskRunner()->BelongsToCurrentThread());
215 return new OpenSLESOutputStream(this, params, SL_ANDROID_STREAM_MEDIA); 216 return new OpenSLESOutputStream(this, params, SL_ANDROID_STREAM_MEDIA);
216 } 217 }
217 218
218 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream( 219 AudioOutputStream* AudioManagerAndroid::MakeLowLatencyOutputStream(
219 const AudioParameters& params, 220 const AudioParameters& params,
220 const std::string& device_id) { 221 const std::string& device_id,
222 const StatisticsCallback& statistics_callback) {
o1ka 2016/05/18 14:00:16 Does it compile? It looks like there is a mismatch
Henrik Grunell 2016/05/23 17:13:54 Done.
221 DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!"; 223 DLOG_IF(ERROR, !device_id.empty()) << "Not implemented!";
222 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format()); 224 DCHECK_EQ(AudioParameters::AUDIO_PCM_LOW_LATENCY, params.format());
223 225
224 // Set stream type which matches the current system-wide audio mode used by 226 // Set stream type which matches the current system-wide audio mode used by
225 // the Android audio manager. 227 // the Android audio manager.
226 const SLint32 stream_type = communication_mode_is_on_ ? 228 const SLint32 stream_type = communication_mode_is_on_ ?
227 SL_ANDROID_STREAM_VOICE : SL_ANDROID_STREAM_MEDIA; 229 SL_ANDROID_STREAM_VOICE : SL_ANDROID_STREAM_MEDIA;
228 return new OpenSLESOutputStream(this, params, stream_type); 230 return new OpenSLESOutputStream(this, params, stream_type);
229 } 231 }
230 232
(...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after
420 output_volume_override_ = volume; 422 output_volume_override_ = volume;
421 423
422 DCHECK(GetTaskRunner()->BelongsToCurrentThread()); 424 DCHECK(GetTaskRunner()->BelongsToCurrentThread());
423 for (OutputStreams::iterator it = streams_.begin(); 425 for (OutputStreams::iterator it = streams_.begin();
424 it != streams_.end(); ++it) { 426 it != streams_.end(); ++it) {
425 (*it)->SetVolume(volume); 427 (*it)->SetVolume(volume);
426 } 428 }
427 } 429 }
428 430
429 } // namespace media 431 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698