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

Merge "SoundPool: Clean up JNI AudioAttribute handling" into tm-dev

Browse Source
This commit is contained in:
Andy Hung
2022-03-28 18:51:22 +00:00
committed by Android (Google) Code Review
parent d9a4f1cdb4 0850300d63
commit fdf11ed6f1
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
media/jni/soundpool/android_media_SoundPool.cpp
View File

@@ -20,6 +20,7 @@
#define LOG_TAG "SoundPool-JNI" #define LOG_TAG "SoundPool-JNI"
#include <utils/Log.h> #include <utils/Log.h>
#include <audio_utils/string.h>
#include <jni.h> #include <jni.h>
#include <nativehelper/JNIPlatformHelp.h> #include <nativehelper/JNIPlatformHelp.h>
#include <nativehelper/ScopedUtfChars.h> #include <nativehelper/ScopedUtfChars.h>
@@ -453,32 +454,34 @@ static jint
android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, jobject weakRef, android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, jobject weakRef,
jint maxChannels, jobject jaa, jstring opPackageName) jint maxChannels, jobject jaa, jstring opPackageName)
{ {
ALOGV("android_media_SoundPool_native_setup");
if (jaa == nullptr) { if (jaa == nullptr) {
ALOGE("Error creating SoundPool: invalid audio attributes"); ALOGE("Error creating SoundPool: invalid audio attributes");
return -1; return -1;
} }
audio_attributes_t *paa = nullptr; // Use the AUDIO_ATTRIBUTES_INITIALIZER here to ensure all non-relevant fields are
// initialized properly. (note that .source is not explicitly initialized here).
audio_attributes_t audioAttributes = AUDIO_ATTRIBUTES_INITIALIZER;
// read the AudioAttributes values // read the AudioAttributes values
paa = (audio_attributes_t *) calloc(1, sizeof(audio_attributes_t));
const auto jtags = const auto jtags =
(jstring) env->GetObjectField(jaa, javaAudioAttrFields.fieldFormattedTags); (jstring) env->GetObjectField(jaa, javaAudioAttrFields.fieldFormattedTags);
const char* tags = env->GetStringUTFChars(jtags, nullptr); const char* tags = env->GetStringUTFChars(jtags, nullptr);
// copying array size -1, char array for tags was calloc'd, no need to NULL-terminate it // infers array size and guarantees zero termination (does not zero fill to the end).
strncpy(paa->tags, tags, AUDIO_ATTRIBUTES_TAGS_MAX_SIZE - 1); audio_utils_strlcpy(audioAttributes.tags, tags);
env->ReleaseStringUTFChars(jtags, tags); env->ReleaseStringUTFChars(jtags, tags);
paa->usage = (audio_usage_t) env->GetIntField(jaa, javaAudioAttrFields.fieldUsage); audioAttributes.usage =
paa->content_type = (audio_usage_t) env->GetIntField(jaa, javaAudioAttrFields.fieldUsage);
audioAttributes.content_type =
(audio_content_type_t) env->GetIntField(jaa, javaAudioAttrFields.fieldContentType); (audio_content_type_t) env->GetIntField(jaa, javaAudioAttrFields.fieldContentType);
paa->flags = (audio_flags_mask_t) env->GetIntField(jaa, javaAudioAttrFields.fieldFlags); audioAttributes.flags =
(audio_flags_mask_t) env->GetIntField(jaa, javaAudioAttrFields.fieldFlags);
ALOGV("android_media_SoundPool_native_setup");
ScopedUtfChars opPackageNameStr(env, opPackageName); ScopedUtfChars opPackageNameStr(env, opPackageName);
auto soundPool = std::make_shared<SoundPool>(maxChannels, paa, opPackageNameStr.c_str()); auto soundPool = std::make_shared<SoundPool>(
maxChannels, &audioAttributes, opPackageNameStr.c_str());
soundPool->setCallback(android_media_callback, nullptr /* user */); soundPool->setCallback(android_media_callback, nullptr /* user */);
// register with SoundPoolManager. // register with SoundPoolManager.
auto oldSoundPool = setSoundPool(env, thiz, soundPool); auto oldSoundPool = setSoundPool(env, thiz, soundPool);
// register Java SoundPool WeakRef using native SoundPool * as the key, for the callback. // register Java SoundPool WeakRef using native SoundPool * as the key, for the callback.
auto oldSoundPoolJavaRef = getSoundPoolJavaRefManager().set( auto oldSoundPoolJavaRef = getSoundPoolJavaRefManager().set(
@@ -486,10 +489,6 @@ android_media_SoundPool_native_setup(JNIEnv *env, jobject thiz, jobject weakRef,
ALOGW_IF(oldSoundPool != nullptr, "%s: Aliased SoundPool object %p", ALOGW_IF(oldSoundPool != nullptr, "%s: Aliased SoundPool object %p",
__func__, oldSoundPool.get()); __func__, oldSoundPool.get());
// audio attributes were copied in SoundPool creation
free(paa);
return 0; return 0;
} }