@mentra/glasses-media 3.2.1-dev.311 → 3.2.1

package/android/src/main/java/com/mentra/glassesmedia/network/InternetHold.kt

@@ -447,13 +447,6 @@ class InternetHold(private val context: Context) {
     private fun cellularIsValidated(manager: ConnectivityManager): Boolean =
         findValidatedCellular(manager) != null
 
-    private fun findValidatedCellular(manager: ConnectivityManager): Network? =
-        manager.allNetworks.firstOrNull { network ->
-            val capabilities = manager.getNetworkCapabilities(network) ?: return@firstOrNull false
-            capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) &&
-                isValidatedInternet(capabilities)
-        }
-
     private fun connectivityManager(): ConnectivityManager? =
         context.applicationContext.getSystemService(ConnectivityManager::class.java)
 
@@ -466,6 +459,14 @@ class InternetHold(private val context: Context) {
 
         private const val DEFAULT_POLL_MS = 200L
 
+        /** Exclude validated carrier IMS/DUN networks that do not provide app internet. */
+        internal fun findValidatedCellular(manager: ConnectivityManager): Network? =
+            manager.allNetworks.firstOrNull { network ->
+                val capabilities = manager.getNetworkCapabilities(network) ?: return@firstOrNull false
+                capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) &&
+                    isValidatedInternet(capabilities)
+            }
+
         fun isValidatedInternet(capabilities: NetworkCapabilities): Boolean =
             capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_INTERNET) &&
                 capabilities.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)

package/android/src/main/java/com/mentra/glassesmedia/publisher/PhoneWhipPublisher.kt

@@ -2,9 +2,10 @@ package com.mentra.glassesmedia.publisher
 
 import android.content.Context
 import android.net.ConnectivityManager
-import android.net.NetworkCapabilities
 import android.os.Handler
 import android.os.HandlerThread
+import com.mentra.glassesmedia.network.InternetHold
+import com.mentra.glassesmedia.trace.SoftApTrace
 import com.mentra.glassesmedia.source.I420Planes
 import java.io.IOException
 import java.util.concurrent.CountDownLatch
@@ -65,12 +66,9 @@ class PhoneWhipPublisher(
         val url = endpoint.toHttpUrl()
         require(url.isHttps) { "Managed WHIP requires HTTPS" }
         val manager = context.getSystemService(ConnectivityManager::class.java)
-        val internet = manager.allNetworks.firstOrNull { network ->
-          manager.getNetworkCapabilities(network)?.let {
-            it.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR) &&
-              it.hasCapability(NetworkCapabilities.NET_CAPABILITY_VALIDATED)
-          } == true
-        } ?: error("Phone mobile data is unavailable")
+        val internet = InternetHold.findValidatedCellular(manager)
+          ?: error("Phone mobile data is unavailable")
+        SoftApTrace.stage("whip_uplink_network", "network" to internet)
         client = OkHttpClient.Builder().socketFactory(internet.socketFactory)
           .dns(object : okhttp3.Dns { override fun lookup(hostname: String) = internet.getAllByName(hostname).toList() })
           .callTimeout(20, TimeUnit.SECONDS).followRedirects(false).build()
@@ -167,7 +165,12 @@ class PhoneWhipPublisher(
     val request = Request.Builder().url(endpoint)
       .post(pc.localDescription.description.toRequestBody("application/sdp".toMediaType())).build()
     http.newCall(request).enqueue(object : Callback {
-      override fun onFailure(call: Call, error: IOException) { queue.post { fail("WHIP signaling failed") } }
+      override fun onFailure(call: Call, error: IOException) {
+        // Exception messages can contain the credential-bearing publish URL. Record types only.
+        SoftApTrace.failure("whip_uplink_signaling", "error" to error.javaClass.simpleName,
+          "cause" to error.cause?.javaClass?.simpleName)
+        queue.post { fail("WHIP signaling failed (${error.javaClass.simpleName})") }
+      }
       override fun onResponse(call: Call, response: Response) {
         response.use {
           val location = response.header("Location")?.let { request.url.resolve(it) }

package/android/src/main/java/com/mentra/glassesmedia/source/DecodedFrameTap.kt

@@ -0,0 +1,224 @@
+package com.mentra.glassesmedia.source
+
+import android.util.Log
+
+/**
+ * A second, optional consumer of decoded glasses video, sitting beside the ACS sender.
+ *
+ * The call owns this pipeline; the preview is a guest. [offer] therefore never blocks, never lets
+ * a `Throwable` reach the decoder thread, and never does real work — a sink may only decide
+ * whether it wants the frame, retain it, and schedule bounded work elsewhere. A preview that
+ * crashes, stalls, or falls behind must cost the call nothing.
+ *
+ * [detach] is generation-checked because sessions overlap: a call ending late must not tear down
+ * the subscription a newer call already installed.
+ *
+ * ## Cost with nothing attached
+ *
+ * With no sink and telemetry off, [offer] is one volatile read and a return. Sink, error handler
+ * and the telemetry flag live in one immutable [State] so that read is the only thing the decoder
+ * thread pays.
+ *
+ * ## Why the metrics live here
+ *
+ * These describe the call, not the preview. With [setTelemetryEnabled] on they are collected even
+ * with no sink attached, so a preview-off run is a usable baseline for the same numbers with the
+ * preview on.
+ */
+object DecodedFrameTap {
+  private const val TAG = "FRAME-PREVIEW"
+
+  /**
+   * A snapshot of decoder-thread observations, drained by the reader.
+   *
+   * Sums rather than a percentile ring because this object cannot depend on the preview module,
+   * and because the two questions here are "is the mean cost negligible" and "was there ever a
+   * bad one" — a mean and a max answer both.
+   */
+  data class Metrics(
+    val framesOffered: Long,
+    val framesWithSink: Long,
+    val offerTotalNs: Long,
+    val offerMaxNs: Long,
+    val cadenceSamples: Long,
+    val cadenceTotalNs: Long,
+    val cadenceMaxNs: Long,
+    val sinkExceptions: Long,
+    /** Frames the ACS sender accepted, recorded at its call sites after [offer]. */
+    val acsFramesSent: Long = 0,
+  ) {
+    /** Mean time inside [offer] over every timed frame, with or without a sink. */
+    val offerMeanUs: Double get() = if (framesOffered > 0) offerTotalNs.toDouble() / framesOffered / 1000.0 else 0.0
+    val offerMaxUs: Double get() = offerMaxNs / 1000.0
+    val cadenceMeanMs: Double get() = if (cadenceSamples > 0) cadenceTotalNs.toDouble() / cadenceSamples / 1_000_000.0 else 0.0
+    val cadenceMaxMs: Double get() = cadenceMaxNs / 1_000_000.0
+  }
+
+  private class State(
+    val sink: VideoFrameListener?,
+    val onSinkError: ((Throwable) -> Unit)?,
+    val generation: Long,
+  )
+
+  @Volatile
+  private var state: State? = null
+
+  private var generation: Long = 0
+  private var currentSink: VideoFrameListener? = null
+  private var currentOnSinkError: ((Throwable) -> Unit)? = null
+
+  @Volatile
+  var telemetryEnabled: Boolean = false
+    private set
+
+  private val metricsLock = Any()
+  private var framesOffered = 0L
+  private var framesWithSink = 0L
+  private var offerTotalNs = 0L
+  private var offerMaxNs = 0L
+  private var cadenceSamples = 0L
+  private var cadenceTotalNs = 0L
+  private var cadenceMaxNs = 0L
+  private var sinkExceptions = 0L
+  private var acsFramesSent = 0L
+  private var lastOfferAtNs = 0L
+
+  /**
+   * Install [listener] and return the generation that owns it. [onSinkError] runs on the decoder
+   * thread after a throw has been caught and counted; it must only schedule work elsewhere.
+   */
+  @Synchronized
+  fun attach(listener: VideoFrameListener, onSinkError: ((Throwable) -> Unit)? = null): Long {
+    generation += 1
+    currentSink = listener
+    currentOnSinkError = onSinkError
+    publish()
+    Log.i(TAG, "tap attached generation=$generation")
+    return generation
+  }
+
+  /** Remove the sink only if it is still the one [generation] installed. */
+  @Synchronized
+  fun detach(generation: Long): Boolean {
+    if (generation != this.generation || currentSink == null) return false
+    currentSink = null
+    currentOnSinkError = null
+    publish()
+    Log.i(TAG, "tap detached generation=$generation")
+    return true
+  }
+
+  /** True while [generation] still owns the installed sink. */
+  @Synchronized
+  fun isCurrent(generation: Long): Boolean = generation == this.generation && currentSink != null
+
+  /** Collect cadence and offer cost even with no sink, so preview off/on can be compared. */
+  @Synchronized
+  fun setTelemetryEnabled(enabled: Boolean) {
+    telemetryEnabled = enabled
+    publish()
+  }
+
+  fun hasSink(): Boolean = state?.sink != null
+
+  private fun publish() {
+    val wasCollecting = state != null
+    state = if (currentSink == null && !telemetryEnabled) {
+      null
+    } else {
+      State(currentSink, currentOnSinkError, generation)
+    }
+    if (!wasCollecting && state != null) {
+      // The first gap after collection resumes would span the whole idle period.
+      synchronized(metricsLock) { lastOfferAtNs = 0L }
+    }
+  }
+
+  /** Read and clear the accumulated observations. Called about once a second by the reporter. */
+  fun drainMetrics(): Metrics = synchronized(metricsLock) {
+    val snapshot = Metrics(
+      framesOffered = framesOffered,
+      framesWithSink = framesWithSink,
+      offerTotalNs = offerTotalNs,
+      offerMaxNs = offerMaxNs,
+      cadenceSamples = cadenceSamples,
+      cadenceTotalNs = cadenceTotalNs,
+      cadenceMaxNs = cadenceMaxNs,
+      sinkExceptions = sinkExceptions,
+      acsFramesSent = acsFramesSent,
+    )
+    framesOffered = 0
+    framesWithSink = 0
+    offerTotalNs = 0
+    offerMaxNs = 0
+    cadenceSamples = 0
+    cadenceTotalNs = 0
+    cadenceMaxNs = 0
+    sinkExceptions = 0
+    acsFramesSent = 0
+    snapshot
+  }
+
+  /**
+   * The ACS sender accepted a frame. Counted under the same gate as [offer], so the send rate is
+   * available whenever the tap's other call metrics are, including preview-off baselines.
+   */
+  fun recordAcsSend() {
+    if (state == null) return
+    synchronized(metricsLock) { acsFramesSent += 1 }
+  }
+
+  /**
+   * Called on libwebrtc's decode thread, immediately before the frame goes to ACS.
+   *
+   * The catch is not defensive padding: the alternative is a preview bug throwing on the decoder
+   * thread and taking the wearer's call video with it.
+   */
+  fun offer(planes: I420Planes) {
+    val current = state ?: return
+    val started = System.nanoTime()
+    val listener = current.sink
+
+    var failure: Throwable? = null
+    if (listener != null) {
+      try {
+        listener.onVideoFrame(planes)
+      } catch (error: Throwable) {
+        failure = error
+      }
+    }
+
+    val elapsed = System.nanoTime() - started
+    val firstFailure: Boolean
+    synchronized(metricsLock) {
+      framesOffered += 1
+      if (lastOfferAtNs > 0) {
+        val gap = started - lastOfferAtNs
+        cadenceSamples += 1
+        cadenceTotalNs += gap
+        if (gap > cadenceMaxNs) cadenceMaxNs = gap
+      }
+      lastOfferAtNs = started
+      offerTotalNs += elapsed
+      if (elapsed > offerMaxNs) offerMaxNs = elapsed
+      if (listener != null) framesWithSink += 1
+      firstFailure = failure != null && sinkExceptions == 0L
+      if (failure != null) sinkExceptions += 1
+    }
+
+    if (failure != null) {
+      if (firstFailure) {
+        try {
+          Log.w(TAG, "preview sink threw generation=${current.generation}; call frame unaffected", failure)
+        } catch (ignored: Throwable) {
+          // Logging renders the sink's throwable, whose message and stack are preview code too.
+        }
+      }
+      try {
+        current.onSinkError?.invoke(failure)
+      } catch (ignored: Throwable) {
+        // The handler is preview code too; it gets no more access to this thread than the sink.
+      }
+    }
+  }
+}

package/ios/CoreKit/Sources/GlassesMediaCore/DecodedFrameTapCore.swift

@@ -0,0 +1,204 @@
+import Foundation
+
+/// The frame-agnostic half of `DecodedFrameTap`: sink ownership, failure isolation and metrics.
+///
+/// The call owns the decoder; a preview sink is a guest. `offer` never lets a thrown error reach
+/// the decoder thread, and with no sink attached and telemetry off it costs one uncontended lock
+/// around a single reference load (Swift has no portable atomics for iOS 15).
+/// Swift runtime traps (force-unwraps, bounds failures) are process failures and cannot be caught
+/// here; the preview prevents them by validating geometry before touching memory.
+public final class DecodedFrameTapCore<Frame> {
+    /// A snapshot of decoder-thread observations, drained by the reader.
+    public struct Metrics {
+        public let framesOffered: Int
+        public let framesWithSink: Int
+        public let offerTotalNs: Int64
+        public let offerMaxNs: Int64
+        public let cadenceSamples: Int
+        public let cadenceTotalNs: Int64
+        public let cadenceMaxNs: Int64
+        public let sinkExceptions: Int
+        /// Frames the ACS sender accepted, recorded at its call sites after `offer`.
+        public let acsFramesSent: Int
+
+        /// Mean time inside `offer` over every timed frame, with or without a sink.
+        public var offerMeanUs: Double {
+            framesOffered > 0 ? Double(offerTotalNs) / Double(framesOffered) / 1000.0 : 0
+        }
+
+        public var offerMaxUs: Double { Double(offerMaxNs) / 1000.0 }
+
+        public var cadenceMeanMs: Double {
+            cadenceSamples > 0 ? Double(cadenceTotalNs) / Double(cadenceSamples) / 1_000_000.0 : 0
+        }
+
+        public var cadenceMaxMs: Double { Double(cadenceMaxNs) / 1_000_000.0 }
+    }
+
+    private final class State {
+        let sink: ((Frame) throws -> Void)?
+        let onSinkError: ((Error) -> Void)?
+        init(sink: ((Frame) throws -> Void)?, onSinkError: ((Error) -> Void)?) {
+            self.sink = sink
+            self.onSinkError = onSinkError
+        }
+    }
+
+    private let stateLock = NSLock()
+    /// Replaced wholesale, never mutated, so `offer` reads one reference under a short lock.
+    private var state: State?
+    private var generation: UInt64 = 0
+    private var sink: ((Frame) throws -> Void)?
+    private var onSinkError: ((Error) -> Void)?
+    public private(set) var telemetryEnabled = false
+
+    private let metricsLock = NSLock()
+    private var framesOffered = 0
+    private var framesWithSink = 0
+    private var offerTotalNs: Int64 = 0
+    private var offerMaxNs: Int64 = 0
+    private var cadenceSamples = 0
+    private var cadenceTotalNs: Int64 = 0
+    private var cadenceMaxNs: Int64 = 0
+    private var sinkExceptions = 0
+    private var acsFramesSent = 0
+    private var lastOfferAtNs: Int64 = 0
+
+    private let clock: () -> Int64
+
+    public init(clock: @escaping () -> Int64 = { Int64(DispatchTime.now().uptimeNanoseconds) }) {
+        self.clock = clock
+    }
+
+    /// Install the sink and return the generation that owns it. `onSinkError` runs on the decoder
+    /// thread after a thrown error has been caught and counted; it must only schedule work.
+    @discardableResult
+    public func attach(_ sink: @escaping (Frame) throws -> Void, onSinkError: ((Error) -> Void)? = nil) -> UInt64 {
+        stateLock.lock()
+        defer { stateLock.unlock() }
+        generation &+= 1
+        self.sink = sink
+        self.onSinkError = onSinkError
+        publishLocked()
+        return generation
+    }
+
+    /// Remove the sink only if it is still the one `generation` installed.
+    @discardableResult
+    public func detach(generation: UInt64) -> Bool {
+        stateLock.lock()
+        defer { stateLock.unlock() }
+        guard generation == self.generation, sink != nil else { return false }
+        sink = nil
+        onSinkError = nil
+        publishLocked()
+        return true
+    }
+
+    public func isCurrent(generation: UInt64) -> Bool {
+        stateLock.lock()
+        defer { stateLock.unlock() }
+        return generation == self.generation && sink != nil
+    }
+
+    public var hasSink: Bool {
+        stateLock.lock()
+        defer { stateLock.unlock() }
+        return sink != nil
+    }
+
+    /// Collect cadence and offer cost even with no sink, so preview off/on can be compared.
+    public func setTelemetryEnabled(_ enabled: Bool) {
+        stateLock.lock()
+        defer { stateLock.unlock() }
+        telemetryEnabled = enabled
+        publishLocked()
+    }
+
+    private func publishLocked() {
+        let wasCollecting = state != nil
+        state = (sink == nil && !telemetryEnabled) ? nil : State(sink: sink, onSinkError: onSinkError)
+        if !wasCollecting, state != nil {
+            // The first gap after collection resumes would span the whole idle period.
+            metricsLock.lock()
+            lastOfferAtNs = 0
+            metricsLock.unlock()
+        }
+    }
+
+    /// Read and clear the accumulated observations. Called about once a second by the reporter.
+    public func drainMetrics() -> Metrics {
+        metricsLock.lock()
+        defer { metricsLock.unlock() }
+        let snapshot = Metrics(
+            framesOffered: framesOffered,
+            framesWithSink: framesWithSink,
+            offerTotalNs: offerTotalNs,
+            offerMaxNs: offerMaxNs,
+            cadenceSamples: cadenceSamples,
+            cadenceTotalNs: cadenceTotalNs,
+            cadenceMaxNs: cadenceMaxNs,
+            sinkExceptions: sinkExceptions,
+            acsFramesSent: acsFramesSent
+        )
+        framesOffered = 0
+        framesWithSink = 0
+        offerTotalNs = 0
+        offerMaxNs = 0
+        cadenceSamples = 0
+        cadenceTotalNs = 0
+        cadenceMaxNs = 0
+        sinkExceptions = 0
+        acsFramesSent = 0
+        return snapshot
+    }
+
+    /// The ACS sender accepted a frame. Counted under the same gate as `offer`.
+    public func recordAcsSend() {
+        stateLock.lock()
+        let collecting = state != nil
+        stateLock.unlock()
+        guard collecting else { return }
+        metricsLock.lock()
+        acsFramesSent += 1
+        metricsLock.unlock()
+    }
+
+    /// Called on the decoder thread, immediately before the frame goes to ACS.
+    public func offer(_ frame: Frame) {
+        stateLock.lock()
+        let current = state
+        stateLock.unlock()
+        guard let current else { return }
+
+        let started = clock()
+        var failure: Error?
+        if let sink = current.sink {
+            do {
+                try sink(frame)
+            } catch {
+                failure = error
+            }
+        }
+        let elapsed = clock() - started
+
+        metricsLock.lock()
+        framesOffered += 1
+        if lastOfferAtNs > 0 {
+            let gap = started - lastOfferAtNs
+            cadenceSamples += 1
+            cadenceTotalNs += gap
+            if gap > cadenceMaxNs { cadenceMaxNs = gap }
+        }
+        lastOfferAtNs = started
+        offerTotalNs += elapsed
+        if elapsed > offerMaxNs { offerMaxNs = elapsed }
+        if current.sink != nil { framesWithSink += 1 }
+        if failure != nil { sinkExceptions += 1 }
+        metricsLock.unlock()
+
+        if let failure {
+            current.onSinkError?(failure)
+        }
+    }
+}

package/ios/DecodedFrameTap.swift

@@ -0,0 +1,64 @@
+import CoreVideo
+import Foundation
+
+/// A second, optional consumer of decoded glasses video, sitting beside the ACS sender.
+///
+/// The call owns this pipeline; the preview is a guest. `offer` never blocks, never lets a thrown
+/// error reach its caller, and never does real work — a sink may only decide whether it wants the
+/// frame, retain it, and schedule bounded work elsewhere. The logic lives in
+/// `DecodedFrameTapCore` so it can be unit tested without CoreVideo.
+///
+/// Detach is generation-checked because sessions overlap: a call ending late must not tear down
+/// the subscription a newer call already installed.
+public final class DecodedFrameTap {
+    public static let shared = DecodedFrameTap()
+
+    public typealias Metrics = DecodedFrameTapCore<CVPixelBuffer>.Metrics
+
+    private let core = DecodedFrameTapCore<CVPixelBuffer>()
+
+    public init() {}
+
+    /// Install the preview sink and return the generation that owns it.
+    @discardableResult
+    public func attach(
+        _ sink: @escaping (CVPixelBuffer) throws -> Void,
+        onSinkError: ((Error) -> Void)? = nil
+    ) -> UInt64 {
+        core.attach(sink, onSinkError: onSinkError)
+    }
+
+    /// Remove the sink only if it is still the one this generation installed.
+    @discardableResult
+    public func detach(generation: UInt64) -> Bool {
+        core.detach(generation: generation)
+    }
+
+    public func isCurrent(generation: UInt64) -> Bool {
+        core.isCurrent(generation: generation)
+    }
+
+    public var hasSink: Bool { core.hasSink }
+
+    /// Collect cadence, offer cost and the ACS send count even with no sink attached.
+    public func setTelemetryEnabled(_ enabled: Bool) {
+        core.setTelemetryEnabled(enabled)
+    }
+
+    public var telemetryEnabled: Bool { core.telemetryEnabled }
+
+    /// Read and clear the accumulated observations. Called about once a second by the reporter.
+    public func drainMetrics() -> Metrics {
+        core.drainMetrics()
+    }
+
+    /// The ACS sender accepted a frame. Called by acs-meeting right after a successful send.
+    public func recordAcsSend() {
+        core.recordAcsSend()
+    }
+
+    /// Called on the decoder's thread, immediately before the frame goes to ACS.
+    public func offer(_ buffer: CVPixelBuffer) {
+        core.offer(buffer)
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mentra/glasses-media",
-  "version": "3.2.1-dev.311",
+  "version": "3.2.1",
   "description": "Shared native glasses media receivers and local network transport",
   "license": "MIT",
   "author": "Mentra Community",