Merge pull request #2246 from Mentra-Community/ya/replace-rtmp-with-srt

Ya/replace rtmp with srt

Author: aisraelov

asg_client/app/build.gradle

@@ -310,6 +310,7 @@ dependencies {
     // StreamPackLite dependencies
     implementation project(':core')
     implementation project(':extension-rtmp')
+    implementation project(':extension-srt')
 
     // OkHttp for network requests
     implementation 'com.squareup.okhttp3:okhttp:4.9.3'
@@ -323,6 +324,11 @@ dependencies {
     // Sentry SDK for error reporting
     implementation 'io.sentry:sentry-android:7.5.0'
 
+    // Google WebRTC for Android (WHIP streaming)
+    // Community-maintained prebuilt of the official Google WebRTC codebase; uses org.webrtc package.
+    // Pinned to M114 (2023) — compiled with Java 11, compatible with this project's Java 17 toolchain.
+    implementation 'io.github.webrtc-sdk:android:114.5735.08.1'
+
     // AndroidX Test dependencies
     androidTestImplementation 'androidx.test:core:1.5.0'
     androidTestImplementation 'androidx.test:runner:1.5.2'

asg_client/app/src/main/AndroidManifest.xml

@@ -171,6 +171,18 @@
             android:exported="true"
             android:foregroundServiceType="camera|microphone" />
 
+        <service
+            android:name="com.mentra.asg_client.io.streaming.services.SrtStreamingService"
+            android:enabled="true"
+            android:exported="true"
+            android:foregroundServiceType="camera|microphone" />
+
+        <service
+            android:name="com.mentra.asg_client.io.streaming.services.WhipStreamingService"
+            android:enabled="true"
+            android:exported="true"
+            android:foregroundServiceType="camera|microphone" />
+
         <service
             android:name="com.mentra.asg_client.io.ota.services.OtaService"
             android:enabled="true"

asg_client/app/src/main/java/com/mentra/asg_client/SysControl.java

@@ -452,13 +452,20 @@ public static void flashRecordingLed(Context context, long durationMs) {
      * @param enable true to enable EIS, false to disable
      */
     public static void setEisEnable(Context context, boolean enable) {
-        Log.d(TAG, "🎥 Setting EIS (vendor.debug.pixsmart.vs) to: " + (enable ? "1" : "0"));
+        Log.d(TAG, "🎥 Setting EIS to: " + (enable ? "ENABLED" : "DISABLED"));
+        // Pixsmart EIS
         Intent nn = new Intent();
         nn.putExtra("cmd", "setProperty");
         nn.putExtra("name", "vendor.debug.pixsmart.vs");
         nn.putExtra("value", enable ? "1": "0");
         sendBroadcast(context, nn);
-        Log.d(TAG, "✅ EIS property broadcast sent");
+        // Morpho video EIS
+        Intent nn2 = new Intent();
+        nn2.putExtra("cmd", "setProperty");
+        nn2.putExtra("name", "vendor.debug.morpho.videoeis.mode");
+        nn2.putExtra("value", enable ? "1": "0");
+        sendBroadcast(context, nn2);
+        Log.d(TAG, "✅ EIS properties set (pixsmart + morpho)");
     }
 
     /**

asg_client/app/src/main/java/com/mentra/asg_client/camera/CameraNeo.java

@@ -4,6 +4,7 @@
 import com.mentra.asg_client.io.hardware.interfaces.IHardwareManager;
 import com.mentra.asg_client.service.utils.ServiceUtils;
 import com.mentra.asg_client.io.hardware.core.HardwareManagerFactory;
+import com.mentra.asg_client.SysControl;
 
 import android.annotation.SuppressLint;
 import android.app.NotificationChannel;
@@ -659,11 +660,13 @@ public int onStartCommand(Intent intent, int flags, int startId) {
                     } else {
                         pendingVideoSettings = null; // Will use defaults
                     }
+                    SysControl.setEisEnable(this, true);
                     setupCameraAndStartRecording(currentVideoId, currentVideoPath);
                     break;
                 case ACTION_STOP_VIDEO_RECORDING:
                     String videoIdToStop = intent.getStringExtra(EXTRA_VIDEO_ID);
                     stopCurrentVideoRecording(videoIdToStop);
+                    SysControl.setEisEnable(this, false);
                     break;
 
                 case ACTION_START_BUFFER:

asg_client/app/src/main/java/com/mentra/asg_client/io/media/core/MediaCaptureService.java

@@ -429,7 +429,7 @@ public void playBatteryLowSound() {
 
     /**
      * Static helper for contexts without MediaCaptureService instance.
-     * Used by RtmpCommandHandler and other handlers.
+     * Used by StreamCommandHandler and other handlers.
      */
     public static void playBatteryLowSound(Context context) {
         IHardwareManager hwManager = HardwareManagerFactory.getInstance(context);

asg_client/app/src/main/java/com/mentra/asg_client/io/streaming/config/RtmpStreamConfig.java

@@ -9,10 +9,10 @@
 public class RtmpStreamConfig {
 
     // Default values (matching current hardcoded values)
-    public static final int DEFAULT_VIDEO_WIDTH = 1280;
-    public static final int DEFAULT_VIDEO_HEIGHT = 720;
-    public static final int DEFAULT_VIDEO_BITRATE = 2000000; // 2 Mbps
-    public static final int DEFAULT_VIDEO_FPS = 30;
+    public static final int DEFAULT_VIDEO_WIDTH = 960;
+    public static final int DEFAULT_VIDEO_HEIGHT = 540;
+    public static final int DEFAULT_VIDEO_BITRATE = 1000000; // 1 Mbps
+    public static final int DEFAULT_VIDEO_FPS = 15;
 
     public static final int DEFAULT_AUDIO_BITRATE = 64000; // 64 kbps
     public static final int DEFAULT_AUDIO_SAMPLE_RATE = 44100;

asg_client/app/src/main/java/com/mentra/asg_client/io/streaming/config/WhipStreamConfig.java

@@ -0,0 +1,126 @@
+package com.mentra.asg_client.io.streaming.config;
+
+import org.json.JSONObject;
+
+/**
+ * Configuration class for WebRTC / WHIP streaming parameters.
+ */
+public class WhipStreamConfig {
+
+  public static final int DEFAULT_VIDEO_WIDTH = 960;
+  public static final int DEFAULT_VIDEO_HEIGHT = 540;
+  public static final int DEFAULT_VIDEO_FPS = 15;
+  public static final int DEFAULT_VIDEO_BITRATE = 1000000; // 1 Mbps
+
+  public static final boolean DEFAULT_ECHO_CANCELLATION = false;
+  public static final boolean DEFAULT_NOISE_SUPPRESSION = false;
+
+  public static final String DEFAULT_STUN_SERVER = "stun:stun.cloudflare.com:3478";
+
+  private int videoWidth = DEFAULT_VIDEO_WIDTH;
+  private int videoHeight = DEFAULT_VIDEO_HEIGHT;
+  private int videoFps = DEFAULT_VIDEO_FPS;
+  private int videoBitrate = DEFAULT_VIDEO_BITRATE;
+
+  private boolean echoCancellation = DEFAULT_ECHO_CANCELLATION;
+  private boolean noiseSuppression = DEFAULT_NOISE_SUPPRESSION;
+
+  private String stunServer = DEFAULT_STUN_SERVER;
+
+  public WhipStreamConfig() {
+  }
+
+  /**
+   * Parse video and audio config from JSON objects sent by the SDK.
+   * Supports both full key names and compact keys for MTU-constrained messages:
+   *   Full: { width, height, bitrate, frameRate } / { echoCancellation, noiseSuppression }
+   *   Compact: { w, h, br, fr } / { ec, ns }
+   */
+  public static WhipStreamConfig fromJson(JSONObject videoJson, JSONObject audioJson) {
+    WhipStreamConfig config = new WhipStreamConfig();
+
+    if (videoJson != null) {
+      config.videoWidth = clamp(optIntWithFallback(videoJson, "width", "w", DEFAULT_VIDEO_WIDTH), 320, 1920);
+      config.videoHeight = clamp(optIntWithFallback(videoJson, "height", "h", DEFAULT_VIDEO_HEIGHT), 240, 1080);
+      config.videoBitrate = clamp(optIntWithFallback(videoJson, "bitrate", "br", DEFAULT_VIDEO_BITRATE), 100000, 10000000);
+      config.videoFps = clamp(optIntWithFallback(videoJson, "frameRate", "fr", DEFAULT_VIDEO_FPS), 10, 60);
+    }
+
+    if (audioJson != null) {
+      config.echoCancellation = optBoolWithFallback(audioJson, "echoCancellation", "ec", DEFAULT_ECHO_CANCELLATION);
+      config.noiseSuppression = optBoolWithFallback(audioJson, "noiseSuppression", "ns", DEFAULT_NOISE_SUPPRESSION);
+    }
+
+    return config;
+  }
+
+  private static int optIntWithFallback(JSONObject json, String fullKey, String compactKey, int defaultValue) {
+    if (json.has(fullKey)) return json.optInt(fullKey, defaultValue);
+    return json.optInt(compactKey, defaultValue);
+  }
+
+  private static boolean optBoolWithFallback(JSONObject json, String fullKey, String compactKey, boolean defaultValue) {
+    if (json.has(fullKey)) return json.optBoolean(fullKey, defaultValue);
+    return json.optBoolean(compactKey, defaultValue);
+  }
+
+  private static int clamp(int value, int min, int max) {
+    return Math.max(min, Math.min(max, value));
+  }
+
+  // Getters
+  public int getVideoWidth() { return videoWidth; }
+  public int getVideoHeight() { return videoHeight; }
+  public int getVideoFps() { return videoFps; }
+  public int getVideoBitrate() { return videoBitrate; }
+  public boolean isEchoCancellation() { return echoCancellation; }
+  public boolean isNoiseSuppression() { return noiseSuppression; }
+  public String getStunServer() { return stunServer; }
+
+  // Setters with validation (fluent API)
+  public WhipStreamConfig setVideoWidth(int width) {
+    this.videoWidth = clamp(width, 320, 1920);
+    return this;
+  }
+
+  public WhipStreamConfig setVideoHeight(int height) {
+    this.videoHeight = clamp(height, 240, 1080);
+    return this;
+  }
+
+  public WhipStreamConfig setVideoFps(int fps) {
+    this.videoFps = clamp(fps, 10, 60);
+    return this;
+  }
+
+  public WhipStreamConfig setVideoBitrate(int bitrate) {
+    this.videoBitrate = clamp(bitrate, 100000, 10000000);
+    return this;
+  }
+
+  public WhipStreamConfig setEchoCancellation(boolean enabled) {
+    this.echoCancellation = enabled;
+    return this;
+  }
+
+  public WhipStreamConfig setNoiseSuppression(boolean enabled) {
+    this.noiseSuppression = enabled;
+    return this;
+  }
+
+  public WhipStreamConfig setStunServer(String stunServer) {
+    this.stunServer = stunServer;
+    return this;
+  }
+
+  @Override
+  public String toString() {
+    return "WhipStreamConfig{"
+        + "video=" + videoWidth + "x" + videoHeight + "@" + videoFps + "fps, "
+        + (videoBitrate / 1000) + "kbps"
+        + ", echo=" + echoCancellation
+        + ", noise=" + noiseSuppression
+        + ", stun=" + stunServer
+        + '}';
+  }
+}

asg_client/app/src/main/java/com/mentra/asg_client/io/streaming/interfaces/StreamingStatusCallback.java

@@ -2,57 +2,66 @@
 
 /**
  * Callback interface for receiving streaming status updates.
- * Extracted from RtmpStreamingService for better separation of concerns.
+ * Each method receives the streamId from the service that fired the event,
+ * so the caller doesn't need to look up the active stream globally.
  */
 public interface StreamingStatusCallback {
-    
+
     /**
      * Called when streaming is starting (connecting)
      *
      * @param streamingUrl The URL being connected to
+     * @param streamId     The stream ID assigned by the cloud, or null if not yet assigned
      */
-    void onStreamStarting(String streamingUrl);
+    void onStreamStarting(String streamingUrl, String streamId);
 
     /**
      * Called when streaming has started successfully
      *
      * @param streamingUrl The URL connected to
+     * @param streamId     The stream ID assigned by the cloud, or null if not yet assigned
      */
-    void onStreamStarted(String streamingUrl);
+    void onStreamStarted(String streamingUrl, String streamId);
 
     /**
      * Called when streaming has stopped
+     *
+     * @param streamId The stream ID of the stopped stream, or null
      */
-    void onStreamStopped();
+    void onStreamStopped(String streamId);
 
     /**
      * Called when a connection is lost and reconnection is being attempted
      *
      * @param attempt     Current reconnection attempt number
      * @param maxAttempts Maximum number of attempts that will be made
      * @param reason      Reason for reconnection
+     * @param streamId    The stream ID, or null
      */
-    void onReconnecting(int attempt, int maxAttempts, String reason);
+    void onReconnecting(int attempt, int maxAttempts, String reason, String streamId);
 
     /**
      * Called when reconnection was successful
      *
      * @param streamingUrl The URL reconnected to
      * @param attempt      The attempt number that succeeded
+     * @param streamId     The stream ID, or null
      */
-    void onReconnected(String streamingUrl, int attempt);
+    void onReconnected(String streamingUrl, int attempt, String streamId);
 
     /**
      * Called when all reconnection attempts have failed
      *
      * @param maxAttempts The maximum number of attempts that were made
+     * @param streamId    The stream ID, or null
      */
-    void onReconnectFailed(int maxAttempts);
+    void onReconnectFailed(int maxAttempts, String streamId);
 
     /**
      * Called when a streaming error occurs
      *
-     * @param error Error message
+     * @param error    Error message
+     * @param streamId The stream ID, or null
      */
-    void onStreamError(String error);
-} 
+    void onStreamError(String error, String streamId);
+}