diff --git a/cmd/mp4/mp4.go b/cmd/mp4/mp4.go index 47aeeb82..55dfb047 100644 --- a/cmd/mp4/mp4.go +++ b/cmd/mp4/mp4.go @@ -15,8 +15,8 @@ import ( func Init() { log = app.GetLogger("mp4") - api.HandleWS("mse", handlerWS) - api.HandleWS("mp4", handlerWS4) + api.HandleWS("mse", handlerWSMSE) + api.HandleWS("mp4", handlerWSMP4) api.HandleFunc("api/frame.mp4", handlerKeyframe) api.HandleFunc("api/stream.mp4", handlerMP4) @@ -65,7 +65,7 @@ func handlerKeyframe(w http.ResponseWriter, r *http.Request) { } func handlerMP4(w http.ResponseWriter, r *http.Request) { - log.Trace().Msgf("[api.mp4] %s %+v", r.Method, r.Header) + log.Trace().Msgf("[mp4] %s %+v", r.Method, r.Header) if isChromeFirst(w, r) || isSafari(w, r) { return diff --git a/cmd/mp4/ws.go b/cmd/mp4/ws.go index 56b2965b..ffe800e5 100644 --- a/cmd/mp4/ws.go +++ b/cmd/mp4/ws.go @@ -11,7 +11,7 @@ import ( const packetSize = 8192 -func handlerWS(tr *api.Transport, msg *api.Message) error { +func handlerWSMSE(tr *api.Transport, msg *api.Message) error { src := tr.Request.URL.Query().Get("src") stream := streams.GetOrNew(src) if stream == nil { @@ -23,6 +23,7 @@ func handlerWS(tr *api.Transport, msg *api.Message) error { cons.RemoteAddr = tr.Request.RemoteAddr if codecs, ok := msg.Value.(string); ok { + log.Trace().Str("codecs", codecs).Msgf("[mp4] new WS/MSE consumer") cons.Medias = parseMedias(codecs, true) } @@ -60,7 +61,7 @@ func handlerWS(tr *api.Transport, msg *api.Message) error { return nil } -func handlerWS4(tr *api.Transport, msg *api.Message) error { +func handlerWSMP4(tr *api.Transport, msg *api.Message) error { src := tr.Request.URL.Query().Get("src") stream := streams.GetOrNew(src) if stream == nil { @@ -70,6 +71,7 @@ func handlerWS4(tr *api.Transport, msg *api.Message) error { cons := &mp4.Segment{} if codecs, ok := msg.Value.(string); ok { + log.Trace().Str("codecs", codecs).Msgf("[mp4] new WS/MP4 consumer") cons.Medias = parseMedias(codecs, false) }