Adjustments for BUNDLE group

Author: mickel8

lib/ex_webrtc/peer_connection.ex

@@ -320,11 +320,7 @@ defmodule ExWebRTC.PeerConnection do
 
     {transceivers, mlines} = generate_offer_mlines(state, opts)
 
-    mids =
-      Enum.map(mlines, fn mline ->
-        {:mid, mid} = ExSDP.get_attribute(mline, :mid)
-        mid
-      end)
+    mids = SDPUtils.get_bundle_mids(mlines)
 
     offer =
       offer
@@ -379,11 +375,7 @@ defmodule ExWebRTC.PeerConnection do
         RTPTransceiver.to_answer_mline(transceiver, mline, opts)
       end)
 
-    mids =
-      Enum.map(mlines, fn mline ->
-        {:mid, mid} = ExSDP.get_attribute(mline, :mid)
-        mid
-      end)
+    mids = SDPUtils.get_bundle_mids(mlines)
 
     answer =
       answer

lib/ex_webrtc/sdp_utils.ex

@@ -1,21 +1,14 @@
 defmodule ExWebRTC.SDPUtils do
   @moduledoc false
 
+  alias ExWebRTC.SDPUtils
   alias ExRTP.Packet.Extension
   alias ExSDP.Attribute.Extmap
 
   alias ExWebRTC.RTPCodecParameters
 
   @type extension() :: {Extension.SourceDescription, atom()}
 
-  @spec get_media_direction(ExSDP.Media.t()) ::
-          :sendrecv | :sendonly | :recvonly | :inactive | nil
-  def get_media_direction(media) do
-    Enum.find(media.attributes, fn attr ->
-      attr in [:sendrecv, :sendonly, :recvonly, :inactive]
-    end)
-  end
-
   @spec ensure_mid(ExSDP.t()) :: :ok | {:error, :missing_mid | :duplicated_mid}
   def ensure_mid(sdp) do
     sdp.media
@@ -42,11 +35,7 @@ defmodule ExWebRTC.SDPUtils do
   def ensure_bundle(sdp) do
     groups = ExSDP.get_attributes(sdp, ExSDP.Attribute.Group)
 
-    mline_mids =
-      Enum.map(sdp.media, fn media ->
-        {:mid, mid} = ExSDP.get_attribute(media, :mid)
-        mid
-      end)
+    mline_mids = get_bundle_mids(sdp.media)
 
     case filter_groups(groups, "BUNDLE") do
       [%ExSDP.Attribute.Group{semantics: "BUNDLE", mids: group_mids}] ->
@@ -78,6 +67,26 @@ defmodule ExWebRTC.SDPUtils do
     end
   end
 
+  @spec get_media_direction(ExSDP.Media.t()) ::
+          :sendrecv | :sendonly | :recvonly | :inactive | nil
+  def get_media_direction(media) do
+    Enum.find(media.attributes, fn attr ->
+      attr in [:sendrecv, :sendonly, :recvonly, :inactive]
+    end)
+  end
+
+  @spec get_bundle_mids([ExSDP.Media.t()]) :: [String.t()]
+  def get_bundle_mids(mlines) do
+    # rejected m-lines are not included in the BUNDLE group
+    Enum.map(mlines, fn mline ->
+      unless SDPUtils.rejected?(mline) do
+        {:mid, mid} = ExSDP.get_attribute(mline, :mid)
+        mid
+      end
+    end)
+    |> Enum.reject(&(&1 == nil))
+  end
+
   @spec get_ice_credentials(ExSDP.t()) ::
           {:ok, {binary(), binary()}}
           | {:error,
@@ -129,9 +138,21 @@ defmodule ExWebRTC.SDPUtils do
 
   @spec add_ice_candidates(ExSDP.t(), [String.t()]) :: ExSDP.t()
   def add_ice_candidates(sdp, candidates) do
+    # we only add candidates to the first mline
+    # as we don't support bundle-policies other than "max-bundle"
     candidates = Enum.map(candidates, &{"candidate", &1})
-    media = Enum.map(sdp.media, &ExSDP.add_attributes(&1, candidates))
-    %ExSDP{sdp | media: media}
+
+    if sdp.media != [] do
+      mline =
+        sdp.media
+        |> List.first()
+        |> ExSDP.add_attributes(candidates)
+
+      media = List.replace_at(sdp.media, 0, mline)
+      %ExSDP{sdp | media: media}
+    else
+      sdp
+    end
   end
 
   @spec get_dtls_role(ExSDP.t()) ::
@@ -284,7 +305,13 @@ defmodule ExWebRTC.SDPUtils do
   end
 
   @spec rejected?(ExSDP.Media.t()) :: boolean()
-  def rejected?(%ExSDP.Media{port: 0}), do: true
+  def rejected?(%ExSDP.Media{port: 0} = media) do
+    # An m-line is only rejected when its port is set to 0,
+    # and there is no `bundle-only` attribute.
+    # See RFC 8843, sec. 6.
+    "bundle-only" not in media.attributes
+  end
+
   def rejected?(%ExSDP.Media{}), do: false
 
   defp do_get_ice_credentials(sdp_or_mline) do

test/ex_webrtc/peer_connection_test.exs

@@ -276,7 +276,12 @@ defmodule ExWebRTC.PeerConnectionTest do
     test "BUNDLE group" do
       {:ok, pc} = PeerConnection.start_link()
 
-      sdp = ExSDP.add_media(ExSDP.new(), [@audio_mline, @video_mline])
+      rejected_mline =
+        %ExSDP.Media{@audio_mline | port: 0}
+        |> ExSDP.delete_attribute(:mid)
+        |> ExSDP.add_attribute({:mid, "2"})
+
+      sdp = ExSDP.add_media(ExSDP.new(), [@audio_mline, @video_mline, rejected_mline])
 
       [
         {[], {:error, :missing_bundle_group}},

test/ex_webrtc/sdp_utils_test.exs

@@ -9,5 +9,11 @@ defmodule ExWebRTC.SDPUtilsTest do
 
     mline = ExSDP.Media.new(:audio, 9, "UDP/TLS/RTP/SAVPF", [8])
     assert false == SDPUtils.rejected?(mline)
+
+    mline =
+      ExSDP.Media.new(:audio, 0, "UDP/TLS/RTP/SAVPF", [8])
+      |> ExSDP.add_attribute("bundle-only")
+
+    assert false == SDPUtils.rejected?(mline)
   end
 end