Update stream info for MP4/MSE/HLS

This commit is contained in:
Alexey Khit
2023-07-08 09:32:54 +03:00
parent 52a4fc329c
commit fded87aa33
5 changed files with 8 additions and 2 deletions
+1
View File
@@ -67,6 +67,7 @@ func handlerStream(w http.ResponseWriter, r *http.Request) {
medias := mp4.ParseQuery(r.URL.Query())
if medias != nil {
cons = &mp4.Consumer{
Desc: "HLS/HTTP",
RemoteAddr: tcp.RemoteAddr(r),
UserAgent: r.UserAgent(),
Medias: medias,
+1
View File
@@ -23,6 +23,7 @@ func handlerWSHLS(tr *ws.Transport, msg *ws.Message) error {
codecs := msg.String()
cons := &mp4.Consumer{
Desc: "HLS/WebSocket",
RemoteAddr: tcp.RemoteAddr(tr.Request),
UserAgent: tr.Request.UserAgent(),
Medias: mp4.ParseCodecs(codecs, true),
+1
View File
@@ -110,6 +110,7 @@ func handlerMP4(w http.ResponseWriter, r *http.Request) {
exit := make(chan error, 1) // Add buffer to prevent blocking
cons := &mp4.Consumer{
Desc: "MP4/HTTP",
RemoteAddr: tcp.RemoteAddr(r),
UserAgent: r.UserAgent(),
Medias: mp4.ParseQuery(r.URL.Query()),
+1
View File
@@ -17,6 +17,7 @@ func handlerWSMSE(tr *ws.Transport, msg *ws.Message) error {
}
cons := &mp4.Consumer{
Desc: "MSE/WebSocket",
RemoteAddr: tcp.RemoteAddr(tr.Request),
UserAgent: tr.Request.UserAgent(),
}
+4 -2
View File
@@ -14,7 +14,9 @@ import (
type Consumer struct {
core.Listener
Medias []*core.Media
Medias []*core.Media
Desc string
UserAgent string
RemoteAddr string
@@ -191,7 +193,7 @@ func (c *Consumer) Start() {
func (c *Consumer) MarshalJSON() ([]byte, error) {
info := &core.Info{
Type: "MP4 passive consumer",
Type: c.Desc + " passive consumer",
RemoteAddr: c.RemoteAddr,
UserAgent: c.UserAgent,
Medias: c.Medias,