Fix: MediaPlaylist with discontinuities should not ignore maps

.travis.yml

@@ -1,4 +1,5 @@
 language: go
+go_import_path: github.com/grafov/m3u8
 
 # Versions of go that are explicitly supported.
 go:
@@ -9,11 +10,9 @@ go:
 
 # Required for coverage.
 before_install:
- - go get golang.org/x/tools/cmd/cover
- - go get github.com/mattn/goveralls
+ - go install golang.org/x/tools/...@latest
 
 script:
  - go build -a -v ./...
  - diff <(gofmt -d .) <("")
  - go test -v -covermode=count -coverprofile=coverage.out
- - $GOPATH/bin/goveralls -coverprofile=coverage.out -service=travis-ci

.whitesource

@@ -0,0 +1,3 @@
+{
+  "settingsInheritedFrom": "zencoder/whitesource-config@main"
+}

reader.go

@@ -26,8 +26,8 @@ var reKeyValue = regexp.MustCompile(`([a-zA-Z0-9_-]+)=("[^"]+"|[^",]+)`)
 
 // TimeParse allows globally apply and/or override Time Parser function.
 // Available variants:
-//		* FullTimeParse - implements full featured ISO/IEC 8601:2004
-//		* StrictTimeParse - implements only RFC3339 Nanoseconds format
+//   - FullTimeParse - implements full featured ISO/IEC 8601:2004
+//   - StrictTimeParse - implements only RFC3339 Nanoseconds format
 var TimeParse func(value string) (time.Time, error) = FullTimeParse
 
 // Decode parses a master playlist passed from the buffer. If `strict`
@@ -327,6 +327,8 @@ func decodeLineOfMasterPlaylist(p *MasterPlaylist, state *decodingState, line st
 				alt.Characteristics = v
 			case "SUBTITLES":
 				alt.Subtitles = v
+			case "CHANNELS":
+				alt.Channels = v
 			case "URI":
 				alt.URI = v
 			}
@@ -536,7 +538,7 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
 		}
 		// If EXT-X-KEY appeared before reference to segment (EXTINF) then it linked to this segment
 		if state.tagKey {
-			p.Segments[p.last()].Key = &Key{state.xkey.Method, state.xkey.URI, state.xkey.IV, state.xkey.Keyformat, state.xkey.Keyformatversions}
+			p.Segments[p.last()].Key = &Key{Method: state.xkey.Method, URI: state.xkey.URI, IV: state.xkey.IV, Keyformat: state.xkey.Keyformat, Keyformatversions: state.xkey.Keyformatversions, KeyID: state.xkey.KeyID}
 			// First EXT-X-KEY may appeared in the header of the playlist and linked to first segment
 			// but for convenient playlist generation it also linked as default playlist key
 			if p.Key == nil {
@@ -546,7 +548,7 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
 		}
 		// If EXT-X-MAP appeared before reference to segment (EXTINF) then it linked to this segment
 		if state.tagMap {
-			p.Segments[p.last()].Map = &Map{state.xmap.URI, state.xmap.Limit, state.xmap.Offset}
+			p.Segments[p.last()].Map = &Map{state.xmap.URI, state.xmap.Limit, state.xmap.Offset, false}
 			// First EXT-X-MAP may appeared in the header of the playlist and linked to first segment
 			// but for convenient playlist generation it also linked as default playlist map
 			if p.Map == nil {
@@ -632,6 +634,8 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
 				state.xkey.Keyformat = v
 			case "KEYFORMATVERSIONS":
 				state.xkey.Keyformatversions = v
+			case "KEYID":
+				state.xkey.KeyID = v
 			}
 		}
 		state.tagKey = true
@@ -693,10 +697,22 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
 		// EXT-OATCLS-SCTE35 contains the SCTE35 tag, EXT-X-CUE-OUT contains duration
 		state.scte.Time, _ = strconv.ParseFloat(line[15:], 64)
 		state.scte.CueType = SCTE35Cue_Start
+	case !state.tagSCTE35 && strings.HasPrefix(line, "#EXT-X-CUE-OUT:"):
+		state.tagSCTE35 = true
+		state.listType = MEDIA
+		state.scte = new(SCTE)
+		state.scte.Syntax = SCTE35_CUE
+		state.scte.Time, _ = strconv.ParseFloat(line[15:], 64)
+		state.scte.CueType = SCTE35Cue_Start
 	case !state.tagSCTE35 && strings.HasPrefix(line, "#EXT-X-CUE-OUT-CONT:"):
+		// Since different SCTE35 tags can look similar when reading them, we
+		// take the SCTE35Syntax of the previous segment. This will give
+		// the SCTESyntax of the starting cue out.
+		scteSyntax := p.Segments[p.tail-1].SCTE.Syntax
+
 		state.tagSCTE35 = true
 		state.scte = new(SCTE)
-		state.scte.Syntax = SCTE35_OATCLS
+		state.scte.Syntax = scteSyntax
 		state.scte.CueType = SCTE35Cue_Mid
 		for attribute, value := range decodeParamsLine(line[20:]) {
 			switch attribute {
@@ -709,9 +725,11 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
 			}
 		}
 	case !state.tagSCTE35 && line == "#EXT-X-CUE-IN":
+		// Same as EXT-X-CUE-OUT-CONT
+		scteSyntax := p.Segments[p.tail-1].SCTE.Syntax
 		state.tagSCTE35 = true
 		state.scte = new(SCTE)
-		state.scte.Syntax = SCTE35_OATCLS
+		state.scte.Syntax = scteSyntax
 		state.scte.CueType = SCTE35Cue_End
 	case !state.tagDiscontinuity && strings.HasPrefix(line, "#EXT-X-DISCONTINUITY"):
 		state.tagDiscontinuity = true

reader_test.go

@@ -1,11 +1,11 @@
 /*
- Playlist parsing tests.
+Playlist parsing tests.
 
- Copyright 2013-2019 The Project Developers.
- See the AUTHORS and LICENSE files at the top-level directory of this distribution
- and at https://github.com/grafov/m3u8/
+Copyright 2013-2019 The Project Developers.
+See the AUTHORS and LICENSE files at the top-level directory of this distribution
+and at https://github.com/grafov/m3u8/
 
- ॐ तारे तुत्तारे तुरे स्व
+ॐ तारे तुत्तारे तुरे स्व
 */
 package m3u8
 
@@ -14,6 +14,7 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"reflect"
 	"testing"
@@ -288,6 +289,43 @@ func TestDecodeMasterWithHLSV7(t *testing.T) {
 	}
 }
 
+func TestDecodeMasterPlaylistWithChapters(t *testing.T) {
+	f, err := os.Open("sample-playlists/master-adv-example-hevc.m3u8")
+	if err != nil {
+		t.Fatal(err)
+	}
+	p := NewMasterPlaylist()
+	err = p.DecodeFrom(bufio.NewReader(f), false)
+	if err != nil {
+		t.Fatal(err)
+	}
+	var audio []*Alternative
+	for _, v := range p.Variants {
+		for _, a := range v.Alternatives {
+			if a.Type == "AUDIO" {
+				audio = append(audio, a)
+			}
+		}
+	}
+	if len(audio) != 3 {
+		t.Fatalf("expected 6 audio renditions got=%d", len(audio))
+	}
+	for _, a := range audio {
+		var expectedChannels string
+		switch a.GroupId {
+		case "a1":
+			expectedChannels = "2"
+		case "a2", "a3":
+			expectedChannels = "6"
+		default:
+			t.Fatalf("unexpected audio GROUP-ID=%q", a.GroupId)
+		}
+		if a.Channels != expectedChannels {
+			t.Fatalf("incorrect channels attriute expected=%q got=%q GROUP-ID=%q", expectedChannels, a.Channels, a.GroupId)
+		}
+	}
+}
+
 /****************************
  * Begin Test MediaPlaylist *
  ****************************/
@@ -564,6 +602,32 @@ func TestMediaPlaylistWithOATCLSSCTE35Tag(t *testing.T) {
 	}
 }
 
+func TestMediaPlaylistWithCueSCTE35Tag(t *testing.T) {
+	f, err := ioutil.ReadFile("sample-playlists/media-playlist-with-cue-scte35.m3u8")
+	if err != nil {
+		t.Fatal(err)
+	}
+	p, _, err := DecodeFrom(bytes.NewReader(f), true)
+	if err != nil {
+		t.Fatal(err)
+	}
+	pp := p.(*MediaPlaylist)
+
+	expect := map[int]*SCTE{
+		2: {Syntax: SCTE35_CUE, CueType: SCTE35Cue_Start, Time: 18},
+		3: {Syntax: SCTE35_CUE, CueType: SCTE35Cue_Mid, Time: 6.0, Elapsed: 6.0},
+		4: {Syntax: SCTE35_CUE, CueType: SCTE35Cue_Mid, Time: 6.0, Elapsed: 12.0},
+		5: {Syntax: SCTE35_CUE, CueType: SCTE35Cue_End},
+	}
+	for i := 0; i < int(pp.Count()); i++ {
+		if !reflect.DeepEqual(pp.Segments[i].SCTE, expect[i]) {
+			t.Errorf("CUE SCTE35 segment %v (uri: %v)\ngot: %#v\nexp: %#v",
+				i, pp.Segments[i].URI, pp.Segments[i].SCTE, expect[i],
+			)
+		}
+	}
+}
+
 func TestDecodeMediaPlaylistWithDiscontinuitySeq(t *testing.T) {
 	f, err := os.Open("sample-playlists/media-playlist-with-discontinuity-seq.m3u8")
 	if err != nil {