Add media playlist AppendSegment(*MediaSegment) method (#44)

writer.go

@@ -33,6 +33,10 @@ import (
 	"time"
 )
 
+var (
+	ErrPlaylistFull = errors.New("playlist is full")
+)
+
 // Set version of the playlist accordingly with section 7
 func version(ver *uint8, newver uint8) {
 	if *ver < newver {
@@ -276,18 +280,24 @@ func (p *MediaPlaylist) Remove() (err error) {
 // Append general chunk to the tail of chunk slice for a media playlist.
 // This operation does reset playlist cache.
 func (p *MediaPlaylist) Append(uri string, duration float64, title string) error {
-	if p.head == p.tail && p.count > 0 {
-		return errors.New("playlist is full")
-	}
 	seg := new(MediaSegment)
 	seg.URI = uri
 	seg.Duration = duration
 	seg.Title = title
+	return p.AppendSegment(seg)
+}
+
+// AppendSegment appends a MediaSegment to the tail of chunk slice for a media playlist.
+// This operation does reset playlist cache.
+func (p *MediaPlaylist) AppendSegment(seg *MediaSegment) error {
+	if p.head == p.tail && p.count > 0 {
+		return ErrPlaylistFull
+	}
 	p.Segments[p.tail] = seg
 	p.tail = (p.tail + 1) % p.capacity
 	p.count++
-	if p.TargetDuration < duration {
-		p.TargetDuration = math.Ceil(duration)
+	if p.TargetDuration < seg.Duration {
+		p.TargetDuration = math.Ceil(seg.Duration)
 	}
 	p.buf.Reset()
 	return nil

writer_test.go

@@ -68,14 +68,38 @@ func TestAddSegmentToMediaPlaylist(t *testing.T) {
 	if e != nil {
 		t.Fatalf("Create media playlist failed: %s", e)
 	}
-	e = p.Append("test01.ts", 5.0, "")
+	e = p.Append("test01.ts", 10.0, "title")
 	if e != nil {
 		t.Errorf("Add 1st segment to a media playlist failed: %s", e)
 	}
-	e = p.Append("test02.ts", 6.0, "")
+	if p.Segments[0].URI != "test01.ts" {
+		t.Errorf("Expected: test01.ts, got: %v", p.Segments[0].URI)
+	}
+	if p.Segments[0].Duration != 10 {
+		t.Errorf("Expected: 10, got: %v", p.Segments[0].Duration)
+	}
+	if p.Segments[0].Title != "title" {
+		t.Errorf("Expected: title, got: %v", p.Segments[0].Title)
+	}
+}
+
+func TestAppendSegmentToMediaPlaylist(t *testing.T) {
+	p, _ := NewMediaPlaylist(2, 2)
+	e := p.AppendSegment(&MediaSegment{Duration: 10})
+	if e != nil {
+		t.Errorf("Add 1st segment to a media playlist failed: %s", e)
+	}
+	if p.TargetDuration != 10 {
+		t.Errorf("Failed to increase TargetDuration, expected: 10, got: %v", p.TargetDuration)
+	}
+	e = p.AppendSegment(&MediaSegment{Duration: 10})
 	if e != nil {
 		t.Errorf("Add 2nd segment to a media playlist failed: %s", e)
 	}
+	e = p.AppendSegment(&MediaSegment{Duration: 10})
+	if e != ErrPlaylistFull {
+		t.Errorf("Add 3rd expected full error, got: %s", e)
+	}
 }
 
 // Create new media playlist