nathan/xTeVe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed broken merge

Browse Source
This commit is contained in:
marmei
2019-12-14 10:17:42 +01:00
parent 66c01dd1fb
commit aa763726a3
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/buffer.go
View File

@@ -1,8 +1,8 @@
package src
/*
Tuner-Limit Bild als Video rendern [ffmpeg]
-loop 1 -i stream-limit.jpg -c:v libx264 -t 1 -pix_fmt yuv420p -vf scale=1920:1080 stream-limit.ts
Tuner-Limit Bild als Video rendern [ffmpeg]
-loop 1 -i stream-limit.jpg -c:v libx264 -t 1 -pix_fmt yuv420p -vf scale=1920:1080 stream-limit.ts
*/
import (
@@ -228,7 +228,7 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
}
//w.WriteHeader(200)
w.WriteHeader(200)
for { // Loop 1: Warten bis das erste Segment durch den Buffer heruntergeladen wurde
@@ -332,23 +332,22 @@ func bufferingStream(playlistID, streamingURL, channelName string, w http.Respon
if streaming == false {
contentType := http.DetectContentType(buffer) + "; name=stream.ts"
//_ = contentType
contentType := http.DetectContentType(buffer)
_ = contentType
//w.Header().Set("Content-type", "video/mpeg")
w.Header().Add("Content-type", contentType)
w.Header().Set("Content-type", contentType)
w.Header().Set("Content-Length", "0")
w.Header().Set("Connection", "close")
}
/*
// HDHR Header
w.Header().Set("Cache-Control", "no-cache")
w.Header().Set("Pragma", "no-cache")
w.Header().Set("transferMode.dlna.org", "Streaming")
// HDHR Header
w.Header().Set("Cache-Control", "no-cache")
w.Header().Set("Pragma", "no-cache")
w.Header().Set("transferMode.dlna.org", "Streaming")
*/
w.WriteHeader(200)
_, err := w.Write(buffer)
if err != nil {