[All] Update ex_webrtc to 0.3.0. Update deps. (#19)

Author: mickel8

broadcaster/lib/broadcaster/forwarder.ex

@@ -97,7 +97,7 @@ defmodule Broadcaster.Forwarder do
 
   @impl true
   def handle_info(
-        {:ex_webrtc, input_pc, {:rtp, id, packet}},
+        {:ex_webrtc, input_pc, {:rtp, id, nil, packet}},
         %{input_pc: input_pc, audio_input: id} = state
       ) do
     for {pc, %{audio: track_id}} <- state.outputs do
@@ -109,7 +109,7 @@ defmodule Broadcaster.Forwarder do
 
   @impl true
   def handle_info(
-        {:ex_webrtc, input_pc, {:rtp, id, packet}},
+        {:ex_webrtc, input_pc, {:rtp, id, nil, packet}},
         %{input_pc: input_pc, video_input: id} = state
       ) do
     for {pc, %{video: track_id}} <- state.outputs do

broadcaster/lib/broadcaster/peer_supervisor.ex

@@ -18,14 +18,7 @@ defmodule Broadcaster.PeerSupervisor do
     %RTPCodecParameters{
       payload_type: 96,
       mime_type: "video/H264",
-      clock_rate: 90_000,
-      rtcp_fbs: [%ExSDP.Attribute.RTCPFeedback{pt: 96, feedback_type: :nack}]
-    },
-    %RTPCodecParameters{
-      payload_type: 97,
-      mime_type: "video/rtx",
-      clock_rate: 90_000,
-      sdp_fmtp_line: %ExSDP.Attribute.FMTP{pt: 97, apt: 96}
+      clock_rate: 90_000
     }
   ]
 
@@ -87,8 +80,13 @@ defmodule Broadcaster.PeerSupervisor do
 
   defp setup_transceivers(pc, direction) do
     if direction == :sendonly do
-      {:ok, _sender} = PeerConnection.add_track(pc, MediaStreamTrack.new(:audio))
-      {:ok, _sender} = PeerConnection.add_track(pc, MediaStreamTrack.new(:video))
+      media_stream_id = MediaStreamTrack.generate_stream_id()
+
+      {:ok, _sender} =
+        PeerConnection.add_track(pc, MediaStreamTrack.new(:audio, [media_stream_id]))
+
+      {:ok, _sender} =
+        PeerConnection.add_track(pc, MediaStreamTrack.new(:video, [media_stream_id]))
     end
 
     transceivers = PeerConnection.get_transceivers(pc)

broadcaster/mix.exs

@@ -52,8 +52,8 @@ defmodule Broadcaster.MixProject do
       {:jason, "~> 1.2"},
       {:dns_cluster, "~> 0.1.1"},
       {:bandit, "~> 1.2"},
-      {:ex_webrtc, "~> 0.2.0"},
-      {:ex_webrtc_dashboard, "~> 0.2.0"}
+      {:ex_webrtc, "~> 0.3.0"},
+      {:ex_webrtc_dashboard, "~> 0.3.0"}
     ]
   end
 

broadcaster/mix.lock

@@ -3,12 +3,20 @@ defmodule Reco.Room do
 
   require Logger
 
-  alias ExWebRTC.{ICECandidate, PeerConnection, SessionDescription}
-  alias ExWebRTC.RTP.VP8Depayloader
+  alias ExWebRTC.{ICECandidate, PeerConnection, RTPCodecParameters, SessionDescription}
+  alias ExWebRTC.RTP.VP8.Depayloader
 
   @max_session_time_s Application.compile_env!(:reco, :max_session_time_s)
   @session_time_timer_interval_ms 1_000
 
+  @video_codecs [
+    %RTPCodecParameters{
+      payload_type: 96,
+      mime_type: "video/VP8",
+      clock_rate: 90_000
+    }
+  ]
+
   defp id(room_id), do: {:via, Registry, {Reco.RoomRegistry, room_id}}
 
   def start_link(room_id) do
@@ -39,7 +47,7 @@ defmodule Reco.Room do
        channel: nil,
        task: nil,
        video_track: nil,
-       video_depayloader: VP8Depayloader.new(),
+       video_depayloader: Depayloader.new(),
        video_decoder: Xav.Decoder.new(:vp8),
        audio_track: nil,
        session_start_time: System.monotonic_time(:millisecond)
@@ -49,7 +57,7 @@ defmodule Reco.Room do
   @impl true
   def handle_call({:connect, channel_pid}, _from, %{channel: nil} = state) do
     Process.monitor(channel_pid)
-    {:ok, pc} = PeerConnection.start_link()
+    {:ok, pc} = PeerConnection.start_link(video_codecs: @video_codecs)
 
     state =
       state
@@ -110,10 +118,10 @@ defmodule Reco.Room do
   end
 
   @impl true
-  def handle_info({:ex_webrtc, _pc, {:rtp, track_id, packet}}, state) do
+  def handle_info({:ex_webrtc, _pc, {:rtp, track_id, nil, packet}}, state) do
     cond do
       state.video_track.id == track_id ->
-        case VP8Depayloader.write(state.video_depayloader, packet) do
+        case Depayloader.write(state.video_depayloader, packet) do
           {:ok, d} ->
             state = %{state | video_depayloader: d}
             {:noreply, state}

reco/lib/reco/room.ex

@@ -46,9 +46,9 @@ defmodule Reco.MixProject do
       {:jason, "~> 1.2"},
       {:dns_cluster, "~> 0.1.1"},
       {:plug_cowboy, "~> 2.5"},
-      {:ex_webrtc, "~> 0.2.0"},
-      {:ex_webrtc_dashboard, "~> 0.2.0"},
-      {:xav, "~> 0.2.0"},
+      {:ex_webrtc, "~> 0.3.0"},
+      {:ex_webrtc_dashboard, "~> 0.3.0"},
+      {:xav, "~> 0.3.0"},
       {:bumblebee, "~> 0.4.2"},
       {:exla, "~> 0.5"}
     ]