Merge pull request #31 from MobileRoboticsSkoltech/blinking_flash

Flash logging
MobileRoboticsSkoltech · Apr 21, 2021 · 0cfcde3 · 0cfcde3
2 parents d7df21d + 7653f8b
commit 0cfcde3
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -32,6 +32,7 @@ This project is based on [Open Camera](https://opencamera.org.uk/)  —  a popul
         - ```{VIDEO_NAME}_accel.csv```, data format: ```X-data, Y-data, Z-data, timestamp (ns)```
         - ```{VIDEO_NAME}_magnetic.csv```, data format: ```X-data, Y-data, Z-data, timestamp (ns)```
         - ```{VIDEO_NAME}_timestamps.csv```, data format: ```timestamp (ns)```
+        - ```{VIDEO_NAME}_flash.csv```, data format: ```timestamp (ns)``` (timestamps of when the flash fired)
 
 ### Remote recording
 

diff --git a/app/src/main/java/net/sourceforge/opencamera/ExtendedAppInterface.java b/app/src/main/java/net/sourceforge/opencamera/ExtendedAppInterface.java
@@ -7,6 +7,7 @@
 import android.util.Log;
 
 import net.sourceforge.opencamera.cameracontroller.YuvImageUtils;
+import net.sourceforge.opencamera.sensorlogging.FlashController;
 import net.sourceforge.opencamera.sensorlogging.RawSensorInfo;
 import net.sourceforge.opencamera.sensorlogging.VideoFrameInfo;
 import net.sourceforge.opencamera.sensorlogging.VideoPhaseInfo;
@@ -26,6 +27,12 @@ public class ExtendedAppInterface extends MyApplicationInterface {
     private static final int SENSOR_FREQ_DEFAULT_PREF = 0;
 
     private final RawSensorInfo mRawSensorInfo;
+
+    public FlashController getFlashController() {
+        return mFlashController;
+    }
+
+    private final FlashController mFlashController;
     private final SharedPreferences mSharedPreferences;
     private final MainActivity mMainActivity;
     private final YuvImageUtils mYuvUtils;
@@ -40,6 +47,8 @@ public VideoFrameInfo setupFrameInfo() throws IOException {
         super(mainActivity, savedInstanceState);
         mRawSensorInfo = mainActivity.getRawSensorInfoManager();
         mMainActivity = mainActivity;
+        mFlashController = new FlashController(mainActivity);
+
         mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(mainActivity);
         // We create it only once here (not during the video) as it is a costly operation
         // (instantiates RenderScript object)
@@ -152,6 +161,16 @@ public void startingVideo() {
             mMainActivity.getPreview().showToast(null, "Requested IMU recording but no sensors were enabled");
             mMainActivity.getPreview().stopVideo(false);
         }
+
+        if (getVideoFlashPref()) {
+            try {
+                mFlashController.startRecording(mLastVideoDate);
+            } catch (IOException e) {
+                Log.e(TAG, "Failed to start flash controller");
+                e.printStackTrace();
+            }
+        }
+
         super.startingVideo();
     }
 
@@ -168,6 +187,10 @@ public void stoppingVideo() {
             mMainActivity.getPreview().showToast("Stopping video with IMU recording...", true);
         }
 
+        if (mFlashController.isRecording()) {
+            mFlashController.stopRecording();
+        }
+
         super.stoppingVideo();
     }
 

diff --git a/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java b/app/src/main/java/net/sourceforge/opencamera/preview/Preview.java
@@ -5145,6 +5145,7 @@ private void flashVideo() {
         // turn on torch
         cancelAutoFocus();
         camera_controller.setFlashValue("flash_torch");
+        applicationInterface.getFlashController().onFlashFired();
         try {
             Thread.sleep(100);
         }

diff --git a/app/src/main/java/net/sourceforge/opencamera/sensorlogging/FlashController.java b/app/src/main/java/net/sourceforge/opencamera/sensorlogging/FlashController.java
@@ -0,0 +1,73 @@
+package net.sourceforge.opencamera.sensorlogging;
+
+import android.os.SystemClock;
+import android.util.Log;
+
+import net.sourceforge.opencamera.MainActivity;
+import net.sourceforge.opencamera.StorageUtils;
+import net.sourceforge.opencamera.StorageUtilsWrapper;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Date;
+
+public class FlashController {
+    private final static String TAG = "FlashController";
+    private final static String TIMESTAMP_FILE_SUFFIX = "_flash";
+    private BufferedWriter mFlashBufferedWriter;
+    private final MainActivity mContext;
+
+    public boolean isRecording() {
+        return mIsRecording;
+    }
+
+    private volatile boolean mIsRecording;
+
+
+    public FlashController(MainActivity context) {
+        mContext = context;
+    }
+
+    public void startRecording(Date currentVideoDate) throws IOException {
+        StorageUtilsWrapper storageUtils = mContext.getStorageUtils();
+
+        File frameTimestampFile = storageUtils.createOutputCaptureInfo(
+                StorageUtils.MEDIA_TYPE_RAW_SENSOR_INFO, "csv", TIMESTAMP_FILE_SUFFIX, currentVideoDate
+        );
+        mFlashBufferedWriter = new BufferedWriter(
+                new PrintWriter(frameTimestampFile)
+        );
+        mIsRecording = true;
+    }
+
+    public void onFlashFired() {
+        if (isRecording() && mFlashBufferedWriter != null) {
+            long timestamp = SystemClock.elapsedRealtimeNanos();
+            try {
+                mFlashBufferedWriter
+                        .append(Long.toString(timestamp))
+                        .append("\n");
+            } catch (IOException e) {
+                Log.d(TAG, "Failed to write flash timestamp");
+            }
+        }
+    }
+
+    public void stopRecording() {
+        mIsRecording = false;
+        try {
+            if (mFlashBufferedWriter != null) {
+                Log.d(TAG, "Before writer close()");
+                mFlashBufferedWriter.flush();
+                mFlashBufferedWriter.close();
+                mFlashBufferedWriter = null;
+                Log.d(TAG, "After writer close()");
+            }
+        } catch (IOException e) {
+            Log.d(TAG, "Exception occurred when attempting to close mFlashBufferedWriter");
+            e.printStackTrace();
+        }
+    }
+}