Skip to content

Commit 879e195

Browse files
committed
Make encoder test work with both macos and linux
1 parent 0e405d8 commit 879e195

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

encoder/encoder_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ func (s *encoderSuite) TestCheckFastStart() {
6363

6464
func (s *encoderSuite) TestEncode() {
6565
absPath, _ := filepath.Abs(s.file.Name())
66-
e, err := NewEncoder(Configure().Log(zapadapter.NewKV(nil)).Ladder(ladder.Default).SpritegenPath(""))
66+
cfg := Configure().Log(zapadapter.NewKV(nil)).Ladder(ladder.Default).SpritegenPath("")
67+
e, err := NewEncoder(cfg)
6768
s.Require().NoError(err)
6869

6970
res, err := e.Encode(absPath, s.out)
@@ -89,16 +90,16 @@ func (s *encoderSuite) TestEncode() {
8990
"master.m3u8": `
9091
#EXTM3U
9192
#EXT-X-VERSION:6
92-
#EXT-X-STREAM-INF:BANDWIDTH=\d+,AVERAGE-BANDWIDTH=\d+,RESOLUTION=1920x1080,CODECS="avc1.\w+,mp4a.40.2"
93+
#EXT-X-STREAM-INF:BANDWIDTH=\d+,(?:AVERAGE-BANDWIDTH=\d+,)?RESOLUTION=1920x1080,CODECS="avc1.\w+,mp4a.40.2"
9394
v0.m3u8
9495
95-
#EXT-X-STREAM-INF:BANDWIDTH=\d+,AVERAGE-BANDWIDTH=\d+,RESOLUTION=1280x720,CODECS="avc1.\w+,mp4a.40.2"
96+
#EXT-X-STREAM-INF:BANDWIDTH=\d+,(?:AVERAGE-BANDWIDTH=\d+,)?RESOLUTION=1280x720,CODECS="avc1.\w+,mp4a.40.2"
9697
v1.m3u8
9798
98-
#EXT-X-STREAM-INF:BANDWIDTH=\d+,AVERAGE-BANDWIDTH=\d+,RESOLUTION=640x360,CODECS="avc1.\w+,mp4a.40.2"
99+
#EXT-X-STREAM-INF:BANDWIDTH=\d+,(?:AVERAGE-BANDWIDTH=\d+,)?RESOLUTION=640x360,CODECS="avc1.\w+,mp4a.40.2"
99100
v2.m3u8
100101
101-
#EXT-X-STREAM-INF:BANDWIDTH=\d+,AVERAGE-BANDWIDTH=\d+,RESOLUTION=256x144,CODECS="avc1.\w+,mp4a.40.2"
102+
#EXT-X-STREAM-INF:BANDWIDTH=\d+,(AVERAGE-BANDWIDTH=\d+,)?RESOLUTION=256x144,CODECS="avc1.\w+,mp4a.40.2"
102103
v3.m3u8`,
103104
"v0.m3u8": "v0_s000000.ts",
104105
"v1.m3u8": "v1_s000000.ts",

0 commit comments

Comments
 (0)