Use SurfaceTexture to keep the video running even if main Activity is paused or stopped. Fixes #6

Author: alexrobin

sensorhub-android-app/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.BLUETOOTH" />
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />   
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
 
     <uses-sdk
         android:minSdkVersion="21"

sensorhub-android-app/res/layout/activity_main.xml

@@ -9,18 +9,18 @@
     android:paddingTop="@dimen/activity_vertical_margin"
     tools:context=".MainActivity" >
 
-    <SurfaceView
-        android:id="@+id/textureView1"
+    <TextureView
+        android:id="@+id/video"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_gravity="center"/>
-    
+
     <TextView
         android:id="@+id/text"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp"
         android:background="#FFFFFF"
         android:text="@string/hello_world"/>
-    
+
 </RelativeLayout>

sensorhub-android-app/src/org/sensorhub/android/MainActivity.java

@@ -16,6 +16,8 @@
 
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.PixelFormat;
+import android.graphics.SurfaceTexture;
 import android.util.Log;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -71,16 +73,17 @@
 import android.widget.TextView;
 import org.vast.util.DateTimeFormat;
 
+import javax.microedition.khronos.egl.EGL10;
 
-public class MainActivity extends Activity implements SurfaceHolder.Callback, IEventListener
+
+public class MainActivity extends Activity implements TextureView.SurfaceTextureListener, IEventListener
 {
     TextView textArea;
     SensorHubService boundService;
     IModuleConfigRepository sensorhubConfig;
     Handler displayHandler;
     Runnable displayCallback;
     StringBuffer displayText = new StringBuffer();
-    SurfaceHolder camPreviewSurfaceHolder;
     boolean oshStarted = false;
     ArrayList<SOSTClient> sostClients = new ArrayList<SOSTClient>();
     URL sosUrl = null;
@@ -144,7 +147,7 @@ protected void updateConfig(SharedPreferences prefs, String runName)
             showVideo = true;
         sensorsConfig.videoCodec = prefs.getString("video_codec", AndroidSensorsConfig.JPEG_CODEC);
         sensorsConfig.androidContext = this.getApplicationContext();
-        sensorsConfig.camPreviewSurfaceHolder = this.camPreviewSurfaceHolder;
+        sensorsConfig.camPreviewTexture = boundService.getVideoTexture();
         sensorsConfig.runName = runName;
         sensorhubConfig.add(sensorsConfig);
         addSosTConfig(sensorsConfig, sosUser, sosPwd);
@@ -201,7 +204,7 @@ protected void updateConfig(SharedPreferences prefs, String runName)
             flironeConfig.name = "FLIR One Camera [" + deviceName + "]";
             flironeConfig.autoStart = true;
             flironeConfig.androidContext = this.getApplicationContext();
-            flironeConfig.camPreviewSurfaceHolder = this.camPreviewSurfaceHolder;
+            flironeConfig.camPreviewTexture = boundService.getVideoTexture();
             sensorhubConfig.add(flironeConfig);
             addSosTConfig(flironeConfig, sosUser, sosPwd);
         }
@@ -238,8 +241,6 @@ protected void onCreate(Bundle savedInstanceState)
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
         textArea = (TextView) findViewById(R.id.text);
-        SurfaceView camPreview = (SurfaceView) findViewById(R.id.textureView1);
-        camPreview.getHolder().addCallback(this);
 
         // bind to SensorHub service
         Intent intent = new Intent(this, SensorHubService.class);
@@ -318,12 +319,17 @@ public void onClick(DialogInterface dialog, int whichButton)
             {
                 getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
                 String runName = input.getText().toString();
-                updateConfig(PreferenceManager.getDefaultSharedPreferences(MainActivity.this), runName);
                 newStatusMessage("Starting SensorHub...");
+
+                updateConfig(PreferenceManager.getDefaultSharedPreferences(MainActivity.this), runName);
                 sostClients.clear();
                 boundService.startSensorHub(sensorhubConfig, MainActivity.this);
+
                 if (showVideo)
+                {
+                    showVideo();
                     textArea.setBackgroundColor(0x80FFFFFF);
+                }
             }
         });
 
@@ -350,7 +356,7 @@ protected void showAboutPopup()
         }
 
         String message = "A software platform for building smart sensor networks and the Internet of Things\n\n";
-        message += "Version: " + version;
+        message += "Version: " + version + "\n";
 
         AlertDialog.Builder alert = new AlertDialog.Builder(this);
         alert.setTitle("OpenSensorHub");
@@ -399,7 +405,6 @@ public void run()
             {
                 displayStatus();
                 textArea.setText(Html.fromHtml(displayText.toString()));
-                //textArea.setText(new DateTimeFormat().formatIso(System.currentTimeMillis()/1000., 0));
                 displayHandler.postDelayed(this, 1000);
             }
         };
@@ -524,6 +529,25 @@ protected void stopListeningForEvents()
     }
 
 
+    protected void showVideo()
+    {
+        if (boundService.getVideoTexture() != null)
+        {
+            TextureView textureView = (TextureView) findViewById(R.id.video);
+            if (textureView.getSurfaceTexture() != boundService.getVideoTexture())
+            {
+                textureView.setSurfaceTexture(boundService.getVideoTexture());
+                textureView.setSurfaceTextureListener(this);
+            }
+        }
+    }
+
+
+    protected void hideVideo()
+    {
+    }
+
+
     @Override
     protected void onStart()
     {
@@ -540,6 +564,7 @@ protected void onResume()
         {
             startListeningForEvents();
             startRefreshingStatus();
+            showVideo();
         }
     }
 
@@ -549,6 +574,7 @@ protected void onPause()
     {
         stopListeningForEvents();
         stopRefreshingStatus();
+        hideVideo();
         super.onPause();
     }
 
@@ -571,20 +597,25 @@ protected void onDestroy()
 
 
     @Override
-    public void surfaceCreated(SurfaceHolder holder)
+    public void onSurfaceTextureAvailable(SurfaceTexture surfaceTexture, int i, int i1)
     {
-        this.camPreviewSurfaceHolder = holder;
     }
 
 
     @Override
-    public void surfaceChanged(SurfaceHolder holder, int format, int width, int height)
+    public void onSurfaceTextureSizeChanged(SurfaceTexture surfaceTexture, int i, int i1)
     {
     }
 
 
     @Override
-    public void surfaceDestroyed(SurfaceHolder holder)
+    public boolean onSurfaceTextureDestroyed(SurfaceTexture surfaceTexture)
+    {
+        return false;
+    }
+
+    @Override
+    public void onSurfaceTextureUpdated(SurfaceTexture surfaceTexture)
     {
-    }    
+    }
 }

sensorhub-android-app/src/org/sensorhub/android/SensorHubService.java

@@ -16,9 +16,15 @@
 
 import javax.xml.parsers.DocumentBuilderFactory;
 
+import android.content.Context;
+import android.graphics.PixelFormat;
+import android.graphics.SurfaceTexture;
 import android.os.*;
 import android.os.Process;
 import android.util.Log;
+import android.view.Gravity;
+import android.view.SurfaceView;
+import android.view.WindowManager;
 import org.sensorhub.api.common.IEventListener;
 import org.sensorhub.api.module.IModuleConfigRepository;
 import org.sensorhub.api.module.ModuleConfig;
@@ -45,8 +51,9 @@ public class SensorHubService extends Service
     private HandlerThread msgThread;
     private Handler msgHandler;
     SensorHub sensorhub;
-    
-    
+    SurfaceTexture videoTex;
+
+
     public class LocalBinder extends Binder {
         SensorHubService getService() {
             return SensorHubService.this;
@@ -71,6 +78,10 @@ public void onCreate() {
             dbf.setNamespaceAware(true);
             XMLImplFinder.setDOMImplementation(dbf.newDocumentBuilder().getDOMImplementation());
 
+            // create video surface texture here so it's not destroyed when pausing the app
+            videoTex = new SurfaceTexture(1);
+            videoTex.detachFromGLContext();
+
             // start handler thread
             msgThread = new HandlerThread("SensorHubService", Process.THREAD_PRIORITY_BACKGROUND);
             msgThread.start();
@@ -129,6 +140,7 @@ public void onDestroy()
     {
         stopSensorHub();
         msgThread.quitSafely();
+        videoTex.release();
     }
 
 
@@ -139,12 +151,15 @@ public IBinder onBind(Intent intent)
     }
 
 
-    /**
-     * @return the SensorHub instance
-     */
     public SensorHub getSensorHub()
     {
         return sensorhub;
     }
+
+
+    public SurfaceTexture getVideoTexture()
+    {
+        return videoTex;
+    }
 
 }

sensorhub-android-flirone/src/org/sensorhub/impl/driver/flir/FlirOneCameraConfig.java

@@ -12,22 +12,22 @@
  
 ******************************* END LICENSE BLOCK ***************************/
 
-package org.sensorhub.impl.driver.flir;
-
-import org.sensorhub.api.sensor.SensorConfig;
+package org.sensorhub.impl.driver.flir;
+
+import android.graphics.SurfaceTexture;
+import org.sensorhub.api.sensor.SensorConfig;
 import android.content.Context;
-import android.view.SurfaceHolder;
-
-
-/**
- * <p>
- * Configuration class for the FLIR One thermal camera driver
- * </p>
- *
- * @author Alex Robin <[email protected]>
- * @since Mar 5, 2016
- */
-public class FlirOneCameraConfig extends SensorConfig
+
+
+/**
+ * <p>
+ * Configuration class for the FLIR One thermal camera driver
+ * </p>
+ *
+ * @author Alex Robin <[email protected]>
+ * @since Mar 5, 2016
+ */
+public class FlirOneCameraConfig extends SensorConfig
 {     
     public boolean enableVisOutput = false;
     public boolean enableStatusOutput = false;
@@ -36,12 +36,12 @@ public class FlirOneCameraConfig extends SensorConfig
     public String runDescription; 
 
     public transient Context androidContext;
-    public transient SurfaceHolder camPreviewSurfaceHolder;
+    public transient SurfaceTexture camPreviewTexture;
 
 
 
     public FlirOneCameraConfig()
     {
         this.moduleClass = FlirOneCameraDriver.class.getCanonicalName();
-    }
-}
+    }
+}