fix: Multiple keys are supported

reader_test.go

@@ -305,7 +305,7 @@ func TestDecodeMediaPlaylist(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	//fmt.Printf("Playlist object: %+v\n", p)
+
 	// check parsed values
 	if p.ver != 3 {
 		t.Errorf("Version of parsed playlist = %d (must = 3)", p.ver)
@@ -402,17 +402,14 @@ func TestDecodeMediaPlaylistWithWidevine(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	//fmt.Printf("Playlist object: %+v\n", p)
 	// check parsed values
 	if p.ver != 2 {
 		t.Errorf("Version of parsed playlist = %d (must = 2)", p.ver)
 	}
 	if p.TargetDuration != 9 {
 		t.Errorf("TargetDuration of parsed playlist = %f (must = 9.0)", p.TargetDuration)
 	}
-	// TODO check other values…
-	//fmt.Printf("%+v\n", p.Key)
-	//fmt.Println(p.Encode().String())
+
 }
 
 // https://datatracker.ietf.org/doc/html/rfc8216#section-4.3.2.4
@@ -429,7 +426,6 @@ func TestDecodeMediaPlaylistWithMutipleKeys(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	//fmt.Printf("Playlist object: %+v\n", p)
 	// check parsed values
 	if p.ver != 2 {
 		t.Errorf("Version of parsed playlist = %d (must = 2)", p.ver)
@@ -441,9 +437,6 @@ func TestDecodeMediaPlaylistWithMutipleKeys(t *testing.T) {
 	if len(p.Keys) != 2 {
 		t.Errorf("Number of keys = %d (must = 2)", len(p.Keys))
 	}
-	// TODO check other values…
-	//fmt.Printf("%+v\n", p.Key)
-	//fmt.Println(p.Encode().String())
 }
 
 func TestDecodeMasterPlaylistWithAutodetection(t *testing.T) {
@@ -459,11 +452,6 @@ func TestDecodeMasterPlaylistWithAutodetection(t *testing.T) {
 		t.Error("Sample not recognized as master playlist.")
 	}
 	mp := m.(*MasterPlaylist)
-	// fmt.Printf(">%+v\n", mp)
-	// for _, v := range mp.Variants {
-	//	fmt.Printf(">>%+v +v\n", v)
-	// }
-	//fmt.Println("Type below must be MasterPlaylist:")
 	CheckType(t, mp)
 }
 

writer.go

@@ -35,6 +35,9 @@ func version(ver *uint8, newver uint8) {
 func strver(ver uint8) string {
 	return strconv.FormatUint(uint64(ver), 10)
 }
+func equal(a, b []*Key) bool {
+	return reflect.DeepEqual(a, b)
+}
 
 // NewMasterPlaylist creates a new empty master playlist. Master
 // playlist consists of variants.
@@ -625,7 +628,7 @@ func (p *MediaPlaylist) Encode() *bytes.Buffer {
 			}
 		}
 		// check for key change
-		if (seg.Keys != nil && !p.Equal(p.Keys, seg.Keys)) && !p.Equal(p.Segments[head-2].Keys, seg.Keys) {
+		if (seg.Keys != nil && !equal(p.Keys, seg.Keys)) && !equal(p.Segments[head-2].Keys, seg.Keys) {
 			for _, key := range seg.Keys {
 				p.buf.WriteString("#EXT-X-KEY:")
 				p.buf.WriteString("METHOD=")
@@ -950,7 +953,3 @@ func (p *MediaPlaylist) GetAllSegments() []*MediaSegment {
 	}
 	return buf
 }
-
-func (p *MediaPlaylist) Equal(a, b []*Key) bool {
-	return reflect.DeepEqual(a, b)
-}