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

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

Issue 14049003: Set default sampling rate to 44100 and query the native output sampling rate. (Closed) Base URL: https://src.chromium.org/svn/trunk/src/
Patch Set: Created 7 years, 8 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/audio_manager_base.h" 5 #include "media/audio/audio_manager_base.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/message_loop_proxy.h" 10 #include "base/message_loop_proxy.h"
11 #include "base/threading/thread.h" 11 #include "base/threading/thread.h"
12 #if defined(OS_ANDROID)
13 #include "jni/AudioManagerAndroid_jni.h"
14 #endif
15 #include "media/audio/audio_output_dispatcher_impl.h" 12 #include "media/audio/audio_output_dispatcher_impl.h"
16 #include "media/audio/audio_output_proxy.h" 13 #include "media/audio/audio_output_proxy.h"
17 #include "media/audio/audio_output_resampler.h" 14 #include "media/audio/audio_output_resampler.h"
18 #include "media/audio/audio_util.h" 15 #include "media/audio/audio_util.h"
19 #include "media/audio/fake_audio_input_stream.h" 16 #include "media/audio/fake_audio_input_stream.h"
20 #include "media/audio/fake_audio_output_stream.h" 17 #include "media/audio/fake_audio_output_stream.h"
21 #include "media/base/media_switches.h" 18 #include "media/base/media_switches.h"
22 19
20 #if defined(OS_ANDROID)
21 #include "jni/AudioManagerAndroid_jni.h"
22 #endif
23
23 namespace media { 24 namespace media {
24 25
25 static const int kStreamCloseDelaySeconds = 5; 26 static const int kStreamCloseDelaySeconds = 5;
26 27
27 // Default maximum number of output streams that can be open simultaneously 28 // Default maximum number of output streams that can be open simultaneously
28 // for all platforms. 29 // for all platforms.
29 static const int kDefaultMaxOutputStreams = 16; 30 static const int kDefaultMaxOutputStreams = 16;
30 31
31 // Default maximum number of input streams that can be open simultaneously 32 // Default maximum number of input streams that can be open simultaneously
32 // for all platforms. 33 // for all platforms.
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after
379 return GetPreferredOutputStreamParameters(AudioParameters()); 380 return GetPreferredOutputStreamParameters(AudioParameters());
380 } 381 }
381 382
382 AudioParameters AudioManagerBase::GetInputStreamParameters( 383 AudioParameters AudioManagerBase::GetInputStreamParameters(
383 const std::string& device_id) { 384 const std::string& device_id) {
384 NOTREACHED(); 385 NOTREACHED();
385 return AudioParameters(); 386 return AudioParameters();
386 } 387 }
387 388
388 #if defined(OS_ANDROID) 389 #if defined(OS_ANDROID)
390 int AudioManagerBase::GetNativeOutputSampleRatee() {
DaleCurtis 2013/04/15 18:13:06 It makes me sad that this needs to be done here :(
391 return Java_AudioManagerAndroid_getNativeOutputSampleRate(
392 base::android::AttachCurrentThread(),
393 j_audio_manager_.obj());
394 }
395
389 void AudioManagerBase::SetAudioMode(int mode) { 396 void AudioManagerBase::SetAudioMode(int mode) {
390 Java_AudioManagerAndroid_setMode( 397 Java_AudioManagerAndroid_setMode(
391 base::android::AttachCurrentThread(), 398 base::android::AttachCurrentThread(),
392 j_audio_manager_.obj(), mode); 399 j_audio_manager_.obj(), mode);
393 } 400 }
394 401
395 void AudioManagerBase::RegisterHeadsetReceiver() { 402 void AudioManagerBase::RegisterHeadsetReceiver() {
396 Java_AudioManagerAndroid_registerHeadsetReceiver( 403 Java_AudioManagerAndroid_registerHeadsetReceiver(
397 base::android::AttachCurrentThread(), 404 base::android::AttachCurrentThread(),
398 j_audio_manager_.obj()); 405 j_audio_manager_.obj());
399 } 406 }
400 407
401 void AudioManagerBase::UnregisterHeadsetReceiver() { 408 void AudioManagerBase::UnregisterHeadsetReceiver() {
402 Java_AudioManagerAndroid_unregisterHeadsetReceiver( 409 Java_AudioManagerAndroid_unregisterHeadsetReceiver(
403 base::android::AttachCurrentThread(), 410 base::android::AttachCurrentThread(),
404 j_audio_manager_.obj()); 411 j_audio_manager_.obj());
405 } 412 }
406 #endif // defined(OS_ANDROID) 413 #endif // defined(OS_ANDROID)
407 414
408 } // namespace media 415 } // namespace media
OLDNEW
« no previous file with comments | « media/audio/audio_manager_base.h ('k') | media/base/android/java/src/org/chromium/media/AudioManagerAndroid.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698