Multiperiod dash check for existing period to add new period (#86)

Author: vish91

examples/ondemand.go

@@ -37,7 +37,7 @@ func exampleOndemand() {
 
 	thumbnailsAS, _ := m.AddNewAdaptationSetThumbnails(mpd.DASH_MIME_TYPE_IMAGE_JPEG)
 	_, _ = thumbnailsAS.SetNewSegmentTemplateThumbnails(1801800, "$RepresentationID$/$Number$.jpg", 0, 30000)
-	_, _ = thumbnailsAS.AddNewRepresentationThumbnails("thumbnails", "5x4","http://dashif.org/guidelines/thumbnail_tile", 50000,  1600, 720)
+	_, _ = thumbnailsAS.AddNewRepresentationThumbnails("thumbnails", "5x4", "http://dashif.org/guidelines/thumbnail_tile", 50000, 1600, 720)
 
 	mpdStr, _ := m.WriteToString()
 	fmt.Println(mpdStr)

mpd/mpd.go

@@ -449,6 +449,9 @@ func NewDynamicMPD(profile DashProfile, availabilityStartTime, minBufferTime str
 
 // AddNewPeriod creates a new Period and make it the currently active one.
 func (m *MPD) AddNewPeriod() *Period {
+	if m.period != nil && m.period.ID == "" && m.period.AdaptationSets == nil {
+		return m.GetCurrentPeriod()
+	}
 	period := &Period{}
 	m.Periods = append(m.Periods, period)
 	m.period = period
@@ -490,7 +493,7 @@ func (m *MPD) AddNewAdaptationSetThumbnailsWithID(id, mimeType string) (*Adaptat
 
 func (period *Period) AddNewAdaptationSetThumbnailsWithID(id, mimeType string) (*AdaptationSet, error) {
 	as := &AdaptationSet{
-		ID: Strptr(id),
+		ID:          Strptr(id),
 		ContentType: Strptr(DASH_CONTENT_TYPE_IMAGE),
 		CommonAttributesAndElements: CommonAttributesAndElements{
 			MimeType: Strptr(mimeType),
@@ -963,7 +966,7 @@ func (as *AdaptationSet) SetNewSegmentTemplateThumbnails(duration int64, media s
 // width - width of the video (i.e. 1280).
 // height - height of the video (i.e 720).
 // uri -
-func (as *AdaptationSet) AddNewRepresentationThumbnails(id, val, uri string,bandwidth, width, height int64) (*Representation, error) {
+func (as *AdaptationSet) AddNewRepresentationThumbnails(id, val, uri string, bandwidth, width, height int64) (*Representation, error) {
 	r := &Representation{
 		Bandwidth: Int64ptr(bandwidth),
 		ID:        Strptr(id),

mpd/mpd_test.go

@@ -3,6 +3,7 @@ package mpd
 import (
 	"encoding/base64"
 	"path/filepath"
+	"strconv"
 	"testing"
 
 	. "github.com/zencoder/go-dash/helpers/ptrs"
@@ -95,6 +96,34 @@ func TestNewDynamicMPDLive(t *testing.T) {
 	require.EqualString(t, expectedString, actualString)
 }
 
+func TestNewMPDMultiPeriod(t *testing.T) {
+	m := NewMPD(DASH_PROFILE_LIVE, VALID_MEDIA_PRESENTATION_DURATION, VALID_MIN_BUFFER_TIME,
+		AttrAvailabilityStartTime(VALID_AVAILABILITY_START_TIME))
+	require.NotNil(t, m)
+	for i := 0; i < 2; i++ {
+		period := m.AddNewPeriod()
+		period.ID = strconv.Itoa(i)
+	}
+
+	expectedMPD := &MPD{
+		XMLNs:                     Strptr("urn:mpeg:dash:schema:mpd:2011"),
+		Profiles:                  Strptr((string)(DASH_PROFILE_LIVE)),
+		Type:                      Strptr("static"),
+		MediaPresentationDuration: Strptr(VALID_MEDIA_PRESENTATION_DURATION),
+		MinBufferTime:             Strptr(VALID_MIN_BUFFER_TIME),
+		AvailabilityStartTime:     Strptr(VALID_AVAILABILITY_START_TIME),
+		period:                    nil,
+		Periods:                   []*Period{{ID: "0"}, {ID: "1"}},
+	}
+
+	expectedString, err := expectedMPD.WriteToString()
+	require.NoError(t, err)
+	actualString, err := m.WriteToString()
+	require.NoError(t, err)
+
+	require.EqualString(t, expectedString, actualString)
+}
+
 func TestContentProtection_ImplementsInterface(t *testing.T) {
 	cp := (*ContentProtectioner)(nil)
 	require.Implements(t, cp, &ContentProtection{})