From fded87aa3341fdd6500a7b12a7dc0640c67448e5 Mon Sep 17 00:00:00 2001
From: Alexey Khit <alexey.khit@gmail.com>
Date: Sat, 8 Jul 2023 09:32:54 +0300
Subject: [PATCH] Update stream info for MP4/MSE/HLS

---
 internal/hls/hls.go | 1 +
 internal/hls/ws.go  | 1 +
 internal/mp4/mp4.go | 1 +
 internal/mp4/ws.go  | 1 +
 pkg/mp4/consumer.go | 6 ++++--
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/internal/hls/hls.go b/internal/hls/hls.go
index de92047a..096cde6f 100644
--- a/internal/hls/hls.go
+++ b/internal/hls/hls.go
@@ -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,
diff --git a/internal/hls/ws.go b/internal/hls/ws.go
index adae0a57..c25485c5 100644
--- a/internal/hls/ws.go
+++ b/internal/hls/ws.go
@@ -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),
diff --git a/internal/mp4/mp4.go b/internal/mp4/mp4.go
index 8b006ad4..bac519fd 100644
--- a/internal/mp4/mp4.go
+++ b/internal/mp4/mp4.go
@@ -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()),
diff --git a/internal/mp4/ws.go b/internal/mp4/ws.go
index 5b3f2eb5..eff94071 100644
--- a/internal/mp4/ws.go
+++ b/internal/mp4/ws.go
@@ -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(),
 	}
diff --git a/pkg/mp4/consumer.go b/pkg/mp4/consumer.go
index f9306b10..4a754500 100644
--- a/pkg/mp4/consumer.go
+++ b/pkg/mp4/consumer.go
@@ -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,