Fix compilation warnings

Author: FelonEkonom

lib/membrane_http_adaptive_stream/hls_source.ex

@@ -2,7 +2,6 @@ defmodule Membrane.HLS.Source do
   use Membrane.Source
   require Membrane.Pad, as: Pad
 
-  alias ExHLS.Client
   alias __MODULE__.ClientGenServer
 
   alias Membrane.{
@@ -12,14 +11,14 @@ defmodule Membrane.HLS.Source do
   }
 
   def_output_pad :video_output,
-    accepted_format: any_of(H264, %RemoteStream{content_type: H264}),
+    accepted_format: any_of(H264, %RemoteStream{content_format: H264}),
     availability: :on_request,
     max_instances: 1,
     flow_control: :manual,
     demand_unit: :buffers
 
   def_output_pad :audio_output,
-    accepted_format: any_of(AAC, %RemoteStream{content_type: AAC}),
+    accepted_format: any_of(AAC, %RemoteStream{content_format: AAC}),
     availability: :on_request,
     max_instances: 1,
     flow_control: :manual,
@@ -50,8 +49,8 @@ defmodule Membrane.HLS.Source do
         :fmp4 -> ExHLS.DemuxingEngine.CMAF
       end
 
-    {:ok, clinet_genserver} = ClientGenServer.start_link(url, demuxing_engine)
-    %{state | client_genserver: clinet_genserver}
+    {:ok, clinet_genserver} = ClientGenServer.start_link(state.url, demuxing_engine)
+    {[], %{state | client_genserver: clinet_genserver}}
   end
 
   @impl true
@@ -61,7 +60,7 @@ defmodule Membrane.HLS.Source do
   end
 
   @impl true
-  def handle_playing(_ctx, state) do
+  def handle_playing(ctx, state) do
     if ctx.pads |> map_size() < 2 do
       raise "HLS Source requires both audio and video output pads to be present"
     end
@@ -70,16 +69,18 @@ defmodule Membrane.HLS.Source do
       ClientGenServer.get_tracks_info(state.client_genserver)
       |> Map.values()
       |> Enum.split_with(fn
-        %RemoteStream{content_type: AAC} -> true
-        %RemoteStream{content_type: H264} -> false
+        %RemoteStream{content_format: AAC} -> true
+        %RemoteStream{content_format: H264} -> false
         %AAC{} -> true
         %H264{} -> false
       end)
 
-    {[
-       stream_format: {:audio_output, audio_stream_format},
-       stream_format: {:video_output, video_stream_format}
-     ], %{state | client_server: client_server}}
+    actions = [
+      stream_format: {state.audio_output.pad_ref, audio_stream_format},
+      stream_format: {state.video_output.pad_ref, video_stream_format}
+    ]
+
+    {actions, state}
   end
 
   @impl true
@@ -107,7 +108,7 @@ defmodule Membrane.HLS.Source do
     {[redemand: state[pad_name].pad_ref], state}
   end
 
-  defp pop_buffers(Pad.ref(pad_name, _id) = pad_ref, demand, state) do
+  defp pop_buffers(Pad.ref(pad_name, _id), demand, state) do
     range_upperbound = min(state[pad_name].qex_size, demand)
 
     if range_upperbound > 0 do
@@ -135,8 +136,8 @@ defmodule Membrane.HLS.Source do
   end
 
   defp request_frames(state) do
-    [audio_output: :request_audio, video_output: :request_video]
-    |> Enum.reduce(state, fn {pad_name, request_type}, state ->
+    [:audio_output, :video_output]
+    |> Enum.reduce(state, fn pad_name, state ->
       request_size = state.buffer_size - state[pad_name].qex_size - state[pad_name].requested
       :ok = do_request(state, pad_name, request_size)
 
@@ -145,7 +146,7 @@ defmodule Membrane.HLS.Source do
     end)
   end
 
-  defp do_request(_state, _pad_name, 0), do: :ok
+  defp do_request(_state, _pad_name, request_size) when request_size < 1, do: :ok
 
   defp do_request(state, :audio_output, request_size) do
     1..request_size

lib/membrane_http_adaptive_stream/hls_source/client_genserver.ex

@@ -46,7 +46,7 @@ defmodule Membrane.HLS.Source.ClientGenServer do
   def handle_cast({:request_video, pid}, state) do
     {frame, client} = Client.read_video_frame(state.client)
     send(pid, {:video_stream, frame})
-    {:noreply}
+    {:noreply, %{state | client: client}}
   end
 
   @impl true

mix.exs

@@ -68,7 +68,8 @@ defmodule Membrane.HTTPAdaptiveStream.MixProject do
       {:membrane_mp4_plugin, "~> 0.35.0"},
       {:membrane_aac_plugin, "~> 0.19.0"},
       {:membrane_h26x_plugin, "~> 0.10.0"},
-      {:ex_hls, path: "../ex_hls"},
+      {:ex_hls,
+       github: "membraneframework-labs/ex_hls", ref: "d72569595f3a4eeb9d1521dfbc8b2445b6e50943"},
       {:bunch, "~> 1.6"},
       {:qex, "~> 0.5"},
       {:membrane_hackney_plugin, "~> 0.11.0", only: :test},

mix.lock

@@ -9,6 +9,7 @@
   "earmark_parser": {:hex, :earmark_parser, "1.4.44", "f20830dd6b5c77afe2b063777ddbbff09f9759396500cdbe7523efd58d7a339c", [:mix], [], "hexpm", "4778ac752b4701a5599215f7030989c989ffdc4f6df457c5f36938cc2d2a2750"},
   "erlex": {:hex, :erlex, "0.2.7", "810e8725f96ab74d17aac676e748627a07bc87eb950d2b83acd29dc047a30595", [:mix], [], "hexpm", "3ed95f79d1a844c3f6bf0cea61e0d5612a42ce56da9c03f01df538685365efb0"},
   "ex_doc": {:hex, :ex_doc, "0.38.2", "504d25eef296b4dec3b8e33e810bc8b5344d565998cd83914ffe1b8503737c02", [:mix], [{:earmark_parser, "~> 1.4.44", [hex: :earmark_parser, repo: "hexpm", optional: false]}, {:makeup_c, ">= 0.1.0", [hex: :makeup_c, repo: "hexpm", optional: true]}, {:makeup_elixir, "~> 0.14 or ~> 1.0", [hex: :makeup_elixir, repo: "hexpm", optional: false]}, {:makeup_erlang, "~> 0.1 or ~> 1.0", [hex: :makeup_erlang, repo: "hexpm", optional: false]}, {:makeup_html, ">= 0.1.0", [hex: :makeup_html, repo: "hexpm", optional: true]}], "hexpm", "732f2d972e42c116a70802f9898c51b54916e542cc50968ac6980512ec90f42b"},
+  "ex_hls": {:git, "https://github.com/membraneframework-labs/ex_hls.git", "d72569595f3a4eeb9d1521dfbc8b2445b6e50943", [ref: "d72569595f3a4eeb9d1521dfbc8b2445b6e50943"]},
   "ex_m3u8": {:git, "https://github.com/membraneframework/ex_m3u8.git", "8a83e4f6dd14e749aadf551bf1adb7ad4d4eb495", [branch: "allow-empty-default"]},
   "file_system": {:hex, :file_system, "1.1.0", "08d232062284546c6c34426997dd7ef6ec9f8bbd090eb91780283c9016840e8f", [:mix], [], "hexpm", "bfcf81244f416871f2a2e15c1b515287faa5db9c6bcf290222206d120b3d43f6"},
   "finch": {:hex, :finch, "0.19.0", "c644641491ea854fc5c1bbaef36bfc764e3f08e7185e1f084e35e0672241b76d", [:mix], [{:mime, "~> 1.0 or ~> 2.0", [hex: :mime, repo: "hexpm", optional: false]}, {:mint, "~> 1.6.2 or ~> 1.7", [hex: :mint, repo: "hexpm", optional: false]}, {:nimble_options, "~> 0.4 or ~> 1.0", [hex: :nimble_options, repo: "hexpm", optional: false]}, {:nimble_pool, "~> 1.1", [hex: :nimble_pool, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "fc5324ce209125d1e2fa0fcd2634601c52a787aff1cd33ee833664a5af4ea2b6"},