Add hls playable field and notification #58
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #58 +/- ##
==========================================
+ Coverage 84.80% 86.00% +1.19%
==========================================
Files 33 33
Lines 487 500 +13
==========================================
+ Hits 413 430 +17
+ Misses 74 70 -4
Continue to review full report in Codecov by Sentry.
|
Rados13
reviewed
Jul 21, 2023
Comment on lines
187
to
195
| correct_components? = | ||
| components | ||
| |> Enum.map(fn %Component{component: component} -> component end) | ||
| |> Enum.all?(fn | ||
| {:hls, %Hls{playable: false}} -> true | ||
| {:rtsp, %Rtsp{}} -> true | ||
| end) | ||
|
|
||
| assert correct_components? |
There was a problem hiding this comment.
Suggested change
| correct_components? = | |
| components | |
| |> Enum.map(fn %Component{component: component} -> component end) | |
| |> Enum.all?(fn | |
| {:hls, %Hls{playable: false}} -> true | |
| {:rtsp, %Rtsp{}} -> true | |
| end) | |
| assert correct_components? | |
| assert true = | |
| components | |
| |> Enum.map(fn %Component{component: component} -> component end) | |
| |> Enum.all?(fn | |
| {:hls, %Hls{playable: false}} -> true | |
| {:rtsp, %Rtsp{}} -> true | |
| _other -> false | |
| end) | |
lib/jellyfish/room.ex
Outdated
Comment on lines
328
to
342
| @impl true | ||
| def handle_info({:playlist_playable, :video, _playlist_idl}, state) do | ||
| endpoint_id = | ||
| Enum.find_value(state.components, fn {id, %{type: type}} -> | ||
| if type == Component.HLS, do: id | ||
| end) | ||
|
|
||
| Phoenix.PubSub.broadcast( | ||
| Jellyfish.PubSub, | ||
| "server_notification", | ||
| {:hls_playable, state.id, endpoint_id} | ||
| ) | ||
|
|
||
| {:noreply, state} | ||
| end |
There was a problem hiding this comment.
Shouldn't we store this information somewhere?
There was a problem hiding this comment.
I think it should be stored inside the HLS component
roznawsk
requested changes
Jul 21, 2023
lib/jellyfish/component.ex
Outdated
| @@ -44,14 +48,20 @@ defmodule Jellyfish.Component do | |||
| @spec new(component(), map()) :: {:ok, t()} | {:error, term()} | |||
| def new(type, options) do | |||
| with {:ok, endpoint} <- type.config(options) do | |||
| metadata = get_metadata(type) | |||
There was a problem hiding this comment.
Perhaps we could move the logic of getting metadata to the modules in question?
Suggested change
| metadata = get_metadata(type) | |
| metadata = type.metadata() |
lib/jellyfish/room.ex
Outdated
Comment on lines
328
to
342
| @impl true | ||
| def handle_info({:playlist_playable, :video, _playlist_idl}, state) do | ||
| endpoint_id = | ||
| Enum.find_value(state.components, fn {id, %{type: type}} -> | ||
| if type == Component.HLS, do: id | ||
| end) | ||
|
|
||
| Phoenix.PubSub.broadcast( | ||
| Jellyfish.PubSub, | ||
| "server_notification", | ||
| {:hls_playable, state.id, endpoint_id} | ||
| ) | ||
|
|
||
| {:noreply, state} | ||
| end |
There was a problem hiding this comment.
I think it should be stored inside the HLS component
roznawsk
approved these changes
Jul 24, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.