Add sdp m line index to ICE Candidates

src/components/ha-web-rtc-player.ts

@@ -54,7 +54,7 @@ class HaWebRtcPlayer extends LitElement {
 
   private _sessionId?: string;
 
-  private _candidatesList: string[] = [];
+  private _candidatesList: RTCIceCandidate[] = [];
 
   protected override render(): TemplateResult {
     if (this._error) {
@@ -248,11 +248,13 @@ class HaWebRtcPlayer extends LitElement {
     if (event.type === "session") {
       this._sessionId = event.session_id;
       this._candidatesList.forEach((candidate) =>
+        // sdpMLineIndex is always populated
         addWebRtcCandidate(
           this.hass,
           this.entityid!,
           event.session_id,
-          candidate
+          candidate.candidate,
+          candidate?.sdpMLineIndex || 0
         )
       );
       this._candidatesList = [];
@@ -267,7 +269,10 @@ class HaWebRtcPlayer extends LitElement {
 
       try {
         await this._peerConnection?.addIceCandidate(
-          new RTCIceCandidate({ candidate: event.candidate, sdpMid: "0" })
+          new RTCIceCandidate({
+            candidate: event.candidate,
+            sdpMLineIndex: event.sdp_m_line_index,
+          })
         );
       } catch (err: any) {
         // eslint-disable-next-line no-console
@@ -285,17 +290,24 @@ class HaWebRtcPlayer extends LitElement {
       return;
     }
 
-    this._logEvent("local ice candidate", event.candidate?.candidate);
+    this._logEvent(
+      "local ice candidate",
+      event.candidate?.candidate,
+      event.candidate?.sdpMLineIndex
+    );
 
     if (this._sessionId) {
+      // sdpMLineIndex is always populated
+      const sdpMLineIndex = event.candidate?.sdpMLineIndex || 0;
       addWebRtcCandidate(
         this.hass,
         this.entityid,
         this._sessionId,
-        event.candidate?.candidate
+        event.candidate?.candidate,
+        sdpMLineIndex
       );
     } else {
-      this._candidatesList.push(event.candidate?.candidate);
+      this._candidatesList.push(event.candidate);
     }
   };
 

src/data/camera.ts

@@ -60,6 +60,7 @@ export interface WebRtcAnswer {
 export interface WebRtcCandidate {
   type: "candidate";
   candidate: string;
+  sdp_m_line_index: number;
 }
 
 export interface WebRtcError {
@@ -139,13 +140,15 @@ export const addWebRtcCandidate = (
   hass: HomeAssistant,
   entity_id: string,
   session_id: string,
-  candidate: string
+  candidate: string,
+  sdpMLineIndex: number
 ) =>
   hass.callWS({
     type: "camera/webrtc/candidate",
     entity_id,
     session_id,
-    candidate,
+    candidate: candidate,
+    sdp_m_line_index: sdpMLineIndex,
   });
 
 export const fetchCameraPrefs = (hass: HomeAssistant, entityId: string) =>