dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-05-15 18:15:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

test

Browse Source
This commit is contained in:
boks1971
2025-08-16 13:15:02 +05:30
parent 15f10f3590
commit 9e11ac0095
3 changed files with 26 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/rtc/participant.go
-37
View File
@@ -2146,43 +2146,6 @@ func (p *ParticipantImpl) setIsPublisher(isPublisher bool) {
// when the server has an offer for participant
func (p *ParticipantImpl) onSubscriberOffer(offer webrtc.SessionDescription, offerId uint32) error {
if p.ProtocolVersion().SupportsSinglePeerConnection() {
parsedOffer, err := offer.Unmarshal()
if err != nil {
p.pubLogger.Warnw(
"could not parse offer", err,
"transport", livekit.SignalTarget_PUBLISHER,
"offer", offer,
"offerId", offerId,
)
return err
}
unmatchAudios, err := p.TransportManager.GetUnmatchMediaForOffer(parsedOffer, "audio")
if err != nil {
p.subLogger.Warnw("could not get unmatch audios", err)
return err
}
unmatchVideos, _ := p.TransportManager.GetUnmatchMediaForOffer(parsedOffer, "video")
if err != nil {
p.subLogger.Warnw("could not get unmatch videos", err)
return err
}
parsedOffer = p.setCodecPreferencesForPublisher(parsedOffer, unmatchAudios, unmatchVideos, false)
// put together munged offer after setting codec preferences
bytes, err := parsedOffer.Marshal()
if err != nil {
p.pubLogger.Errorw("failed to marshal offer", err)
return err
}
offer = webrtc.SessionDescription{
Type: offer.Type,
SDP: string(bytes),
}
}
p.subLogger.Debugw(
"sending offer",
"transport", livekit.SignalTarget_SUBSCRIBER,
pkg/rtc/participant_sdp.go
+1 -1
View File
@@ -151,7 +151,7 @@ func (p *ParticipantImpl) setCodecPreferencesForPublisher(
parsedOffer *sdp.SessionDescription,
unmatchAudios []*sdp.MediaDescription,
unmatchVideos []*sdp.MediaDescription,
useSdpCid bool,
useSdpCid bool, // SINGLE-PEER-CONNECTION-TODO: remove this arg
) *sdp.SessionDescription {
parsedOffer, unprocessedUnmatchAudios := p.setCodecPreferencesForPublisherMedia(
parsedOffer,
pkg/rtc/transport.go
+25 -1
View File
@@ -1058,8 +1058,32 @@ func (t *PCTransport) AddRemoteTrackAndNegotiate(
enabledCodecs = append(enabledCodecs, c)
}
}
} else {
for _, c := range codecs {
if mime.IsMimeTypeStringRTX(c.RTPCodecCapability.MimeType) {
enabledCodecs = append(enabledCodecs, c)
}
}
}
transceiver.SetCodecPreferences(enabledCodecs)
// arrange enabled by preference in TrackInfo
// SINGLE-PEER-CONNECTION-TODO: have to figure out which codec index
mimeType := ""
if len(ti.Codecs) != 0 {
mimeType = ti.Codecs[0].MimeType
}
preferredCodecs := make([]webrtc.RTPCodecParameters, 0, len(enabledCodecs))
leftCodecs := make([]webrtc.RTPCodecParameters, 0, len(enabledCodecs))
for _, enabledCodec := range enabledCodecs {
if mimeType == "" || mime.NormalizeMimeType(enabledCodec.RTPCodecCapability.MimeType) == mime.NormalizeMimeType(mimeType) {
preferredCodecs = append(preferredCodecs, enabledCodec)
} else {
leftCodecs = append(leftCodecs, enabledCodec)
}
}
transceiver.SetCodecPreferences(append(append([]webrtc.RTPCodecParameters{}, preferredCodecs...), leftCodecs...))
// SINGLE-PEER-CONNECTION-TOOD: need to configure stereo for audio codecs
// SINGLE-PEER-CONNECTION-TODO: do setCodecPreferencesOpusRedForPublisher for audio
t.Negotiate(true)
return nil