Merge "Move common audio AIDL types to audio.media.audio.common" (9c14e18b) · Commits · e / os / android_hardware_interfaces

audio/core/all-versions/vts/functional/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -58,6 +58,7 @@ cc_test {
		"libmedia_helper",
		"android.hardware.audio@2.0",
		"android.hardware.audio.common@2.0",
		"android.media.audio.common.types-V1-cpp",
		],
		cflags: [
		"-DMAJOR_VERSION=2",
		@@ -84,6 +85,7 @@ cc_test {
		"libmedia_helper",
		"android.hardware.audio@4.0",
		"android.hardware.audio.common@4.0",
		"android.media.audio.common.types-V1-cpp",
		],
		cflags: [
		"-DMAJOR_VERSION=4",
		@@ -110,6 +112,7 @@ cc_test {
		"libmedia_helper",
		"android.hardware.audio@5.0",
		"android.hardware.audio.common@5.0",
		"android.media.audio.common.types-V1-cpp",
		],
		cflags: [
		"-DMAJOR_VERSION=5",
		@@ -137,6 +140,7 @@ cc_test {
		"libmedia_helper",
		"android.hardware.audio@6.0",
		"android.hardware.audio.common@6.0",
		"android.media.audio.common.types-V1-cpp",
		],
		cflags: [
		"-DMAJOR_VERSION=6",
		@@ -200,6 +204,7 @@ cc_test {
		static_libs: [
		"android.hardware.audio@6.0",
		"android.hardware.audio.common@6.0",
		"android.media.audio.common.types-V1-cpp",
		"libaudiofoundation",
		"libaudiopolicycomponents",
		"libmedia_helper",

soundtrigger/aidl/cli/java/android/hardware/soundtrigger3/cli/SthalCli.java

+16 −8

Original line number	Diff line number	Diff line
		@@ -19,7 +19,11 @@ import android.annotation.NonNull;
		import android.hardware.soundtrigger3.ISoundTriggerHw;
		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.AudioFormatDescription;
		import android.media.audio.common.AudioFormatType;
		import android.media.audio.common.PcmType;
		import android.media.soundtrigger.ConfidenceLevel;
		import android.media.soundtrigger.ModelParameterRange;
		import android.media.soundtrigger.PhraseRecognitionEvent;
		@@ -36,7 +40,6 @@ import android.os.ParcelFileDescriptor;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.os.SystemProperties;

		import java.util.Scanner;
		import java.util.concurrent.ConcurrentHashMap;
		import java.util.concurrent.ConcurrentMap;
		@@ -196,9 +199,7 @@ public class SthalCli {
		event.type = SoundModelType.GENERIC;
		event.status = status;
		event.captureAvailable = true;
		event.audioConfig.channelMask = 16;
		event.audioConfig.format = 1;
		event.audioConfig.sampleRateHz = 16000;
		event.audioConfig = createConfig();
		try {
		model.callback.recognitionCallback(modelHandle, event);
		} catch (RemoteException e) {
		@@ -216,10 +217,7 @@ public class SthalCli {
		event.common.type = SoundModelType.KEYPHRASE;
		event.common.status = status;
		event.common.captureAvailable = true;
		event.common.audioConfig = new AudioConfig();
		event.common.audioConfig.channelMask = 16;
		event.common.audioConfig.format = 1;
		event.common.audioConfig.sampleRateHz = 16000;
		event.common.audioConfig = createConfig();
		if (model.phraseModel.phrases.length > 0) {
		PhraseRecognitionExtra extra = new PhraseRecognitionExtra();
		extra.id = model.phraseModel.phrases[0].id;
		@@ -250,6 +248,16 @@ public class SthalCli {
		}
		}

		private 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;
		return config;
		}

		@Override
		public void registerGlobalCallback(ISoundTriggerHwGlobalCallback callback) {
		System.out.println("registerGlobalCallback()");