@mentra/acs-meeting 3.3.0-dev.515 → 3.3.0-dev.516

package/README.md

@@ -36,7 +36,7 @@ differences are collected in [iOS](#ios).
 **The phone is a relay, not a capture device.** It receives what the glasses already
 encoded, decodes it, and re-publishes it into ACS. Live video is not drawn on the phone,
 and a live frame does not cross the JavaScript bridge. A photo shutter is the exception:
-the phone draws a "Taking a photo" card, then a still, and feeds those pixels through the
+the phone draws a "Taking a photo..." card, then a still, and feeds those pixels through the
 same sender. See [Photo hold](#photo-hold).
 
 ```
@@ -542,7 +542,7 @@ publisher (`start_stream` on Direct link; Call's own stream on Cloudflare), keep
 meeting, the hotspot, and the ACS sender up, and replaces the tile with three pictures
 in order:
 
-1. A full-frame card, "Taking a photo", from the button press until the still is ready.
+1. A full-frame card, "Taking a photo...", from the button press until the still is ready.
 2. The still, for a few seconds counted by the caller from `shownAt`.
 3. Live video again.
 

package/android/src/main/java/com/mentra/acsmeeting/AcsMeetingSession.kt

@@ -139,7 +139,11 @@ class AcsMeetingSession(
   private val muted = AtomicBoolean(false)
   private val frameSender = AcsFrameSender(stats, avSync)
   private val outgoingHold = OutgoingVideoHold(
-    send = { planes -> frameSender.sendPlanes(planes) },
+    // The self-preview mirrors what Teams receives, so it shows the card and the still too.
+    send = { planes ->
+      DecodedFrameTap.offer(planes)
+      frameSender.sendPlanes(planes)
+    },
     // The negotiated size, not the profile ceiling: ACS renegotiates below the ceiling under load,
     // and sendPlanes drops any hold frame whose dimensions differ from the negotiated format.
     width = { frameSender.negotiatedSize()?.width ?: profile.width },

package/android/src/main/java/com/mentra/acsmeeting/video/OutgoingVideoHold.kt

@@ -32,8 +32,8 @@ class OutgoingVideoHold(
   private val scheduler = Executors.newSingleThreadScheduledExecutor { runnable ->
     Thread(runnable, "acs-photo-hold").apply { isDaemon = true }
   }
-  private var task: ScheduledFuture<*>? = null
-  private var planes: HeldPlanes? = null
+  @Volatile private var task: ScheduledFuture<*>? = null
+  @Volatile private var planes: HeldPlanes? = null
 
   fun isActive(): Boolean = running.get()
 
@@ -45,13 +45,17 @@ class OutgoingVideoHold(
    * module thread cannot stall (and risk an ANR) waiting for ACS to accept the first frame.
    */
   fun start(kind: String, imageBytes: ByteArray?, onResult: (Boolean) -> Unit) {
-    stop()
+    // Build the replacement before touching the current hold. Card -> still must not open a gap:
+    // while `running` is false the session forwards live glasses frames, and right after a photo
+    // those are the reopened camera's unexposed first frames.
     val w = width()
     val h = height()
     val frame = when (kind) {
       "image" -> imageBytes?.let { decode(it, w, h) } ?: card(w, h)
       else -> card(w, h)
     }
+    task?.cancel(false)
+    task = null
     planes = frame
     running.set(true)
     val settled = AtomicBoolean(false)
@@ -84,7 +88,7 @@ class OutgoingVideoHold(
       textAlign = Paint.Align.CENTER
       textSize = (h / 12f).coerceAtLeast(24f)
     }
-    canvas.drawText("Taking a photo", w / 2f, h / 2f, paint)
+    canvas.drawText("Taking a photo...", w / 2f, h / 2f, paint)
     return HeldPlanes(bitmap)
   }
 
@@ -189,10 +193,26 @@ private class HeldPlanes(bitmap: Bitmap) {
     }
   }
 
-  fun frame(): I420Planes {
-    y.position(0)
-    u.position(0)
-    v.position(0)
-    return I420Planes(y, width, u, chromaWidth, v, chromaWidth, width, height, System.nanoTime())
+  /**
+   * Fresh views per frame: the preview reads a frame on its own worker after the sender has
+   * moved on, so frames must not share buffer positions. The pixels never change while held, so
+   * retaining one past the callback is safe and needs no bookkeeping.
+   */
+  fun frame(): I420Planes = I420Planes(
+    y.duplicate().apply { position(0) },
+    width,
+    u.duplicate().apply { position(0) },
+    chromaWidth,
+    v.duplicate().apply { position(0) },
+    chromaWidth,
+    width,
+    height,
+    System.nanoTime(),
+    retain = NO_OP,
+    release = NO_OP,
+  )
+
+  private companion object {
+    val NO_OP: () -> Unit = {}
   }
 }

package/ios/AcsMeetingModule.swift

@@ -1574,7 +1574,7 @@ func takingPhotoCardPixelBuffer(width: Int, height: Int) -> CVPixelBuffer? {
         kCTFontAttributeName: font,
         kCTForegroundColorAttributeName: CGColor(gray: 1, alpha: 1),
     ] as CFDictionary
-    guard let attributed = CFAttributedStringCreate(nil, "Taking a photo" as CFString, attrs) else { return nil }
+    guard let attributed = CFAttributedStringCreate(nil, "Taking a photo..." as CFString, attrs) else { return nil }
     let line = CTLineCreateWithAttributedString(attributed)
     var ascent: CGFloat = 0
     let lineWidth = CGFloat(CTLineGetTypographicBounds(line, &ascent, nil, nil))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/acs-meeting",
-  "version": "3.3.0-dev.515",
+  "version": "3.3.0-dev.516",
   "description": "MentraOS native ACS Teams meeting module (WHEP decode → ACS raw media)",
   "main": "build/index.js",
   "react-native": "src/index.ts",
@@ -32,7 +32,7 @@
   },
   "dependencies": {
     "@expo/config-plugins": "~55.0.10",
-    "@mentra/glasses-media": "3.3.0-dev.515"
+    "@mentra/glasses-media": "3.3.0-dev.516"
   },
   "devDependencies": {
     "expo-module-scripts": "^55.0.2",