(config.observedProperties.size());
+ for (SOSOfferingCapabilities offering : caps.getLayers()) {
+ if (offering.getMainProcedure().equals(config.sensorUID)) {
+ String offeringID = offering.getIdentifier();
+
+ for (String obsProp : config.observedProperties) {
+ if (offering.getObservableProperties().contains(obsProp)) {
+ // create data request
+ GetResultRequest req = new GetResultRequest();
+ req.setGetServer(config.sosEndpointUrl);
+ req.setVersion(SOS_VERSION);
+ req.setOffering(offeringID);
+ req.getObservables().add(obsProp);
+ req.setTime(TimeExtent.getPeriodStartingNow(STREAM_END_TIME));
+ req.setXmlWrapper(false);
+
+ // create client and retrieve result template
+ SOSClient sos = new SOSClient(req, config.sosUseWebsockets);
+ sosClients.add(sos);
+ sos.retrieveStreamDescription();
+ DataComponent recordDef = sos.getRecordDescription();
+ if (recordDef.getName() == null)
+ recordDef.setName("output" + outputNum);
+
+ // retrieve sensor description from remote SOS if available (first time only)
+ try {
+ if (outputNum == 1 && config.sensorML == null)
+ this.sensorDescription = (AbstractPhysicalProcess) sos.getSensorDescription(config.sensorUID);
+ } catch (SensorHubException e) {
+ Log.d(TAG, "Cannot get remote sensor description.", e);
+ }
+
+ // create output
+ final ProxySensorOutput output = new ProxySensorOutput(this, recordDef, sos.getRecommendedEncoding());
+ this.addOutput(output, false);
+
+ // HACK TO PREVENT GETRESULT TIME ERROR
+// sos.startStream((data) -> output.publishNewRecord(data));
+// try {
+// Thread.sleep(1000);
+// } catch (InterruptedException e) {
+// e.printStackTrace();
+// }
+// sos.stopStream();
+
+ outputNum++;
+ }
+ }
+ }
+ }
+
+ if (sosClients.isEmpty())
+ throw new SensorHubException("Requested observation data is not available from SOS " + config.sosEndpointUrl +
+ ". Check Sensor UID and observed properties have valid values.");
+ }
+
+ }
+
+ public void startSOSStreams() throws SensorHubException {
+ for (int i = 0; i < sosClients.size(); i++) {
+ String name = sosClients.get(i).getRecordDescription().getName();
+ SOSRecordListener rl = new SOSRecordListener() {
+ @Override
+ public void newRecord(DataBlock data) {
+ ProxySensorOutput output = (ProxySensorOutput) getObservationOutputs().get(name);
+ output.publishNewRecord(data);
+ }
+ };
+ sosClients.get(i).startStream(rl);
+ }
+ }
+
+ public void startSOSStream(String outputName) throws SensorHubException {
+ for (SOSClient client : sosClients) {
+ if (client.getRecordDescription().getName().equals(outputName)) {
+ SOSRecordListener recordListener = new SOSRecordListener() {
+ @Override
+ public void newRecord(DataBlock data) {
+ ProxySensorOutput output = (ProxySensorOutput) getObservationOutputs().get(outputName);
+ output.publishNewRecord(data);
+ }
+ };
+ client.startStream(recordListener);
+ break;
+ }
+ }
+ }
+
+ public void stopSOSStreams() throws SensorHubException {
+ for (int i = 0; i < sosClients.size(); i++) {
+ sosClients.get(i).stopStream();
+ }
+ }
+
+ public void stopSOSStream(String outputName) throws SensorHubException {
+ for (SOSClient client : sosClients) {
+ if (client.getRecordDescription().getName().equals(outputName)) {
+ client.stopStream();
+ break;
+ }
+ }
+ }
+}
diff --git a/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorConfig.java b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorConfig.java
new file mode 100644
index 00000000..36910192
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorConfig.java
@@ -0,0 +1,23 @@
+package org.sensorhub.impl.swe.proxysensor;
+
+import android.content.Context;
+
+import org.sensorhub.api.module.ModuleConfig;
+import org.sensorhub.impl.sensor.swe.SWEVirtualSensorConfig;
+
+public class ProxySensorConfig extends SWEVirtualSensorConfig
+{
+ public transient Context androidContext;
+
+ public ProxySensorConfig()
+ {
+ super();
+ this.moduleClass = ProxySensor.class.getCanonicalName();
+ }
+
+ @Override
+ public ModuleConfig clone()
+ {
+ return this; // disable clone for now as it crashes Android app
+ }
+}
diff --git a/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorDescriptor.java b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorDescriptor.java
new file mode 100644
index 00000000..d643d46b
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorDescriptor.java
@@ -0,0 +1,33 @@
+package org.sensorhub.impl.swe.proxysensor;
+
+import org.sensorhub.api.module.IModule;
+import org.sensorhub.api.module.IModuleProvider;
+import org.sensorhub.api.module.ModuleConfig;
+import org.sensorhub.impl.module.JarModuleProvider;
+
+public class ProxySensorDescriptor extends JarModuleProvider implements IModuleProvider
+{
+ @Override
+ public String getModuleName()
+ {
+ return "Proxy Sensor";
+ }
+
+ @Override
+ public String getModuleDescription()
+ {
+ return "Altered SWEVirtualSensor with changes to event listeners implementation sending data.";
+ }
+
+ @Override
+ public Class> getModuleClass()
+ {
+ return ProxySensor.class;
+ }
+
+ @Override
+ public Class getModuleConfigClass()
+ {
+ return ProxySensorConfig.class;
+ }
+}
diff --git a/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorOutput.java b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorOutput.java
new file mode 100644
index 00000000..912c6d33
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/ProxySensorOutput.java
@@ -0,0 +1,61 @@
+package org.sensorhub.impl.swe.proxysensor;
+
+import android.util.Log;
+
+import net.opengis.swe.v20.DataBlock;
+import net.opengis.swe.v20.DataComponent;
+import net.opengis.swe.v20.DataEncoding;
+
+import org.sensorhub.api.common.IEventListener;
+import org.sensorhub.api.common.SensorHubException;
+import org.sensorhub.impl.sensor.swe.SWEVirtualSensor;
+import org.sensorhub.impl.sensor.swe.SWEVirtualSensorOutput;
+
+import static android.content.ContentValues.TAG;
+
+public class ProxySensorOutput extends SWEVirtualSensorOutput
+{
+ ProxySensor parentSensor;
+ DataComponent recordStructure;
+ DataEncoding recordEncoding;
+
+ public ProxySensorOutput(ProxySensor sensor, DataComponent recordStructure, DataEncoding recordEncoding) {
+ super(sensor, recordStructure, recordEncoding);
+ this.parentSensor = sensor;
+ this.recordStructure = recordStructure;
+ this.recordEncoding = recordEncoding;
+ }
+
+ @Override
+ public void publishNewRecord(DataBlock dataBlock) {
+ super.publishNewRecord(dataBlock);
+ Log.d(TAG, "publishNewRecord: ");
+ }
+
+ @Override
+ public long getLatestRecordTime() {
+ return System.currentTimeMillis();
+ }
+
+ @Override
+ public void registerListener(IEventListener listener)
+ {
+ Log.d(TAG, "Registering Proxy Sensor Listener for: " + this.name);
+ try {
+ this.parentSensor.startSOSStream(this.name);
+ } catch (SensorHubException e) {
+ Log.d(TAG, "Error Starting Stream while registering Proxy Sensor", e);
+ }
+ eventHandler.registerListener(listener);
+ }
+
+ @Override
+ public void unregisterListener(IEventListener listener) {
+ try {
+ this.parentSensor.stopSOSStream(this.name);
+ Log.d(TAG, "unregisterListener: Stopping stream: " + this.name);
+ } catch (SensorHubException e) {
+ e.printStackTrace();
+ }
+ }
+}
diff --git a/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/IMqttSubscriber.java b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/IMqttSubscriber.java
new file mode 100644
index 00000000..2265b953
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/IMqttSubscriber.java
@@ -0,0 +1,21 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+ The contents of this file are subject to the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one
+ at http://mozilla.org/MPL/2.0/.
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the License.
+
+ Copyright (C) 2020 Botts Innovative Research, Inc. All Rights Reserved.
+
+ ******************************* END LICENSE BLOCK ***************************/
+package org.sensorhub.impl.swe.proxysensor.mqtt;
+
+public interface IMqttSubscriber {
+
+ void subscribeToTopics();
+
+ void onMessage(String message);
+}
diff --git a/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttConnectionListener.java b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttConnectionListener.java
new file mode 100644
index 00000000..f53edcef
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttConnectionListener.java
@@ -0,0 +1,56 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+ The contents of this file are subject to the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one
+ at http://mozilla.org/MPL/2.0/.
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the License.
+
+ Copyright (C) 2020 Botts Innovative Research, Inc. All Rights Reserved.
+
+ ******************************* END LICENSE BLOCK ***************************/
+package org.sensorhub.impl.swe.proxysensor.mqtt;
+
+import android.util.Log;
+
+import org.eclipse.paho.client.mqttv3.DisconnectedBufferOptions;
+import org.eclipse.paho.client.mqttv3.IMqttActionListener;
+import org.eclipse.paho.client.mqttv3.IMqttToken;
+
+public class MqttConnectionListener implements IMqttActionListener {
+
+ private static final String TAG = "MqttConnectionListener";
+
+ private MqttHelper mqttHelper;
+ private IMqttSubscriber subscriber;
+
+ public MqttConnectionListener(MqttHelper helper, IMqttSubscriber subscriber) {
+
+ mqttHelper = helper;
+
+ this.subscriber = subscriber;
+ }
+
+ @Override
+ public void onSuccess(IMqttToken asyncActionToken) {
+
+ Log.d(TAG, "Connected");
+
+ DisconnectedBufferOptions options = new DisconnectedBufferOptions();
+ options.setBufferEnabled(true);
+ options.setBufferSize(100);
+ options.setPersistBuffer(false);
+ options.setDeleteOldestMessages(false);
+ mqttHelper.setDisconnectedBufferOptions(options);
+
+ subscriber.subscribeToTopics();
+ }
+
+ @Override
+ public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+
+ Log.d(TAG, "Connection failure", exception);
+ }
+}
diff --git a/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttHelper.java b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttHelper.java
new file mode 100644
index 00000000..90b08c3c
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttHelper.java
@@ -0,0 +1,156 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+ The contents of this file are subject to the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one
+ at http://mozilla.org/MPL/2.0/.
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the License.
+
+ Copyright (C) 2020 Botts Innovative Research, Inc. All Rights Reserved.
+
+ ******************************* END LICENSE BLOCK ***************************/
+package org.sensorhub.impl.swe.proxysensor.mqtt;
+
+import android.content.Context;
+import android.util.Log;
+
+import org.eclipse.paho.android.service.MqttAndroidClient;
+import org.eclipse.paho.client.mqttv3.DisconnectedBufferOptions;
+import org.eclipse.paho.client.mqttv3.IMqttActionListener;
+import org.eclipse.paho.client.mqttv3.IMqttToken;
+import org.eclipse.paho.client.mqttv3.MqttClient;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.eclipse.paho.client.mqttv3.MqttException;
+
+/**
+ *
+ * Android MQTT wrapper
+ *
+ *
+ * @author Nick Garay
+ * @since Jan 10, 2020
+ */
+public class MqttHelper {
+
+ private final String TAG = "MqttHelper";
+ private MqttAndroidClient client;
+
+ public MqttHelper() {
+ }
+
+ public IMqttToken connect(Context context, String url) {
+
+ IMqttToken connectionToken = null;
+
+ String clientId = MqttClient.generateClientId();
+
+ client = new MqttAndroidClient(context, url, clientId);
+
+ try {
+
+ MqttConnectOptions options = new MqttConnectOptions();
+ options.setConnectionTimeout(3000);
+ options.setKeepAliveInterval(300);
+ options.setAutomaticReconnect(true);
+ options.setCleanSession(false);
+
+ connectionToken = client.connect(options);
+
+ }catch(Exception e) {
+
+ Log.d(TAG, "Connection failure", e);
+ }
+
+ return connectionToken;
+ }
+
+ public IMqttToken connect(Context context, String username, String password, String url) {
+
+ IMqttToken connectionToken = null;
+
+ String clientId = MqttClient.generateClientId();
+
+ client = new MqttAndroidClient(context, url, clientId);
+
+ try {
+
+ MqttConnectOptions options = new MqttConnectOptions();
+ options.setConnectionTimeout(3000);
+ options.setKeepAliveInterval(300);
+ options.setAutomaticReconnect(true);
+ options.setCleanSession(false);
+ options.setUserName(username);
+ options.setPassword(password.toCharArray());
+
+ connectionToken = client.connect(options);
+
+ }catch(Exception e) {
+
+ Log.d(TAG, "Connection failure", e);
+ }
+
+ return connectionToken;
+ }
+
+ public void setDisconnectedBufferOptions(DisconnectedBufferOptions options) {
+
+ client.setBufferOpts(options);
+ }
+
+ public IMqttToken subscribe(String topic, MqttMessageHandler listener) {
+
+ IMqttToken subscribeToken = null;
+
+ try {
+
+ subscribeToken = client.subscribe(topic, 0, null, listener, listener);
+
+ } catch (MqttException ex) {
+
+ Log.d(TAG, "Subscribe fail", ex);
+ }
+
+ return subscribeToken;
+ }
+
+ public void unsubscribe(String topic) {
+
+ try {
+
+ client.unsubscribe(topic);
+
+ } catch (MqttException ex) {
+
+ Log.d(TAG, "Unsubscribe fail", ex);
+ }
+ }
+
+ public void disconnect() {
+
+ try {
+
+ client.disconnect().setActionCallback(new IMqttActionListener() {
+
+ @Override
+ public void onSuccess(IMqttToken asyncActionToken) {
+
+ Log.d(TAG, "Disconnected");
+ client.unregisterResources();
+ client.close();
+ }
+
+ @Override
+ public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+
+ Log.d(TAG, "Failed to disconnect", exception);
+ }
+ });
+
+ } catch(Exception e) {
+
+ Log.d(TAG, "Failed to disconnect", e);
+ }
+ }
+}
diff --git a/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttMessageHandler.java b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttMessageHandler.java
new file mode 100644
index 00000000..547deb90
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/main/java/org/sensorhub/impl/swe/proxysensor/mqtt/MqttMessageHandler.java
@@ -0,0 +1,68 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+ The contents of this file are subject to the Mozilla Public License, v. 2.0.
+ If a copy of the MPL was not distributed with this file, You can obtain one
+ at http://mozilla.org/MPL/2.0/.
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the specific language governing rights and limitations under the License.
+
+ Copyright (C) 2020 Botts Innovative Research, Inc. All Rights Reserved.
+
+ ******************************* END LICENSE BLOCK ***************************/
+package org.sensorhub.impl.swe.proxysensor.mqtt;
+
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.Message;
+import android.util.Log;
+
+import org.eclipse.paho.client.mqttv3.IMqttActionListener;
+import org.eclipse.paho.client.mqttv3.IMqttMessageListener;
+import org.eclipse.paho.client.mqttv3.IMqttToken;
+import org.eclipse.paho.client.mqttv3.MqttMessage;
+
+public class MqttMessageHandler extends Handler implements IMqttActionListener, IMqttMessageListener {
+
+ private static final String TAG = "MqttMessageHandler";
+
+ private IMqttSubscriber subscriber;
+
+ public MqttMessageHandler(IMqttSubscriber subscriber) {
+
+ super();
+
+ this.subscriber = subscriber;
+ }
+
+ @Override
+ public void onSuccess(IMqttToken asyncActionToken) {
+
+ Log.d(TAG,"Subscribed - Topic: " + asyncActionToken.getTopics().toString());
+ }
+
+ @Override
+ public void onFailure(IMqttToken asyncActionToken, Throwable exception) {
+
+ Log.d(TAG, "Subscribe fail", exception);
+ }
+
+ @Override
+ public void messageArrived(String topic, MqttMessage message) throws Exception {
+
+ Log.d(TAG, "Topic: " + topic);
+ Bundle bundle = new Bundle();
+ bundle.putString("mqtt-message", message.toString());
+ Message msg = new Message();
+ msg.setData(bundle);
+ this.sendMessage(msg);
+ }
+
+ @Override
+ public void handleMessage(Message message) {
+
+ String mqttMessage = message.getData().getString("mqtt-message");
+ subscriber.onMessage(mqttMessage);
+ }
+}
diff --git a/sensorhub-android-proxysensor/src/test/java/org/sensorhub/impl/swe/proxysensor/ExampleUnitTest.java b/sensorhub-android-proxysensor/src/test/java/org/sensorhub/impl/swe/proxysensor/ExampleUnitTest.java
new file mode 100644
index 00000000..1bd8a253
--- /dev/null
+++ b/sensorhub-android-proxysensor/src/test/java/org/sensorhub/impl/swe/proxysensor/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package org.sensorhub.impl.swe.proxysensor;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see Testing documentation
+ */
+public class ExampleUnitTest {
+ @Test
+ public void addition_isCorrect() {
+ assertEquals(4, 2 + 2);
+ }
+}
\ No newline at end of file
diff --git a/sensorhub-android-service/src/org/sensorhub/android/SensorHubService.java b/sensorhub-android-service/src/org/sensorhub/android/SensorHubService.java
index c46056d7..d73ae5f2 100644
--- a/sensorhub-android-service/src/org/sensorhub/android/SensorHubService.java
+++ b/sensorhub-android-service/src/org/sensorhub/android/SensorHubService.java
@@ -26,12 +26,14 @@
import android.view.SurfaceView;
import android.view.WindowManager;
import org.sensorhub.api.common.IEventListener;
+import org.sensorhub.api.common.SensorHubException;
import org.sensorhub.api.module.IModuleConfigRepository;
import org.sensorhub.api.module.ModuleConfig;
import org.sensorhub.impl.SensorHub;
import org.sensorhub.impl.SensorHubConfig;
import org.sensorhub.impl.common.EventBus;
import org.sensorhub.impl.module.ModuleRegistry;
+import org.sensorhub.impl.service.HttpServer;
import org.vast.xml.XMLImplFinder;
import android.app.Service;
import android.content.Intent;
@@ -133,6 +135,15 @@ public void run() {
sensorhub.stop();
SensorHub.clearInstance();
sensorhub = null;
+
+ // Make sure the server gets cleaned up
+ try {
+ if (HttpServer.getInstance() != null) {
+ HttpServer.getInstance().cleanup();
+ }
+ } catch (SensorHubException e) {
+ e.printStackTrace();
+ }
}
});
}
diff --git a/sensorhub-driver-android/AndroidManifest.xml b/sensorhub-driver-android/AndroidManifest.xml
index a11d911f..e9a28838 100644
--- a/sensorhub-driver-android/AndroidManifest.xml
+++ b/sensorhub-driver-android/AndroidManifest.xml
@@ -2,4 +2,7 @@
package="org.sensorhub.impl.sensor.android"
android:versionCode="1"
android:versionName="1.0" >
+
+
+
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsConfig.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsConfig.java
index eb505e95..7c2558b2 100644
--- a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsConfig.java
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsConfig.java
@@ -17,6 +17,7 @@
import android.graphics.SurfaceTexture;
import org.sensorhub.api.module.ModuleConfig;
import org.sensorhub.api.sensor.SensorConfig;
+import org.sensorhub.impl.sensor.android.audio.AudioEncoderConfig;
import org.sensorhub.impl.sensor.android.video.VideoEncoderConfig;
import android.content.Context;
@@ -39,16 +40,21 @@ public class AndroidSensorsConfig extends SensorConfig
public boolean activateOrientationEuler = true;
public boolean activateGpsLocation = true;
public boolean activateNetworkLocation = false;
+ public int selectedCameraId = 0;
public boolean activateBackCamera = false;
public boolean activateFrontCamera = false;
+ public boolean enableCamera = false;
public VideoEncoderConfig videoConfig = new VideoEncoderConfig();
public boolean outputVideoRoll = false;
-
+ public boolean activateMicAudio = false;
+ public AudioEncoderConfig audioConfig = new AudioEncoderConfig();
+
+
public String deviceName;
public String runName;
public String runDescription;
-
-
+
+
public AndroidSensorsConfig()
{
this.moduleClass = AndroidSensorsDriver.class.getCanonicalName();
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsDriver.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsDriver.java
index d1e1e4dc..fe4c8215 100644
--- a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsDriver.java
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/AndroidSensorsDriver.java
@@ -37,6 +37,9 @@
import org.sensorhub.api.sensor.ISensorDataInterface;
import org.sensorhub.api.sensor.SensorException;
import org.sensorhub.impl.sensor.AbstractSensorModule;
+import org.sensorhub.impl.sensor.android.audio.AndroidAudioOutputAAC;
+import org.sensorhub.impl.sensor.android.audio.AndroidAudioOutputOPUS;
+import org.sensorhub.impl.sensor.android.audio.AudioEncoderConfig;
import org.sensorhub.impl.sensor.android.video.AndroidCameraOutputH264;
import org.sensorhub.impl.sensor.android.video.AndroidCameraOutputH265;
import org.sensorhub.impl.sensor.android.video.AndroidCameraOutputMJPEG;
@@ -141,6 +144,9 @@ public synchronized void init() throws SensorHubException
if (androidContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY))
createCameraOutputs(androidContext);
+ // create data interfaces for audio
+ if (androidContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_MICROPHONE))
+ createAudioOutputs(androidContext);
}
@@ -160,6 +166,8 @@ public void start() throws SensorException
@SuppressWarnings("deprecation")
protected void createCameraOutputs(Context androidContext) throws SensorException
{
+ int selectedCameraId = config.selectedCameraId;
+
/*if (android.os.Build.VERSION.SDK_INT > android.os.Build.VERSION_CODES.LOLLIPOP)
{
CameraManager cameraManager = (CameraManager)androidContext.getSystemService(Context.CAMERA_SERVICE);
@@ -185,34 +193,37 @@ protected void createCameraOutputs(Context androidContext) throws SensorExceptio
}
else*/
{
+ // TODO: check if the rotation issue may actually stem from here
for (int cameraId = 0; cameraId < android.hardware.Camera.getNumberOfCameras(); cameraId++)
{
android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
- android.hardware.Camera.getCameraInfo(cameraId, info);
+// android.hardware.Camera.getCameraInfo(cameraId, info);
+ android.hardware.Camera.getCameraInfo(selectedCameraId, info);
- if ( (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK && config.activateBackCamera) ||
- (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT && config.activateFrontCamera))
+ /*if ( (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_BACK && config.activateBackCamera) ||
+ (info.facing == android.hardware.Camera.CameraInfo.CAMERA_FACING_FRONT && config.activateFrontCamera))*/
+ if(config.enableCamera)
{
SurfaceTexture camPreviewTexture = SensorHubService.getVideoTexture();
if (VideoEncoderConfig.JPEG_CODEC.equals(config.videoConfig.codec)) {
- useCamera(new AndroidCameraOutputMJPEG(this, cameraId, camPreviewTexture), cameraId);
+ useCamera(new AndroidCameraOutputMJPEG(this, selectedCameraId, camPreviewTexture), selectedCameraId);
break;
}
else if (VideoEncoderConfig.H264_CODEC.equals(config.videoConfig.codec)) {
- useCamera(new AndroidCameraOutputH264(this, cameraId, camPreviewTexture), cameraId);
+ useCamera(new AndroidCameraOutputH264(this, selectedCameraId, camPreviewTexture), selectedCameraId);
// try a break to test
break;
}
else if (VideoEncoderConfig.H265_CODEC.equals(config.videoConfig.codec)) {
- useCamera(new AndroidCameraOutputH265(this, cameraId, camPreviewTexture), cameraId);
+ useCamera(new AndroidCameraOutputH265(this, selectedCameraId, camPreviewTexture), selectedCameraId);
break;
}
else if (VideoEncoderConfig.VP9_CODEC.equals(config.videoConfig.codec)) {
- useCamera(new AndroidCameraOutputVP9(this, cameraId, camPreviewTexture), cameraId);
+ useCamera(new AndroidCameraOutputVP9(this, selectedCameraId, camPreviewTexture), selectedCameraId);
break;
}
else if (VideoEncoderConfig.VP8_CODEC.equals(config.videoConfig.codec)) {
- useCamera(new AndroidCameraOutputVP8(this, cameraId, camPreviewTexture), cameraId);
+ useCamera(new AndroidCameraOutputVP8(this, selectedCameraId, camPreviewTexture), selectedCameraId);
break;
}
else
@@ -223,6 +234,19 @@ else if (VideoEncoderConfig.VP8_CODEC.equals(config.videoConfig.codec)) {
}
+ protected void createAudioOutputs(Context androidContext) throws SensorException
+ {
+ if(config.activateMicAudio) {
+ if (AudioEncoderConfig.AAC_CODEC.equals(config.audioConfig.codec))
+ useAudio(new AndroidAudioOutputAAC(this), "MIC");
+ else if (AudioEncoderConfig.OPUS_CODEC.equals(config.audioConfig.codec))
+ useAudio(new AndroidAudioOutputOPUS(this), "MIC");
+ else
+ throw new SensorException("Unsupported codec " + config.audioConfig.codec);
+ }
+ }
+
+
protected void useSensor(ISensorDataInterface output, Sensor sensor)
{
addOutput(output, false);
@@ -255,6 +279,14 @@ protected void useCamera2(ISensorDataInterface output, String cameraId)
}
+ protected void useAudio(ISensorDataInterface output, String srcName)
+ {
+ addOutput(output, false);
+ smlComponents.add(smlBuilder.getAudioComponentDescription(srcName));
+ log.info("Getting data from audio source " + srcName);
+ }
+
+
@Override
public void stop() throws SensorException
{
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/SensorMLBuilder.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/SensorMLBuilder.java
index 47e2db2e..23f8673c 100644
--- a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/SensorMLBuilder.java
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/SensorMLBuilder.java
@@ -1,24 +1,24 @@
-/***************************** BEGIN LICENSE BLOCK ***************************
-
-The contents of this file are subject to the Mozilla Public License, v. 2.0.
-If a copy of the MPL was not distributed with this file, You can obtain one
-at http://mozilla.org/MPL/2.0/.
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the License.
-
-Copyright (C) 2012-2015 Sensia Software LLC. All Rights Reserved.
-
-******************************* END LICENSE BLOCK ***************************/
-
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+The contents of this file are subject to the Mozilla Public License, v. 2.0.
+If a copy of the MPL was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the License.
+
+Copyright (C) 2012-2015 Sensia Software LLC. All Rights Reserved.
+
+******************************* END LICENSE BLOCK ***************************/
+
package org.sensorhub.impl.sensor.android;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.vast.data.SWEFactory;
import org.vast.sensorML.SMLFactory;
-import net.opengis.sensorml.v20.PhysicalComponent;
+import net.opengis.sensorml.v20.PhysicalComponent;
import android.hardware.Sensor;
import android.hardware.SensorManager;
import android.location.LocationManager;
@@ -93,18 +93,27 @@ else if (val instanceof Object[])
}*/
return comp;
- }
-
-
- /*
- * Version to support older camera API on devices with SDK < 21
- */
- public PhysicalComponent getComponentDescription(int cameraId)
- {
- PhysicalComponent comp = smlFac.newPhysicalComponent();
- comp.setId("CAM_" + cameraId);
- comp.setName("Android Camera #" + cameraId);
- return comp;
+ }
+
+
+ /*
+ * Version to support older camera API on devices with SDK < 21
+ */
+ public PhysicalComponent getComponentDescription(int cameraId)
+ {
+ PhysicalComponent comp = smlFac.newPhysicalComponent();
+ comp.setId("CAM_" + cameraId);
+ comp.setName("Android Camera #" + cameraId);
+ return comp;
+ }
+
+
+ public PhysicalComponent getAudioComponentDescription(String audioSrcName)
+ {
+ PhysicalComponent comp = smlFac.newPhysicalComponent();
+ comp.setId("AUDIO_" + audioSrcName);
+ comp.setName("Android Audio " + audioSrcName);
+ return comp;
}
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutput.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutput.java
new file mode 100644
index 00000000..ea0f6c48
--- /dev/null
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutput.java
@@ -0,0 +1,400 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+The contents of this file are subject to the Mozilla Public License, v. 2.0.
+If a copy of the MPL was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the License.
+
+Copyright (C) 2012-2015 Sensia Software LLC. All Rights Reserved.
+
+******************************* END LICENSE BLOCK ***************************/
+
+package org.sensorhub.impl.sensor.android.audio;
+
+import android.graphics.ImageFormat;
+import android.graphics.SurfaceTexture;
+import android.hardware.Camera;
+import android.hardware.Camera.Parameters;
+import android.hardware.Sensor;
+import android.hardware.SensorEvent;
+import android.hardware.SensorEventListener;
+import android.hardware.SensorManager;
+import android.media.AudioFormat;
+import android.media.AudioRecord;
+import android.media.MediaCodec;
+import android.media.MediaCodec.BufferInfo;
+import android.media.MediaRecorder;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.SystemClock;
+
+import net.opengis.swe.v20.BinaryBlock;
+import net.opengis.swe.v20.BinaryComponent;
+import net.opengis.swe.v20.BinaryEncoding;
+import net.opengis.swe.v20.ByteEncoding;
+import net.opengis.swe.v20.ByteOrder;
+import net.opengis.swe.v20.DataBlock;
+import net.opengis.swe.v20.DataComponent;
+import net.opengis.swe.v20.DataEncoding;
+import net.opengis.swe.v20.DataRecord;
+import net.opengis.swe.v20.DataStream;
+import net.opengis.swe.v20.DataType;
+import net.opengis.swe.v20.Quantity;
+
+import org.sensorhub.algo.vecmath.Vect3d;
+import org.sensorhub.api.sensor.SensorDataEvent;
+import org.sensorhub.api.sensor.SensorException;
+import org.sensorhub.impl.sensor.AbstractSensorOutput;
+import org.sensorhub.impl.sensor.android.AndroidSensorsDriver;
+import org.sensorhub.impl.sensor.android.IAndroidOutput;
+import org.sensorhub.impl.sensor.android.video.VideoEncoderConfig;
+import org.sensorhub.impl.sensor.videocam.VideoCamHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.vast.cdm.common.CDMException;
+import org.vast.data.AbstractDataBlock;
+import org.vast.data.DataBlockMixed;
+import org.vast.swe.SWEConstants;
+import org.vast.swe.SWEHelper;
+import org.vast.swe.helper.GeoPosHelper;
+
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+
+
+/**
+ *
+ * Implementation of data interface capturing audio data using Android
+ * AudioRecord API. See https://www.codota.com/code/java/classes/android.media.AudioRecord
+ *
+ *
+ * @author Alex Robin
+ * @since Mar 22, 2021
+ */
+@SuppressWarnings("deprecation")
+public abstract class AndroidAudioOutput extends AbstractSensorOutput implements IAndroidOutput
+{
+ // keep logger name short because in LogCat it's max 23 chars
+ static final Logger log = LoggerFactory.getLogger(AndroidAudioOutput.class.getSimpleName());
+
+ DataComponent dataStruct;
+ DataEncoding dataEncoding;
+ int sampleRateHz = 11025;
+ int pcmEncoding = AudioFormat.ENCODING_PCM_16BIT;
+ int numSamplesPerRecord;
+ int bytesPerSample;
+ int bytesPerRecord;
+ int bitrate = 64 * 1000; // bits/s
+
+ Looper bgLooper;
+ AudioRecord audioRecord;
+ long systemTimeOffset = -1L;
+ long lastRecordTime = 0;
+ byte[] codecInfoData;
+ MediaCodec mCodec;
+ BufferInfo bufferInfo = new BufferInfo();
+ int packetHeaderSize = 0;
+
+ protected abstract String getCodecName();
+
+ protected abstract void initCodec(int inputBufferSize) throws SensorException;
+
+ protected abstract void addPacketHeader(byte[] packet, int packetLen);
+
+
+ protected AndroidAudioOutput(AndroidSensorsDriver parentModule, String name) throws SensorException
+ {
+ super(name, parentModule);
+
+ // init audio recorder and codec
+ initAudio();
+ initCodec(bytesPerRecord);
+ initOutputStructure();
+ }
+
+
+ protected void initOutputStructure()
+ {
+ // create SWE Common data structure and encoding
+ SWEHelper swe = new SWEHelper();
+ String numSamplesId = "NUM_SAMPLES";
+ dataStruct = swe.createRecord()
+ .name(getName())
+ .definition(SWEHelper.getPropertyUri("AudioFrame"))
+ .addField("time", swe.createTime().asPhenomenonTimeIsoUTC().build())
+ .addField("sampleRate", swe.createQuantity()
+ .label("Sample Rate")
+ .description("Number of audio samples per second")
+ .definition(SWEHelper.getQudtUri("DataRate"))
+ .uomCode("Hz"))
+ .addField("numSamples", swe.createCount()
+ .id(numSamplesId)
+ .label("Num Samples")
+ .description("Number of audio samples packaged in this record"))
+ .addField("samples", swe.createArray()
+ .withVariableSize(numSamplesId)
+ .withElement("sample", swe.createCount()
+ .label("Audio Sample")
+ .definition(SWEConstants.DEF_DN)
+ .dataType(DataType.SHORT))
+ .build())
+ .build();
+
+ //////////////////////////
+ // binary encoding spec //
+ //////////////////////////
+ BinaryEncoding dataEnc = swe.newBinaryEncoding();
+ dataEnc.setByteEncoding(ByteEncoding.RAW);
+ dataEnc.setByteOrder(ByteOrder.BIG_ENDIAN);
+ BinaryComponent comp;
+
+ // time stamp
+ comp = swe.newBinaryComponent();
+ comp.setRef("/" + dataStruct.getComponent(0).getName());
+ comp.setCdmDataType(DataType.DOUBLE);
+ dataEnc.addMemberAsComponent(comp);
+
+ // sample rate
+ comp = swe.newBinaryComponent();
+ comp.setRef("/" + dataStruct.getComponent(1).getName());
+ comp.setCdmDataType(DataType.INT);
+ dataEnc.addMemberAsComponent(comp);
+
+ // num samples
+ comp = swe.newBinaryComponent();
+ comp.setRef("/" + dataStruct.getComponent(2).getName());
+ comp.setCdmDataType(DataType.INT);
+ dataEnc.addMemberAsComponent(comp);
+
+ // audio codec
+ BinaryBlock compressedBlock = swe.newBinaryBlock();
+ compressedBlock.setRef("/" + dataStruct.getComponent(3).getName());
+ compressedBlock.setCompression(getCodecName());
+ dataEnc.addMemberAsBlock(compressedBlock);
+
+ try
+ {
+ SWEHelper.assignBinaryEncoding(dataStruct, dataEnc);
+ }
+ catch (CDMException e)
+ {
+ throw new RuntimeException("Invalid binary encoding configuration", e);
+ };
+
+ this.dataEncoding = dataEnc;
+ }
+
+
+ protected void initAudio() throws SensorException
+ {
+ AudioEncoderConfig audioConfig = parentSensor.getConfiguration().audioConfig;
+ sampleRateHz = audioConfig.sampleRate;
+ bitrate = audioConfig.bitRate * 1000;
+
+ if (numSamplesPerRecord <= 0)
+ numSamplesPerRecord = (int)(sampleRateHz/10);
+ bytesPerSample = (pcmEncoding == AudioFormat.ENCODING_PCM_8BIT) ? 1 : 2;
+ bytesPerRecord = numSamplesPerRecord*bytesPerSample;
+
+ // create audio recorder object
+ // we use an internal buffer twice as big as the read buffer
+ // so we have time to compress a chunk while we're recording the next one
+ audioRecord = new AudioRecord(
+ MediaRecorder.AudioSource.MIC,
+ sampleRateHz,
+ AudioFormat.CHANNEL_IN_MONO,
+ pcmEncoding,
+ bytesPerRecord*2);
+ }
+
+
+ @Override
+ public void start(Handler eventHandler) throws SensorException
+ {
+ try
+ {
+ // start codec
+ if (mCodec != null)
+ mCodec.start();
+
+ // reset time
+ lastRecordTime = 0;
+ systemTimeOffset = -1;
+
+ // read audio samples in background thread
+ Thread bgThread = new Thread() {
+ public void run()
+ {
+ try
+ {
+ byte[] buffer = new byte[numSamplesPerRecord*2]; // 16 bits samples
+ audioRecord.startRecording();
+
+ while (audioRecord.getRecordingState() != AudioRecord.RECORDSTATE_STOPPED) {
+ readAndEncodeAudioData();
+ }
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ };
+ bgThread.start();
+ }
+ catch (Exception e)
+ {
+ throw new SensorException("Cannot start codec " + mCodec.getName(), e);
+ }
+ }
+
+
+ private void readAndEncodeAudioData()
+ {
+ // get next available buffer from codec
+ int inputBufferIndex = mCodec.dequeueInputBuffer(0);
+ if (inputBufferIndex >= 0)
+ {
+ ByteBuffer inputBuffer = mCodec.getInputBuffer(inputBufferIndex);
+ inputBuffer.clear();
+
+ int readBytes = audioRecord.read(inputBuffer, bytesPerRecord);
+ log.debug(lastRecordTime + ": " + readBytes + " audio bytes read");
+ mCodec.queueInputBuffer(inputBufferIndex, 0, readBytes, lastRecordTime, 0);
+ lastRecordTime += (numSamplesPerRecord * 1000000) / sampleRateHz; // in µs
+
+ encode();
+ }
+ }
+
+
+ private void encode()
+ {
+ int outputBufferIndex;
+
+ do {
+ outputBufferIndex = mCodec.dequeueOutputBuffer(bufferInfo, 0);
+ if (outputBufferIndex >= 0) {
+ ByteBuffer outBuffer = mCodec.getOutputBuffer(outputBufferIndex);
+ int outDataSize = outBuffer.remaining();
+ log.debug(bufferInfo.presentationTimeUs + ": " + outDataSize + " compressed audio bytes");
+ int outDataOffset = packetHeaderSize;
+
+ // create buffer to hold packet header + data
+ byte[] outData = new byte[outDataSize + outDataOffset];
+
+ // copy encoded data
+ outBuffer.get(outData, outDataOffset, outDataSize);
+ addPacketHeader(outData, outDataSize);
+
+ // release output buffer
+ mCodec.releaseOutputBuffer(outputBufferIndex, false);
+
+ // send it to output (but skip codec config bytes)
+ if (bufferInfo.flags != MediaCodec.BUFFER_FLAG_CODEC_CONFIG)
+ sendCompressedData(bufferInfo.presentationTimeUs, outData);
+ }
+ }
+ while (outputBufferIndex >= 0);
+ }
+
+
+ protected void sendCompressedData(long timeStamp, byte[] compressedData)
+ {
+ // generate new data record
+ DataBlock newRecord;
+ if (latestRecord == null)
+ newRecord = dataStruct.createDataBlock();
+ else
+ newRecord = latestRecord.renew();
+
+ // set time stamp
+ int idx = 0;
+ double samplingTime = getJulianTimeStamp(timeStamp);
+ newRecord.setDoubleValue(idx++, samplingTime);
+ newRecord.setIntValue(idx++, sampleRateHz);
+ newRecord.setIntValue(idx++, numSamplesPerRecord);
+
+ // set encoded data
+ AbstractDataBlock audioData = ((DataBlockMixed) newRecord).getUnderlyingObject()[idx++];
+ audioData.setUnderlyingObject(compressedData);
+
+ // send event
+ latestRecord = newRecord;
+ latestRecordTime = System.currentTimeMillis();
+ eventHandler.publishEvent(new SensorDataEvent(latestRecordTime, this, latestRecord));
+ }
+
+
+ @Override
+ public void stop()
+ {
+ if (audioRecord != null)
+ {
+ audioRecord.stop();
+ audioRecord = null;
+ }
+
+ if (mCodec != null)
+ {
+ mCodec.stop();
+ mCodec.release();
+ }
+
+ if (bgLooper != null)
+ {
+ bgLooper.quit();
+ bgLooper = null;
+ }
+ }
+
+
+ @Override
+ public double getAverageSamplingPeriod()
+ {
+ return numSamplesPerRecord/(double)sampleRateHz;
+ }
+
+
+ @Override
+ public DataComponent getRecordDescription()
+ {
+ return dataStruct;
+ }
+
+
+ @Override
+ public DataEncoding getRecommendedEncoding()
+ {
+ return dataEncoding;
+ }
+
+
+ @Override
+ public DataBlock getLatestRecord()
+ {
+ return latestRecord;
+ }
+
+
+ @Override
+ public long getLatestRecordTime()
+ {
+ return latestRecordTime;
+ }
+
+
+ protected double getJulianTimeStamp(long sensorTimeStampUs)
+ {
+ long sensorTimeMillis = sensorTimeStampUs / 1000;
+
+ if (systemTimeOffset < 0)
+ systemTimeOffset = System.currentTimeMillis() - sensorTimeMillis;
+
+ return (systemTimeOffset + sensorTimeMillis) / 1000.;
+ }
+}
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutputAAC.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutputAAC.java
new file mode 100644
index 00000000..3772f617
--- /dev/null
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutputAAC.java
@@ -0,0 +1,115 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+The contents of this file are subject to the Mozilla Public License, v. 2.0.
+If a copy of the MPL was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the License.
+
+Copyright (C) 2012-2015 Sensia Software LLC. All Rights Reserved.
+
+******************************* END LICENSE BLOCK ***************************/
+
+package org.sensorhub.impl.sensor.android.audio;
+
+import android.graphics.SurfaceTexture;
+import android.media.MediaCodec;
+import android.media.MediaCodecInfo;
+import android.media.MediaFormat;
+
+import org.sensorhub.api.sensor.SensorException;
+import org.sensorhub.impl.sensor.android.AndroidSensorsDriver;
+
+
+/**
+ *
+ * Implementation of data interface capturing audio data and compressing it
+ * using AAC codec.
+ *
+ *
+ * @author Alex Robin
+ * @since March 22, 2021
+ */
+@SuppressWarnings("deprecation")
+public class AndroidAudioOutputAAC extends AndroidAudioOutput
+{
+ private static final String CODEC_NAME = "AAC";
+ private static int[] ADTS_FREQ_TABLE = { 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050, 16000, 12000, 11025, 8000, 7350 };
+
+ int adtsFreqIdx;
+
+
+ public AndroidAudioOutputAAC(AndroidSensorsDriver parentModule) throws SensorException
+ {
+ super(parentModule, "audio" + "_" + CODEC_NAME);
+ }
+
+ @Override
+ protected String getCodecName()
+ {
+ return CODEC_NAME;
+ }
+
+ @Override
+ protected void initCodec(int inputBufferSize) throws SensorException
+ {
+ try {
+ final String audioCodec = MediaFormat.MIMETYPE_AUDIO_AAC;
+ mCodec = MediaCodec.createEncoderByType(audioCodec);
+ MediaFormat mediaFormat = MediaFormat.createAudioFormat(audioCodec, sampleRateHz, 1);
+ mediaFormat.setInteger("pcm-encoding", pcmEncoding);
+ mediaFormat.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, inputBufferSize);
+ mediaFormat.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+ mediaFormat.setInteger(MediaFormat.KEY_BITRATE_MODE, MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR);
+ mediaFormat.setInteger(MediaFormat.KEY_AAC_PROFILE, MediaCodecInfo.CodecProfileLevel.AACObjectLC);
+ mCodec.configure(mediaFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+ log.debug("MediaCodec initialized");
+ }
+ catch (Exception e)
+ {
+ throw new SensorException("Cannot initialize codec " + mCodec.getName(), e);
+ }
+ }
+
+
+ @Override
+ protected void initAudio() throws SensorException
+ {
+ // ADTS always includes 1024 samples per packet so align record size to that
+ this.numSamplesPerRecord = 1024;
+ super.initAudio();
+
+ // set ADTS packet header size
+ packetHeaderSize = 7;
+
+ // compute sample rate index to be used in ADTS headers
+ adtsFreqIdx = -1;
+ for (int i = 0; i < ADTS_FREQ_TABLE.length; i++)
+ {
+ if (ADTS_FREQ_TABLE[i] == sampleRateHz)
+ adtsFreqIdx = i;
+ }
+ if (adtsFreqIdx < 0)
+ throw new SensorException("Unsupported sample rate for AAC: " + sampleRateHz);
+ }
+
+
+ protected void addPacketHeader(byte[] packet, int dataLen)
+ {
+ int profile = 2; // AAC LC
+ int freqIdx = adtsFreqIdx;
+ int chanCfg = 1; // mono
+ int frameLen = dataLen + packetHeaderSize;
+
+ // fill in ADTS data
+ packet[0] = (byte)0xFF;
+ packet[1] = (byte)0xF1;
+ packet[2] = (byte)(((profile - 1) << 6) + (freqIdx << 2) +(chanCfg >> 2));
+ packet[3] = (byte)(((chanCfg & 3) << 6) + (frameLen >> 11));
+ packet[4] = (byte)((frameLen & 0x7FF) >> 3);
+ packet[5] = (byte)(((frameLen & 7) << 5) + 0x1F);
+ packet[6] = (byte)0xFC;
+ }
+}
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutputOPUS.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutputOPUS.java
new file mode 100644
index 00000000..588e3e8b
--- /dev/null
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AndroidAudioOutputOPUS.java
@@ -0,0 +1,87 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+The contents of this file are subject to the Mozilla Public License, v. 2.0.
+If a copy of the MPL was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the License.
+
+Copyright (C) 2012-2015 Sensia Software LLC. All Rights Reserved.
+
+******************************* END LICENSE BLOCK ***************************/
+
+package org.sensorhub.impl.sensor.android.audio;
+
+import android.media.MediaCodec;
+import android.media.MediaCodecInfo;
+import android.media.MediaFormat;
+
+import org.sensorhub.api.sensor.SensorException;
+import org.sensorhub.impl.sensor.android.AndroidSensorsDriver;
+
+
+/**
+ *
+ * Implementation of data interface capturing audio data and compressing it
+ * using the Opus codec.
+ *
+ *
+ * @author Alex Robin
+ * @since March 29, 2021
+ */
+@SuppressWarnings("deprecation")
+public class AndroidAudioOutputOPUS extends AndroidAudioOutput
+{
+ private static final String CODEC_NAME = "OPUS";
+
+ int adtsFreqIdx;
+
+
+ public AndroidAudioOutputOPUS(AndroidSensorsDriver parentModule) throws SensorException
+ {
+ super(parentModule, "audio" + "_" + CODEC_NAME);
+ }
+
+ @Override
+ protected String getCodecName()
+ {
+ return CODEC_NAME;
+ }
+
+ @Override
+ protected void initCodec(int inputBufferSize) throws SensorException
+ {
+ try {
+ final String audioCodec = MediaFormat.MIMETYPE_AUDIO_OPUS;
+ mCodec = MediaCodec.createEncoderByType(audioCodec);
+ MediaFormat mediaFormat = MediaFormat.createAudioFormat(audioCodec, sampleRateHz, 1);
+ mediaFormat.setInteger("pcm-encoding", pcmEncoding);
+ mediaFormat.setInteger(MediaFormat.KEY_MAX_INPUT_SIZE, inputBufferSize);
+ mediaFormat.setInteger(MediaFormat.KEY_BIT_RATE, bitrate);
+ mediaFormat.setInteger(MediaFormat.KEY_BITRATE_MODE, MediaCodecInfo.EncoderCapabilities.BITRATE_MODE_VBR);
+ mCodec.configure(mediaFormat, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
+ log.debug("MediaCodec initialized");
+ }
+ catch (Exception e)
+ {
+ throw new SensorException("Cannot initialize codec " + mCodec.getName(), e);
+ }
+ }
+
+
+ @Override
+ protected void initAudio() throws SensorException
+ {
+ super.initAudio();
+
+ // no header for opus
+ packetHeaderSize = 0;
+ }
+
+
+ protected void addPacketHeader(byte[] packet, int dataLen)
+ {
+ }
+}
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AudioEncoderConfig.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AudioEncoderConfig.java
new file mode 100644
index 00000000..7525b4a5
--- /dev/null
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/audio/AudioEncoderConfig.java
@@ -0,0 +1,40 @@
+/***************************** BEGIN LICENSE BLOCK ***************************
+
+The contents of this file are subject to the Mozilla Public License, v. 2.0.
+If a copy of the MPL was not distributed with this file, You can obtain one
+at http://mozilla.org/MPL/2.0/.
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+for the specific language governing rights and limitations under the License.
+
+Copyright (C) 2012-2015 Sensia Software LLC. All Rights Reserved.
+
+******************************* END LICENSE BLOCK ***************************/
+
+package org.sensorhub.impl.sensor.android.audio;
+
+
+/**
+ *
+ * Configuration of audio encoding parameters
+ *
+ *
+ * @author Alex Robin
+ * @since Mar 22, 2021
+ */
+public class AudioEncoderConfig
+{
+ public final static String AAC_CODEC = "AAC";
+ public final static String AMRNB_CODEC = "AMR-NB";
+ public final static String AMRWB_CODEC = "AMR-WB";
+ public final static String FLAC_CODEC = "FLAC";
+ public final static String OPUS_CODEC = "OPUS";
+ public final static String VORBIS_CODEC = "VORBIS";
+ public final static String PCM_CODEC = "PCM";
+
+
+ public String codec = AAC_CODEC;
+ public int sampleRate = 8000; // Hz
+ public int bitRate = 64; // kbits/sec
+}
diff --git a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/video/AndroidCameraOutput.java b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/video/AndroidCameraOutput.java
index c8240a54..a0c8ef13 100644
--- a/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/video/AndroidCameraOutput.java
+++ b/sensorhub-driver-android/src/main/java/org/sensorhub/impl/sensor/android/video/AndroidCameraOutput.java
@@ -88,7 +88,6 @@ public abstract class AndroidCameraOutput extends AbstractSensorOutput
}
}
+include ':sensorhub-android-proxysensor'