Skip to content

Commit f4a4ab4

Browse files
committed
Requested changes
1 parent 1f6ec0c commit f4a4ab4

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

lib/ex_webrtc/rtp_transceiver.ex

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,7 @@ defmodule ExWebRTC.RTPTransceiver do
559559

560560
get_sender_attrs(
561561
transceiver.sender,
562-
codecs,
563-
transceiver.sender.ssrc,
564-
transceiver.sender.rtx_ssrc
562+
codecs
565563
)
566564
else
567565
[]
@@ -577,7 +575,7 @@ defmodule ExWebRTC.RTPTransceiver do
577575
end
578576

579577
@doc false
580-
defp get_sender_attrs(sender, codecs, ssrc, rtx_ssrc) do
578+
defp get_sender_attrs(sender, codecs) do
581579
# According to RFC 8829 sec. 5.2.1, track IDs should not be included.
582580
# However, most browsers support track IDs in MSID. We will follow this practice.
583581
msid_attrs =
@@ -594,25 +592,25 @@ defmodule ExWebRTC.RTPTransceiver do
594592
[]
595593
end
596594

597-
ssrc_attrs = get_ssrc_attrs(codecs, ssrc, rtx_ssrc, sender)
595+
ssrc_attrs = get_ssrc_attrs(sender, codecs)
598596

599597
msid_attrs ++ ssrc_attrs
600598
end
601599

602-
defp get_ssrc_attrs(codecs, ssrc, rtx_ssrc, sender) do
600+
defp get_ssrc_attrs(sender, codecs) do
603601
codec = Enum.any?(codecs, fn codec -> not String.ends_with?(codec.mime_type, "/rtx") end)
604602
rtx_codec = Enum.any?(codecs, fn codec -> String.ends_with?(codec.mime_type, "/rtx") end)
605603

606-
do_get_ssrc_attrs(codec, rtx_codec, ssrc, rtx_ssrc, sender)
604+
do_get_ssrc_attrs(sender, codec, rtx_codec)
607605
end
608606

609607
# we didn't manage to negotiate any codec
610-
defp do_get_ssrc_attrs(false, _rtx_codec, _ssrc, _rtx_ssrc, _sender) do
608+
defp do_get_ssrc_attrs(_sender, false, _rtx_codec) do
611609
[]
612610
end
613611

614612
# we have a codec but not rtx codec
615-
defp do_get_ssrc_attrs(_codec, false, ssrc, _rtx_ssrc, sender) do
613+
defp do_get_ssrc_attrs(%{ssrc: ssrc} = sender, _codec, false) do
616614
case sender.track do
617615
%MediaStreamTrack{streams: streams, id: id} when streams != [] ->
618616
Enum.map(streams, fn stream ->
@@ -630,7 +628,7 @@ defmodule ExWebRTC.RTPTransceiver do
630628
end
631629

632630
# we have both codec and rtx codec
633-
defp do_get_ssrc_attrs(_codec, _rtx_codec, ssrc, rtx_ssrc, sender) do
631+
defp do_get_ssrc_attrs(%{ssrc: ssrc, rtx_ssrc: rtx_ssrc} = sender, _codec, _rtx_codec) do
634632
fid = %ExSDP.Attribute.SSRCGroup{semantics: "FID", ssrcs: [ssrc, rtx_ssrc]}
635633

636634
ssrc_attrs =

0 commit comments

Comments
 (0)