Update the rtsp_to_hls demo #283
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
mat-hek
reviewed
Aug 29, 2024
rtsp_to_hls/lib/pipeline.ex
Outdated
| @@ -63,34 +84,22 @@ defmodule Membrane.Demo.RtspToHls.Pipeline do | |||
| generate_best_effort_timestamps: %{framerate: {30, 1}} | |||
rtsp_to_hls/lib/server/handler.ex
Outdated
There was a problem hiding this comment.
I'm wondering if we should put the server code in the lib directory since this demo is called rtsp_to_hls 🤔 Maybe we should keep all the server stuff in server.exs?
mat-hek
approved these changes
Nov 12, 2024
Comment on lines
+34
to
+35
| [:audio, :video] | ||
| |> Enum.filter(fn media_type -> Enum.any?(tracks, &(&1.type == media_type)) end) |
There was a problem hiding this comment.
So we just support one audio and one video track? If so, I'd just add audio_track and video_track fields to the state, it should be much simpler
There was a problem hiding this comment.
I don't really think so, since we also support only video (and only audio) streams, I tried doing this and a lot of branching arises
rtsp_to_hls/lib/pipeline.ex
Outdated
Comment on lines
49
to
58
| spec: [ | ||
| child(:hls, %Membrane.HTTPAdaptiveStream.SinkBin{ | ||
| target_window_duration: Membrane.Time.seconds(120), | ||
| manifest_module: Membrane.HTTPAdaptiveStream.HLS, | ||
| storage: %Membrane.HTTPAdaptiveStream.Storages.FileStorage{ | ||
| directory: state.output_path | ||
| } | ||
| }) | ||
| | track_specs | ||
| ] |
There was a problem hiding this comment.
Suggested change
| spec: [ | |
| child(:hls, %Membrane.HTTPAdaptiveStream.SinkBin{ | |
| target_window_duration: Membrane.Time.seconds(120), | |
| manifest_module: Membrane.HTTPAdaptiveStream.HLS, | |
| storage: %Membrane.HTTPAdaptiveStream.Storages.FileStorage{ | |
| directory: state.output_path | |
| } | |
| }) | |
| | track_specs | |
| ] | |
| hls = | |
| child(:hls, %Membrane.HTTPAdaptiveStream.SinkBin{ | |
| target_window_duration: Membrane.Time.seconds(120), | |
| manifest_module: Membrane.HTTPAdaptiveStream.HLS, | |
| storage: %Membrane.HTTPAdaptiveStream.Storages.FileStorage{ | |
| directory: state.output_path | |
| } | |
| }) | |
| [spec: [hls | track_specs]] |
rtsp_to_hls/lib/pipeline.ex
Outdated
| def handle_child_notification({:new_track, ssrc, _track}, :source, _ctx, state) do | ||
| Logger.warning("new_rtp_stream Unsupported stream connected") | ||
| def handle_child_notification({:new_track, ssrc, track}, :source, _ctx, state) do | ||
| if Enum.member?(state.tracks_left_to_link, track.type) do |
There was a problem hiding this comment.
Suggested change
| if Enum.member?(state.tracks_left_to_link, track.type) do | |
| if track.type in state.tracks_left_to_link do |
mat-hek
approved these changes
Nov 13, 2024
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.