From 6dcf4f5c53b295e8943034c4b7d3c7a5cae818be Mon Sep 17 00:00:00 2001 From: Mikhail Naganov Date: Tue, 31 Aug 2021 17:45:13 -0700 Subject: [PATCH] Update use of a.m.a.c.AudioConfig in sthal_cli_3 Bug: 188932434 Test: m sthal_cli_3 Change-Id: Ifcc94ecfa7aa9d9a5292f45a35083c4681223529 --- .../android/hardware/soundtrigger3/cli/SthalCli.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java index 2922e8369b..0fd1dda73d 100644 --- a/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java +++ b/soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java @@ -21,6 +21,7 @@ import android.hardware.soundtrigger3.ISoundTriggerHwCallback; import android.hardware.soundtrigger3.ISoundTriggerHwGlobalCallback; import android.media.audio.common.AudioChannelLayout; import android.media.audio.common.AudioConfig; +import android.media.audio.common.AudioConfigBase; import android.media.audio.common.AudioFormatDescription; import android.media.audio.common.AudioFormatType; import android.media.audio.common.PcmType; @@ -348,11 +349,12 @@ public class SthalCli { private static AudioConfig createConfig() { AudioConfig config = new AudioConfig(); - config.channelMask = AudioChannelLayout.layoutMask(AudioChannelLayout.LAYOUT_MONO); - config.format = new AudioFormatDescription(); - config.format.type = AudioFormatType.PCM; - config.format.pcm = PcmType.INT_16_BIT; - config.sampleRateHz = 16000; + config.base = new AudioConfigBase(); + config.base.channelMask = AudioChannelLayout.layoutMask(AudioChannelLayout.LAYOUT_MONO); + config.base.format = new AudioFormatDescription(); + config.base.format.type = AudioFormatType.PCM; + config.base.format.pcm = PcmType.INT_16_BIT; + config.base.sampleRate = 16000; return config; } }