Remove RTP extensions on removing SessionBin's output pad (#154)

Author: mickel8

README.md

@@ -15,7 +15,7 @@ The package can be installed by adding `membrane_rtp_plugin` to your list of dep
 ```elixir
 def deps do
   [
-    {:membrane_rtp_plugin, "~> 0.23.0"},
+    {:membrane_rtp_plugin, "~> 0.23.1"},
     {:ex_libsrtp, "~> 0.6.0"} # required only if SRTP/SRTCP support is needed
   ]
 end

lib/membrane/rtcp/parser.ex

@@ -45,7 +45,7 @@ defmodule Membrane.RTCP.Parser do
         {actions, state}
 
       {:error, reason} ->
-        Membrane.Logger.warn("""
+        Membrane.Logger.warning("""
         Couldn't parse rtcp packet:
         #{inspect(payload, limit: :infinity)}
         Reason: #{inspect(reason)}. Ignoring packet.
@@ -133,7 +133,7 @@ defmodule Membrane.RTCP.Parser do
   end
 
   defp process_rtcp(unknown_packet, metadata) do
-    Membrane.Logger.warn("""
+    Membrane.Logger.warning("""
     Unhandled RTCP packet
     #{inspect(unknown_packet, pretty: true, limit: :infinity)}
     #{inspect(metadata, pretty: true)}

lib/membrane/rtp/inbound_packet_tracker.ex

@@ -82,7 +82,7 @@ defmodule Membrane.RTP.InboundPacketTracker do
     if abs(delta) > @max_diff do
       # The gap is too big, we consider this packet to be malformed
       # Ignore it
-      Membrane.Logger.warn(
+      Membrane.Logger.warning(
         "Dropping packet #{seq_num} with big sequence number difference (#{delta})"
       )
 

lib/membrane/rtp/rtx_parser.ex

@@ -79,7 +79,7 @@ defmodule Membrane.RTP.RTXParser do
   def handle_process(:input, %Buffer{payload: payload, metadata: metadata}, _ctx, state) do
     # Ignore empty buffers, most likely used for bandwidth estimation
     if byte_size(payload) > 0 do
-      Membrane.Logger.warn(
+      Membrane.Logger.warning(
         "Received invalid RTX buffer with sequence_number #{metadata.rtp.sequence_number}"
       )
     end

lib/membrane/rtp/session_bin.ex

@@ -609,16 +609,9 @@ defmodule Membrane.RTP.SessionBin do
     state = %{state | ssrcs: Map.delete(state.ssrcs, ssrc)}
 
     to_remove =
-      [
-        :rtx_funnel,
-        :rtx,
-        :rtx_decryptor,
-        :stream_receive_bin
-      ]
-      |> Enum.map(&{&1, ssrc})
-      |> Enum.filter(fn name ->
-        child = Map.get(ctx.children, name)
-        child && not child.terminating?
+      Enum.flat_map(ctx.children, fn
+        {{name, ^ssrc}, %{terminating?: false}} -> [{name, ssrc}]
+        _other -> []
       end)
 
     {[remove_child: to_remove], state}

lib/membrane/srtcp/decryptor.ex

@@ -79,7 +79,7 @@ if Code.ensure_loaded?(ExLibSRTP) do
 
     @impl true
     def handle_event(_pad, %SRTP.KeyingMaterialEvent{}, _ctx, state) do
-      Membrane.Logger.warn("Got unexpected SRTP.KeyingMaterialEvent. Ignoring.")
+      Membrane.Logger.warning("Got unexpected SRTP.KeyingMaterialEvent. Ignoring.")
       {[], state}
     end
 

lib/membrane/srtp/decryptor.ex

@@ -73,7 +73,7 @@ if Code.ensure_loaded?(ExLibSRTP) do
 
     @impl true
     def handle_event(_pad, %SRTP.KeyingMaterialEvent{}, _ctx, state) do
-      Membrane.Logger.warn("Got unexpected SRTP.KeyingMaterialEvent. Ignoring.")
+      Membrane.Logger.warning("Got unexpected SRTP.KeyingMaterialEvent. Ignoring.")
       {[], state}
     end
 

lib/membrane/srtp/encryptor.ex

@@ -89,7 +89,7 @@ if Code.ensure_loaded?(ExLibSRTP) do
 
     @impl true
     def handle_event(_pad, %SRTP.KeyingMaterialEvent{}, _ctx, state) do
-      Membrane.Logger.warn("Got unexpected SRTP.KeyingMaterialEvent. Ignoring.")
+      Membrane.Logger.warning("Got unexpected SRTP.KeyingMaterialEvent. Ignoring.")
       {[], state}
     end
 
@@ -124,7 +124,7 @@ if Code.ensure_loaded?(ExLibSRTP) do
           raise "Failed to protect #{inspect(packet_type)} due to unhandled error #{reason}"
 
         {:error, reason} ->
-          Membrane.Logger.warn("Ignoring #{inspect(packet_type)} packet due to `#{reason}`")
+          Membrane.Logger.warning("Ignoring #{inspect(packet_type)} packet due to `#{reason}`")
           []
       end
     end

mix.exs

@@ -1,7 +1,7 @@
 defmodule Membrane.RTP.Plugin.MixProject do
   use Mix.Project
 
-  @version "0.23.0"
+  @version "0.23.1"
   @github_url "https://github.com/membraneframework/membrane_rtp_plugin"
 
   def project do