@@ -116,10 +116,12 @@ function appendBuffer(test, sourceBuffer, data) {
116
116
sourceBuffer . appendBuffer ( data ) ;
117
117
}
118
118
119
- function trimBuffered ( test , mediaElement , sourceBuffer , minimumPreviousDuration , newDuration , skip_duration_prechecks ) {
119
+ function trimBuffered ( test , mediaSource , sourceBuffer , minimumPreviousDuration , newDuration , skip_duration_prechecks ) {
120
120
if ( ! skip_duration_prechecks ) {
121
- assert_less_than ( newDuration , minimumPreviousDuration ) ;
122
- assert_less_than ( minimumPreviousDuration , mediaElement . duration ) ;
121
+ assert_less_than ( newDuration , minimumPreviousDuration ,
122
+ "trimBuffered newDuration must be less than minimumPreviousDuration" ) ;
123
+ assert_less_than ( minimumPreviousDuration , mediaSource . duration ,
124
+ "trimBuffered minimumPreviousDuration must be less than mediaSource.duration" ) ;
123
125
}
124
126
test . expectEvent ( sourceBuffer , "update" ) ;
125
127
test . expectEvent ( sourceBuffer , "updateend" ) ;
@@ -128,7 +130,8 @@ function trimBuffered(test, mediaElement, sourceBuffer, minimumPreviousDuration,
128
130
129
131
function trimDuration ( test , mediaElement , mediaSource , newDuration , skip_duration_prechecks ) {
130
132
if ( ! skip_duration_prechecks ) {
131
- assert_less_than ( newDuration , mediaElement . duration ) ;
133
+ assert_less_than ( newDuration , mediaSource . duration ,
134
+ "trimDuration newDuration must be less than mediaSource.duration" ) ;
132
135
}
133
136
test . expectEvent ( mediaElement , "durationchange" ) ;
134
137
mediaSource . duration = newDuration ;
@@ -158,7 +161,8 @@ function runChangeTypeTest(test, mediaElement, mediaSource, metadataA, typeA, da
158
161
// implicit_changetype and negative_test.
159
162
160
163
function findSafeOffset ( targetTime , overlappedMediaMetadata , overlappedStartTime , overlappingMediaMetadata ) {
161
- assert_greater_than_equal ( targetTime , overlappedStartTime ) ;
164
+ assert_greater_than_equal ( targetTime , overlappedStartTime ,
165
+ "findSafeOffset targetTime must be greater than or equal to overlappedStartTime" ) ;
162
166
163
167
let offset = targetTime ;
164
168
if ( "start_time" in overlappingMediaMetadata ) {
@@ -177,7 +181,8 @@ function runChangeTypeTest(test, mediaElement, mediaSource, metadataA, typeA, da
177
181
let gopsToRetain = Math . ceil ( ( targetTime - overlappedStartTime ) / overlappedMediaMetadata [ "keyframe_interval" ] ) ;
178
182
let adjustedTime = overlappedStartTime + gopsToRetain * overlappedMediaMetadata [ "keyframe_interval" ] ;
179
183
180
- assert_greater_than_equal ( adjustedTime , targetTime ) ;
184
+ assert_greater_than_equal ( adjustedTime , targetTime ,
185
+ "findSafeOffset adjustedTime must be greater than or equal to targetTime" ) ;
181
186
offset += adjustedTime - targetTime ;
182
187
return { "offset" : offset , "adjustedTime" : adjustedTime } ;
183
188
}
@@ -221,7 +226,8 @@ function runChangeTypeTest(test, mediaElement, mediaSource, metadataA, typeA, da
221
226
// changeType B->B and append B starting at 1.0 seconds (or at the first
222
227
// keyframe in B at or after 1.0 seconds if it has keyframe_interval defined).
223
228
test . waitForExpectedEvents ( ( ) => {
224
- assert_less_than ( lastStart , 1.0 ) ;
229
+ assert_less_than ( lastStart , 1.0 ,
230
+ "changeType B->B lastStart must be less than 1.0" ) ;
225
231
let safeOffset = findSafeOffset ( 1.0 , metadataB , lastStart , metadataB ) ;
226
232
lastStart = safeOffset [ "adjustedTime" ] ;
227
233
if ( ! implicit_changetype ) {
@@ -239,7 +245,8 @@ function runChangeTypeTest(test, mediaElement, mediaSource, metadataA, typeA, da
239
245
// changeType B->A and append A starting at 1.5 seconds (or at the first
240
246
// keyframe in B at or after 1.5 seconds if it has keyframe_interval defined).
241
247
test . waitForExpectedEvents ( ( ) => {
242
- assert_less_than ( lastStart , 1.5 ) ;
248
+ assert_less_than ( lastStart , 1.5 ,
249
+ "changeType B->A lastStart must be less than 1.5" ) ;
243
250
let safeOffset = findSafeOffset ( 1.5 , metadataB , lastStart , metadataA ) ;
244
251
// Retain the previous lastStart because the next block will append data
245
252
// which begins between that start time and this block's start time.
@@ -258,7 +265,8 @@ function runChangeTypeTest(test, mediaElement, mediaSource, metadataA, typeA, da
258
265
// changeType A->A and append A starting at 1.3 seconds (or at the first
259
266
// keyframe in B at or after 1.3 seconds if it has keyframe_interval defined).
260
267
test . waitForExpectedEvents ( ( ) => {
261
- assert_less_than ( lastStart , 1.3 ) ;
268
+ assert_less_than ( lastStart , 1.3 ,
269
+ "changeType A->A lastStart must be less than 1.3" ) ;
262
270
// Our next append will begin by overlapping some of metadataB, then some of
263
271
// metadataA.
264
272
let safeOffset = findSafeOffset ( 1.3 , metadataB , lastStart , metadataA ) ;
@@ -277,7 +285,7 @@ function runChangeTypeTest(test, mediaElement, mediaSource, metadataA, typeA, da
277
285
// Trim duration to 2 seconds, then play through to end.
278
286
test . waitForExpectedEvents ( ( ) => {
279
287
// If negative testing, then skip fragile assertions.
280
- trimBuffered ( test , mediaElement , sourceBuffer , 2.1 , 2 , negative_test ) ;
288
+ trimBuffered ( test , mediaSource , sourceBuffer , 2.1 , 2 , negative_test ) ;
281
289
} ) ;
282
290
283
291
test . waitForExpectedEvents ( ( ) => {
@@ -286,7 +294,7 @@ function runChangeTypeTest(test, mediaElement, mediaSource, metadataA, typeA, da
286
294
} ) ;
287
295
288
296
test . waitForExpectedEvents ( ( ) => {
289
- assert_equals ( mediaElement . currentTime , 0 ) ;
297
+ assert_equals ( mediaElement . currentTime , 0 , "currentTime must be 0" ) ;
290
298
test . expectEvent ( mediaSource , "sourceended" ) ;
291
299
test . expectEvent ( mediaElement , "play" ) ;
292
300
test . expectEvent ( mediaElement , "ended" ) ;
0 commit comments