Send update_track_metadata also for pending subscriptions (#237)

fishjam-dev · Mar 3, 2023 · 247a3c3 · 247a3c3
1 parent 93e8ff3
commit 247a3c3
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 9 deletions.
diff --git a/config/prod.exs b/config/prod.exs
@@ -1 +0,0 @@
-

diff --git a/config/test.exs b/config/test.exs
@@ -1 +0,0 @@
-

diff --git a/lib/membrane_rtc_engine/engine.ex b/lib/membrane_rtc_engine/engine.ex
@@ -656,6 +656,7 @@ defmodule Membrane.RTC.Engine do
           state.subscriptions
           |> Map.values()
           |> Enum.flat_map(&Map.values/1)
+          |> then(&(&1 ++ state.pending_subscriptions))
           |> Enum.filter(&(&1.track_id == track_id))
           |> Enum.map(& &1.endpoint_id)
           |> Enum.map(

diff --git a/test/membrane_rtc_engine/engine_test.exs b/test/membrane_rtc_engine/engine_test.exs
@@ -15,6 +15,8 @@ defmodule Membrane.RTC.EngineTest do
 
     Engine.register(pid, self())
 
+    on_exit(fn -> assert :ok = Engine.terminate(pid, blocking?: true) end)
+
     [rtc_engine: pid]
   end
 

diff --git a/test/membrane_rtc_engine/hls_endpoint_test.exs b/test/membrane_rtc_engine/hls_endpoint_test.exs
@@ -39,6 +39,7 @@ defmodule Membrane.RTC.HLSEndpointTest do
   describe "HLS Endpoint test" do
     @describetag :tmp_dir
 
+    # FIXME: Test prints logs informing of parent crashing (HLS Endpoint)
     test "creates correct hls stream from single (h264) input", %{
       rtc_engine: rtc_engine,
       tmp_dir: tmp_dir

diff --git a/test/membrane_rtc_engine/tee_test.exs b/test/membrane_rtc_engine/tee_test.exs
@@ -62,7 +62,7 @@ defmodule Membrane.RTC.Engine.TeeTest do
     refute_sink_event(pipeline, :other_sink, %TrackVariantResumed{variant: :high}, 0)
     refute_sink_event(pipeline, :other_sink, %TrackVariantResumed{variant: :medium}, 0)
 
-    Pipeline.terminate(pipeline, blocking?: true)
+    :ok = Pipeline.terminate(pipeline, blocking?: true)
   end
 
   test "Tee forwards TrackVariantPaused" do
@@ -81,7 +81,7 @@ defmodule Membrane.RTC.Engine.TeeTest do
     refute_sink_event(pipeline, :sink, %TrackVariantPaused{variant: :high})
     refute_sink_event(pipeline, :sink, %TrackVariantPaused{variant: :medium}, 0)
 
-    Pipeline.terminate(pipeline, blocking?: true)
+    :ok = Pipeline.terminate(pipeline, blocking?: true)
   end
 
   test "Tee generates KeyframeRequestEvent on receiving RequestTrackVariant event" do
@@ -104,7 +104,7 @@ defmodule Membrane.RTC.Engine.TeeTest do
     refute_sink_event(pipeline, {:source, :medium}, %Membrane.KeyframeRequestEvent{}, 0)
     refute_sink_event(pipeline, {:source, :low}, %Membrane.KeyframeRequestEvent{}, 0)
 
-    Pipeline.terminate(pipeline, blocking?: true)
+    :ok = Pipeline.terminate(pipeline, blocking?: true)
   end
 
   test "Tee raises on receiving invalid RequestTrackVariant event" do
@@ -188,7 +188,7 @@ defmodule Membrane.RTC.Engine.TeeTest do
 
     request_and_check_high.(pipeline)
 
-    Pipeline.terminate(pipeline, blocking?: true)
+    :ok = Pipeline.terminate(pipeline, blocking?: true)
   end
 
   test "Tee raises on receiving data from inactive track variant" do
@@ -216,7 +216,7 @@ defmodule Membrane.RTC.Engine.TeeTest do
     refute_sink_event(pipeline, {:source, :medium}, %Membrane.KeyframeRequestEvent{}, 0)
     refute_sink_event(pipeline, {:source, :low}, %Membrane.KeyframeRequestEvent{}, 0)
 
-    Pipeline.terminate(pipeline, blocking?: true)
+    :ok = Pipeline.terminate(pipeline, blocking?: true)
   end
 
   test "Tee forwards KeyframeRequestEvent when there is some variant being forwarded" do
@@ -240,7 +240,7 @@ defmodule Membrane.RTC.Engine.TeeTest do
     refute_sink_event(pipeline, {:source, :medium}, %Membrane.KeyframeRequestEvent{})
     refute_sink_event(pipeline, {:source, :low}, %Membrane.KeyframeRequestEvent{}, 0)
 
-    Pipeline.terminate(pipeline, blocking?: true)
+    :ok = Pipeline.terminate(pipeline, blocking?: true)
   end
 
   test "forwards VoiceActivityChanged" do
@@ -269,7 +269,7 @@ defmodule Membrane.RTC.Engine.TeeTest do
     # We're already on high, so we expect the event to be forwarded
     assert_sink_event(pipeline, :sink, ^event)
 
-    Pipeline.terminate(pipeline, blocking?: true)
+    :ok = Pipeline.terminate(pipeline, blocking?: true)
   end
 
   test "forwards VoiceActivityChanged after TrackVariantSwitched" do