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

Unified Diff: media/audio/android/audio_manager_android.h

Issue 93233003: Mute audio when volume is zero on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: media/audio/android/audio_manager_android.h
diff --git a/media/audio/android/audio_manager_android.h b/media/audio/android/audio_manager_android.h
index ed2b2c3ce916d8033c3cbe7517c21ed4b8588b24..00a031c41e65a8a1cce8574140092cc0c4240ee5 100644
--- a/media/audio/android/audio_manager_android.h
+++ b/media/audio/android/audio_manager_android.h
@@ -5,12 +5,16 @@
#ifndef MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
#define MEDIA_AUDIO_ANDROID_AUDIO_MANAGER_ANDROID_H_
+#include <set>
+
#include "base/android/jni_android.h"
#include "base/gtest_prod_util.h"
#include "media/audio/audio_manager_base.h"
namespace media {
+class OpenSLESOutputStream;
+
// Android implemention of AudioManager.
class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
public:
@@ -52,6 +56,8 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
static bool RegisterAudioManager(JNIEnv* env);
+ void SetMute(JNIEnv* env, jobject obj, jboolean state);
+
protected:
virtual ~AudioManagerAndroid();
@@ -68,12 +74,17 @@ class MEDIA_EXPORT AudioManagerAndroid : public AudioManagerBase {
int GetAudioLowLatencyOutputFrameSize();
int GetOptimalOutputFrameSize(int sample_rate, int channels);
+ void DoSetMuteOnAudioThread(bool state);
+
// Allow the AudioAndroidTest to access private methods.
FRIEND_TEST_ALL_PREFIXES(AudioAndroidTest, IsAudioLowLatencySupported);
// Java AudioManager instance.
base::android::ScopedJavaGlobalRef<jobject> j_audio_manager_;
+ typedef std::set<OpenSLESOutputStream*> OutputStreams;
+ OutputStreams streams_;
+
DISALLOW_COPY_AND_ASSIGN(AudioManagerAndroid);
};
« no previous file with comments | « no previous file | media/audio/android/audio_manager_android.cc » ('j') | media/audio/android/audio_manager_android.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698