diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 06:18:49 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-20 06:18:49 +0000 |
| commit | e2ca3d4a927a09809dd1d4a4669eeecd778ae0ce (patch) | |
| tree | 390777cbc92a31830f290a5f35bbbba2c3218943 /media/audio/audio_manager_base.h | |
| parent | 0567733b5a7e5a8e2e771c9ea83a7cd53403988c (diff) | |
| download | chromium_src-e2ca3d4a927a09809dd1d4a4669eeecd778ae0ce.zip chromium_src-e2ca3d4a927a09809dd1d4a4669eeecd778ae0ce.tar.gz chromium_src-e2ca3d4a927a09809dd1d4a4669eeecd778ae0ce.tar.bz2 | |
Add MODIFY_AUDIO_SETTINGS permission in Android manifest and implementation in android audio manager.
MODIFY_AUDIO_SETTINGS allows application to be able to configure audio settings.
In android audio manager, a function SetAudioMode is added to set audio mode.
BUG=180328
Contributed by leozwang@chromium.org (https://codereview.chromium.org/12571006/).
Review URL: https://codereview.chromium.org/12843015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@189210 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/audio/audio_manager_base.h')
| -rw-r--r-- | media/audio/audio_manager_base.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/media/audio/audio_manager_base.h b/media/audio/audio_manager_base.h index 2275f9b..beb2a73 100644 --- a/media/audio/audio_manager_base.h +++ b/media/audio/audio_manager_base.h @@ -20,6 +20,10 @@ #include "base/win/scoped_com_initializer.h" #endif +#if defined(OS_ANDROID) +#include "base/android/jni_android.h" +#endif + namespace base { class Thread; } @@ -93,6 +97,10 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { virtual AudioParameters GetInputStreamParameters( const std::string& device_id) OVERRIDE; +#if defined(OS_ANDROID) + static bool RegisterAudioManager(JNIEnv* env); +#endif + protected: AudioManagerBase(); @@ -132,6 +140,8 @@ class MEDIA_EXPORT AudioManagerBase : public AudioManager { // Called by Shutdown(). void ShutdownOnAudioThread(); + void SetAudioMode(int mode); + // Counts the number of active input streams to find out if something else // is currently recording in Chrome. base::AtomicRefCount num_active_input_streams_; |