Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Decode got error while #EXT-X-PROGRAM-DATE-TIME exists in media playlist #121

Merged
merged 2 commits into from Jan 14, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion reader.go
Expand Up @@ -409,7 +409,7 @@ func decodeLineOfMediaPlaylist(p *MediaPlaylist, wv *WV, state *decodingState, l
return err
}
}
if state.tagProgramDateTime {
if state.tagProgramDateTime && p.Count() > 0 {
state.tagProgramDateTime = false
if err = p.SetProgramDateTime(state.programDateTime); strict && err != nil {
return err
Expand Down
50 changes: 50 additions & 0 deletions reader_test.go
Expand Up @@ -16,6 +16,7 @@ import (
"os"
"reflect"
"testing"
"time"
)

func TestDecodeMasterPlaylist(t *testing.T) {
Expand Down Expand Up @@ -522,6 +523,55 @@ func TestMediaPlaylistWithSCTE35Tag(t *testing.T) {
}
}

func TestDecodeMediaPlaylistWithProgramDateTime(t *testing.T) {
f, err := os.Open("sample-playlists/media-playlist-with-program-date-time.m3u8")
if err != nil {
t.Fatal(err)
}
p, listType, err := DecodeFrom(bufio.NewReader(f), true)
if err != nil {
t.Fatal(err)
}
pp := p.(*MediaPlaylist)
CheckType(t, pp)
if listType != MEDIA {
t.Error("Sample not recognized as media playlist.")
}
// check parsed values
if pp.TargetDuration != 15 {
t.Errorf("TargetDuration of parsed playlist = %f (must = 15.0)", pp.TargetDuration)
}

if !pp.Closed {
t.Error("VOD sample media playlist, closed should be true.")
}

if pp.SeqNo != 0 {
t.Error("Media sequence defined in sample playlist is 0")
}

segNames := []string{"20181231/0555e0c371ea801726b92512c331399d_00000000.ts",
"20181231/0555e0c371ea801726b92512c331399d_00000001.ts",
"20181231/0555e0c371ea801726b92512c331399d_00000002.ts",
"20181231/0555e0c371ea801726b92512c331399d_00000003.ts"}
if pp.Count() != uint(len(segNames)) {
t.Errorf("Segments in playlist %d != %d", pp.Count(), len(segNames))
}

for idx, name := range segNames {
if pp.Segments[idx].URI != name {
t.Errorf("Segment name mismatch (%d/%d): %s != %s", idx, pp.Count(), pp.Segments[idx].Title, name)
}
}

// The ProgramDateTime of the 1st segment should be: 2018-12-31T09:47:22+08:00
st, _ := time.Parse(time.RFC3339, "2018-12-31T09:47:22+08:00")
if !pp.Segments[0].ProgramDateTime.Equal(st) {
t.Errorf("The program date time of the 1st segment should be: %v, actual value: %v",
st, pp.Segments[0].ProgramDateTime)
}
}

/****************
* Benchmarks *
****************/
Expand Down
17 changes: 17 additions & 0 deletions sample-playlists/media-playlist-with-program-date-time.m3u8
@@ -0,0 +1,17 @@
#EXTM3U
#EXT-X-VERSION:3
#EXT-X-MEDIA-SEQUENCE:0
#EXT-X-ALLOW-CACHE:YES
#EXT-X-PROGRAM-DATE-TIME:2018-12-31T09:47:22+08:00
#EXT-X-TARGETDURATION:15


#EXTINF:14.666000,
20181231/0555e0c371ea801726b92512c331399d_00000000.ts
#EXTINF:13.698000,
20181231/0555e0c371ea801726b92512c331399d_00000001.ts
#EXTINF:14.668000,
20181231/0555e0c371ea801726b92512c331399d_00000002.ts
#EXTINF:13.200000,
20181231/0555e0c371ea801726b92512c331399d_00000003.ts
#EXT-X-ENDLIST