162eb81e by Tom Johnson

merge fixes

2 parents 9ca37f0f f1616fd4
......@@ -352,10 +352,6 @@
currentUri.duration = entry.duration;
}
currentUri.timeRange = {};
currentUri.timeRange.start = (uris.length > 0) ? uris[uris.length-1].timeRange.end : 0;
currentUri.timeRange.end = currentUri.timeRange.start + currentUri.duration;
this.manifest.segments = uris;
},
......@@ -378,12 +374,20 @@
this.manifest.playlistType = entry.playlistType;
},
'stream-inf': function() {
this.manifest.playlists = uris;
if (!entry.attributes) {
this.trigger('warn', {
message: 'ignoring empty stream-inf attributes'
});
return;
}
if (!currentUri.attributes) {
currentUri.attributes = {};
}
currentUri.attributes = mergeOptions(currentUri.attributes,
entry.attributes);
this.manifest.playlists = uris;
},
'targetduration': function() {
if (!isFinite(entry.duration) || entry.duration < 0) {
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "http://example.com/00001.ts"
},
{
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "https://example.com/00002.ts"
},
{
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "//example.com/00003.ts"
},
{
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "http://example.com/00004.ts"
}
],
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
},
{
......@@ -21,10 +17,6 @@
"offset": 522828
},
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "hls_450k_video.ts"
},
{
......@@ -33,10 +25,6 @@
"offset": 1110328
},
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "hls_450k_video.ts"
},
{
......@@ -45,10 +33,6 @@
"offset": 1823412
},
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "hls_450k_video.ts"
},
{
......@@ -57,10 +41,6 @@
"offset": 2299992
},
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "hls_450k_video.ts"
},
{
......@@ -69,10 +49,6 @@
"offset": 2835604
},
"duration": 10,
"timeRange": {
"end": 60,
"start": 50
},
"uri": "hls_450k_video.ts"
},
{
......@@ -81,10 +57,6 @@
"offset": 3042780
},
"duration": 10,
"timeRange": {
"end": 70,
"start": 60
},
"uri": "hls_450k_video.ts"
},
{
......@@ -93,10 +65,6 @@
"offset": 3498680
},
"duration": 10,
"timeRange": {
"end": 80,
"start": 70
},
"uri": "hls_450k_video.ts"
},
{
......@@ -105,10 +73,6 @@
"offset": 4155928
},
"duration": 10,
"timeRange": {
"end": 90,
"start": 80
},
"uri": "hls_450k_video.ts"
},
{
......@@ -117,10 +81,6 @@
"offset": 4727636
},
"duration": 10,
"timeRange": {
"end": 100,
"start": 90
},
"uri": "hls_450k_video.ts"
},
{
......@@ -129,10 +89,6 @@
"offset": 5212676
},
"duration": 10,
"timeRange": {
"end": 110,
"start": 100
},
"uri": "hls_450k_video.ts"
},
{
......@@ -141,10 +97,6 @@
"offset": 5921812
},
"duration": 10,
"timeRange": {
"end": 120,
"start": 110
},
"uri": "hls_450k_video.ts"
},
{
......@@ -153,10 +105,6 @@
"offset": 6651816
},
"duration": 10,
"timeRange": {
"end": 130,
"start": 120
},
"uri": "hls_450k_video.ts"
},
{
......@@ -165,10 +113,6 @@
"offset": 7108092
},
"duration": 10,
"timeRange": {
"end": 140,
"start": 130
},
"uri": "hls_450k_video.ts"
},
{
......@@ -177,10 +121,6 @@
"offset": 7576776
},
"duration": 10,
"timeRange": {
"end": 150,
"start": 140
},
"uri": "hls_450k_video.ts"
},
{
......@@ -189,10 +129,6 @@
"offset": 8021772
},
"duration": 10,
"timeRange": {
"end": 160,
"start": 150
},
"uri": "hls_450k_video.ts"
},
{
......@@ -201,10 +137,6 @@
"offset": 8353216
},
"duration": 1.4167,
"timeRange": {
"end": 161.4167,
"start": 160
},
"uri": "hls_450k_video.ts"
}
],
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
}
],
......
......@@ -5,10 +5,6 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
},
{
......@@ -17,10 +13,6 @@
"offset": 522828
},
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "hls_450k_video.ts"
},
{
......@@ -29,10 +21,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "hls_450k_video2.ts"
},
{
......@@ -41,10 +29,6 @@
"offset": 1823412
},
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "hls_450k_video.ts"
},
{
......@@ -53,10 +37,6 @@
"offset": 2299992
},
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "hls_450k_video.ts"
},
{
......@@ -65,10 +45,6 @@
"offset": 2835604
},
"duration": 10,
"timeRange": {
"end": 60,
"start": 50
},
"uri": "hls_450k_video.ts"
},
{
......@@ -77,10 +53,6 @@
"offset": 3042780
},
"duration": 10,
"timeRange": {
"end": 70,
"start": 60
},
"uri": "hls_450k_video.ts"
},
{
......@@ -89,10 +61,6 @@
"offset": 3498680
},
"duration": 10,
"timeRange": {
"end": 80,
"start": 70
},
"uri": "hls_450k_video.ts"
},
{
......@@ -101,10 +69,6 @@
"offset": 4155928
},
"duration": 10,
"timeRange": {
"end": 90,
"start": 80
},
"uri": "hls_450k_video.ts"
},
{
......@@ -113,10 +77,6 @@
"offset": 4727636
},
"duration": 10,
"timeRange": {
"end": 100,
"start": 90
},
"uri": "hls_450k_video.ts"
},
{
......@@ -125,10 +85,6 @@
"offset": 5212676
},
"duration": 10,
"timeRange": {
"end": 110,
"start": 100
},
"uri": "hls_450k_video.ts"
},
{
......@@ -137,10 +93,6 @@
"offset": 5921812
},
"duration": 10,
"timeRange": {
"end": 120,
"start": 110
},
"uri": "hls_450k_video.ts"
},
{
......@@ -149,10 +101,6 @@
"offset": 6651816
},
"duration": 10,
"timeRange": {
"end": 130,
"start": 120
},
"uri": "hls_450k_video.ts"
},
{
......@@ -161,10 +109,6 @@
"offset": 7108092
},
"duration": 10,
"timeRange": {
"end": 140,
"start": 130
},
"uri": "hls_450k_video.ts"
},
{
......@@ -173,10 +117,6 @@
"offset": 7576776
},
"duration": 10,
"timeRange": {
"end": 150,
"start": 140
},
"uri": "hls_450k_video.ts"
},
{
......@@ -185,10 +125,6 @@
"offset": 8021772
},
"duration": 10,
"timeRange": {
"end": 160,
"start": 150
},
"uri": "hls_450k_video.ts"
},
{
......@@ -197,10 +133,6 @@
"offset": 8353216
},
"duration": 1.4167,
"timeRange": {
"end": 161.4167,
"start": 160
},
"uri": "hls_450k_video.ts"
}
],
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
}
],
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "/00001.ts"
},
{
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "/subdir/00002.ts"
},
{
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "/00003.ts"
},
{
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "/00004.ts"
}
],
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
}
],
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
{
"duration": 6.08,
"timeRange": {
"end": 12.719999999999999,
"start": 6.64
},
"uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
},
{
"duration": 6.6,
"timeRange": {
"end": 19.32,
"start": 12.719999999999999
},
"uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
},
{
"duration": 5,
"timeRange": {
"end": 24.32,
"start": 19.32
},
"uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
}
],
......
......@@ -5,50 +5,26 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts"
},
{
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts"
},
{
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts"
},
{
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts"
},
{
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts"
},
{
"duration": 8,
"timeRange": {
"end": 58,
"start": 50
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts"
}
],
......
......@@ -5,50 +5,26 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts"
},
{
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts"
},
{
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts"
},
{
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts"
},
{
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts"
},
{
"duration": 8,
"timeRange": {
"end": 58,
"start": 50
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts"
}
],
......
{
"allowCache": true,
"mediaSequence": 1,
"playlistType":"VOD",
"playlistType": "VOD",
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
}
],
"targetDuration": 8,
"totalDuration": 6.64
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
},
{
......@@ -20,10 +16,6 @@
"length": 587500,
"offset": 522828
},
"timeRange": {
"end": NaN,
"start": 10
},
"uri": "hls_450k_video.ts"
},
{
......@@ -32,10 +24,6 @@
"offset": 1110328
},
"duration": 5,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -44,10 +32,6 @@
"offset": 1823412
},
"duration": 9.7,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -56,10 +40,6 @@
"offset": 2299992
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -68,10 +48,6 @@
"offset": 2835604
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -80,10 +56,6 @@
"offset": 3042780
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -92,10 +64,6 @@
"offset": 3498680
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -104,10 +72,6 @@
"offset": 4155928
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -116,10 +80,6 @@
"offset": 4727636
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -128,10 +88,6 @@
"offset": 5212676
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -140,10 +96,6 @@
"offset": 5921812
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -152,10 +104,6 @@
"offset": 6651816
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -164,10 +112,6 @@
"offset": 7108092
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -176,10 +120,6 @@
"offset": 7576776
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......@@ -188,10 +128,6 @@
"offset": 8021772
},
"duration": 10,
"timeRange": {
"end": NaN,
"start": NaN
},
"uri": "hls_450k_video.ts"
},
{
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
}
],
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
{
"duration": 6.08,
"timeRange": {
"end": 12.719999999999999,
"start": 6.64
},
"uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
},
{
"duration": 6.6,
"timeRange": {
"end": 19.32,
"start": 12.719999999999999
},
"uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
},
{
"duration": 5,
"timeRange": {
"end": 24.32,
"start": 19.32
},
"uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
}
],
......
......@@ -5,50 +5,26 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts"
},
{
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts"
},
{
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts"
},
{
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts"
},
{
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts"
},
{
"duration": 8,
"timeRange": {
"end": 58,
"start": 50
},
"uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts"
}
],
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
},
{
......@@ -21,10 +17,6 @@
"offset": 522828
},
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "hls_450k_video.ts"
},
{
......@@ -33,10 +25,6 @@
"offset": 1110328
},
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "hls_450k_video.ts"
},
{
......@@ -45,10 +33,6 @@
"offset": 1823412
},
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "hls_450k_video.ts"
},
{
......@@ -57,10 +41,6 @@
"offset": 2299992
},
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "hls_450k_video.ts"
},
{
......@@ -69,10 +49,6 @@
"offset": 2835604
},
"duration": 10,
"timeRange": {
"end": 60,
"start": 50
},
"uri": "hls_450k_video.ts"
},
{
......@@ -81,10 +57,6 @@
"offset": 3042780
},
"duration": 10,
"timeRange": {
"end": 70,
"start": 60
},
"uri": "hls_450k_video.ts"
},
{
......@@ -93,10 +65,6 @@
"offset": 3498680
},
"duration": 10,
"timeRange": {
"end": 80,
"start": 70
},
"uri": "hls_450k_video.ts"
},
{
......@@ -105,10 +73,6 @@
"offset": 4155928
},
"duration": 10,
"timeRange": {
"end": 90,
"start": 80
},
"uri": "hls_450k_video.ts"
},
{
......@@ -117,10 +81,6 @@
"offset": 4727636
},
"duration": 10,
"timeRange": {
"end": 100,
"start": 90
},
"uri": "hls_450k_video.ts"
},
{
......@@ -129,10 +89,6 @@
"offset": 5212676
},
"duration": 10,
"timeRange": {
"end": 110,
"start": 100
},
"uri": "hls_450k_video.ts"
},
{
......@@ -141,10 +97,6 @@
"offset": 5921812
},
"duration": 10,
"timeRange": {
"end": 120,
"start": 110
},
"uri": "hls_450k_video.ts"
},
{
......@@ -153,10 +105,6 @@
"offset": 6651816
},
"duration": 10,
"timeRange": {
"end": 130,
"start": 120
},
"uri": "hls_450k_video.ts"
},
{
......@@ -165,10 +113,6 @@
"offset": 7108092
},
"duration": 10,
"timeRange": {
"end": 140,
"start": 130
},
"uri": "hls_450k_video.ts"
},
{
......@@ -177,10 +121,6 @@
"offset": 7576776
},
"duration": 10,
"timeRange": {
"end": 150,
"start": 140
},
"uri": "hls_450k_video.ts"
},
{
......@@ -189,10 +129,6 @@
"offset": 8021772
},
"duration": 10,
"timeRange": {
"end": 160,
"start": 150
},
"uri": "hls_450k_video.ts"
},
{
......@@ -201,10 +137,6 @@
"offset": 8353216
},
"duration": 1.4167,
"timeRange": {
"end": 161.4167,
"start": 160
},
"uri": "hls_450k_video.ts"
}
],
......
......@@ -5,12 +5,8 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "/test/ts-files/zencoder/gogo/00001.ts"
},
}
],
"totalDuration": 10
}
\ No newline at end of file
......
......@@ -5,44 +5,24 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "/test/ts-files/zencoder/gogo/00001.ts"
},
{
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "/test/ts-files/zencoder/gogo/00002.ts"
},
{
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "/test/ts-files/zencoder/gogo/00003.ts"
},
{
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "/test/ts-files/zencoder/gogo/00004.ts"
},
{
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "/test/ts-files/zencoder/gogo/00005.ts"
},
}
],
"targetDuration": 10,
"totalDuration": 30
......
{
"allowCache": true,
"mediaSequence": 0,
"playlistType":"VOD",
"playlistType": "VOD",
"segments": [
{
"duration": 10.0,
"timeRange": {
"end": 10.0,
"start": 0
},
"duration": 10,
"uri": "/test/ts-files/zencoder/gogo/00001.ts"
},
}
],
"targetDuration": 10,
"totalDuration": 10.0
"totalDuration": 10
}
\ No newline at end of file
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "00001.ts"
},
{
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "00002.ts"
},
{
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "00003.ts"
},
{
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "00004.ts"
}
],
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
{
"duration": 6.08,
"timeRange": {
"end": 12.719999999999999,
"start": 6.64
},
"uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
},
{
"duration": 6.6,
"timeRange": {
"end": 19.32,
"start": 12.719999999999999
},
"uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
},
{
"duration": 5,
"timeRange": {
"end": 24.32,
"start": 19.32
},
"uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
}
],
......
......@@ -5,23 +5,15 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
},
{
"uri": "hls_450k_video.ts"
},
{
"duration": 5,
"timeRange": {
"end": 30,
"start": 20
},
"duration": 10,
"uri": "hls_450k_video.ts"
},
}
],
"targetDuration": 10,
"totalDuration": 30
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
{
"duration": 6.08,
"timeRange": {
"end": 12.719999999999999,
"start": 6.64
},
"uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
},
{
"duration": 6.6,
"timeRange": {
"end": 19.32,
"start": 12.719999999999999
},
"uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
},
{
"duration": 5,
"timeRange": {
"end": 24.32,
"start": 19.32
},
"uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
}
],
......
......@@ -5,10 +5,6 @@
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
{
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
{
"duration": 6.08,
"timeRange": {
"end": 12.719999999999999,
"start": 6.64
},
"uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
},
{
"duration": 6.6,
"timeRange": {
"end": 19.32,
"start": 12.719999999999999
},
"uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
},
{
"duration": 5,
"timeRange": {
"end": 24.32,
"start": 19.32
},
"uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
}
],
......
......@@ -9,10 +9,6 @@
"offset": 0
},
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
},
{
......@@ -21,10 +17,6 @@
"offset": 522828
},
"duration": 10,
"timeRange": {
"end": 20,
"start": 10
},
"uri": "hls_450k_video.ts"
},
{
......@@ -33,10 +25,6 @@
"offset": 1110328
},
"duration": 10,
"timeRange": {
"end": 30,
"start": 20
},
"uri": "hls_450k_video.ts"
},
{
......@@ -45,10 +33,6 @@
"offset": 1823412
},
"duration": 10,
"timeRange": {
"end": 40,
"start": 30
},
"uri": "hls_450k_video.ts"
},
{
......@@ -57,10 +41,6 @@
"offset": 2299992
},
"duration": 10,
"timeRange": {
"end": 50,
"start": 40
},
"uri": "hls_450k_video.ts"
},
{
......@@ -69,10 +49,6 @@
"offset": 2835604
},
"duration": 10,
"timeRange": {
"end": 60,
"start": 50
},
"uri": "hls_450k_video.ts"
},
{
......@@ -81,10 +57,6 @@
"offset": 3042780
},
"duration": 10,
"timeRange": {
"end": 70,
"start": 60
},
"uri": "hls_450k_video.ts"
},
{
......@@ -93,10 +65,6 @@
"offset": 3498680
},
"duration": 10,
"timeRange": {
"end": 80,
"start": 70
},
"uri": "hls_450k_video.ts"
},
{
......@@ -105,10 +73,6 @@
"offset": 4155928
},
"duration": 10,
"timeRange": {
"end": 90,
"start": 80
},
"uri": "hls_450k_video.ts"
},
{
......@@ -117,10 +81,6 @@
"offset": 4727636
},
"duration": 10,
"timeRange": {
"end": 100,
"start": 90
},
"uri": "hls_450k_video.ts"
},
{
......@@ -129,10 +89,6 @@
"offset": 5212676
},
"duration": 10,
"timeRange": {
"end": 110,
"start": 100
},
"uri": "hls_450k_video.ts"
},
{
......@@ -141,10 +97,6 @@
"offset": 5921812
},
"duration": 10,
"timeRange": {
"end": 120,
"start": 110
},
"uri": "hls_450k_video.ts"
},
{
......@@ -153,10 +105,6 @@
"offset": 6651816
},
"duration": 10,
"timeRange": {
"end": 130,
"start": 120
},
"uri": "hls_450k_video.ts"
},
{
......@@ -165,10 +113,6 @@
"offset": 7108092
},
"duration": 10,
"timeRange": {
"end": 140,
"start": 130
},
"uri": "hls_450k_video.ts"
},
{
......@@ -177,10 +121,6 @@
"offset": 7576776
},
"duration": 10,
"timeRange": {
"end": 150,
"start": 140
},
"uri": "hls_450k_video.ts"
},
{
......@@ -189,10 +129,6 @@
"offset": 8021772
},
"duration": 10,
"timeRange": {
"end": 160,
"start": 150
},
"uri": "hls_450k_video.ts"
},
{
......@@ -201,10 +137,6 @@
"offset": 8353216
},
"duration": 1.4167,
"timeRange": {
"end": 161.4167,
"start": 160
},
"uri": "hls_450k_video.ts"
}
],
......
{
"allowCache": true,
"mediaSequence": 17,
"playlistType":"VOD",
"playlistType": "VOD",
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
}
],
"targetDuration": 8,
"totalDuration": 6.64
......
......@@ -4,7 +4,7 @@
"playlists": [
{
"attributes": {
"PROGRAM-ID": 1,
"PROGRAM-ID": 1
},
"uri": "media.m3u8"
},
......
......@@ -5,34 +5,18 @@
"segments": [
{
"duration": 6.64,
"timeRange": {
"end": 6.64,
"start": 0
},
"uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
},
{
"duration": 6.08,
"timeRange": {
"end": 12.719999999999999,
"start": 6.64
},
"uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
},
{
"duration": 6.6,
"timeRange": {
"end": 19.32,
"start": 12.719999999999999
},
"uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
},
{
"duration": 5,
"timeRange": {
"end": 24.32,
"start": 19.32
},
"uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
}
],
......
......@@ -5,12 +5,8 @@
"segments": [
{
"duration": 10,
"timeRange": {
"end": 10,
"start": 0
},
"uri": "hls_450k_video.ts"
},
}
],
"targetDuration": 10,
"totalDuration": 10
......