Add both H264 packetization modes in default codecs

Author: sgfn

lib/ex_webrtc/peer_connection/configuration.ex

@@ -27,29 +27,7 @@ defmodule ExWebRTC.PeerConnection.Configuration do
     clock_rate: 90_000
   }
 
-  @default_codec_params_h264 %RTPCodecParameters{
-    payload_type: 99,
-    mime_type: "video/H264",
-    clock_rate: 90_000,
-    sdp_fmtp_line: %FMTP{
-      pt: 99,
-      level_asymmetry_allowed: true,
-      packetization_mode: 1,
-      profile_level_id: 0x42E01F
-    }
-  }
-
-  @default_codec_params_av1 %RTPCodecParameters{
-    payload_type: 45,
-    mime_type: "video/AV1",
-    clock_rate: 90_000,
-    sdp_fmtp_line: %FMTP{pt: 45, level_idx: 5, profile: 0, tier: 0}
-  }
-
-  @default_audio_codecs [@default_codec_params_opus]
-
-  @default_video_codecs [
-    @default_codec_params_vp8,
+  @default_codec_params_h264 [
     %RTPCodecParameters{
       payload_type: 98,
       mime_type: "video/H264",
@@ -61,10 +39,34 @@ defmodule ExWebRTC.PeerConnection.Configuration do
         profile_level_id: 0x42E01F
       }
     },
-    @default_codec_params_h264,
-    @default_codec_params_av1
+    %RTPCodecParameters{
+      payload_type: 99,
+      mime_type: "video/H264",
+      clock_rate: 90_000,
+      sdp_fmtp_line: %FMTP{
+        pt: 99,
+        level_asymmetry_allowed: true,
+        packetization_mode: 1,
+        profile_level_id: 0x42E01F
+      }
+    }
   ]
 
+  @default_codec_params_av1 %RTPCodecParameters{
+    payload_type: 45,
+    mime_type: "video/AV1",
+    clock_rate: 90_000,
+    sdp_fmtp_line: %FMTP{pt: 45, level_idx: 5, profile: 0, tier: 0}
+  }
+
+  @default_audio_codecs [@default_codec_params_opus]
+  @default_video_codecs [
+                          @default_codec_params_vp8,
+                          @default_codec_params_h264,
+                          @default_codec_params_av1
+                        ]
+                        |> List.flatten()
+
   @typedoc """
   Allowed audio codec names which will get expanded to the relevant default `t:ExWebRTC.RTPCodecParameters.t/0`
   """
@@ -716,7 +718,7 @@ defmodule ExWebRTC.PeerConnection.Configuration do
         options
 
       Enum.all?(codecs, &is_atom/1) ->
-        expanded_codecs = Enum.map(codecs, &expand_default_codec/1)
+        expanded_codecs = codecs |> Enum.map(&expand_default_codec/1) |> List.flatten()
         Keyword.put(options, key, expanded_codecs)
 
       true ->

test/ex_webrtc/peer_connection/configuration_test.exs

@@ -515,11 +515,13 @@ defmodule ExWebRTC.PeerConnection.ConfigurationTest do
 
     assert Configuration.expand_default_codecs(og_options) == og_options
 
-    [video_codecs: [vp8_params, h264_params]] =
+    # 2 packetization_modes for H264
+    [video_codecs: [vp8_params, h264_params_0, h264_params_1]] =
       Configuration.expand_default_codecs(video_codecs: [:vp8, :h264])
 
     assert vp8_params.mime_type == "video/VP8"
-    assert h264_params.mime_type == "video/H264"
+    assert h264_params_0.mime_type == "video/H264"
+    assert h264_params_1.mime_type == "video/H264"
 
     assert_raise RuntimeError, fn -> Configuration.expand_default_codecs(video_codecs: [:av2]) end