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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: media/audio/audio_manager_base.cc
===================================================================
--- media/audio/audio_manager_base.cc (revision 194029)
+++ media/audio/audio_manager_base.cc (working copy)
@@ -9,9 +9,6 @@
#include "base/command_line.h"
#include "base/message_loop_proxy.h"
#include "base/threading/thread.h"
-#if defined(OS_ANDROID)
-#include "jni/AudioManagerAndroid_jni.h"
-#endif
#include "media/audio/audio_output_dispatcher_impl.h"
#include "media/audio/audio_output_proxy.h"
#include "media/audio/audio_output_resampler.h"
@@ -20,6 +17,10 @@
#include "media/audio/fake_audio_output_stream.h"
#include "media/base/media_switches.h"
+#if defined(OS_ANDROID)
+#include "jni/AudioManagerAndroid_jni.h"
+#endif
+
namespace media {
static const int kStreamCloseDelaySeconds = 5;
@@ -386,6 +387,12 @@
}
#if defined(OS_ANDROID)
+int AudioManagerBase::GetNativeOutputSampleRatee() {
DaleCurtis 2013/04/15 18:13:06 It makes me sad that this needs to be done here :(
+ return Java_AudioManagerAndroid_getNativeOutputSampleRate(
+ base::android::AttachCurrentThread(),
+ j_audio_manager_.obj());
+}
+
void AudioManagerBase::SetAudioMode(int mode) {
Java_AudioManagerAndroid_setMode(
base::android::AttachCurrentThread(),
« 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