Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
brainfood
/
videojs-contrib-hls
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Graphs
Network
Create a new issue
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
014577a9
authored
2014-10-30 11:30:32 -0400
by
Gary Katsevman
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
Make ts segments be playlist specific
1 parent
1624f3ab
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
21 additions
and
21 deletions
test/manifest/media.json
test/manifest/media.m3u8
test/manifest/media1.m3u8
test/manifest/media3.m3u8
test/videojs-hls_test.js
test/manifest/media.json
View file @
014577a
...
...
@@ -5,21 +5,21 @@
"segments"
:
[
{
"duration"
:
10
,
"uri"
:
"00001.ts"
"uri"
:
"
media-
00001.ts"
},
{
"duration"
:
10
,
"uri"
:
"00002.ts"
"uri"
:
"
media-
00002.ts"
},
{
"duration"
:
10
,
"uri"
:
"00003.ts"
"uri"
:
"
media-
00003.ts"
},
{
"duration"
:
10
,
"uri"
:
"00004.ts"
"uri"
:
"
media-
00004.ts"
}
],
"targetDuration"
:
10
,
"endList"
:
true
}
\ No newline at end of file
}
...
...
test/manifest/media.m3u8
View file @
014577a
...
...
@@ -2,12 +2,12 @@
#EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-TARGETDURATION:10
#EXTINF:10,
00001.ts
media-
00001.ts
#EXTINF:10,
00002.ts
media-
00002.ts
#EXTINF:10,
00003.ts
media-
00003.ts
#EXTINF:10,
00004.ts
media-
00004.ts
#ZEN-TOTAL-DURATION:57.9911
#EXT-X-ENDLIST
...
...
test/manifest/media1.m3u8
View file @
014577a
...
...
@@ -2,12 +2,12 @@
#EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-TARGETDURATION:10
#EXTINF:10,
00001.ts
media1-
00001.ts
#EXTINF:10,
00002.ts
media1-
00002.ts
#EXTINF:10,
00003.ts
media1-
00003.ts
#EXTINF:10,
00004.ts
media1-
00004.ts
#ZEN-TOTAL-DURATION:57.9911
#EXT-X-ENDLIST
...
...
test/manifest/media3.m3u8
View file @
014577a
...
...
@@ -2,12 +2,12 @@
#EXT-X-PLAYLIST-TYPE:VOD
#EXT-X-TARGETDURATION:10
#EXTINF:10,
00001.ts
media3-
00001.ts
#EXTINF:10,
00002.ts
media3-
00002.ts
#EXTINF:10,
00003.ts
media3-
00003.ts
#EXTINF:10,
00004.ts
media3-
00004.ts
#ZEN-TOTAL-DURATION:57.9911
#EXT-X-ENDLIST
...
...
test/videojs-hls_test.js
View file @
014577a
...
...
@@ -260,7 +260,7 @@ test('starts downloading a segment on loadedmetadata', function() {
strictEqual
(
requests
[
1
].
url
,
window
.
location
.
origin
+
window
.
location
.
pathname
.
split
(
'/'
).
slice
(
0
,
-
1
).
join
(
'/'
)
+
'/manifest/00001.ts'
,
'/manifest/
media-
00001.ts'
,
'the first segment is requested'
);
});
...
...
@@ -364,7 +364,7 @@ test('downloads media playlists after loading the master', function() {
strictEqual
(
requests
[
2
].
url
,
window
.
location
.
origin
+
window
.
location
.
pathname
.
split
(
'/'
).
slice
(
0
,
-
1
).
join
(
'/'
)
+
'/manifest/00001.ts'
,
'/manifest/
media-
00001.ts'
,
'first segment requested'
);
});
...
...
@@ -399,7 +399,7 @@ test('downloads a second media playlist before playback, if bandwidth is high',
strictEqual
(
requests
[
3
].
url
,
window
.
location
.
origin
+
window
.
location
.
pathname
.
split
(
'/'
).
slice
(
0
,
-
1
).
join
(
'/'
)
+
'/manifest/00001.ts'
,
'/manifest/
media1-
00001.ts'
,
'first segment requested'
);
});
...
...
@@ -710,7 +710,7 @@ test('downloads the next segment if the buffer is getting low', function() {
strictEqual
(
requests
[
2
].
url
,
window
.
location
.
origin
+
window
.
location
.
pathname
.
split
(
'/'
).
slice
(
0
,
-
1
).
join
(
'/'
)
+
'/manifest/00002.ts'
,
'/manifest/
media-
00002.ts'
,
'made segment request'
);
});
...
...
Please
register
or
sign in
to post a comment