Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure we match WHIP simulcast layers properly #247

Merged
merged 1 commit into from
Apr 5, 2024
+9 −6
Merged

Ensure we match WHIP simulcast layers properly #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/livekit/mediatransportutil v0.0.0-20240302142739-1c3dd691a1b8
github.com/livekit/protocol v1.12.0
github.com/livekit/psrpc v0.5.3-0.20240315045730-ba2e5b9923b5
github.com/livekit/server-sdk-go/v2 v2.1.1-0.20240403161440-39126a2c9d49
github.com/livekit/server-sdk-go/v2 v2.1.1-0.20240404231543-b3ffc4b59334
github.com/pion/dtls/v2 v2.2.10
github.com/pion/interceptor v0.1.27
github.com/pion/rtcp v1.2.14
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ github.com/livekit/protocol v1.12.0 h1:B7qsqq5xf9MmyG9WEk9/gMsfMVXuyLNxX5cO6TQil
github.com/livekit/protocol v1.12.0/go.mod h1:G7Pa985GhZv2MCC3UnUocBhZfi3DsWA6WmlSkkpQYTM=
github.com/livekit/psrpc v0.5.3-0.20240315045730-ba2e5b9923b5 h1:I2noW2VjGcf8E0pCJVK5p3x9G3O2u57DaPgSCJWtkRo=
github.com/livekit/psrpc v0.5.3-0.20240315045730-ba2e5b9923b5/go.mod h1:CQUBSPfYYAaevg1TNCc6/aYsa8DJH4jSRFdCeSZk5u0=
github.com/livekit/server-sdk-go/v2 v2.1.1-0.20240403161440-39126a2c9d49 h1:azrrvWCMRJyaPbMJ1fta+OuzWmt6/fsuM5jdGK/dibE=
github.com/livekit/server-sdk-go/v2 v2.1.1-0.20240403161440-39126a2c9d49/go.mod h1:8KmZmvjahDfYnF0STHatRzxyV+OH5gN3zQlHtbpqOAU=
github.com/livekit/server-sdk-go/v2 v2.1.1-0.20240404231543-b3ffc4b59334 h1:Q6i08pWwPs55uQMh0m/gN0b++MUY64zSKED8fYaKhZE=
github.com/livekit/server-sdk-go/v2 v2.1.1-0.20240404231543-b3ffc4b59334/go.mod h1:8KmZmvjahDfYnF0STHatRzxyV+OH5gN3zQlHtbpqOAU=
github.com/mackerelio/go-osstat v0.2.4 h1:qxGbdPkFo65PXOb/F/nhDKpF2nGmGaCFDLXoZjJTtUs=
github.com/mackerelio/go-osstat v0.2.4/go.mod h1:Zy+qzGdZs3A9cuIqmgbJvwbmLQH9dJvtio5ZjJTbdlQ=
github.com/magefile/mage v1.15.0 h1:BvGheCMAsG3bWUDbZ8AyXXpCNwU9u5CB6sM+HNb9HYg=
Expand Down
9 changes: 6 additions & 3 deletions pkg/whip/sdk_media_sink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"context"
"fmt"
"io"
"sort"
"strings"
"sync"

Expand Down Expand Up @@ -178,6 +179,10 @@ func (sp *SDKMediaSink) ensureVideoTracksInitialized(pkt *rtp.Packet, t *SDKMedi

}

sort.Slice(layers, func(i, j int) bool {
return layers[i].Width > layers[j].Width
})

if len(layers) != 0 {
videoState := getVideoState(sp.codecParameters.MimeType, uint(layers[0].Width), uint(layers[0].Height))
sp.params.SetInputVideoState(context.Background(), videoState, true)
Expand All @@ -194,11 +199,9 @@ func (sp *SDKMediaSink) ensureVideoTracksInitialized(pkt *rtp.Packet, t *SDKMedi
t = sp.tracks[q.Quality]
t.localTrack = tracks[i]
rtcpHandlers[i].SetPacketSink(t)
sp.logger.Infow("adding video track", "width", q.Width, "height", q.Height, "quality", q.Quality, "codec", sp.codecParameters.MimeType)
}

for _, l := range layers {
sp.logger.Infow("adding video track", "width", l.Width, "height", l.Height, "codec", sp.codecParameters.MimeType)
}
sp.sinkInitialized = true

return sp.sinkInitialized, nil
Expand Down