Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Audio: Support FCC_LIMIT for 22.2 testing" into sc-dev am: aadafc7bf2

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14904524

Change-Id: Iab4b7b45f08add806e3d082476f835dfdebc20cf
This commit is contained in:
Andy Hung
2021-06-09 19:59:01 +00:00
committed by Automerger Merge Worker
parent 3ec5783f20 aadafc7bf2
commit 21e0f4137a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/jni/android_media_AudioSystem.cpp
View File

@@ -2383,7 +2383,7 @@ android_media_AudioSystem_setSurroundFormatEnabled(JNIEnv *env, jobject thiz,
}
static jint android_media_AudioSystem_getMaxChannelCount(JNIEnv *env, jobject thiz) {
return FCC_8;
return FCC_LIMIT;
}
static jint android_media_AudioSystem_getMaxSampleRate(JNIEnv *env, jobject thiz) {

2
media/jni/soundpool/Sound.cpp
View File

@@ -214,7 +214,7 @@ status_t Sound::doLoad()
} else if (sampleRate > kMaxSampleRate) {
ALOGE("%s: sample rate (%u) out of range", __func__, sampleRate);
status = BAD_VALUE;
} else if (channelCount < 1 || channelCount > FCC_8) {
} else if (channelCount < 1 || channelCount > FCC_LIMIT) {
ALOGE("%s: sample channel count (%d) out of range", __func__, channelCount);
status = BAD_VALUE;
} else {