Minor fixes - add rid to the on_packet callback, don't duplicate streams_info timer, only create player pc when there is at least one publisher track

Author: mickel8

lib/live_ex_webrtc/player.ex

@@ -99,7 +99,7 @@ defmodule LiveExWebRTC.Player do
             munger: nil,
             layer: nil,
             target_layer: nil,
-            video_layers: [{"h", "high"}],
+            video_layers: [],
             # codec that will be used for video sending
             video_send_codec: nil
 
@@ -253,7 +253,6 @@ defmodule LiveExWebRTC.Player do
       socket =
         receive do
           {^ref, %Player{publisher_id: ^pub_id} = player} ->
-            player = %Player{player | layer: "h", target_layer: "h"}
             PubSub.subscribe(player.pubsub, "streams:info:#{player.publisher_id}")
             assign(socket, player: player, display_settings: "hidden")
         after
@@ -267,7 +266,10 @@ defmodule LiveExWebRTC.Player do
   end
 
   @impl true
-  def handle_info({:ex_webrtc, _pid, {:connection_state_change, :connected}}, socket) do
+  def handle_info(
+        {:ex_webrtc, pc, {:connection_state_change, :connected}},
+        %{assigns: %{player: %{pc: pc}}} = socket
+      ) do
     %{player: player} = socket.assigns
 
     # subscribe only if we managed to negotiate tracks
@@ -323,6 +325,8 @@ defmodule LiveExWebRTC.Player do
         publisher_video_track: old_publisher_video_track,
         video_layers: old_layers
       } ->
+        if player.pc, do: PeerConnection.close(player.pc)
+
         video_layers = (publisher_video_track && publisher_video_track.rids) || ["h"]
 
         video_layers =
@@ -336,6 +340,7 @@ defmodule LiveExWebRTC.Player do
           player
           | publisher_audio_track: publisher_audio_track,
             publisher_video_track: publisher_video_track,
+            pc: nil,
             layer: "h",
             target_layer: "h",
             video_layers: video_layers,
@@ -358,8 +363,12 @@ defmodule LiveExWebRTC.Player do
           end)
         end
 
-        socket = push_event(socket, "connect-#{player.id}", %{})
-        {:noreply, socket}
+        if publisher_audio_track != nil or publisher_video_track != nil do
+          socket = push_event(socket, "connect-#{player.id}", %{})
+          {:noreply, socket}
+        else
+          {:noreply, socket}
+        end
     end
   end
 
@@ -456,16 +465,16 @@ defmodule LiveExWebRTC.Player do
     audio_tr = Enum.find(transceivers, fn tr -> tr.sender.id == audio_sender.id end)
 
     # check if tracks were negotiated successfully
-    video_negotiated? = video_tr && video_tr.direction == :sendrecv
-    audio_negotiated? = audio_tr && audio_tr.direction == :sendrecv
+    video_negotiated? = video_tr && video_tr.current_direction not in [:recvonly, :inactive]
+    audio_negotiated? = audio_tr && audio_tr.current_direction not in [:recvonly, :inactive]
 
     new_player = %Player{
       player
       | pc: pc,
         audio_track_id: audio_negotiated? && audio_track.id,
         video_track_id: video_negotiated? && video_track.id,
         munger: video_negotiated? && Munger.new(List.first(video_tr.codecs)),
-        video_send_codec: List.first(video_tr.codecs)
+        video_send_codec: video_negotiated? && List.first(video_tr.codecs)
     }
 
     {:noreply,

lib/live_ex_webrtc/publisher.ex

@@ -22,7 +22,8 @@ defmodule LiveExWebRTC.Publisher do
   * `streams:audio:#{publisher_id}:#{audio_track_id}` - for receiving audio packets
   * `streams:video:#{publisher_id}:#{video_track_id}:#{layer}` - for receiving video packets.
   The message is in form of `{:live_ex_webrtc, :video, "l" | "m" | "h", ExRTP.Packet.t()}` or
-  `{:live_ex_webrtc, :audio, ExRTP.Packet.t()}`
+  `{:live_ex_webrtc, :audio, ExRTP.Packet.t()}`. Packets for non-simulcast video tracks are always
+  sent with "h" identifier.
   * `streams:info:#{publisher.id}"` - for receiving information about publisher tracks and their layers.
   The message is in form of: `{:live_ex_webrtc, :info, audio_track :: ExWebRTC.MediaStreamTrack.t(), video_track :: ExWebRTC.MediaStreamTrack.t()}`.
   * `publishers:#{publisher_id}` for sending keyframe request.
@@ -126,6 +127,7 @@ defmodule LiveExWebRTC.Publisher do
   @type on_packet ::
           (publisher_id :: String.t(),
            packet_type :: :audio | :video,
+           layer :: nil | "l" | "m" | "h",
            packet :: ExRTP.Packet.t(),
            socket :: Phoenix.LiveView.Socket.t() ->
              packet :: ExRTP.Packet.t())
@@ -510,6 +512,7 @@ defmodule LiveExWebRTC.Publisher do
       socket =
         receive do
           {^ref, %Publisher{id: ^pub_id} = publisher} ->
+            Process.send_after(self(), :streams_info, 1000)
             codecs = publisher.video_codecs || PeerConnection.Configuration.default_video_codecs()
             publisher = %Publisher{publisher | simulcast_supported?: simulcast_supported?(codecs)}
             assign(socket, publisher: publisher)
@@ -548,15 +551,15 @@ defmodule LiveExWebRTC.Publisher do
   def handle_info({:ex_webrtc, _pc, {:rtp, track_id, rid, packet}}, socket) do
     %{publisher: publisher} = socket.assigns
 
-    kind =
+    {kind, rid} =
       case publisher do
-        %Publisher{video_track: %{id: ^track_id}} -> :video
-        %Publisher{audio_track: %{id: ^track_id}} -> :audio
+        %Publisher{video_track: %{id: ^track_id}} -> {:video, rid || "h"}
+        %Publisher{audio_track: %{id: ^track_id}} -> {:audio, nil}
       end
 
     packet =
       if publisher.on_packet,
-        do: publisher.on_packet.(publisher.id, kind, packet, socket),
+        do: publisher.on_packet.(publisher.id, kind, rid, packet, socket),
         else: packet
 
     if publisher.record?, do: Recorder.record(publisher.recorder, track_id, nil, packet)
@@ -565,7 +568,7 @@ defmodule LiveExWebRTC.Publisher do
       case kind do
         :audio -> {"", {:live_ex_webrtc, kind, packet}}
         # for non simulcast tracks, push everything with "h" identifier
-        :video -> {":#{rid || "h"}", {:live_ex_webrtc, kind, rid || "h", packet}}
+        :video -> {":#{rid}", {:live_ex_webrtc, kind, rid, packet}}
       end
 
     PubSub.broadcast(publisher.pubsub, "streams:#{kind}:#{publisher.id}:#{track_id}#{layer}", msg)
@@ -681,8 +684,6 @@ defmodule LiveExWebRTC.Publisher do
         video_track: video_track
     }
 
-    Process.send_after(self(), :streams_info, 1_000)
-
     {:noreply,
      socket
      |> assign(publisher: new_publisher)