Update license headers, string resources

Author: azaat

app/src/main/java/com/googleresearch/capturesync/CameraController.java

@@ -1,5 +1,5 @@
-/**
- * Copyright 2019 The Google Research Authors.
+/*
+ * Copyright 2021 Mobile Robotics Lab. at Skoltech.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -130,7 +130,7 @@ public CameraController(
             output -> {
               CaptureResult result = output.result;
               Object userTag = CaptureRequestTag.getUserTag(result);
-              // MROB: We don't skip them cause every frame counts!!
+              // We don't skip them because every frame counts when restoring video sequence
 //              if (userTag != null && userTag.equals(PhaseAlignController.INJECT_FRAME)) {
 //                Log.v(TAG, "Skipping phase align injection frame.");
 //                output.close();
@@ -150,7 +150,6 @@ public CameraController(
 
               long phaseNs = phaseAlignController.updateCaptureTimestamp(synchronizedTimestampNs);
               double phaseMs = TimeUtils.nanosToMillis((double) phaseNs);
-//
 //          Log.v(
 //              TAG,
 //              String.format(

app/src/main/java/com/googleresearch/capturesync/CaptureRequestFactory.java

@@ -1,5 +1,5 @@
-/**
- * Copyright 2019 The Google Research Authors.
+/*
+ * Copyright 2021 Mobile Robotics Lab. at Skoltech.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -87,7 +87,8 @@ public CaptureRequest.Builder makePreview(
   }
 
   /**
-   * Experimental MROB. Creates builder for video request
+   * An alternative capture request for video,
+   * includes everything from preview + mediaRecorder
    */
   public CaptureRequest.Builder makeVideo(
           Surface recorderSurface,
@@ -103,29 +104,6 @@ public CaptureRequest.Builder makeVideo(
       builder.addTarget(recorderSurface);
     }
     return builder;
-/*
-    CaptureRequest.Builder builder = device.createCaptureRequest(TEMPLATE_PREVIEW);
-    // Manually set exposure and sensitivity using UI sliders on the leader.
-    builder.set(CONTROL_AE_MODE, CONTROL_AE_MODE_OFF);
-    builder.set(SENSOR_EXPOSURE_TIME, sensorExposureTimeNs);
-    builder.set(SENSOR_SENSITIVITY, sensorSensitivity);
-
-    // Auto white balance used, these could be locked and sent from the leader instead.
-    builder.set(CONTROL_AWB_MODE, CONTROL_AWB_MODE_AUTO);
-
-    // Auto focus is used since different devices may have different manual focus values.
-    builder.set(CONTROL_AF_MODE, CONTROL_AF_MODE_CONTINUOUS_PICTURE);
-
-    if (viewfinderSurface != null) {
-      builder.addTarget(viewfinderSurface);
-    }
-    List<Integer> targetIndices = new ArrayList<>();
-    for (int i = 0; i < imageSurfaces.size(); i++) {
-      builder.addTarget(imageSurfaces.get(i));
-      targetIndices.add(i);
-    }
-    builder.setTag(new CaptureRequestTag(targetIndices, null));
-    return builder;*/
   }
 
 

app/src/main/java/com/googleresearch/capturesync/MainActivity.java

@@ -1,19 +1,20 @@
 /*
- * Copyright 2019 The Google Research Authors.
- * <p>
+ * Copyright 2021 Mobile Robotics Lab. at Skoltech.
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * <p>
- * http://www.apache.org/licenses/LICENSE-2.0
- * <p>
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
+
 package com.googleresearch.capturesync;
 
 import android.Manifest.permission;
@@ -90,7 +91,6 @@
  */
 public class MainActivity extends Activity {
     private static final String TAG = "MainActivity";
-    //  private static final int EXP_LEN = 20_000;
     private static final int STATIC_LEN = 15_000;
     private String lastTimeStamp;
     private PeriodCalculator periodCalculator;

app/src/main/res/values/strings.xml

@@ -4,14 +4,14 @@
     <!-- Synchronized simplecamera2 app. [CHAR_LIMIT=80] -->
     <string name="app_name">CaptureSync</string>
     <!-- Request synchronized still. [CHAR_LIMIT=80] -->
-    <string name="action_capture_still">Capture Still</string>
+    <string name="action_capture_still">Record video</string>
     <!-- Request phase alignment. [CHAR_LIMIT=80] -->
     <string name="action_phase_align">Align Phases</string>
     <!-- Request send 2A values. [CHAR_LIMIT=80] -->
     <string name="action_send_2a">Align 2A</string>
 
     <!-- Status text. [CHAR_LIMIT=80] -->
-    <string name="status_text_uninitialized">SoftwareSync Demo App</string>
+    <string name="status_text_uninitialized">RecSync Android</string>
     <!-- Status text for current phase. [CHAR_LIMIT=80] -->
     <string name="status_text_phase">Phase</string>
     <!-- Slider text for exposure. [CHAR_LIMIT=80] -->