drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[BUG] audio: Misalignement of Native/Java AudioAttributes"

Browse Source
This commit is contained in:
Treehugger Robot 2023-05-23 15:59:29 +00:00 committed by Gerrit Code Review
commit b9b0db6200
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/jni/android_media_AudioProductStrategies.cpp
View File

@ -86,8 +86,8 @@ static jint convertAudioProductStrategiesFromNative(
// Audio Attributes Group array // Audio Attributes Group array
int attrGroupIndex = 0; int attrGroupIndex = 0;
std::map<int /**attributesGroupIndex*/, std::vector<AudioAttributes> > groups; std::map<int /**attributesGroupIndex*/, std::vector<VolumeGroupAttributes> > groups;
for (const auto &attr : strategy.getAudioAttributes()) { for (const auto &attr : strategy.getVolumeGroupAttributes()) {
int groupId = attr.getGroupId(); int groupId = attr.getGroupId();
int streamType = attr.getStreamType(); int streamType = attr.getStreamType();
const auto &iter = std::find_if(begin(groups), end(groups), const auto &iter = std::find_if(begin(groups), end(groups),
@ -108,17 +108,17 @@ static jint convertAudioProductStrategiesFromNative(
jAudioAttributesGroups = env->NewObjectArray(numAttributesGroups, gAudioAttributesGroupClass, NULL); jAudioAttributesGroups = env->NewObjectArray(numAttributesGroups, gAudioAttributesGroupClass, NULL);
for (const auto &iter : groups) { for (const auto &iter : groups) {
std::vector<AudioAttributes> audioAttributesGroups = iter.second; std::vector<VolumeGroupAttributes> volumeGroupAttributes = iter.second;
jint numAttributes = audioAttributesGroups.size(); jint numAttributes = volumeGroupAttributes.size();
jint jGroupId = audioAttributesGroups.front().getGroupId(); jint jGroupId = volumeGroupAttributes.front().getGroupId();
jint jLegacyStreamType = audioAttributesGroups.front().getStreamType(); jint jLegacyStreamType = volumeGroupAttributes.front().getStreamType();
jStatus = JNIAudioAttributeHelper::getJavaArray(env, &jAudioAttributes, numAttributes); jStatus = JNIAudioAttributeHelper::getJavaArray(env, &jAudioAttributes, numAttributes);
if (jStatus != (jint)AUDIO_JAVA_SUCCESS) { if (jStatus != (jint)AUDIO_JAVA_SUCCESS) {
goto exit; goto exit;
} }
for (size_t j = 0; j < static_cast<size_t>(numAttributes); j++) { for (size_t j = 0; j < static_cast<size_t>(numAttributes); j++) {
auto attributes = audioAttributesGroups[j].getAttributes(); auto attributes = volumeGroupAttributes[j].getAttributes();
jStatus = JNIAudioAttributeHelper::nativeToJava(env, &jAudioAttribute, attributes); jStatus = JNIAudioAttributeHelper::nativeToJava(env, &jAudioAttribute, attributes);
if (jStatus != AUDIO_JAVA_SUCCESS) { if (jStatus != AUDIO_JAVA_SUCCESS) {