Merge pull request #3 from membraneframework/ex_webrtc-0.3

bump elixir webrtc to 0.3

.circleci/config.yml

@@ -10,12 +10,15 @@ workflows:
           filters: &filters
             tags:
               only: /v.*/
+          cache-version: 3
       - elixir/test:
           filters:
             <<: *filters
+          cache-version: 3
       - elixir/lint:
           filters:
             <<: *filters
+          cache-version: 3
       - elixir/hex_publish:
           requires:
             - elixir/build_test
@@ -28,3 +31,5 @@ workflows:
               ignore: /.*/
             tags:
               only: /v.*/
+          cache-version: 3
+

README.md

@@ -15,7 +15,7 @@ The package can be installed by adding `membrane_webrtc_plugin` to your list of
 ```elixir
 def deps do
   [
-    {:membrane_webrtc_plugin, "~> 0.20.0"}
+    {:membrane_webrtc_plugin, "~> 0.21.0"}
   ]
 end
 ```

lib/membrane_webrtc/ex_webrtc/sink.ex

@@ -12,6 +12,8 @@ defmodule Membrane.WebRTC.ExWebRTCSink do
     SessionDescription
   }
 
+  alias ExRTCP.Packet.PayloadFeedback.PLI
+
   alias Membrane.WebRTC.{ExWebRTCUtils, SignalingChannel, SimpleWebSocketServer}
 
   def_options signaling: [], tracks: [], video_codec: [], ice_servers: []
@@ -38,7 +40,8 @@ defmodule Membrane.WebRTC.ExWebRTCSink do
        audio_params: ExWebRTCUtils.codec_params(:opus),
        video_params: ExWebRTCUtils.codec_params(opts.video_codec),
        video_codec: opts.video_codec,
-       ice_servers: opts.ice_servers
+       ice_servers: opts.ice_servers,
+       last_keyframe_request_ts: nil
      }}
   end
 
@@ -133,6 +136,42 @@ defmodule Membrane.WebRTC.ExWebRTCSink do
     raise "Track #{inspect(track_id)} was rejected by the other peer"
   end
 
+  @impl true
+  def handle_info({:ex_webrtc, _from, {:rtcp, rtcp_packets}}, ctx, state) do
+    pli? =
+      rtcp_packets
+      |> Enum.reduce(false, fn
+        %PLI{} = packet, _pli? ->
+          Membrane.Logger.debug("Keyframe request received: #{inspect(packet)}")
+          true
+
+        packet, pli? ->
+          Membrane.Logger.debug_verbose("Ignoring RTCP packet: #{inspect(packet)}")
+          pli?
+      end)
+
+    now = System.os_time(:millisecond) |> Membrane.Time.milliseconds()
+    then = state.last_keyframe_request_ts
+
+    request_keyframe? = pli? and (then == nil or now - then >= Membrane.Time.second())
+    state = if request_keyframe?, do: %{state | last_keyframe_request_ts: now}, else: state
+
+    actions =
+      if request_keyframe? do
+        ctx.pads
+        |> Enum.flat_map(fn {pad_ref, pad_data} ->
+          case pad_data.options.kind do
+            :video -> [event: {pad_ref, %Membrane.KeyframeRequestEvent{}}]
+            :audio -> []
+          end
+        end)
+      else
+        []
+      end
+
+    {actions, state}
+  end
+
   @impl true
   def handle_info({:ex_webrtc, _from, message}, _ctx, state) do
     Membrane.Logger.debug("Ignoring ex_webrtc message: #{inspect(message)}")

lib/membrane_webrtc/ex_webrtc/source.ex

@@ -75,13 +75,36 @@ defmodule Membrane.WebRTC.ExWebRTCSource do
     {[stream_format: {pad, %Membrane.RTP{}}], state}
   end
 
+  @impl true
+  def handle_event(pad, %Membrane.KeyframeRequestEvent{}, _ctx, state) do
+    track_id =
+      state.output_tracks
+      |> Enum.find_value(fn
+        {track_id, {:connected, ^pad}} -> track_id
+        _other -> false
+      end)
+
+    if track_id do
+      Membrane.Logger.debug("Sending PLI on track #{inspect(track_id)}")
+      :ok = PeerConnection.send_pli(state.pc, track_id)
+    end
+
+    {[], state}
+  end
+
+  @impl true
+  def handle_event(pad, event, _ctx, state) do
+    Membrane.Logger.debug("Ignoring event #{inspect(event)} that arrived on pad #{inspect(pad)}")
+    {[], state}
+  end
+
   @impl true
   def handle_info({:ex_webrtc, _from, _msg}, _ctx, %{status: :closed} = state) do
     {[], state}
   end
 
   @impl true
-  def handle_info({:ex_webrtc, _from, {:rtp, id, packet}}, _ctx, state) do
+  def handle_info({:ex_webrtc, _from, {:rtp, id, _rid, packet}}, _ctx, state) do
     buffer = %Membrane.Buffer{
       payload: packet.payload,
       metadata: %{rtp: packet |> Map.from_struct() |> Map.delete(:payload)}

lib/membrane_webrtc/ex_webrtc/utils.ex

@@ -15,41 +15,21 @@ defmodule Membrane.WebRTC.ExWebRTCUtils do
     ]
 
   def codec_params(:h264) do
-    pt = 96
-    rtx_pt = 97
-
     [
       %RTPCodecParameters{
-        payload_type: pt,
+        payload_type: 96,
         mime_type: "video/H264",
-        clock_rate: codec_clock_rate(:h264),
-        rtcp_fbs: [%ExSDP.Attribute.RTCPFeedback{pt: pt, feedback_type: :nack}]
-      },
-      %RTPCodecParameters{
-        payload_type: rtx_pt,
-        mime_type: "video/rtx",
-        clock_rate: codec_clock_rate(:h264),
-        sdp_fmtp_line: %ExSDP.Attribute.FMTP{pt: rtx_pt, apt: pt}
+        clock_rate: codec_clock_rate(:h264)
       }
     ]
   end
 
   def codec_params(:vp8) do
-    pt = 102
-    rtx_pt = 103
-
     [
       %RTPCodecParameters{
-        payload_type: pt,
+        payload_type: 102,
         mime_type: "video/VP8",
-        clock_rate: codec_clock_rate(:vp8),
-        rtcp_fbs: [%ExSDP.Attribute.RTCPFeedback{pt: pt, feedback_type: :nack}]
-      },
-      %RTPCodecParameters{
-        payload_type: rtx_pt,
-        mime_type: "video/rtx",
-        clock_rate: codec_clock_rate(:vp8),
-        sdp_fmtp_line: %ExSDP.Attribute.FMTP{pt: rtx_pt, apt: pt}
+        clock_rate: codec_clock_rate(:vp8)
       }
     ]
   end

mix.exs

@@ -1,7 +1,7 @@
 defmodule Membrane.WebRTC.Plugin.Mixfile do
   use Mix.Project
 
-  @version "0.20.0"
+  @version "0.21.0"
   @github_url "https://github.com/membraneframework/membrane_webrtc_plugin"
 
   def project do
@@ -37,10 +37,10 @@ defmodule Membrane.WebRTC.Plugin.Mixfile do
   defp deps do
     [
       {:membrane_core, "~> 1.0"},
-      {:ex_webrtc, "~> 0.2.0"},
-      {:membrane_rtp_plugin, "~> 0.27.1"},
+      {:ex_webrtc, "~> 0.3.0"},
+      {:membrane_rtp_plugin, "~> 0.29.0"},
       {:membrane_rtp_h264_plugin, "~> 0.19.0"},
-      {:membrane_rtp_vp8_plugin, "~> 0.9.0"},
+      {:membrane_rtp_vp8_plugin, "~> 0.9.1"},
       {:membrane_rtp_opus_plugin, "~> 0.9.0"},
       {:bandit, "~> 1.2"},
       {:websock_adapter, "~> 0.5.0"},