bfdbffc082
* Use mapped SDP answer when using single peer connection mode. In single peer connection mode, the client does not get the TR_ ids for tracks. That is because the transceiver is created with a receiver when the offer is generated and a random id assigned. Once the id is assigned, it is not updated. So, when client gets `onTrack`, the id of the associated MediaStreamTrack is not the TR_ variety. So, send the mapping of mid -> trackID in signalling when sending answer. And used that on client side to find LK track ID for given mid. Side note: Probably worth doing it for dual peer connection also when subscriber sends offer so that we do not have to deduce it on client side using some rules. * generated protobuf --------- Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
101 lines
2.7 KiB
Go
101 lines
2.7 KiB
Go
// Copyright 2023 LiveKit, Inc.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package signalling
|
|
|
|
import (
|
|
"encoding/json"
|
|
|
|
"github.com/livekit/protocol/livekit"
|
|
"github.com/pion/webrtc/v4"
|
|
)
|
|
|
|
func ToProtoSessionDescription(sd webrtc.SessionDescription, id uint32) *livekit.SessionDescription {
|
|
if sd.SDP == "" {
|
|
return nil
|
|
}
|
|
|
|
return &livekit.SessionDescription{
|
|
Type: sd.Type.String(),
|
|
Sdp: sd.SDP,
|
|
Id: id,
|
|
}
|
|
}
|
|
|
|
func FromProtoSessionDescription(sd *livekit.SessionDescription) (webrtc.SessionDescription, uint32) {
|
|
var sdType webrtc.SDPType
|
|
switch sd.Type {
|
|
case webrtc.SDPTypeOffer.String():
|
|
sdType = webrtc.SDPTypeOffer
|
|
case webrtc.SDPTypeAnswer.String():
|
|
sdType = webrtc.SDPTypeAnswer
|
|
case webrtc.SDPTypePranswer.String():
|
|
sdType = webrtc.SDPTypePranswer
|
|
case webrtc.SDPTypeRollback.String():
|
|
sdType = webrtc.SDPTypeRollback
|
|
}
|
|
return webrtc.SessionDescription{
|
|
Type: sdType,
|
|
SDP: sd.Sdp,
|
|
}, sd.Id
|
|
}
|
|
|
|
func ToProtoMappedSessionDescription(sd webrtc.SessionDescription, id uint32, midToTrackID map[string]string) *livekit.MappedSessionDescription {
|
|
if sd.SDP == "" {
|
|
return nil
|
|
}
|
|
|
|
return &livekit.MappedSessionDescription{
|
|
SessionDescription: &livekit.SessionDescription{
|
|
Type: sd.Type.String(),
|
|
Sdp: sd.SDP,
|
|
Id: id,
|
|
},
|
|
MidToTrackId: midToTrackID,
|
|
}
|
|
}
|
|
|
|
func ToProtoTrickle(candidateInit webrtc.ICECandidateInit, target livekit.SignalTarget, final bool) *livekit.TrickleRequest {
|
|
data, _ := json.Marshal(candidateInit)
|
|
return &livekit.TrickleRequest{
|
|
CandidateInit: string(data),
|
|
Target: target,
|
|
Final: final,
|
|
}
|
|
}
|
|
|
|
func FromProtoTrickle(trickle *livekit.TrickleRequest) (webrtc.ICECandidateInit, error) {
|
|
ci := webrtc.ICECandidateInit{}
|
|
err := json.Unmarshal([]byte(trickle.CandidateInit), &ci)
|
|
if err != nil {
|
|
return webrtc.ICECandidateInit{}, err
|
|
}
|
|
return ci, nil
|
|
}
|
|
|
|
func FromProtoIceServers(iceservers []*livekit.ICEServer) []webrtc.ICEServer {
|
|
if iceservers == nil {
|
|
return nil
|
|
}
|
|
servers := make([]webrtc.ICEServer, 0, len(iceservers))
|
|
for _, server := range iceservers {
|
|
servers = append(servers, webrtc.ICEServer{
|
|
URLs: server.Urls,
|
|
Username: server.Username,
|
|
Credential: server.Credential,
|
|
})
|
|
}
|
|
return servers
|
|
}
|