summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@google.com>2015-05-29 23:46:10 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-05-29 23:46:11 +0000
commit88a4a5da5eb158fe00f17af581f7529884c0b474 (patch)
tree7baf203ab518de1743b8b1c36e491fc25cdd3c26
parent43f23007e7b6e42fc765e3e7b178492b1a3fc392 (diff)
parent45c7c53181a1b10223fa8708432c31c4be4496a3 (diff)
downloadandroid_frameworks_wilhelm-88a4a5da5eb158fe00f17af581f7529884c0b474.tar.gz
android_frameworks_wilhelm-88a4a5da5eb158fe00f17af581f7529884c0b474.tar.bz2
android_frameworks_wilhelm-88a4a5da5eb158fe00f17af581f7529884c0b474.zip
Merge "Allow playback of sample rates up to 192 kHz" into mnc-dev
-rw-r--r--src/android/AudioPlayer_to_android.cpp18
1 files changed, 2 insertions, 16 deletions
diff --git a/src/android/AudioPlayer_to_android.cpp b/src/android/AudioPlayer_to_android.cpp
index da7c7b8..1e07f78 100644
--- a/src/android/AudioPlayer_to_android.cpp
+++ b/src/android/AudioPlayer_to_android.cpp
@@ -966,22 +966,8 @@ SLresult android_audioPlayer_checkSourceSink(CAudioPlayer *pAudioPlayer)
return result;
}
- switch (df_pcm->samplesPerSec) {
- case SL_SAMPLINGRATE_8:
- case SL_SAMPLINGRATE_11_025:
- case SL_SAMPLINGRATE_12:
- case SL_SAMPLINGRATE_16:
- case SL_SAMPLINGRATE_22_05:
- case SL_SAMPLINGRATE_24:
- case SL_SAMPLINGRATE_32:
- case SL_SAMPLINGRATE_44_1:
- case SL_SAMPLINGRATE_48:
- break;
- case SL_SAMPLINGRATE_64:
- case SL_SAMPLINGRATE_88_2:
- case SL_SAMPLINGRATE_96:
- case SL_SAMPLINGRATE_192:
- default:
+ if (df_pcm->samplesPerSec < SL_SAMPLINGRATE_8 ||
+ df_pcm->samplesPerSec > SL_SAMPLINGRATE_192) {
SL_LOGE("Cannot create audio player: unsupported sample rate %u milliHz",
(unsigned) df_pcm->samplesPerSec);
return SL_RESULT_CONTENT_UNSUPPORTED;