zishuo/ipchub
1
0
Fork 0
mirror of https://github.com/cnotch/ipchub.git synced 2025-09-27 03:45:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

update comments

Browse Source
This commit is contained in:
notch
2020-12-29 08:51:39 +08:00
parent eef3eccafa
commit 61c355efd8
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ipchub.conf
View File

@@ -2,6 +2,8 @@
"listen": ":1554", "listen": ":1554",
"auth": false, "auth": false,
"cache_gop": true, "cache_gop": true,
"hlspath":"./",
"hlsfragment":10,
"profile": true, "profile": true,
"log": { "log": {
"level": "DEBUG", "level": "DEBUG",

18
protos/hls/muxer.go
View File

@@ -26,7 +26,7 @@ const hlsSegmentMinDurationMs = 100
// in ms, for HLS aac flush the audio // in ms, for HLS aac flush the audio
const hlsAacDelay = 100 const hlsAacDelay = 100
const remainSegmets = 3 const hlsRemainSegments = 3
// Muxer the HLS stream(m3u8 and ts files). // Muxer the HLS stream(m3u8 and ts files).
type Muxer struct { type Muxer struct {
@@ -187,7 +187,7 @@ func (muxer *Muxer) segmentClose(muxerClosed bool) (err error) {
defer muxer.l.Unlock() defer muxer.l.Unlock()
muxer.current.file.close() muxer.current.file.close()
remain := remainSegmets remain := hlsRemainSegments
if muxerClosed { if muxerClosed {
remain = 0 remain = 0
} }
@@ -205,6 +205,16 @@ func (muxer *Muxer) segmentClose(muxerClosed bool) (err error) {
// 仅保留3个 // 仅保留3个
if len(muxer.segments) > remain { if len(muxer.segments) > remain {
for i := 0; i < len(muxer.segments)-remain; i++ { for i := 0; i < len(muxer.segments)-remain; i++ {
// // 可以考虑异步删除
// if muxerClosed {
// muxer.segments[i].file.delete()
// } else {
// file := muxer.segments[i].file
// delay := time.Duration(2*muxer.hlsFragment) * time.Second
// scheduler.AfterFunc(delay, func() {
// file.delete()
// }, "hls segment file delay(1.5*hlsFragment).")
// }
muxer.segments[i].file.delete() muxer.segments[i].file.delete()
muxer.segments[i] = nil muxer.segments[i] = nil
} }
@@ -271,8 +281,8 @@ func (muxer *Muxer) M3u8(token string) ([]byte, error) {
defer muxer.l.RUnlock() defer muxer.l.RUnlock()
segments := muxer.segments segments := muxer.segments
if len(segments) < remainSegmets { if len(segments) < hlsRemainSegments {
return nil, errors.New("Playlist is not enough,Maybe the HLS stream just started") return nil, errors.New("playlist is not enough,maybe the HLS stream just started")
} }
seq := segments[0].sequenceNo seq := segments[0].sequenceNo