neoris/core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix counting HLSv7 sessions (datarhei/restreamer#849)

Browse Source
This commit is contained in:
Ingo Oppermann 2024-11-04 12:23:49 +01:00
parent 6872ba0498
commit 0f3dfe4e67
No known key found for this signature in database
GPG Key ID: 2AB32426E9DD229E
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
http/middleware/session/HLS.go
View File

@ -137,7 +137,7 @@ func (h *hls) handleIngress(c echo.Context, next echo.HandlerFunc) error {
h.lock.Unlock() h.lock.Unlock()
} }
}() }()
} else if strings.HasSuffix(path, ".ts") { } else if strings.HasSuffix(path, ".ts") || strings.HasSuffix(path, ".mp4") {
// Get the size of the .ts file and store it in the ts-map for later use. // Get the size of the .ts file and store it in the ts-map for later use.
reader := req.Body reader := req.Body
r := &bodysizeReader{ r := &bodysizeReader{
@ -171,7 +171,7 @@ func (h *hls) handleEgress(c echo.Context, next echo.HandlerFunc) error {
sessionID := c.QueryParam("session") sessionID := c.QueryParam("session")
isM3U8 := strings.HasSuffix(path, ".m3u8") isM3U8 := strings.HasSuffix(path, ".m3u8")
isTS := strings.HasSuffix(path, ".ts") isSegment := strings.HasSuffix(path, ".ts") || strings.HasSuffix(path, ".mp4")
rewrite := false rewrite := false
@ -257,12 +257,12 @@ func (h *hls) handleEgress(c echo.Context, next echo.HandlerFunc) error {
res.Write(rewriter.buffer.Bytes()) res.Write(rewriter.buffer.Bytes())
} }
if isM3U8 || isTS { if isM3U8 || isSegment {
// Collect how many bytes we've written in this session // Collect how many bytes we've written in this session
h.egressCollector.Egress(sessionID, headerSize(res.Header())) h.egressCollector.Egress(sessionID, headerSize(res.Header()))
h.egressCollector.Egress(sessionID, res.Size) h.egressCollector.Egress(sessionID, res.Size)
if isTS { if isSegment {
// Activate the session. If the session is already active, this is a noop // Activate the session. If the session is already active, this is a noop
h.egressCollector.Activate(sessionID) h.egressCollector.Activate(sessionID)
} }
@ -329,7 +329,7 @@ func (r *bodyReader) getSegments(dir string) []string {
} }
// Ignore anything that doesn't end in .ts // Ignore anything that doesn't end in .ts
if !strings.HasSuffix(u.Path, ".ts") { if !strings.HasSuffix(u.Path, ".ts") && !strings.HasSuffix(u.Path, ".mp4") {
continue continue
} }
@ -402,7 +402,7 @@ func (g *sessionRewriter) rewriteHLS(sessionID string, requestURL *url.URL) {
} }
// Write anything that doesn't end in .m3u8 or .ts unmodified // Write anything that doesn't end in .m3u8 or .ts unmodified
if !strings.HasSuffix(u.Path, ".m3u8") && !strings.HasSuffix(u.Path, ".ts") { if !strings.HasSuffix(u.Path, ".m3u8") && !strings.HasSuffix(u.Path, ".ts") && !strings.HasSuffix(u.Path, ".mp4") {
buffer.WriteString(line + "\n") buffer.WriteString(line + "\n")
continue continue
} }