From d6deb6cfa4ab9284c4b382dfe0a8395f9ef00fe9 Mon Sep 17 00:00:00 2001 From: Raja Subramanian Date: Mon, 10 Jan 2022 19:07:21 +0530 Subject: [PATCH] Move UpdateTrackInfo into MediaTrackReceiver (#329) --- pkg/rtc/mediatrack.go | 2 +- pkg/rtc/mediatrackreceiver.go | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/rtc/mediatrack.go b/pkg/rtc/mediatrack.go index 0a7e7e856..f2361cf61 100644 --- a/pkg/rtc/mediatrack.go +++ b/pkg/rtc/mediatrack.go @@ -111,7 +111,7 @@ func (t *MediaTrack) SdpCid() string { } func (t *MediaTrack) ToProto() *livekit.TrackInfo { - info := t.params.TrackInfo + info := t.MediaTrackReceiver.TrackInfo() info.Muted = t.IsMuted() info.Simulcast = t.IsSimulcast() layers := t.MediaTrackReceiver.GetVideoLayers() diff --git a/pkg/rtc/mediatrackreceiver.go b/pkg/rtc/mediatrackreceiver.go index ff22ef0ef..20ab07033 100644 --- a/pkg/rtc/mediatrackreceiver.go +++ b/pkg/rtc/mediatrackreceiver.go @@ -194,6 +194,17 @@ func (t *MediaTrackReceiver) AddSubscriber(sub types.Participant) error { return nil } +func (t *MediaTrackReceiver) UpdateTrackInfo(ti *livekit.TrackInfo) { + t.params.TrackInfo = ti + if ti != nil && t.Kind() == livekit.TrackType_VIDEO { + t.UpdateVideoLayers(ti.Layers) + } +} + +func (t *MediaTrackReceiver) TrackInfo() *livekit.TrackInfo { + return t.params.TrackInfo +} + func (t *MediaTrackReceiver) UpdateVideoLayers(layers []*livekit.VideoLayer) { for _, layer := range layers { t.layerDimensions.Store(layer.Quality, layer)