Merge pull request #32 from MobileRoboticsSkoltech/remote_extension

Add exposure time reporting to remote feature

Author: anastasiia-kornilova

api_client/basic_example.py

@@ -10,13 +10,12 @@ def main():
     remote = RemoteControl(HOST)
     print("Connected")
 
-    accel_data, gyro_data, magnetic_data = remote.get_imu(10000, True, False, True)
-    print("Magnetometer data length: %d" % len(magnetic_data))
-    with open("magnetic.csv", "w+") as imu_file:
-        imu_file.writelines(magnetic_data)
+    #print("Magnetometer data length: %d" % len(magnetic_data))
+    #with open("magnetic.csv", "w+") as imu_file:
+    #    imu_file.writelines(magnetic_data)
 
-    phase, duration = remote.start_video()
-    print("%d %f" % (phase, duration))
+    phase, duration, exp_time = remote.start_video()
+    print("%d %f" % (exp_time, duration))
     time.sleep(5)
     remote.stop_video()
 

api_client/src/RemoteControl.py

@@ -6,7 +6,7 @@
 BUFFER_SIZE = 4096
 PROPS_PATH = '../app/src/main/assets/server_config.properties'
 SUPPORTED_SERVER_VERSIONS = [
-    'v.0.1'
+    'v.0.1.1'
 ]
 NUM_SENSORS = 3
 
@@ -81,7 +81,7 @@ def get_imu(self, duration_ms, want_accel, want_gyro, want_magnetic):
     def start_video(self):
         """
         Starts video recording and receives phase and duration info
-        :return: Tuple (phase, average duration) - all in nanoseconds
+        :return: Tuple (phase, average duration, exposure time) - all in nanoseconds
         """
         status, socket_file = self._send_and_get_response_status(
             self.props['VIDEO_START_REQUEST']
@@ -94,8 +94,11 @@ def start_video(self):
         line = socket_file.readline()
         avg_duration_ns = float(line)
 
+        line = socket_file.readline()
+        exposure_time = int(line)
+
         socket_file.readline()
-        return phase_ns, avg_duration_ns
+        return phase_ns, avg_duration_ns, exposure_time
 
     def stop_video(self):
         """

app/src/main/assets/server_config.properties

@@ -1,5 +1,5 @@
 RPC_PORT=6969
-SERVER_VERSION=v.0.1
+SERVER_VERSION=v.0.1.1
 VIDEO_START_REQUEST=video_start
 VIDEO_STOP_REQUEST=video_stop
 GET_VIDEO_REQUEST=get_video

app/src/main/java/net/sourceforge/opencamera/sensorlogging/VideoFrameInfo.java

@@ -1,6 +1,5 @@
 package net.sourceforge.opencamera.sensorlogging;
 
-import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
 import android.util.Log;
@@ -11,6 +10,7 @@
 import net.sourceforge.opencamera.StorageUtils;
 import net.sourceforge.opencamera.StorageUtilsWrapper;
 import net.sourceforge.opencamera.cameracontroller.YuvImageUtils;
+import net.sourceforge.opencamera.preview.Preview;
 
 import java.io.BufferedWriter;
 import java.io.Closeable;
@@ -47,7 +47,7 @@ public class VideoFrameInfo implements Closeable {
     private final ExtendedAppInterface mAppInterface;
     private final BufferedWriter mFrameBufferedWriter;
     private final boolean mShouldSaveFrames;
-    private final Context mContext;
+    private final MainActivity mContext;
     private final YuvImageUtils mYuvUtils;
     private final BlockingQueue<VideoPhaseInfo> mPhaseInfoReporter;
     private final List<Long> durationsNs;
@@ -102,8 +102,14 @@ public void submitProcessFrame(long timestamp) {
                             mLastTimestamp = timestamp;
                         } else if (mFrameNumber == PHASE_CALC_N_FRAMES) {
                             // Should report phase
+                            Preview preview = mContext.getPreview();
+
+                            long exposureTime = 0;
+                            if(preview.getCameraController().captureResultHasExposureTime() ) {
+                                exposureTime = preview.getCameraController().captureResultExposureTime();
+                            }
                             mPhaseInfoReporter.add(
-                                    new VideoPhaseInfo(timestamp, durationsNs)
+                                    new VideoPhaseInfo(timestamp, durationsNs, exposureTime)
                             );
                         }
 

app/src/main/java/net/sourceforge/opencamera/sensorlogging/VideoPhaseInfo.java

@@ -7,6 +7,8 @@
 public class VideoPhaseInfo {
     private final long mVideoPhaseNs;
     private final double mAvgDurationNs;
+    private final long mExposureTime;
+
 
     private static double mean(List<Long> numList) {
         double sum = 0;
@@ -16,9 +18,10 @@ private static double mean(List<Long> numList) {
         return sum / numList.size();
     }
 
-    public VideoPhaseInfo(long videoPhaseNs, List<Long> frameDurations) {
+    public VideoPhaseInfo(long videoPhaseNs, List<Long> frameDurations, long exposureTime) {
         this.mVideoPhaseNs = videoPhaseNs;
         this.mAvgDurationNs = mean(frameDurations);
+        this.mExposureTime = exposureTime;
     }
 
     public long getVideoPhaseNs() {
@@ -29,9 +32,11 @@ public double getAvgDurationNs() {
         return mAvgDurationNs;
     }
 
+    public long getExposureTime() { return mExposureTime; }
+
     @NonNull
     @Override
     public String toString() {
-        return mVideoPhaseNs + "\n" + mAvgDurationNs + "\n";
+        return mVideoPhaseNs + "\n" + mAvgDurationNs + "\n" + mExposureTime + "\n";
     }
 }