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

Merge "SoundTrigger: fix capture format in recognition event" into lmp-dev

Browse Source
This commit is contained in:
Eric Laurent
2014-09-07 19:10:06 +00:00
committed by Android (Google) Code Review
parent b30c9920df 39fcca0a50
commit 8232d822aa
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/hardware/soundtrigger/SoundTrigger.java
View File

@@ -480,7 +480,7 @@ public class SoundTrigger {
int capturePreambleMs = in.readInt();
boolean triggerInData = in.readByte() == 1;
AudioFormat captureFormat = null;
if (triggerInData) {
if (in.readByte() == 1) {
int sampleRate = in.readInt();
int encoding = in.readInt();
int channelMask = in.readInt();
@@ -508,7 +508,8 @@ public class SoundTrigger {
dest.writeInt(captureSession);
dest.writeInt(captureDelayMs);
dest.writeInt(capturePreambleMs);
if (triggerInData && (captureFormat != null)) {
dest.writeByte((byte) (triggerInData ? 1 : 0));
if (captureFormat != null) {
dest.writeByte((byte)1);
dest.writeInt(captureFormat.getSampleRate());
dest.writeInt(captureFormat.getEncoding());

2
core/jni/android_hardware_SoundTrigger.cpp
View File

@@ -211,7 +211,7 @@ void JNISoundTriggerCallback::onRecognitionEvent(struct sound_trigger_recognitio
}
jobject jAudioFormat = NULL;
if (event->trigger_in_data) {
if (event->trigger_in_data || event->capture_available) {
jAudioFormat = env->NewObject(gAudioFormatClass,
gAudioFormatCstor,
audioFormatFromNative(event->audio_config.format),