Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 media/whip_server.go
Original file line number Diff line number Diff line change
Expand Up @@ -493,7 +493,7 @@
if r.TLS != nil {
scheme = "https"
}
return fmt.Sprintf("%s://%s/%s", scheme, r.Host, r.URL.Path)
return fmt.Sprintf("%s://%s%s", scheme, r.Host, r.URL.Path)

Check warning on line 496 in media/whip_server.go

View check run for this annotation

Codecov / codecov/patch

media/whip_server.go#L496

Added line #L496 was not covered by tests
}

// split h264 nalus
Expand Down
15 changes: 11 additions & 4 deletions server/ai_mediaserver.go
Original file line number Diff line number Diff line change
Expand Up @@ -890,15 +890,22 @@
}
mediamtxOutputURL := internalOutputHost + streamName + "-out"
mediaMTXOutputAlias := fmt.Sprintf("%s%s-%s-out", internalOutputHost, streamName, requestID)
outputURL := ""
streamID := ""
outputURL := r.URL.Query().Get("rtmpOutput")
streamID := r.URL.Query().Get("streamId")

Check warning on line 894 in server/ai_mediaserver.go

View check run for this annotation

Codecov / codecov/patch

server/ai_mediaserver.go#L893-L894

Added lines #L893 - L894 were not covered by tests
pipelineID := ""
pipeline := ""
pipeline := r.URL.Query().Get("pipeline")

Check warning on line 896 in server/ai_mediaserver.go

View check run for this annotation

Codecov / codecov/patch

server/ai_mediaserver.go#L896

Added line #L896 was not covered by tests
pipelineParams := make(map[string]interface{})
sourceTypeStr := "livepeer-whip"
queryParams := r.URL.Query().Encode()
orchestrator := r.URL.Query().Get("orchestrator")

rawParams := r.URL.Query().Get("params")
if rawParams != "" {
if err := json.Unmarshal([]byte(rawParams), &pipelineParams); err != nil {
clog.Errorf(ctx, "Invalid pipeline params: %s", err)
http.Error(w, "Invalid pipeline params", http.StatusBadRequest)
return
}

Check warning on line 907 in server/ai_mediaserver.go

View check run for this annotation

Codecov / codecov/patch

server/ai_mediaserver.go#L901-L907

Added lines #L901 - L907 were not covered by tests
}
// collect RTMP outputs
var rtmpOutputs []string

Expand Down
Loading