dandri/livekit
1
0
Fork 0
mirror of https://github.com/livekit/livekit.git synced 2026-03-29 17:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send raw mime type also in subscribed qualities. (#3103)

Browse Source
This commit is contained in:
Raja Subramanian
2024-10-16 11:45:12 +05:30
committed by GitHub
parent a66fff1576
commit c8bb3345c6
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/rtc/dynacast/dynacastmanager.go
View File

@@ -38,6 +38,7 @@ type DynacastManager struct {
params DynacastManagerParams
lock sync.RWMutex
mimeCases map[string]string // mime lower case => given case mapping // TODO-REMOVE-AFTER-NORMALIZED-DEPLOY
dynacastQuality map[string]*DynacastQuality // mime type => DynacastQuality
maxSubscribedQuality map[string]livekit.VideoQuality
committedMaxSubscribedQuality map[string]livekit.VideoQuality
@@ -58,6 +59,7 @@ func NewDynacastManager(params DynacastManagerParams) *DynacastManager {
}
d := &DynacastManager{
params: params,
mimeCases: make(map[string]string),
dynacastQuality: make(map[string]*DynacastQuality),
maxSubscribedQuality: make(map[string]livekit.VideoQuality),
committedMaxSubscribedQuality: make(map[string]livekit.VideoQuality),
@@ -159,13 +161,13 @@ func (d *DynacastManager) getOrCreateDynacastQuality(mime string) *DynacastQuali
return nil
}
mime = strings.ToLower(mime)
if dq := d.dynacastQuality[mime]; dq != nil {
normalizedMime := strings.ToLower(mime)
if dq := d.dynacastQuality[normalizedMime]; dq != nil {
return dq
}
dq := NewDynacastQuality(DynacastQualityParams{
MimeType: mime,
MimeType: normalizedMime,
Logger: d.params.Logger,
})
dq.OnSubscribedMaxQualityChange(func(mimeType string, maxQuality livekit.VideoQuality) {
@@ -173,8 +175,10 @@ func (d *DynacastManager) getOrCreateDynacastQuality(mime string) *DynacastQuali
})
dq.Start()
d.dynacastQuality[mime] = dq
d.dynacastQuality[normalizedMime] = dq
if normalizedMime != mime {
d.mimeCases[normalizedMime] = mime
}
return dq
}
@@ -283,6 +287,12 @@ func (d *DynacastManager) enqueueSubscribedQualityChange() {
CodecMime: mime,
Quality: quality,
})
if rawMime, ok := d.mimeCases[mime]; ok {
maxSubscribedQualities = append(maxSubscribedQualities, types.SubscribedCodecQuality{
CodecMime: rawMime,
Quality: quality,
})
}
if quality == livekit.VideoQuality_OFF {
subscribedCodecs = append(subscribedCodecs, &livekit.SubscribedCodec{