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

Merge changes I3aab572e,Iff9abda2 am: f340f3a01d

Browse Source 
Change-Id: I11b74c7d36e05856f3676a79a8c8809741077ab9
This commit is contained in:
Eric Laurent
2020-04-07 21:35:10 +00:00
committed by Automerger Merge Worker
parent f8709ba43c f340f3a01d
commit 5ca6ee2154
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/jni/android_media_AudioProductStrategies.cpp
View File

@@ -85,10 +85,23 @@ static jint convertAudioProductStrategiesFromNative(
jStrategyId = static_cast<jint>(strategy.getId());
// Audio Attributes Group array
std::map<int, std::vector<AudioAttributes> > groups;
int attrGroupIndex = 0;
std::map<int /**attributesGroupIndex*/, std::vector<AudioAttributes> > groups;
for (const auto &attr : strategy.getAudioAttributes()) {
int attrGroupId = attr.getGroupId();
groups[attrGroupId].push_back(attr);
int groupId = attr.getGroupId();
int streamType = attr.getStreamType();
const auto &iter = std::find_if(begin(groups), end(groups),
[groupId, streamType](const auto &iter) {
const auto &frontAttr = iter.second.front();
return frontAttr.getGroupId() == groupId && frontAttr.getStreamType() == streamType;
});
// Same Volume Group Id and same stream type
if (iter != end(groups)) {
groups[iter->first].push_back(attr);
} else {
// Add a new Group of AudioAttributes for this product strategy
groups[attrGroupIndex++].push_back(attr);
}
}
numAttributesGroups = groups.size();
@@ -97,7 +110,7 @@ static jint convertAudioProductStrategiesFromNative(
for (const auto &iter : groups) {
std::vector<AudioAttributes> audioAttributesGroups = iter.second;
jint numAttributes = audioAttributesGroups.size();
jint jGroupId = iter.first;
jint jGroupId = audioAttributesGroups.front().getGroupId();
jint jLegacyStreamType = audioAttributesGroups.front().getStreamType();
jStatus = JNIAudioAttributeHelper::getJavaArray(env, &jAudioAttributes, numAttributes);