RTSP input #13
Merged
RTSP input #13
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
Co-authored-by: Jakub Pryc <[email protected]> Co-authored-by: Łukasz Kita <[email protected]>
Use new rtmp api
Closed
mat-hek
requested changes
Aug 28, 2024
test/support/compare.ex
Outdated
Comment on lines
63
to
64
| # [{audio_id, %Membrane.AAC{}}, {video_id, %Membrane.H264{}}] = | ||
| # Enum.sort_by(tracks, fn {_id, %format{}} -> format end) |
mix.exs
Outdated
Comment on lines
49
to
70
| # {:membrane_webrtc_plugin, | ||
| # github: "membraneframework/membrane_webrtc_plugin", branch: "bump_rtp_plugin"}, | ||
| {:ex_sdp, "~> 0.17.0", override: true}, | ||
| {:membrane_webrtc_plugin, "~> 0.21.0"}, | ||
| {:membrane_opus_plugin, "~> 0.20.0"}, | ||
| # {:membrane_opus_plugin, "~> 0.20.0"}, | ||
| {:membrane_opus_plugin, | ||
| github: "membraneframework/membrane_opus_plugin", branch: "non-monotonic-pts-fix"}, | ||
| {:membrane_aac_plugin, "~> 0.18.0"}, | ||
| {:membrane_aac_fdk_plugin, "~> 0.18.0"}, | ||
| {:membrane_h26x_plugin, "~> 0.10.0"}, | ||
| {:membrane_h264_ffmpeg_plugin, "~> 0.32.0"}, | ||
| {:membrane_mp4_plugin, | ||
| github: "membraneframework/membrane_mp4_plugin", branch: "wip-avc3", override: true}, | ||
| {:membrane_mp4_plugin, "~> 0.35.2", override: true}, | ||
| {:membrane_realtimer_plugin, "~> 0.9.0"}, | ||
| {:membrane_http_adaptive_stream_plugin, "~> 0.18.0"}, | ||
| # {:membrane_http_adaptive_stream_plugin, "~> 0.18.0"}, | ||
| {:membrane_http_adaptive_stream_plugin, | ||
| github: "membraneframework/membrane_http_adaptive_stream_plugin", branch: "fix-linking"}, | ||
| {:membrane_rtmp_plugin, "~> 0.25.0"}, | ||
| {:membrane_rtsp_plugin, | ||
| github: "membraneframework-labs/membrane_rtsp_plugin", branch: "allow-for-eos"}, | ||
| # {:membrane_rtsp_plugin, "~> 0.2.0"}, | ||
| {:membrane_udp_plugin, "~> 0.14.0"}, | ||
| {:membrane_rtp_plugin, "~> 0.29.0", override: true}, |
lib/boombox/rtsp.ex
Outdated
| %Membrane.H264.Parser{ | ||
| spss: spss, | ||
| ppss: ppss | ||
| # generate_best_effort_timestamps: %{framerate: {60, 1}} |
There was a problem hiding this comment.
Suggested change
| # generate_best_effort_timestamps: %{framerate: {60, 1}} |
lib/boombox/rtsp.ex
Outdated
| def handle_input_tracks(tracks) do | ||
| track_builders = | ||
| Map.new(tracks, fn | ||
| {ssrc, %{rtpmap: %{encoding: "H264"}} = track} -> |
There was a problem hiding this comment.
let's raise a readable error when encoding doesn't match
| _muxed_header -> :muxed_av | ||
| end | ||
|
|
||
| # %{audio_track: audio_track, video_track: video_track} = get_tracks(opts.directory, hls_mode) |
mat-hek
approved these changes
Sep 3, 2024
lib/boombox/pipeline.ex
Outdated
| @@ -61,7 +61,8 @@ defmodule Boombox.Pipeline do | |||
| spec_builder: [], | |||
| track_builders: nil, | |||
| last_result: nil, | |||
| eos_info: nil | |||
| eos_info: nil, | |||
| rtsp_state: %{set_up_tracks: %{}, tracks_left_to_link: 0, track_builders: %{}} | |||
There was a problem hiding this comment.
let's move the state initialization to RTSP module
lib/boombox/pipeline.ex
Outdated
Comment on lines
95
to
100
| set_up_tracks: %{ | ||
| optional(:audio) => Membrane.RTSP.Source.track(), | ||
| optional(:video) => Membrane.RTSP.Source.track() | ||
| }, | ||
| tracks_left_to_link: non_neg_integer(), | ||
| track_builders: Boombox.Pipeline.track_builders() |
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.
solves: #5