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

Jump to bottom

mapic: Fix multistream target URL ? handling #1300

Merged
merged 1 commit into from
Sep 5, 2024
Merged

mapic: Fix multistream target URL ? handling #1300

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
9 changes: 3 additions & 6 deletions mapic/mistapiconnector_app.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,16 +748,13 @@ func (mc *mac) getPushUrl(stream *api.Stream, targetRef *api.MultistreamTargetRe
}
videoSelector = fmt.Sprintf("~%dx%d", prof.Width, prof.Height)
}
join := "?"
if strings.Contains(target.URL, "?") {
join = "&"
}
audioSelector := "maxbps"
if targetRef.VideoOnly {
audioSelector = "silent"
}
// Inject ?video=~widthxheight to send the correct rendition
return target, fmt.Sprintf("%s%svideo=%s&audio=%s", target.URL, join, videoSelector, audioSelector), nil
// Inject ?video=~widthxheight to send the correct rendition. Notice that we don't care if there is already a
// query-string in the URL since Mist will always strip from the last `?` in the push URL for its configs.
return target, fmt.Sprintf("%s?video=%s&audio=%s", target.URL, videoSelector, audioSelector), nil
}

func (mc *mac) getStreamInfoLogged(playbackID string) (*streamInfo, bool) {
Expand Down
Loading