162eb81e by Tom Johnson

merge fixes

2 parents 9ca37f0f f1616fd4
...@@ -352,10 +352,6 @@ ...@@ -352,10 +352,6 @@
352 currentUri.duration = entry.duration; 352 currentUri.duration = entry.duration;
353 } 353 }
354 354
355 currentUri.timeRange = {};
356 currentUri.timeRange.start = (uris.length > 0) ? uris[uris.length-1].timeRange.end : 0;
357 currentUri.timeRange.end = currentUri.timeRange.start + currentUri.duration;
358
359 this.manifest.segments = uris; 355 this.manifest.segments = uris;
360 356
361 }, 357 },
...@@ -378,12 +374,20 @@ ...@@ -378,12 +374,20 @@
378 this.manifest.playlistType = entry.playlistType; 374 this.manifest.playlistType = entry.playlistType;
379 }, 375 },
380 'stream-inf': function() { 376 'stream-inf': function() {
377 this.manifest.playlists = uris;
378
379 if (!entry.attributes) {
380 this.trigger('warn', {
381 message: 'ignoring empty stream-inf attributes'
382 });
383 return;
384 }
385
381 if (!currentUri.attributes) { 386 if (!currentUri.attributes) {
382 currentUri.attributes = {}; 387 currentUri.attributes = {};
383 } 388 }
384 currentUri.attributes = mergeOptions(currentUri.attributes, 389 currentUri.attributes = mergeOptions(currentUri.attributes,
385 entry.attributes); 390 entry.attributes);
386 this.manifest.playlists = uris;
387 }, 391 },
388 'targetduration': function() { 392 'targetduration': function() {
389 if (!isFinite(entry.duration) || entry.duration < 0) { 393 if (!isFinite(entry.duration) || entry.duration < 0) {
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "http://example.com/00001.ts" 8 "uri": "http://example.com/00001.ts"
13 }, 9 },
14 { 10 {
15 "duration": 10, 11 "duration": 10,
16 "timeRange": {
17 "end": 20,
18 "start": 10
19 },
20 "uri": "https://example.com/00002.ts" 12 "uri": "https://example.com/00002.ts"
21 }, 13 },
22 { 14 {
23 "duration": 10, 15 "duration": 10,
24 "timeRange": {
25 "end": 30,
26 "start": 20
27 },
28 "uri": "//example.com/00003.ts" 16 "uri": "//example.com/00003.ts"
29 }, 17 },
30 { 18 {
31 "duration": 10, 19 "duration": 10,
32 "timeRange": {
33 "end": 40,
34 "start": 30
35 },
36 "uri": "http://example.com/00004.ts" 20 "uri": "http://example.com/00004.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 }, 13 },
18 { 14 {
...@@ -21,10 +17,6 @@ ...@@ -21,10 +17,6 @@
21 "offset": 522828 17 "offset": 522828
22 }, 18 },
23 "duration": 10, 19 "duration": 10,
24 "timeRange": {
25 "end": 20,
26 "start": 10
27 },
28 "uri": "hls_450k_video.ts" 20 "uri": "hls_450k_video.ts"
29 }, 21 },
30 { 22 {
...@@ -33,10 +25,6 @@ ...@@ -33,10 +25,6 @@
33 "offset": 1110328 25 "offset": 1110328
34 }, 26 },
35 "duration": 10, 27 "duration": 10,
36 "timeRange": {
37 "end": 30,
38 "start": 20
39 },
40 "uri": "hls_450k_video.ts" 28 "uri": "hls_450k_video.ts"
41 }, 29 },
42 { 30 {
...@@ -45,10 +33,6 @@ ...@@ -45,10 +33,6 @@
45 "offset": 1823412 33 "offset": 1823412
46 }, 34 },
47 "duration": 10, 35 "duration": 10,
48 "timeRange": {
49 "end": 40,
50 "start": 30
51 },
52 "uri": "hls_450k_video.ts" 36 "uri": "hls_450k_video.ts"
53 }, 37 },
54 { 38 {
...@@ -57,10 +41,6 @@ ...@@ -57,10 +41,6 @@
57 "offset": 2299992 41 "offset": 2299992
58 }, 42 },
59 "duration": 10, 43 "duration": 10,
60 "timeRange": {
61 "end": 50,
62 "start": 40
63 },
64 "uri": "hls_450k_video.ts" 44 "uri": "hls_450k_video.ts"
65 }, 45 },
66 { 46 {
...@@ -69,10 +49,6 @@ ...@@ -69,10 +49,6 @@
69 "offset": 2835604 49 "offset": 2835604
70 }, 50 },
71 "duration": 10, 51 "duration": 10,
72 "timeRange": {
73 "end": 60,
74 "start": 50
75 },
76 "uri": "hls_450k_video.ts" 52 "uri": "hls_450k_video.ts"
77 }, 53 },
78 { 54 {
...@@ -81,10 +57,6 @@ ...@@ -81,10 +57,6 @@
81 "offset": 3042780 57 "offset": 3042780
82 }, 58 },
83 "duration": 10, 59 "duration": 10,
84 "timeRange": {
85 "end": 70,
86 "start": 60
87 },
88 "uri": "hls_450k_video.ts" 60 "uri": "hls_450k_video.ts"
89 }, 61 },
90 { 62 {
...@@ -93,10 +65,6 @@ ...@@ -93,10 +65,6 @@
93 "offset": 3498680 65 "offset": 3498680
94 }, 66 },
95 "duration": 10, 67 "duration": 10,
96 "timeRange": {
97 "end": 80,
98 "start": 70
99 },
100 "uri": "hls_450k_video.ts" 68 "uri": "hls_450k_video.ts"
101 }, 69 },
102 { 70 {
...@@ -105,10 +73,6 @@ ...@@ -105,10 +73,6 @@
105 "offset": 4155928 73 "offset": 4155928
106 }, 74 },
107 "duration": 10, 75 "duration": 10,
108 "timeRange": {
109 "end": 90,
110 "start": 80
111 },
112 "uri": "hls_450k_video.ts" 76 "uri": "hls_450k_video.ts"
113 }, 77 },
114 { 78 {
...@@ -117,10 +81,6 @@ ...@@ -117,10 +81,6 @@
117 "offset": 4727636 81 "offset": 4727636
118 }, 82 },
119 "duration": 10, 83 "duration": 10,
120 "timeRange": {
121 "end": 100,
122 "start": 90
123 },
124 "uri": "hls_450k_video.ts" 84 "uri": "hls_450k_video.ts"
125 }, 85 },
126 { 86 {
...@@ -129,10 +89,6 @@ ...@@ -129,10 +89,6 @@
129 "offset": 5212676 89 "offset": 5212676
130 }, 90 },
131 "duration": 10, 91 "duration": 10,
132 "timeRange": {
133 "end": 110,
134 "start": 100
135 },
136 "uri": "hls_450k_video.ts" 92 "uri": "hls_450k_video.ts"
137 }, 93 },
138 { 94 {
...@@ -141,10 +97,6 @@ ...@@ -141,10 +97,6 @@
141 "offset": 5921812 97 "offset": 5921812
142 }, 98 },
143 "duration": 10, 99 "duration": 10,
144 "timeRange": {
145 "end": 120,
146 "start": 110
147 },
148 "uri": "hls_450k_video.ts" 100 "uri": "hls_450k_video.ts"
149 }, 101 },
150 { 102 {
...@@ -153,10 +105,6 @@ ...@@ -153,10 +105,6 @@
153 "offset": 6651816 105 "offset": 6651816
154 }, 106 },
155 "duration": 10, 107 "duration": 10,
156 "timeRange": {
157 "end": 130,
158 "start": 120
159 },
160 "uri": "hls_450k_video.ts" 108 "uri": "hls_450k_video.ts"
161 }, 109 },
162 { 110 {
...@@ -165,10 +113,6 @@ ...@@ -165,10 +113,6 @@
165 "offset": 7108092 113 "offset": 7108092
166 }, 114 },
167 "duration": 10, 115 "duration": 10,
168 "timeRange": {
169 "end": 140,
170 "start": 130
171 },
172 "uri": "hls_450k_video.ts" 116 "uri": "hls_450k_video.ts"
173 }, 117 },
174 { 118 {
...@@ -177,10 +121,6 @@ ...@@ -177,10 +121,6 @@
177 "offset": 7576776 121 "offset": 7576776
178 }, 122 },
179 "duration": 10, 123 "duration": 10,
180 "timeRange": {
181 "end": 150,
182 "start": 140
183 },
184 "uri": "hls_450k_video.ts" 124 "uri": "hls_450k_video.ts"
185 }, 125 },
186 { 126 {
...@@ -189,10 +129,6 @@ ...@@ -189,10 +129,6 @@
189 "offset": 8021772 129 "offset": 8021772
190 }, 130 },
191 "duration": 10, 131 "duration": 10,
192 "timeRange": {
193 "end": 160,
194 "start": 150
195 },
196 "uri": "hls_450k_video.ts" 132 "uri": "hls_450k_video.ts"
197 }, 133 },
198 { 134 {
...@@ -201,10 +137,6 @@ ...@@ -201,10 +137,6 @@
201 "offset": 8353216 137 "offset": 8353216
202 }, 138 },
203 "duration": 1.4167, 139 "duration": 1.4167,
204 "timeRange": {
205 "end": 161.4167,
206 "start": 160
207 },
208 "uri": "hls_450k_video.ts" 140 "uri": "hls_450k_video.ts"
209 } 141 }
210 ], 142 ],
......
...@@ -9,13 +9,9 @@ ...@@ -9,13 +9,9 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 } 13 }
18 ], 14 ],
19 "targetDuration": 10, 15 "targetDuration": 10,
20 "totalDuration": 10 16 "totalDuration": 10
21 } 17 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "hls_450k_video.ts" 8 "uri": "hls_450k_video.ts"
13 }, 9 },
14 { 10 {
...@@ -17,10 +13,6 @@ ...@@ -17,10 +13,6 @@
17 "offset": 522828 13 "offset": 522828
18 }, 14 },
19 "duration": 10, 15 "duration": 10,
20 "timeRange": {
21 "end": 20,
22 "start": 10
23 },
24 "uri": "hls_450k_video.ts" 16 "uri": "hls_450k_video.ts"
25 }, 17 },
26 { 18 {
...@@ -29,10 +21,6 @@ ...@@ -29,10 +21,6 @@
29 "offset": 0 21 "offset": 0
30 }, 22 },
31 "duration": 10, 23 "duration": 10,
32 "timeRange": {
33 "end": 30,
34 "start": 20
35 },
36 "uri": "hls_450k_video2.ts" 24 "uri": "hls_450k_video2.ts"
37 }, 25 },
38 { 26 {
...@@ -41,10 +29,6 @@ ...@@ -41,10 +29,6 @@
41 "offset": 1823412 29 "offset": 1823412
42 }, 30 },
43 "duration": 10, 31 "duration": 10,
44 "timeRange": {
45 "end": 40,
46 "start": 30
47 },
48 "uri": "hls_450k_video.ts" 32 "uri": "hls_450k_video.ts"
49 }, 33 },
50 { 34 {
...@@ -53,10 +37,6 @@ ...@@ -53,10 +37,6 @@
53 "offset": 2299992 37 "offset": 2299992
54 }, 38 },
55 "duration": 10, 39 "duration": 10,
56 "timeRange": {
57 "end": 50,
58 "start": 40
59 },
60 "uri": "hls_450k_video.ts" 40 "uri": "hls_450k_video.ts"
61 }, 41 },
62 { 42 {
...@@ -65,10 +45,6 @@ ...@@ -65,10 +45,6 @@
65 "offset": 2835604 45 "offset": 2835604
66 }, 46 },
67 "duration": 10, 47 "duration": 10,
68 "timeRange": {
69 "end": 60,
70 "start": 50
71 },
72 "uri": "hls_450k_video.ts" 48 "uri": "hls_450k_video.ts"
73 }, 49 },
74 { 50 {
...@@ -77,10 +53,6 @@ ...@@ -77,10 +53,6 @@
77 "offset": 3042780 53 "offset": 3042780
78 }, 54 },
79 "duration": 10, 55 "duration": 10,
80 "timeRange": {
81 "end": 70,
82 "start": 60
83 },
84 "uri": "hls_450k_video.ts" 56 "uri": "hls_450k_video.ts"
85 }, 57 },
86 { 58 {
...@@ -89,10 +61,6 @@ ...@@ -89,10 +61,6 @@
89 "offset": 3498680 61 "offset": 3498680
90 }, 62 },
91 "duration": 10, 63 "duration": 10,
92 "timeRange": {
93 "end": 80,
94 "start": 70
95 },
96 "uri": "hls_450k_video.ts" 64 "uri": "hls_450k_video.ts"
97 }, 65 },
98 { 66 {
...@@ -101,10 +69,6 @@ ...@@ -101,10 +69,6 @@
101 "offset": 4155928 69 "offset": 4155928
102 }, 70 },
103 "duration": 10, 71 "duration": 10,
104 "timeRange": {
105 "end": 90,
106 "start": 80
107 },
108 "uri": "hls_450k_video.ts" 72 "uri": "hls_450k_video.ts"
109 }, 73 },
110 { 74 {
...@@ -113,10 +77,6 @@ ...@@ -113,10 +77,6 @@
113 "offset": 4727636 77 "offset": 4727636
114 }, 78 },
115 "duration": 10, 79 "duration": 10,
116 "timeRange": {
117 "end": 100,
118 "start": 90
119 },
120 "uri": "hls_450k_video.ts" 80 "uri": "hls_450k_video.ts"
121 }, 81 },
122 { 82 {
...@@ -125,10 +85,6 @@ ...@@ -125,10 +85,6 @@
125 "offset": 5212676 85 "offset": 5212676
126 }, 86 },
127 "duration": 10, 87 "duration": 10,
128 "timeRange": {
129 "end": 110,
130 "start": 100
131 },
132 "uri": "hls_450k_video.ts" 88 "uri": "hls_450k_video.ts"
133 }, 89 },
134 { 90 {
...@@ -137,10 +93,6 @@ ...@@ -137,10 +93,6 @@
137 "offset": 5921812 93 "offset": 5921812
138 }, 94 },
139 "duration": 10, 95 "duration": 10,
140 "timeRange": {
141 "end": 120,
142 "start": 110
143 },
144 "uri": "hls_450k_video.ts" 96 "uri": "hls_450k_video.ts"
145 }, 97 },
146 { 98 {
...@@ -149,10 +101,6 @@ ...@@ -149,10 +101,6 @@
149 "offset": 6651816 101 "offset": 6651816
150 }, 102 },
151 "duration": 10, 103 "duration": 10,
152 "timeRange": {
153 "end": 130,
154 "start": 120
155 },
156 "uri": "hls_450k_video.ts" 104 "uri": "hls_450k_video.ts"
157 }, 105 },
158 { 106 {
...@@ -161,10 +109,6 @@ ...@@ -161,10 +109,6 @@
161 "offset": 7108092 109 "offset": 7108092
162 }, 110 },
163 "duration": 10, 111 "duration": 10,
164 "timeRange": {
165 "end": 140,
166 "start": 130
167 },
168 "uri": "hls_450k_video.ts" 112 "uri": "hls_450k_video.ts"
169 }, 113 },
170 { 114 {
...@@ -173,10 +117,6 @@ ...@@ -173,10 +117,6 @@
173 "offset": 7576776 117 "offset": 7576776
174 }, 118 },
175 "duration": 10, 119 "duration": 10,
176 "timeRange": {
177 "end": 150,
178 "start": 140
179 },
180 "uri": "hls_450k_video.ts" 120 "uri": "hls_450k_video.ts"
181 }, 121 },
182 { 122 {
...@@ -185,10 +125,6 @@ ...@@ -185,10 +125,6 @@
185 "offset": 8021772 125 "offset": 8021772
186 }, 126 },
187 "duration": 10, 127 "duration": 10,
188 "timeRange": {
189 "end": 160,
190 "start": 150
191 },
192 "uri": "hls_450k_video.ts" 128 "uri": "hls_450k_video.ts"
193 }, 129 },
194 { 130 {
...@@ -197,10 +133,6 @@ ...@@ -197,10 +133,6 @@
197 "offset": 8353216 133 "offset": 8353216
198 }, 134 },
199 "duration": 1.4167, 135 "duration": 1.4167,
200 "timeRange": {
201 "end": 161.4167,
202 "start": 160
203 },
204 "uri": "hls_450k_video.ts" 136 "uri": "hls_450k_video.ts"
205 } 137 }
206 ], 138 ],
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 } 13 }
18 ], 14 ],
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "/00001.ts" 8 "uri": "/00001.ts"
13 }, 9 },
14 { 10 {
15 "duration": 10, 11 "duration": 10,
16 "timeRange": {
17 "end": 20,
18 "start": 10
19 },
20 "uri": "/subdir/00002.ts" 12 "uri": "/subdir/00002.ts"
21 }, 13 },
22 { 14 {
23 "duration": 10, 15 "duration": 10,
24 "timeRange": {
25 "end": 30,
26 "start": 20
27 },
28 "uri": "/00003.ts" 16 "uri": "/00003.ts"
29 }, 17 },
30 { 18 {
31 "duration": 10, 19 "duration": 10,
32 "timeRange": {
33 "end": 40,
34 "start": 30
35 },
36 "uri": "/00004.ts" 20 "uri": "/00004.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 } 13 }
18 ], 14 ],
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 },
14 { 10 {
15 "duration": 6.08, 11 "duration": 6.08,
16 "timeRange": {
17 "end": 12.719999999999999,
18 "start": 6.64
19 },
20 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts" 12 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
21 }, 13 },
22 { 14 {
23 "duration": 6.6, 15 "duration": 6.6,
24 "timeRange": {
25 "end": 19.32,
26 "start": 12.719999999999999
27 },
28 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts" 16 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
29 }, 17 },
30 { 18 {
31 "duration": 5, 19 "duration": 5,
32 "timeRange": {
33 "end": 24.32,
34 "start": 19.32
35 },
36 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts" 20 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -5,50 +5,26 @@ ...@@ -5,50 +5,26 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts" 8 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts"
13 }, 9 },
14 { 10 {
15 "duration": 10, 11 "duration": 10,
16 "timeRange": {
17 "end": 20,
18 "start": 10
19 },
20 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts" 12 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts"
21 }, 13 },
22 { 14 {
23 "duration": 10, 15 "duration": 10,
24 "timeRange": {
25 "end": 30,
26 "start": 20
27 },
28 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts" 16 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts"
29 }, 17 },
30 { 18 {
31 "duration": 10, 19 "duration": 10,
32 "timeRange": {
33 "end": 40,
34 "start": 30
35 },
36 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts" 20 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts"
37 }, 21 },
38 { 22 {
39 "duration": 10, 23 "duration": 10,
40 "timeRange": {
41 "end": 50,
42 "start": 40
43 },
44 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts" 24 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts"
45 }, 25 },
46 { 26 {
47 "duration": 8, 27 "duration": 8,
48 "timeRange": {
49 "end": 58,
50 "start": 50
51 },
52 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts" 28 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts"
53 } 29 }
54 ], 30 ],
......
...@@ -5,50 +5,26 @@ ...@@ -5,50 +5,26 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts" 8 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts"
13 }, 9 },
14 { 10 {
15 "duration": 10, 11 "duration": 10,
16 "timeRange": {
17 "end": 20,
18 "start": 10
19 },
20 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts" 12 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts"
21 }, 13 },
22 { 14 {
23 "duration": 10, 15 "duration": 10,
24 "timeRange": {
25 "end": 30,
26 "start": 20
27 },
28 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts" 16 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts"
29 }, 17 },
30 { 18 {
31 "duration": 10, 19 "duration": 10,
32 "timeRange": {
33 "end": 40,
34 "start": 30
35 },
36 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts" 20 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts"
37 }, 21 },
38 { 22 {
39 "duration": 10, 23 "duration": 10,
40 "timeRange": {
41 "end": 50,
42 "start": 40
43 },
44 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts" 24 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts"
45 }, 25 },
46 { 26 {
47 "duration": 8, 27 "duration": 8,
48 "timeRange": {
49 "end": 58,
50 "start": 50
51 },
52 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts" 28 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts"
53 } 29 }
54 ], 30 ],
......
1 { 1 {
2 "allowCache": true, 2 "allowCache": true,
3 "mediaSequence": 1, 3 "mediaSequence": 1,
4 "playlistType":"VOD", 4 "playlistType": "VOD",
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 }
14 ], 10 ],
15 "targetDuration": 8, 11 "targetDuration": 8,
16 "totalDuration": 6.64 12 "totalDuration": 6.64
17 } 13 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 }, 13 },
18 { 14 {
...@@ -20,10 +16,6 @@ ...@@ -20,10 +16,6 @@
20 "length": 587500, 16 "length": 587500,
21 "offset": 522828 17 "offset": 522828
22 }, 18 },
23 "timeRange": {
24 "end": NaN,
25 "start": 10
26 },
27 "uri": "hls_450k_video.ts" 19 "uri": "hls_450k_video.ts"
28 }, 20 },
29 { 21 {
...@@ -32,10 +24,6 @@ ...@@ -32,10 +24,6 @@
32 "offset": 1110328 24 "offset": 1110328
33 }, 25 },
34 "duration": 5, 26 "duration": 5,
35 "timeRange": {
36 "end": NaN,
37 "start": NaN
38 },
39 "uri": "hls_450k_video.ts" 27 "uri": "hls_450k_video.ts"
40 }, 28 },
41 { 29 {
...@@ -44,10 +32,6 @@ ...@@ -44,10 +32,6 @@
44 "offset": 1823412 32 "offset": 1823412
45 }, 33 },
46 "duration": 9.7, 34 "duration": 9.7,
47 "timeRange": {
48 "end": NaN,
49 "start": NaN
50 },
51 "uri": "hls_450k_video.ts" 35 "uri": "hls_450k_video.ts"
52 }, 36 },
53 { 37 {
...@@ -56,10 +40,6 @@ ...@@ -56,10 +40,6 @@
56 "offset": 2299992 40 "offset": 2299992
57 }, 41 },
58 "duration": 10, 42 "duration": 10,
59 "timeRange": {
60 "end": NaN,
61 "start": NaN
62 },
63 "uri": "hls_450k_video.ts" 43 "uri": "hls_450k_video.ts"
64 }, 44 },
65 { 45 {
...@@ -68,10 +48,6 @@ ...@@ -68,10 +48,6 @@
68 "offset": 2835604 48 "offset": 2835604
69 }, 49 },
70 "duration": 10, 50 "duration": 10,
71 "timeRange": {
72 "end": NaN,
73 "start": NaN
74 },
75 "uri": "hls_450k_video.ts" 51 "uri": "hls_450k_video.ts"
76 }, 52 },
77 { 53 {
...@@ -80,10 +56,6 @@ ...@@ -80,10 +56,6 @@
80 "offset": 3042780 56 "offset": 3042780
81 }, 57 },
82 "duration": 10, 58 "duration": 10,
83 "timeRange": {
84 "end": NaN,
85 "start": NaN
86 },
87 "uri": "hls_450k_video.ts" 59 "uri": "hls_450k_video.ts"
88 }, 60 },
89 { 61 {
...@@ -92,10 +64,6 @@ ...@@ -92,10 +64,6 @@
92 "offset": 3498680 64 "offset": 3498680
93 }, 65 },
94 "duration": 10, 66 "duration": 10,
95 "timeRange": {
96 "end": NaN,
97 "start": NaN
98 },
99 "uri": "hls_450k_video.ts" 67 "uri": "hls_450k_video.ts"
100 }, 68 },
101 { 69 {
...@@ -104,10 +72,6 @@ ...@@ -104,10 +72,6 @@
104 "offset": 4155928 72 "offset": 4155928
105 }, 73 },
106 "duration": 10, 74 "duration": 10,
107 "timeRange": {
108 "end": NaN,
109 "start": NaN
110 },
111 "uri": "hls_450k_video.ts" 75 "uri": "hls_450k_video.ts"
112 }, 76 },
113 { 77 {
...@@ -116,10 +80,6 @@ ...@@ -116,10 +80,6 @@
116 "offset": 4727636 80 "offset": 4727636
117 }, 81 },
118 "duration": 10, 82 "duration": 10,
119 "timeRange": {
120 "end": NaN,
121 "start": NaN
122 },
123 "uri": "hls_450k_video.ts" 83 "uri": "hls_450k_video.ts"
124 }, 84 },
125 { 85 {
...@@ -128,10 +88,6 @@ ...@@ -128,10 +88,6 @@
128 "offset": 5212676 88 "offset": 5212676
129 }, 89 },
130 "duration": 10, 90 "duration": 10,
131 "timeRange": {
132 "end": NaN,
133 "start": NaN
134 },
135 "uri": "hls_450k_video.ts" 91 "uri": "hls_450k_video.ts"
136 }, 92 },
137 { 93 {
...@@ -140,10 +96,6 @@ ...@@ -140,10 +96,6 @@
140 "offset": 5921812 96 "offset": 5921812
141 }, 97 },
142 "duration": 10, 98 "duration": 10,
143 "timeRange": {
144 "end": NaN,
145 "start": NaN
146 },
147 "uri": "hls_450k_video.ts" 99 "uri": "hls_450k_video.ts"
148 }, 100 },
149 { 101 {
...@@ -152,10 +104,6 @@ ...@@ -152,10 +104,6 @@
152 "offset": 6651816 104 "offset": 6651816
153 }, 105 },
154 "duration": 10, 106 "duration": 10,
155 "timeRange": {
156 "end": NaN,
157 "start": NaN
158 },
159 "uri": "hls_450k_video.ts" 107 "uri": "hls_450k_video.ts"
160 }, 108 },
161 { 109 {
...@@ -164,10 +112,6 @@ ...@@ -164,10 +112,6 @@
164 "offset": 7108092 112 "offset": 7108092
165 }, 113 },
166 "duration": 10, 114 "duration": 10,
167 "timeRange": {
168 "end": NaN,
169 "start": NaN
170 },
171 "uri": "hls_450k_video.ts" 115 "uri": "hls_450k_video.ts"
172 }, 116 },
173 { 117 {
...@@ -176,10 +120,6 @@ ...@@ -176,10 +120,6 @@
176 "offset": 7576776 120 "offset": 7576776
177 }, 121 },
178 "duration": 10, 122 "duration": 10,
179 "timeRange": {
180 "end": NaN,
181 "start": NaN
182 },
183 "uri": "hls_450k_video.ts" 123 "uri": "hls_450k_video.ts"
184 }, 124 },
185 { 125 {
...@@ -188,10 +128,6 @@ ...@@ -188,10 +128,6 @@
188 "offset": 8021772 128 "offset": 8021772
189 }, 129 },
190 "duration": 10, 130 "duration": 10,
191 "timeRange": {
192 "end": NaN,
193 "start": NaN
194 },
195 "uri": "hls_450k_video.ts" 131 "uri": "hls_450k_video.ts"
196 }, 132 },
197 { 133 {
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 } 13 }
18 ], 14 ],
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 },
14 { 10 {
15 "duration": 6.08, 11 "duration": 6.08,
16 "timeRange": {
17 "end": 12.719999999999999,
18 "start": 6.64
19 },
20 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts" 12 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
21 }, 13 },
22 { 14 {
23 "duration": 6.6, 15 "duration": 6.6,
24 "timeRange": {
25 "end": 19.32,
26 "start": 12.719999999999999
27 },
28 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts" 16 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
29 }, 17 },
30 { 18 {
31 "duration": 5, 19 "duration": 5,
32 "timeRange": {
33 "end": 24.32,
34 "start": 19.32
35 },
36 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts" 20 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -5,50 +5,26 @@ ...@@ -5,50 +5,26 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts" 8 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00001.ts"
13 }, 9 },
14 { 10 {
15 "duration": 10, 11 "duration": 10,
16 "timeRange": {
17 "end": 20,
18 "start": 10
19 },
20 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts" 12 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00002.ts"
21 }, 13 },
22 { 14 {
23 "duration": 10, 15 "duration": 10,
24 "timeRange": {
25 "end": 30,
26 "start": 20
27 },
28 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts" 16 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00003.ts"
29 }, 17 },
30 { 18 {
31 "duration": 10, 19 "duration": 10,
32 "timeRange": {
33 "end": 40,
34 "start": 30
35 },
36 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts" 20 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00004.ts"
37 }, 21 },
38 { 22 {
39 "duration": 10, 23 "duration": 10,
40 "timeRange": {
41 "end": 50,
42 "start": 40
43 },
44 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts" 24 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00005.ts"
45 }, 25 },
46 { 26 {
47 "duration": 8, 27 "duration": 8,
48 "timeRange": {
49 "end": 58,
50 "start": 50
51 },
52 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts" 28 "uri": "/test/ts-files/zencoder/haze/Haze_Mantel_President_encoded_1200-00006.ts"
53 } 29 }
54 ], 30 ],
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 }, 13 },
18 { 14 {
...@@ -21,10 +17,6 @@ ...@@ -21,10 +17,6 @@
21 "offset": 522828 17 "offset": 522828
22 }, 18 },
23 "duration": 10, 19 "duration": 10,
24 "timeRange": {
25 "end": 20,
26 "start": 10
27 },
28 "uri": "hls_450k_video.ts" 20 "uri": "hls_450k_video.ts"
29 }, 21 },
30 { 22 {
...@@ -33,10 +25,6 @@ ...@@ -33,10 +25,6 @@
33 "offset": 1110328 25 "offset": 1110328
34 }, 26 },
35 "duration": 10, 27 "duration": 10,
36 "timeRange": {
37 "end": 30,
38 "start": 20
39 },
40 "uri": "hls_450k_video.ts" 28 "uri": "hls_450k_video.ts"
41 }, 29 },
42 { 30 {
...@@ -45,10 +33,6 @@ ...@@ -45,10 +33,6 @@
45 "offset": 1823412 33 "offset": 1823412
46 }, 34 },
47 "duration": 10, 35 "duration": 10,
48 "timeRange": {
49 "end": 40,
50 "start": 30
51 },
52 "uri": "hls_450k_video.ts" 36 "uri": "hls_450k_video.ts"
53 }, 37 },
54 { 38 {
...@@ -57,10 +41,6 @@ ...@@ -57,10 +41,6 @@
57 "offset": 2299992 41 "offset": 2299992
58 }, 42 },
59 "duration": 10, 43 "duration": 10,
60 "timeRange": {
61 "end": 50,
62 "start": 40
63 },
64 "uri": "hls_450k_video.ts" 44 "uri": "hls_450k_video.ts"
65 }, 45 },
66 { 46 {
...@@ -69,10 +49,6 @@ ...@@ -69,10 +49,6 @@
69 "offset": 2835604 49 "offset": 2835604
70 }, 50 },
71 "duration": 10, 51 "duration": 10,
72 "timeRange": {
73 "end": 60,
74 "start": 50
75 },
76 "uri": "hls_450k_video.ts" 52 "uri": "hls_450k_video.ts"
77 }, 53 },
78 { 54 {
...@@ -81,10 +57,6 @@ ...@@ -81,10 +57,6 @@
81 "offset": 3042780 57 "offset": 3042780
82 }, 58 },
83 "duration": 10, 59 "duration": 10,
84 "timeRange": {
85 "end": 70,
86 "start": 60
87 },
88 "uri": "hls_450k_video.ts" 60 "uri": "hls_450k_video.ts"
89 }, 61 },
90 { 62 {
...@@ -93,10 +65,6 @@ ...@@ -93,10 +65,6 @@
93 "offset": 3498680 65 "offset": 3498680
94 }, 66 },
95 "duration": 10, 67 "duration": 10,
96 "timeRange": {
97 "end": 80,
98 "start": 70
99 },
100 "uri": "hls_450k_video.ts" 68 "uri": "hls_450k_video.ts"
101 }, 69 },
102 { 70 {
...@@ -105,10 +73,6 @@ ...@@ -105,10 +73,6 @@
105 "offset": 4155928 73 "offset": 4155928
106 }, 74 },
107 "duration": 10, 75 "duration": 10,
108 "timeRange": {
109 "end": 90,
110 "start": 80
111 },
112 "uri": "hls_450k_video.ts" 76 "uri": "hls_450k_video.ts"
113 }, 77 },
114 { 78 {
...@@ -117,10 +81,6 @@ ...@@ -117,10 +81,6 @@
117 "offset": 4727636 81 "offset": 4727636
118 }, 82 },
119 "duration": 10, 83 "duration": 10,
120 "timeRange": {
121 "end": 100,
122 "start": 90
123 },
124 "uri": "hls_450k_video.ts" 84 "uri": "hls_450k_video.ts"
125 }, 85 },
126 { 86 {
...@@ -129,10 +89,6 @@ ...@@ -129,10 +89,6 @@
129 "offset": 5212676 89 "offset": 5212676
130 }, 90 },
131 "duration": 10, 91 "duration": 10,
132 "timeRange": {
133 "end": 110,
134 "start": 100
135 },
136 "uri": "hls_450k_video.ts" 92 "uri": "hls_450k_video.ts"
137 }, 93 },
138 { 94 {
...@@ -141,10 +97,6 @@ ...@@ -141,10 +97,6 @@
141 "offset": 5921812 97 "offset": 5921812
142 }, 98 },
143 "duration": 10, 99 "duration": 10,
144 "timeRange": {
145 "end": 120,
146 "start": 110
147 },
148 "uri": "hls_450k_video.ts" 100 "uri": "hls_450k_video.ts"
149 }, 101 },
150 { 102 {
...@@ -153,10 +105,6 @@ ...@@ -153,10 +105,6 @@
153 "offset": 6651816 105 "offset": 6651816
154 }, 106 },
155 "duration": 10, 107 "duration": 10,
156 "timeRange": {
157 "end": 130,
158 "start": 120
159 },
160 "uri": "hls_450k_video.ts" 108 "uri": "hls_450k_video.ts"
161 }, 109 },
162 { 110 {
...@@ -165,10 +113,6 @@ ...@@ -165,10 +113,6 @@
165 "offset": 7108092 113 "offset": 7108092
166 }, 114 },
167 "duration": 10, 115 "duration": 10,
168 "timeRange": {
169 "end": 140,
170 "start": 130
171 },
172 "uri": "hls_450k_video.ts" 116 "uri": "hls_450k_video.ts"
173 }, 117 },
174 { 118 {
...@@ -177,10 +121,6 @@ ...@@ -177,10 +121,6 @@
177 "offset": 7576776 121 "offset": 7576776
178 }, 122 },
179 "duration": 10, 123 "duration": 10,
180 "timeRange": {
181 "end": 150,
182 "start": 140
183 },
184 "uri": "hls_450k_video.ts" 124 "uri": "hls_450k_video.ts"
185 }, 125 },
186 { 126 {
...@@ -189,10 +129,6 @@ ...@@ -189,10 +129,6 @@
189 "offset": 8021772 129 "offset": 8021772
190 }, 130 },
191 "duration": 10, 131 "duration": 10,
192 "timeRange": {
193 "end": 160,
194 "start": 150
195 },
196 "uri": "hls_450k_video.ts" 132 "uri": "hls_450k_video.ts"
197 }, 133 },
198 { 134 {
...@@ -201,10 +137,6 @@ ...@@ -201,10 +137,6 @@
201 "offset": 8353216 137 "offset": 8353216
202 }, 138 },
203 "duration": 1.4167, 139 "duration": 1.4167,
204 "timeRange": {
205 "end": 161.4167,
206 "start": 160
207 },
208 "uri": "hls_450k_video.ts" 140 "uri": "hls_450k_video.ts"
209 } 141 }
210 ], 142 ],
......
...@@ -5,12 +5,8 @@ ...@@ -5,12 +5,8 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "/test/ts-files/zencoder/gogo/00001.ts" 8 "uri": "/test/ts-files/zencoder/gogo/00001.ts"
13 }, 9 }
14 ], 10 ],
15 "totalDuration": 10 11 "totalDuration": 10
16 } 12 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,45 +5,25 @@ ...@@ -5,45 +5,25 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "/test/ts-files/zencoder/gogo/00001.ts" 8 "uri": "/test/ts-files/zencoder/gogo/00001.ts"
13 }, 9 },
14 { 10 {
15 "duration": 10, 11 "duration": 10,
16 "timeRange": {
17 "end": 20,
18 "start": 10
19 },
20 "uri": "/test/ts-files/zencoder/gogo/00002.ts" 12 "uri": "/test/ts-files/zencoder/gogo/00002.ts"
21 }, 13 },
22 { 14 {
23 "duration": 10, 15 "duration": 10,
24 "timeRange": {
25 "end": 30,
26 "start": 20
27 },
28 "uri": "/test/ts-files/zencoder/gogo/00003.ts" 16 "uri": "/test/ts-files/zencoder/gogo/00003.ts"
29 }, 17 },
30 { 18 {
31 "duration": 10, 19 "duration": 10,
32 "timeRange": {
33 "end": 40,
34 "start": 30
35 },
36 "uri": "/test/ts-files/zencoder/gogo/00004.ts" 20 "uri": "/test/ts-files/zencoder/gogo/00004.ts"
37 }, 21 },
38 { 22 {
39 "duration": 10, 23 "duration": 10,
40 "timeRange": {
41 "end": 50,
42 "start": 40
43 },
44 "uri": "/test/ts-files/zencoder/gogo/00005.ts" 24 "uri": "/test/ts-files/zencoder/gogo/00005.ts"
45 }, 25 }
46 ], 26 ],
47 "targetDuration": 10, 27 "targetDuration": 10,
48 "totalDuration": 30 28 "totalDuration": 30
49 } 29 }
...\ No newline at end of file ...\ No newline at end of file
......
1 { 1 {
2 "allowCache": true, 2 "allowCache": true,
3 "mediaSequence": 0, 3 "mediaSequence": 0,
4 "playlistType":"VOD", 4 "playlistType": "VOD",
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10.0, 7 "duration": 10,
8 "timeRange": {
9 "end": 10.0,
10 "start": 0
11 },
12 "uri": "/test/ts-files/zencoder/gogo/00001.ts" 8 "uri": "/test/ts-files/zencoder/gogo/00001.ts"
13 }, 9 }
14 ], 10 ],
15 "targetDuration": 10, 11 "targetDuration": 10,
16 "totalDuration": 10.0 12 "totalDuration": 10
17 } 13 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "00001.ts" 8 "uri": "00001.ts"
13 }, 9 },
14 { 10 {
15 "duration": 10, 11 "duration": 10,
16 "timeRange": {
17 "end": 20,
18 "start": 10
19 },
20 "uri": "00002.ts" 12 "uri": "00002.ts"
21 }, 13 },
22 { 14 {
23 "duration": 10, 15 "duration": 10,
24 "timeRange": {
25 "end": 30,
26 "start": 20
27 },
28 "uri": "00003.ts" 16 "uri": "00003.ts"
29 }, 17 },
30 { 18 {
31 "duration": 10, 19 "duration": 10,
32 "timeRange": {
33 "end": 40,
34 "start": 30
35 },
36 "uri": "00004.ts" 20 "uri": "00004.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 },
14 { 10 {
15 "duration": 6.08, 11 "duration": 6.08,
16 "timeRange": {
17 "end": 12.719999999999999,
18 "start": 6.64
19 },
20 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts" 12 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
21 }, 13 },
22 { 14 {
23 "duration": 6.6, 15 "duration": 6.6,
24 "timeRange": {
25 "end": 19.32,
26 "start": 12.719999999999999
27 },
28 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts" 16 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
29 }, 17 },
30 { 18 {
31 "duration": 5, 19 "duration": 5,
32 "timeRange": {
33 "end": 24.32,
34 "start": 19.32
35 },
36 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts" 20 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -5,23 +5,15 @@ ...@@ -5,23 +5,15 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "hls_450k_video.ts" 8 "uri": "hls_450k_video.ts"
13 }, 9 },
14 { 10 {
15 "uri": "hls_450k_video.ts" 11 "uri": "hls_450k_video.ts"
16 }, 12 },
17 { 13 {
18 "duration": 5, 14 "duration": 10,
19 "timeRange": {
20 "end": 30,
21 "start": 20
22 },
23 "uri": "hls_450k_video.ts" 15 "uri": "hls_450k_video.ts"
24 }, 16 }
25 ], 17 ],
26 "targetDuration": 10, 18 "targetDuration": 10,
27 "totalDuration": 30 19 "totalDuration": 30
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 },
14 { 10 {
15 "duration": 6.08, 11 "duration": 6.08,
16 "timeRange": {
17 "end": 12.719999999999999,
18 "start": 6.64
19 },
20 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts" 12 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
21 }, 13 },
22 { 14 {
23 "duration": 6.6, 15 "duration": 6.6,
24 "timeRange": {
25 "end": 19.32,
26 "start": 12.719999999999999
27 },
28 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts" 16 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
29 }, 17 },
30 { 18 {
31 "duration": 5, 19 "duration": 5,
32 "timeRange": {
33 "end": 24.32,
34 "start": 19.32
35 },
36 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts" 20 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -5,10 +5,6 @@ ...@@ -5,10 +5,6 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 },
14 { 10 {
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 },
14 { 10 {
15 "duration": 6.08, 11 "duration": 6.08,
16 "timeRange": {
17 "end": 12.719999999999999,
18 "start": 6.64
19 },
20 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts" 12 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
21 }, 13 },
22 { 14 {
23 "duration": 6.6, 15 "duration": 6.6,
24 "timeRange": {
25 "end": 19.32,
26 "start": 12.719999999999999
27 },
28 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts" 16 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
29 }, 17 },
30 { 18 {
31 "duration": 5, 19 "duration": 5,
32 "timeRange": {
33 "end": 24.32,
34 "start": 19.32
35 },
36 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts" 20 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
9 "offset": 0 9 "offset": 0
10 }, 10 },
11 "duration": 10, 11 "duration": 10,
12 "timeRange": {
13 "end": 10,
14 "start": 0
15 },
16 "uri": "hls_450k_video.ts" 12 "uri": "hls_450k_video.ts"
17 }, 13 },
18 { 14 {
...@@ -21,10 +17,6 @@ ...@@ -21,10 +17,6 @@
21 "offset": 522828 17 "offset": 522828
22 }, 18 },
23 "duration": 10, 19 "duration": 10,
24 "timeRange": {
25 "end": 20,
26 "start": 10
27 },
28 "uri": "hls_450k_video.ts" 20 "uri": "hls_450k_video.ts"
29 }, 21 },
30 { 22 {
...@@ -33,10 +25,6 @@ ...@@ -33,10 +25,6 @@
33 "offset": 1110328 25 "offset": 1110328
34 }, 26 },
35 "duration": 10, 27 "duration": 10,
36 "timeRange": {
37 "end": 30,
38 "start": 20
39 },
40 "uri": "hls_450k_video.ts" 28 "uri": "hls_450k_video.ts"
41 }, 29 },
42 { 30 {
...@@ -45,10 +33,6 @@ ...@@ -45,10 +33,6 @@
45 "offset": 1823412 33 "offset": 1823412
46 }, 34 },
47 "duration": 10, 35 "duration": 10,
48 "timeRange": {
49 "end": 40,
50 "start": 30
51 },
52 "uri": "hls_450k_video.ts" 36 "uri": "hls_450k_video.ts"
53 }, 37 },
54 { 38 {
...@@ -57,10 +41,6 @@ ...@@ -57,10 +41,6 @@
57 "offset": 2299992 41 "offset": 2299992
58 }, 42 },
59 "duration": 10, 43 "duration": 10,
60 "timeRange": {
61 "end": 50,
62 "start": 40
63 },
64 "uri": "hls_450k_video.ts" 44 "uri": "hls_450k_video.ts"
65 }, 45 },
66 { 46 {
...@@ -69,10 +49,6 @@ ...@@ -69,10 +49,6 @@
69 "offset": 2835604 49 "offset": 2835604
70 }, 50 },
71 "duration": 10, 51 "duration": 10,
72 "timeRange": {
73 "end": 60,
74 "start": 50
75 },
76 "uri": "hls_450k_video.ts" 52 "uri": "hls_450k_video.ts"
77 }, 53 },
78 { 54 {
...@@ -81,10 +57,6 @@ ...@@ -81,10 +57,6 @@
81 "offset": 3042780 57 "offset": 3042780
82 }, 58 },
83 "duration": 10, 59 "duration": 10,
84 "timeRange": {
85 "end": 70,
86 "start": 60
87 },
88 "uri": "hls_450k_video.ts" 60 "uri": "hls_450k_video.ts"
89 }, 61 },
90 { 62 {
...@@ -93,10 +65,6 @@ ...@@ -93,10 +65,6 @@
93 "offset": 3498680 65 "offset": 3498680
94 }, 66 },
95 "duration": 10, 67 "duration": 10,
96 "timeRange": {
97 "end": 80,
98 "start": 70
99 },
100 "uri": "hls_450k_video.ts" 68 "uri": "hls_450k_video.ts"
101 }, 69 },
102 { 70 {
...@@ -105,10 +73,6 @@ ...@@ -105,10 +73,6 @@
105 "offset": 4155928 73 "offset": 4155928
106 }, 74 },
107 "duration": 10, 75 "duration": 10,
108 "timeRange": {
109 "end": 90,
110 "start": 80
111 },
112 "uri": "hls_450k_video.ts" 76 "uri": "hls_450k_video.ts"
113 }, 77 },
114 { 78 {
...@@ -117,10 +81,6 @@ ...@@ -117,10 +81,6 @@
117 "offset": 4727636 81 "offset": 4727636
118 }, 82 },
119 "duration": 10, 83 "duration": 10,
120 "timeRange": {
121 "end": 100,
122 "start": 90
123 },
124 "uri": "hls_450k_video.ts" 84 "uri": "hls_450k_video.ts"
125 }, 85 },
126 { 86 {
...@@ -129,10 +89,6 @@ ...@@ -129,10 +89,6 @@
129 "offset": 5212676 89 "offset": 5212676
130 }, 90 },
131 "duration": 10, 91 "duration": 10,
132 "timeRange": {
133 "end": 110,
134 "start": 100
135 },
136 "uri": "hls_450k_video.ts" 92 "uri": "hls_450k_video.ts"
137 }, 93 },
138 { 94 {
...@@ -141,10 +97,6 @@ ...@@ -141,10 +97,6 @@
141 "offset": 5921812 97 "offset": 5921812
142 }, 98 },
143 "duration": 10, 99 "duration": 10,
144 "timeRange": {
145 "end": 120,
146 "start": 110
147 },
148 "uri": "hls_450k_video.ts" 100 "uri": "hls_450k_video.ts"
149 }, 101 },
150 { 102 {
...@@ -153,10 +105,6 @@ ...@@ -153,10 +105,6 @@
153 "offset": 6651816 105 "offset": 6651816
154 }, 106 },
155 "duration": 10, 107 "duration": 10,
156 "timeRange": {
157 "end": 130,
158 "start": 120
159 },
160 "uri": "hls_450k_video.ts" 108 "uri": "hls_450k_video.ts"
161 }, 109 },
162 { 110 {
...@@ -165,10 +113,6 @@ ...@@ -165,10 +113,6 @@
165 "offset": 7108092 113 "offset": 7108092
166 }, 114 },
167 "duration": 10, 115 "duration": 10,
168 "timeRange": {
169 "end": 140,
170 "start": 130
171 },
172 "uri": "hls_450k_video.ts" 116 "uri": "hls_450k_video.ts"
173 }, 117 },
174 { 118 {
...@@ -177,10 +121,6 @@ ...@@ -177,10 +121,6 @@
177 "offset": 7576776 121 "offset": 7576776
178 }, 122 },
179 "duration": 10, 123 "duration": 10,
180 "timeRange": {
181 "end": 150,
182 "start": 140
183 },
184 "uri": "hls_450k_video.ts" 124 "uri": "hls_450k_video.ts"
185 }, 125 },
186 { 126 {
...@@ -189,10 +129,6 @@ ...@@ -189,10 +129,6 @@
189 "offset": 8021772 129 "offset": 8021772
190 }, 130 },
191 "duration": 10, 131 "duration": 10,
192 "timeRange": {
193 "end": 160,
194 "start": 150
195 },
196 "uri": "hls_450k_video.ts" 132 "uri": "hls_450k_video.ts"
197 }, 133 },
198 { 134 {
...@@ -201,10 +137,6 @@ ...@@ -201,10 +137,6 @@
201 "offset": 8353216 137 "offset": 8353216
202 }, 138 },
203 "duration": 1.4167, 139 "duration": 1.4167,
204 "timeRange": {
205 "end": 161.4167,
206 "start": 160
207 },
208 "uri": "hls_450k_video.ts" 140 "uri": "hls_450k_video.ts"
209 } 141 }
210 ], 142 ],
......
1 { 1 {
2 "allowCache": true, 2 "allowCache": true,
3 "mediaSequence": 17, 3 "mediaSequence": 17,
4 "playlistType":"VOD", 4 "playlistType": "VOD",
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 }
14 ], 10 ],
15 "targetDuration": 8, 11 "targetDuration": 8,
16 "totalDuration": 6.64 12 "totalDuration": 6.64
17 } 13 }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
4 "playlists": [ 4 "playlists": [
5 { 5 {
6 "attributes": { 6 "attributes": {
7 "PROGRAM-ID": 1, 7 "PROGRAM-ID": 1
8 }, 8 },
9 "uri": "media.m3u8" 9 "uri": "media.m3u8"
10 }, 10 },
......
...@@ -5,34 +5,18 @@ ...@@ -5,34 +5,18 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 6.64, 7 "duration": 6.64,
8 "timeRange": {
9 "end": 6.64,
10 "start": 0
11 },
12 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts" 8 "uri": "/test/ts-files/tvy7/8a5e2822668b5370f4eb1438b2564fb7ab12ffe1-hi720.ts"
13 }, 9 },
14 { 10 {
15 "duration": 6.08, 11 "duration": 6.08,
16 "timeRange": {
17 "end": 12.719999999999999,
18 "start": 6.64
19 },
20 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts" 12 "uri": "/test/ts-files/tvy7/56be1cef869a1c0cc8e38864ad1add17d187f051-hi720.ts"
21 }, 13 },
22 { 14 {
23 "duration": 6.6, 15 "duration": 6.6,
24 "timeRange": {
25 "end": 19.32,
26 "start": 12.719999999999999
27 },
28 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts" 16 "uri": "/test/ts-files/tvy7/549c8c77f55f049741a06596e5c1e01dacaa46d0-hi720.ts"
29 }, 17 },
30 { 18 {
31 "duration": 5, 19 "duration": 5,
32 "timeRange": {
33 "end": 24.32,
34 "start": 19.32
35 },
36 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts" 20 "uri": "/test/ts-files/tvy7/6cfa378684ffeb1c455a64dae6c103290a1f53d4-hi720.ts"
37 } 21 }
38 ], 22 ],
......
...@@ -5,13 +5,9 @@ ...@@ -5,13 +5,9 @@
5 "segments": [ 5 "segments": [
6 { 6 {
7 "duration": 10, 7 "duration": 10,
8 "timeRange": {
9 "end": 10,
10 "start": 0
11 },
12 "uri": "hls_450k_video.ts" 8 "uri": "hls_450k_video.ts"
13 }, 9 }
14 ], 10 ],
15 "targetDuration": 10, 11 "targetDuration": 10,
16 "totalDuration": 10 12 "totalDuration": 10
17 } 13 }
...\ No newline at end of file ...\ No newline at end of file
......