From 8558709c73d064dd972e392d45fb5c7a2819943c Mon Sep 17 00:00:00 2001 From: Andy Hung Date: Mon, 7 Jun 2021 16:44:36 -0700 Subject: [PATCH] Audio: Support FCC_LIMIT for 22.2 testing Rename from FCC_8. Test: SoundPool(Aac|Haptic|Midi|Ogg)Test Bug: 189325443 Change-Id: I6c83d4bc2cbf4aaf72ac4648bbebaceaf9bb06a9 --- core/jni/android_media_AudioSystem.cpp | 2 +- media/jni/soundpool/Sound.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp index 56814c7eb774f..5ca4ec0aae13d 100644 --- a/core/jni/android_media_AudioSystem.cpp +++ b/core/jni/android_media_AudioSystem.cpp @@ -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) { diff --git a/media/jni/soundpool/Sound.cpp b/media/jni/soundpool/Sound.cpp index 50e0d336f9819..6ef074090df87 100644 --- a/media/jni/soundpool/Sound.cpp +++ b/media/jni/soundpool/Sound.cpp @@ -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 {