tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move sthal_cli under 2.4

Browse source 
This version is specifically a mock of STHAL 2.4, so it makes more
sense to put it under 2.4 and name it as such.

I intend to add a separate mock for the AIDL version, so making sure
the two don't collide.

Test: Ran the mock HAL and manually verified operation.
Change-Id: Ica8e53b981d73737bfb1720628592e650fc86ee0
This commit is contained in:
Ytai Ben-Tsvi 2021-03-18 16:07:39 -07:00
parent 6b50bdd0ae
commit b97a2512eb
5 changed files with 35 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
soundtrigger/sthal_cli/Android.bp → soundtrigger/2.4/cli/Android.bp
View file

@ -1,6 +1,6 @@
java_binary {
name: "sthal_cli",
wrapper: "sthal_cli",
name: "sthal_cli_2.4",
wrapper: "sthal_cli_2.4",
srcs: ["java/**/*.java"],
static_libs: [
"android.hardware.soundtrigger-V2.4-java",

0
soundtrigger/sthal_cli/OWNERS → soundtrigger/2.4/cli/OWNERS
View file

57
soundtrigger/sthal_cli/java/android/hardware/soundtrigger/cli/SthalCli.java → soundtrigger/2.4/cli/java/android/hardware/soundtrigger/V2_4/cli/SthalCli.java
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package android.hardware.soundtrigger.cli;
package android.hardware.soundtrigger.V2_4.cli;
import android.hardware.soundtrigger.V2_0.PhraseRecognitionExtra;
import android.hardware.soundtrigger.V2_0.RecognitionMode;
@ -26,6 +26,7 @@ import android.os.HidlMemoryUtil;
import android.os.HwBinder;
import android.os.RemoteException;
import android.os.SystemProperties;
import java.util.Scanner;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@ -63,8 +64,7 @@ public class SthalCli {
SystemProperties.set("debug.soundtrigger_middleware.use_mock_hal", "true");
SystemProperties.set("sys.audio.restart.hal", "1");
while (processCommand())
;
while (processCommand()) ;
} catch (Exception e) {
e.printStackTrace();
} finally {
@ -97,13 +97,13 @@ public class SthalCli {
return true;
case "r":
mService.sendRecognitionEvent(
Integer.parseInt(tokens[1]), Integer.parseInt(tokens[2]));
mService.sendRecognitionEvent(Integer.parseInt(tokens[1]),
Integer.parseInt(tokens[2]));
return true;
case "p":
mService.sendPhraseRecognitionEvent(
Integer.parseInt(tokens[1]), Integer.parseInt(tokens[2]));
mService.sendPhraseRecognitionEvent(Integer.parseInt(tokens[1]),
Integer.parseInt(tokens[2]));
return true;
case "d":
@ -111,9 +111,7 @@ public class SthalCli {
return true;
case "h":
System.out.print("Available commands:\n"
+ "h - help\n"
+ "q - quit\n"
System.out.print("Available commands:\n" + "h - help\n" + "q - quit\n"
+ "a - send onResourcesAvailable event\n"
+ "u <model> - send modelUnloaded event\n"
+ "r <model> <status> - send recognitionEvent\n"
@ -177,8 +175,7 @@ public class SthalCli {
Model model = mLoadedModels.get(modelHandle);
if (model != null && model.config != null) {
android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.RecognitionEvent event =
new android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback
.RecognitionEvent();
new android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.RecognitionEvent();
event.header.model = modelHandle;
event.header.type = SoundModelType.GENERIC;
event.header.status = status;
@ -200,10 +197,9 @@ public class SthalCli {
public void sendPhraseRecognitionEvent(int modelHandle, int status) {
Model model = mLoadedModels.get(modelHandle);
if (model != null && model.config != null) {
android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback
.PhraseRecognitionEvent event =
new android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback
.PhraseRecognitionEvent();
android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.PhraseRecognitionEvent
event =
new android.hardware.soundtrigger.V2_1.ISoundTriggerHwCallback.PhraseRecognitionEvent();
event.common.header.model = modelHandle;
event.common.header.type = SoundModelType.KEYPHRASE;
event.common.header.status = status;
@ -250,8 +246,7 @@ public class SthalCli {
public void loadSoundModel_2_4(SoundModel soundModel, ISoundTriggerHwCallback callback,
loadSoundModel_2_4Callback _hidl_cb) {
int handle = mHandleCounter++;
System.out.println(
String.format("loadSoundModel_2_4(soundModel=%s) -> %d", soundModel, handle));
System.out.printf("loadSoundModel_2_4(soundModel=%s) -> %d%n", soundModel, handle);
mLoadedModels.put(handle, new Model(callback, soundModel));
_hidl_cb.onValues(0, handle);
}
@ -260,16 +255,16 @@ public class SthalCli {
public void loadPhraseSoundModel_2_4(PhraseSoundModel soundModel,
ISoundTriggerHwCallback callback, loadPhraseSoundModel_2_4Callback _hidl_cb) {
int handle = mHandleCounter++;
System.out.println(String.format(
"loadPhraseSoundModel_2_4(soundModel=%s) -> %d", soundModel, handle));
System.out.printf("loadPhraseSoundModel_2_4(soundModel=%s) -> %d%n", soundModel,
handle);
mLoadedModels.put(handle, new Model(callback, soundModel));
_hidl_cb.onValues(0, handle);
}
@Override
public int startRecognition_2_4(
int modelHandle, android.hardware.soundtrigger.V2_3.RecognitionConfig config) {
System.out.println(String.format("startRecognition_2_4(modelHandle=%d)", modelHandle));
public int startRecognition_2_4(int modelHandle,
android.hardware.soundtrigger.V2_3.RecognitionConfig config) {
System.out.printf("startRecognition_2_4(modelHandle=%d)%n", modelHandle);
Model model = mLoadedModels.get(modelHandle);
if (model != null) {
model.config = config;
@ -292,26 +287,26 @@ public class SthalCli {
}
@Override
public void queryParameter(
int modelHandle, int modelParam, queryParameterCallback _hidl_cb) {
public void queryParameter(int modelHandle, int modelParam,
queryParameterCallback _hidl_cb) {
_hidl_cb.onValues(0, new OptionalModelParameterRange());
}
@Override
public int getModelState(int modelHandle) {
System.out.println(String.format("getModelState(modelHandle=%d)", modelHandle));
System.out.printf("getModelState(modelHandle=%d)%n", modelHandle);
return 0;
}
@Override
public int unloadSoundModel(int modelHandle) {
System.out.println(String.format("unloadSoundModel(modelHandle=%d)", modelHandle));
System.out.printf("unloadSoundModel(modelHandle=%d)%n", modelHandle);
return 0;
}
@Override
public int stopRecognition(int modelHandle) {
System.out.println(String.format("stopRecognition(modelHandle=%d)", modelHandle));
System.out.printf("stopRecognition(modelHandle=%d)%n", modelHandle);
Model model = mLoadedModels.get(modelHandle);
if (model != null) {
model.config = null;
@ -335,8 +330,8 @@ public class SthalCli {
// Everything below is not implemented and not expected to be called.
@Override
public int startRecognition_2_3(
int modelHandle, android.hardware.soundtrigger.V2_3.RecognitionConfig config) {
public int startRecognition_2_3(int modelHandle,
android.hardware.soundtrigger.V2_3.RecognitionConfig config) {
throw new UnsupportedOperationException();
}
@ -403,4 +398,4 @@ public class SthalCli {
throw new UnsupportedOperationException();
}
}
}
}

7
soundtrigger/2.4/cli/sthal_cli_2.4 Normal file
View file

@ -0,0 +1,7 @@
#!/system/bin/sh
# Script to start "sthal_cli_2.4" on the device
#
base=/system
export CLASSPATH=$base/framework/sthal_cli_2.4.jar
exec app_process $base/bin android.hardware.soundtrigger.V2_4.cli.SthalCli "$@"

7
soundtrigger/sthal_cli/sthal_cli
View file

@ -1,7 +0,0 @@
#!/system/bin/sh
# Script to start "sthal_cli" on the device
#
base=/system
export CLASSPATH=$base/framework/sthal_cli.jar
exec app_process $base/bin android.hardware.soundtrigger.cli.SthalCli "$@"