From 1e1e5f71a655cfd0ec6e1b14dc7e60985d6eb5fb Mon Sep 17 00:00:00 2001
From: zijiren233 <pyh1670605849@gmail.com>
Date: Mon, 22 Jan 2024 00:37:27 +0800
Subject: [PATCH] Fix: play in ios

---
 protocol/hls/cache.go | 16 +++++++++++-----
 server/channel.go     |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/protocol/hls/cache.go b/protocol/hls/cache.go
index 16a37d5..64ac564 100755
--- a/protocol/hls/cache.go
+++ b/protocol/hls/cache.go
@@ -38,7 +38,7 @@ func (tc *TSCache) all() []*TSItem {
 	return items
 }
 
-func (tc *TSCache) GenM3U8File(tsPath func(tsName string) (tsPath string)) []byte {
+func (tc *TSCache) GenM3U8File(tsPath func(tsName string) (tsPath string)) ([]byte, error) {
 	var seq int64
 	var maxDuration int64
 	m3u8body := bytes.NewBuffer(nil)
@@ -53,14 +53,20 @@ func (tc *TSCache) GenM3U8File(tsPath func(tsName string) (tsPath string)) []byt
 		if seq == 0 {
 			seq = item.SeqNum
 		}
-		fmt.Fprintf(m3u8body, "#EXTINF:%.3f,\n%s\n#EXT-X-BYTERANGE:%d\n", float64(item.Duration)/float64(1000), tsPath(item.TsName), len(item.Data))
+		_, err := fmt.Fprintf(m3u8body, "#EXTINF:%.3f,\n%s\n", float64(item.Duration)/float64(1000), tsPath(item.TsName))
+		if err != nil {
+			return nil, err
+		}
 	}
 	w := bytes.NewBuffer(make([]byte, 0, m3u8body.Len()+256))
 	fmt.Fprintf(w,
-		"#EXTM3U\n#EXT-X-VERSION:3\n#EXT-X-ALLOW-CACHE:NO\n#EXT-X-TARGETDURATION:%d\n#EXT-X-MEDIA-SEQUENCE:%d\n\n",
+		"#EXTM3U\n#EXT-X-VERSION:3\n#EXT-X-ALLOW-CACHE:NO\n#EXT-X-TARGETDURATION:%d\n#EXT-X-MEDIA-SEQUENCE:%d\n",
 		maxDuration/1000+1, seq)
-	m3u8body.WriteTo(w)
-	return w.Bytes()
+	_, err := m3u8body.WriteTo(w)
+	if err != nil {
+		return nil, err
+	}
+	return w.Bytes(), nil
 }
 
 func (tc *TSCache) PushItem(item *TSItem) {
diff --git a/server/channel.go b/server/channel.go
index 80fd82e..938215b 100644
--- a/server/channel.go
+++ b/server/channel.go
@@ -214,7 +214,7 @@ func (c *Channel) GenM3U8File(tsPath func(tsName string) (tsPath string)) ([]byt
 	if !c.InitdHlsPlayer() {
 		return nil, ErrHlsPlayerNotInit
 	}
-	return c.HlsPlayer().GetCacheInc().GenM3U8File(tsPath), nil
+	return c.HlsPlayer().GetCacheInc().GenM3U8File(tsPath)
 }
 
 func (c *Channel) GetTsFile(tsName string) ([]byte, error) {