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

Unified Diff: webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java

Issue 1347243003: Reduces default sample rate from 44.1kHz to 16kHz (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
diff --git a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
index 81a2bddcd743d790810ddedfd7d1829a2a6ef30f..2bd840084dbb4a3c85b730f9fc76ab1598ea4edf 100644
--- a/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
+++ b/webrtc/modules/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java
@@ -42,8 +42,11 @@ class WebRtcAudioManager {
// Guaranteed to be supported by all devices.
private static final int BITS_PER_SAMPLE = 16;
- // Use 44.1kHz as the default sampling rate.
- private static final int SAMPLE_RATE_HZ = 44100;
+ // Use 16kHz as the default sample rate. A higher sample rate might prevent
+ // us from supporting communication mode on some older (e.g. ICS) devices.
+ private static final int DEFAULT_SAMPLE_RATE_HZ = 16000;
+
+ private static final int DEFAULT_FRAME_PER_BUFFER = 256;
// TODO(henrika): add stereo support for playout.
private static final int CHANNELS = 1;
@@ -56,8 +59,6 @@ class WebRtcAudioManager {
"MODE_IN_COMMUNICATION",
};
- private static final int DEFAULT_FRAME_PER_BUFFER = 256;
-
private final long nativeAudioManager;
private final Context context;
private final AudioManager audioManager;
@@ -166,12 +167,12 @@ class WebRtcAudioManager {
return 8000;
}
if (!WebRtcAudioUtils.runningOnJellyBeanMR1OrHigher()) {
- return SAMPLE_RATE_HZ;
+ return DEFAULT_SAMPLE_RATE_HZ;
}
String sampleRateString = audioManager.getProperty(
AudioManager.PROPERTY_OUTPUT_SAMPLE_RATE);
return (sampleRateString == null) ?
- SAMPLE_RATE_HZ : Integer.parseInt(sampleRateString);
+ DEFAULT_SAMPLE_RATE_HZ : Integer.parseInt(sampleRateString);
}
// Returns the native output buffer size for low-latency output streams.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698