[0.x] janus: avoid RTX payload type collisions #3078
Merged
Conversation
This file contains hidden or 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
|
For context, before this patch when pulling with pion reading from a streaming plugin mountpoint, I was seeing: and with this patch, I get: Note that 1.x has an equivalent bug, but the context is a bit more complicated so I wanted to get feedback on this PR first. |
|
OK I can reproduce this with the following change to the Then we can see the borked SDP using https://github.com/pion/example-webrtc-applications/blob/master/janus-gateway/streaming/main.go with this patch: diff --git a/janus-gateway/streaming/main.go b/janus-gateway/streaming/main.go
index 6a0e125..c97437b 100644
--- a/janus-gateway/streaming/main.go
+++ b/janus-gateway/streaming/main.go
@@ -94,6 +94,7 @@ func main() {
Type: webrtc.SDPTypeOffer,
SDP: msg.Jsep["sdp"].(string),
}
+ fmt.Println("GOT JSEP", offer.SDP)
// Create a new RTCPeerConnection
var peerConnection *webrtc.PeerConnectionwhich yields: |
lminiero
reviewed
Sep 27, 2022
Yeah I tested and 1.x is affected, but as mentioned it means checking all media which is a bit different than the fix here. |
|
1.x already has maps to keep track of what's used in a medium instance. I think we can get away with it by having a |
Previously only collsions with other video payload types was being avoided, this checks additionally for audio and application m-lines.
d4cd5e3 to
ba309b7
Compare
|
I initially wanted to keep this open until I could prepare a PR for multistream as well, but that one is taking longer than expected, ando so may take a while: as such, no reason to keep this stuck, so I'll merge 👍 I'll reference it from the new multistream PR when that one is ready. |
lminiero
added a commit
that referenced
this pull request
Sep 28, 2022
lminiero
added a commit
that referenced
this pull request
Oct 3, 2022
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.
Previously only collsions with other video payload types was being avoided, this checks additionally for audio and application m-lines.