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

Merge "soundtrigger JNI: fix AudioFormat channel mask"

Browse Source
This commit is contained in:
Eric Laurent
2019-02-27 17:00:01 +00:00
committed by Android (Google) Code Review
parent b610eccf3c 66ef06aa1f
commit 5d38dc3f6c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/jni/android_hardware_SoundTrigger.cpp
View File

@@ -221,12 +221,23 @@ void JNISoundTriggerCallback::onRecognitionEvent(struct sound_trigger_recognitio
jobject jAudioFormat = NULL;
if (event->trigger_in_data || event->capture_available) {
jint channelMask = (jint)audio_channel_mask_get_bits(event->audio_config.channel_mask);
jint channelIndexMask = (jint)AUDIO_CHANNEL_NONE;
switch (audio_channel_mask_get_representation(event->audio_config.channel_mask)) {
case AUDIO_CHANNEL_REPRESENTATION_INDEX:
channelIndexMask = channelMask;
channelMask = (jint)AUDIO_CHANNEL_NONE;
break;
default:
break;
}
jAudioFormat = env->NewObject(gAudioFormatClass,
gAudioFormatCstor,
audioFormatFromNative(event->audio_config.format),
event->audio_config.sample_rate,
inChannelMaskFromNative(event->audio_config.channel_mask),
(jint)0 /* channelIndexMask */);
channelMask,
channelIndexMask);
}
if (event->type == SOUND_MODEL_TYPE_KEYPHRASE) {