Merge pull request #3595 from Mentra-Community/aisraelov/camera-riser-sound

Play prep clicks and sensor-timed snaps for photos

Author: aisraelov

asg_client/app/src/main/assets/camera_prep_click.wav

@@ -52,6 +52,12 @@ public class AsgConstants {
 
     public static final long CAMERA_WARM_UP_MAX_DURATION_MS = 60_000L;
 
+    /** Cadence for the short hold-still click while a cold photo spins up the camera. */
+    public static final long CAMERA_PREP_CLICK_INTERVAL_MS = 900L;
+
+    /** Target lead before the estimated end of sensor exposure for starting the camera snap. */
+    public static final long CAMERA_SNAP_TARGET_LEAD_MS = 100L;
+
     /** Safety lease for a miniapp-owned transient FOV override. */
     public static final long CAMERA_FOV_OVERRIDE_DEFAULT_TTL_MS = 300_000L;
 

asg_client/app/src/main/assets/camera_snap.wav

@@ -1,14 +1,15 @@
 package com.mentra.asg_client.audio;
 
 /**
- * Constants for audio asset file names in the application's assets directory.
- * Most audio files are in WAV format for optimal compatibility with I2S audio routing.
- * Some files (like battery announcements and storage alerts) use MP3 format.
+ * Constants for audio asset file names in the application's assets directory. Most audio files are
+ * in WAV format for optimal compatibility with I2S audio routing. Some files (like battery
+ * announcements and storage alerts) use MP3 format.
+ *
+ * <p>Usage:
  *
- * Usage:
  * <pre>
  * if (hardwareManager.supportsAudioPlayback()) {
- *     hardwareManager.playAudioAsset(AudioAssets.TAKE_PHOTO_HOT);
+ *     hardwareManager.playAudioAsset(AudioAssets.CAMERA_SNAP);
  * }
  * </pre>
  */
@@ -19,91 +20,53 @@ private AudioAssets() {
         throw new AssertionError("AudioAssets is a utility class and should not be instantiated");
     }
 
-    /**
-     * Low battery notification sound
-     */
+    /** Low battery notification sound */
     public static final String BATTERY_LOW = "battery_low.wav";
 
-    /**
-     * Storage full notification sound
-     */
+    /** Storage full notification sound */
     public static final String STORAGE_FULL = "storage_full.mp3";
 
-    /**
-     * Shutter sound for a "cold" photo capture — the camera was not already running, so it must
-     * spin up (1–2s on Mentra Live due to slow ISP startup) before the shot lands. This is a
-     * longer clip whose duration spans the warmup so the user keeps their head still until the
-     * photo is actually taken.
-     */
-    public static final String TAKE_PHOTO_COLD = "take_photo_cold.wav";
+    /** Short hold-still cue repeated while a cold capture spins up the camera and ISP. */
+    public static final String CAMERA_PREP_CLICK = "camera_prep_click.wav";
 
-    /**
-     * Shutter sound for a "hot" photo capture — the camera was already running (kept alive after a
-     * recent shot), so the capture is near-instant. This is a short clip for snappy, responsive
-     * feedback on rapid-fire shots.
-     */
-    public static final String TAKE_PHOTO_HOT = "take_photo_hot.wav";
+    /** Camera snap anchored to sensor exposure timing or the completed JPEG frame boundary. */
+    public static final String CAMERA_SNAP = "camera_snap.wav";
 
-    /**
-     * UI click or button press sound
-     */
+    /** UI click or button press sound */
     public static final String CLICK_SOUND = "click_sound.wav";
 
-    /**
-     * Device/glasses connected notification
-     */
+    /** Device/glasses connected notification */
     public static final String CONNECTED = "connected.wav";
 
-    /**
-     * Device/glasses disconnected notification
-     */
+    /** Device/glasses disconnected notification */
     public static final String DISCONNECTED = "disconnected.wav";
 
-    /**
-     * Power off sound
-     */
+    /** Power off sound */
     public static final String POWER_OFF = "power_off.wav";
 
-    /**
-     * Power on sound
-     */
+    /** Power on sound */
     public static final String POWER_ON = "power_on.wav";
 
-    /**
-     * Audio recording started notification
-     */
+    /** Audio recording started notification */
     public static final String RECORDING_START = "recording_start.wav";
 
-    /**
-     * Audio recording stopped notification
-     */
+    /** Audio recording stopped notification */
     public static final String RECORDING_STOP = "recording_stop.wav";
 
-    /**
-     * Volume adjustment sound
-     */
+    /** Volume adjustment sound */
     public static final String VOLUME_CHANGE = "volume_change.wav";
 
-    /**
-     * Video recording started notification
-     * Same as audio recording start for consistency
-     */
+    /** Video recording started notification Same as audio recording start for consistency */
     public static final String VIDEO_RECORDING_START = RECORDING_START;
 
-    /**
-     * Video recording stopped notification
-     * Same as audio recording stop for consistency
-     */
+    /** Video recording stopped notification Same as audio recording stop for consistency */
     public static final String VIDEO_RECORDING_STOP = RECORDING_STOP;
 
-    /**
-     * Battery level announcement audio folder prefix
-     */
+    /** Battery level announcement audio folder prefix */
     public static final String BATTERY_LEVEL_PREFIX = "battery/";
 
     /**
-     * Get battery level announcement audio file path.
-     * Rounds to nearest 10% (10, 20, 30... 100).
+     * Get battery level announcement audio file path. Rounds to nearest 10% (10, 20, 30... 100).
      *
      * @param percent Battery level 0-100
      * @return Asset path like "battery/50.mp3"
@@ -112,4 +75,4 @@ public static String getBatteryLevelAsset(int percent) {
         int rounded = Math.max(10, Math.min(100, ((percent + 5) / 10) * 10));
         return BATTERY_LEVEL_PREFIX + rounded + ".mp3";
     }
-}
+}