Skip to content

Commit

Permalink
Merge pull request #168 from membraneframework/rtcp-sender-packet
Browse files Browse the repository at this point in the history
Forward rtcp sender packet event
  • Loading branch information
Karolk99 authored May 23, 2024
2 parents 549c65c + b2d4cd2 commit 5ab025a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ The package can be installed by adding `membrane_rtp_plugin` to your list of dep
```elixir
def deps do
[
{:membrane_rtp_plugin, "~> 0.27.1"},
{:membrane_rtp_plugin, "~> 0.28.0"},
{:ex_libsrtp, ">= 0.0.0"} # required only if SRTP/SRTCP support is needed
]
end
Expand Down
2 changes: 1 addition & 1 deletion lib/membrane/rtcp/receiver.ex
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ defmodule Membrane.RTCP.Receiver do
arrival_ts: event.arrival_timestamp
}

{[], %{state | sr_info: sr_info}}
{[event: {:output, event}], %{state | sr_info: sr_info}}
end

@impl true
Expand Down
7 changes: 6 additions & 1 deletion lib/membrane/rtp/session_bin.ex
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,12 @@ defmodule Membrane.RTP.SessionBin do
RTCP packets for inbound stream can be provided either in-band or via a separate `rtp_input` pad instance. Corresponding
receiver report packets will be sent back through `rtcp_receiver_output` with the same id as `rtp_input` for the RTP stream.
RTCP for outbound stream is not yet supported. # But will be :)
RTCP sender reports from inbound streams are parsed and then dispatched as `Membrane.RTCP.SenderReportPacket` events on session bin `:output` pads.
On each `Pad.ref(:output, ssrc)`, only RTCP sender reports with the corresponding SSRC will be sent.
These reports can be used, for instance, to synchronize different rtp streams.
RTCP packets for the outbound stream are available on `rtcp_sender_output` pad.
RTCP packets will only be produced if rtcp_sender_report_interval option is set to a value other than nil.
"""
use Membrane.Bin

Expand Down
5 changes: 2 additions & 3 deletions mix.exs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
defmodule Membrane.RTP.Plugin.MixProject do
use Mix.Project

@version "0.27.1"
@version "0.28.0"
@github_url "https://github.com/membraneframework/membrane_rtp_plugin"

def project do
Expand Down Expand Up @@ -40,8 +40,7 @@ defmodule Membrane.RTP.Plugin.MixProject do
{:membrane_rtp_format, "~> 0.8.0"},
{:membrane_funnel_plugin, "~> 0.9.0"},
{:membrane_telemetry_metrics, "~> 0.1.0"},
{:membrane_rtsp,
github: "membraneframework/membrane_rtsp", branch: "expand-length-verification"},
{:membrane_rtsp, "~> 0.7.0"},
{:ex_libsrtp, "~> 0.6.0 or ~> 0.7.0", optional: true},
{:qex, "~> 0.5.1"},
{:bunch, "~> 1.5"},
Expand Down
2 changes: 1 addition & 1 deletion mix.lock
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"membrane_rtp_format": {:hex, :membrane_rtp_format, "0.8.0", "828924bbd27efcf85b2015ae781e824c4a9928f0a7dc132abc66817b2c6edfc4", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "bc75d2a649dfaef6df563212fbb9f9f62eebc871393692f9dae8d289bd4f94bb"},
"membrane_rtp_h264_plugin": {:hex, :membrane_rtp_h264_plugin, "0.19.0", "112bfedc14fb83bdb549ef1a03da23908feedeb165fd3e4512a549f1af532ae7", [:mix], [{:bunch, "~> 1.5", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.8.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}], "hexpm", "76fd159e7406cadbef15124cba30eca3fffcf71a7420964f26e23d4cffd9b29d"},
"membrane_rtp_mpegaudio_plugin": {:hex, :membrane_rtp_mpegaudio_plugin, "0.14.0", "eda543add9e035c8c0a99aaf7400f424922737efe934856b02b48e61679edba5", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_mpegaudio_format, "~> 0.3.0", [hex: :membrane_mpegaudio_format, repo: "hexpm", optional: false]}, {:membrane_rtp_format, "~> 0.8.0", [hex: :membrane_rtp_format, repo: "hexpm", optional: false]}], "hexpm", "ec19247c7907771d38914aafbb7df74bdc2744c8b2ae29b34106b9bbcc5ede10"},
"membrane_rtsp": {:git, "https://github.com/membraneframework/membrane_rtsp.git", "fb7526292de77826fde814de8d81a8ee03441069", [branch: "expand-length-verification"]},
"membrane_rtsp": {:hex, :membrane_rtsp, "0.7.0", "92b145cd7c18e897c6e3e3f2e8c5b95bd98d9eec41f45755875eadd222c42933", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:ex_sdp, "~> 0.15.0", [hex: :ex_sdp, repo: "hexpm", optional: false]}, {:mockery, "~> 2.3", [hex: :mockery, repo: "hexpm", optional: false]}, {:nimble_parsec, "~> 1.4.0", [hex: :nimble_parsec, repo: "hexpm", optional: false]}], "hexpm", "debf4fa612ea6b084bce1926745c660e404bf647ed975cf22f01925084080cbe"},
"membrane_telemetry_metrics": {:hex, :membrane_telemetry_metrics, "0.1.0", "cb93d28356b436b0597736c3e4153738d82d2a14ff547f831df7e9051e54fc06", [:mix], [{:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}, {:telemetry_metrics, "~> 0.6.1", [hex: :telemetry_metrics, repo: "hexpm", optional: false]}], "hexpm", "aba28dc8311f70ced95d984509be930fac55857d2d18bffcf768815e627be3f0"},
"metrics": {:hex, :metrics, "1.0.1", "25f094dea2cda98213cecc3aeff09e940299d950904393b2a29d191c346a8486", [:rebar3], [], "hexpm", "69b09adddc4f74a40716ae54d140f93beb0fb8978d8636eaded0c31b6f099f16"},
"mime": {:hex, :mime, "2.0.5", "dc34c8efd439abe6ae0343edbb8556f4d63f178594894720607772a041b04b02", [:mix], [], "hexpm", "da0d64a365c45bc9935cc5c8a7fc5e49a0e0f9932a761c55d6c52b142780a05c"},
Expand Down

0 comments on commit 5ab025a

Please sign in to comment.