Merge "replace the hardcode for min/max sample rate with audio.h in jni" into main

Shunkai Yao · Gerrit Code Review · commit a55f17862ee6 · 2024-07-10T20:13:59.000Z
diff --git a/core/jni/android_media_AudioSystem.cpp b/core/jni/android_media_AudioSystem.cpp
@@ -2703,12 +2703,11 @@ static jint android_media_AudioSystem_getMaxChannelCount(JNIEnv *env, jobject th
 }
 
 static jint android_media_AudioSystem_getMaxSampleRate(JNIEnv *env, jobject thiz) {
-    // see frameworks/av/services/audiopolicy/common/include/policy.h
-    return 192000; // SAMPLE_RATE_HZ_MAX (for API)
+    return SAMPLE_RATE_HZ_MAX;
 }
 
 static jint android_media_AudioSystem_getMinSampleRate(JNIEnv *env, jobject thiz) {
-    return 4000; // SAMPLE_RATE_HZ_MIN  (for API)
+    return SAMPLE_RATE_HZ_MIN;
 }
 
 static std::vector<uid_t> convertJIntArrayToUidVector(JNIEnv *env, jintArray jArray) {

Original file line number	Diff line number	Diff line change
`@@ -2703,12 +2703,11 @@ static jint android_media_AudioSystem_getMaxChannelCount(JNIEnv *env, jobject th`
`2703`	`2703`	`}`
`2704`	`2704`
`2705`	`2705`	`static jint android_media_AudioSystem_getMaxSampleRate(JNIEnv *env, jobject thiz) {`
`2706`		`- // see frameworks/av/services/audiopolicy/common/include/policy.h`
`2707`		`- return 192000; // SAMPLE_RATE_HZ_MAX (for API)`
	`2706`	`+ return SAMPLE_RATE_HZ_MAX;`
`2708`	`2707`	`}`
`2709`	`2708`
`2710`	`2709`	`static jint android_media_AudioSystem_getMinSampleRate(JNIEnv *env, jobject thiz) {`
`2711`		`- return 4000; // SAMPLE_RATE_HZ_MIN (for API)`
	`2710`	`+ return SAMPLE_RATE_HZ_MIN;`
`2712`	`2711`	`}`
`2713`	`2712`
`2714`	`2713`	`static std::vector<uid_t> convertJIntArrayToUidVector(JNIEnv *env, jintArray jArray) {`