941e5b0d by brandonocasey

updated package.json to reflect master hls deps

fixed a typo in src/videojs-contrib-hls
fixed some inconsistencies in test/videojs-contrib-hls
1 parent a5ab53ec
...@@ -89,10 +89,10 @@ ...@@ -89,10 +89,10 @@
89 "utils/" 89 "utils/"
90 ], 90 ],
91 "dependencies": { 91 "dependencies": {
92 "pkcs7": "^0.2.3", 92 "pkcs7": "^0.2.2",
93 "video.js": "^5.0.0", 93 "video.js": "^5.2.1",
94 "videojs-contrib-media-sources": "^2.4.4", 94 "videojs-contrib-media-sources": "^2.4.4",
95 "videojs-swf": "^5.0.1" 95 "videojs-swf": "^5.0.0"
96 }, 96 },
97 "devDependencies": { 97 "devDependencies": {
98 "babel": "^5.8.0", 98 "babel": "^5.8.0",
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
118 "minimist": "^1.2.0", 118 "minimist": "^1.2.0",
119 "npm-run-all": "^1.2.0", 119 "npm-run-all": "^1.2.0",
120 "portscanner": "^1.0.0", 120 "portscanner": "^1.0.0",
121 "qunitjs": "^1.0.0", 121 "qunitjs": "^1.18.0",
122 "serve-static": "^1.10.0", 122 "serve-static": "^1.10.0",
123 "shelljs": "^0.5.3", 123 "shelljs": "^0.5.3",
124 "sinon": "1.10.2", 124 "sinon": "1.10.2",
......
...@@ -811,7 +811,7 @@ export default class HlsHandler extends Component { ...@@ -811,7 +811,7 @@ export default class HlsHandler extends Component {
811 // the highest bandwidth variant that is just-larger-than 811 // the highest bandwidth variant that is just-larger-than
812 // the video player 812 // the video player
813 resolutionPlusOne = variant; 813 resolutionPlusOne = variant;
814 resolutionPlusOneAttribute = resolutionPlusOneAttribute.attributes.RESOLUTION; 814 resolutionPlusOneAttribute = resolutionPlusOne.attributes.RESOLUTION;
815 } 815 }
816 } 816 }
817 817
...@@ -933,13 +933,11 @@ export default class HlsHandler extends Component { ...@@ -933,13 +933,11 @@ export default class HlsHandler extends Component {
933 933
934 // we have entered a state where we are fetching the same segment, 934 // we have entered a state where we are fetching the same segment,
935 // try to walk forward 935 // try to walk forward
936 /* eslint-disable max-len */
937 if (this.lastSegmentLoaded_ && 936 if (this.lastSegmentLoaded_ &&
938 this.playlistUriToUrl(this.lastSegmentLoaded_.uri) === this.playlistUriToUrl(segment.uri) && 937 this.playlistUriToUrl(this.lastSegmentLoaded_.uri) === this.playlistUriToUrl(segment.uri) &&
939 this.lastSegmentLoaded_.byterange === segment.byterange) { 938 this.lastSegmentLoaded_.byterange === segment.byterange) {
940 return this.fillBuffer(mediaIndex + 1); 939 return this.fillBuffer(mediaIndex + 1);
941 } 940 }
942 /* eslint-enable max-len */
943 941
944 // package up all the work to append the segment 942 // package up all the work to append the segment
945 segmentInfo = { 943 segmentInfo = {
......
...@@ -294,15 +294,11 @@ QUnit.module('HLS -', { ...@@ -294,15 +294,11 @@ QUnit.module('HLS -', {
294 videojs.Hls.Decrypter = this.old.Decrypt; 294 videojs.Hls.Decrypter = this.old.Decrypt;
295 videojs.SourceBuffer = this.old.SourceBuffer; 295 videojs.SourceBuffer = this.old.SourceBuffer;
296 296
297 // The clock _must_ be restored before disposing the player; otherwise,
298 // certain timeout listeners that happen inside video.js may throw errors.
299 this.clock.restore();
300 // XXX TODO WHY!?!?!?
301 this.player.dispose(); 297 this.player.dispose();
302 298
303 this.sinonXHR.restore(); 299 this.sinonXHR.restore();
304 videojs.xhr.XMLHttpRequest = this.old.XHR; 300 videojs.xhr.XMLHttpRequest = this.old.XHR;
305 301 this.clock.restore();
306 } 302 }
307 }); 303 });
308 304
...@@ -1195,7 +1191,6 @@ QUnit.test('selects the correct rendition by player dimensions', function() { ...@@ -1195,7 +1191,6 @@ QUnit.test('selects the correct rendition by player dimensions', function() {
1195 this.player.height(360); 1191 this.player.height(360);
1196 this.player.tech_.hls.bandwidth = 3000000; 1192 this.player.tech_.hls.bandwidth = 3000000;
1197 1193
1198 this.clock.tick(1);
1199 playlist = this.player.tech_.hls.selectPlaylist(); 1194 playlist = this.player.tech_.hls.selectPlaylist();
1200 1195
1201 QUnit.deepEqual(playlist.attributes.RESOLUTION, 1196 QUnit.deepEqual(playlist.attributes.RESOLUTION,
...@@ -1209,7 +1204,6 @@ QUnit.test('selects the correct rendition by player dimensions', function() { ...@@ -1209,7 +1204,6 @@ QUnit.test('selects the correct rendition by player dimensions', function() {
1209 this.player.height(1080); 1204 this.player.height(1080);
1210 this.player.tech_.hls.bandwidth = 3000000; 1205 this.player.tech_.hls.bandwidth = 3000000;
1211 1206
1212 this.clock.tick(1);
1213 playlist = this.player.tech_.hls.selectPlaylist(); 1207 playlist = this.player.tech_.hls.selectPlaylist();
1214 1208
1215 QUnit.deepEqual(playlist.attributes.RESOLUTION, 1209 QUnit.deepEqual(playlist.attributes.RESOLUTION,
...@@ -1221,7 +1215,6 @@ QUnit.test('selects the correct rendition by player dimensions', function() { ...@@ -1221,7 +1215,6 @@ QUnit.test('selects the correct rendition by player dimensions', function() {
1221 1215
1222 this.player.width(396); 1216 this.player.width(396);
1223 this.player.height(224); 1217 this.player.height(224);
1224 this.clock.tick(1);
1225 playlist = this.player.tech_.hls.selectPlaylist(); 1218 playlist = this.player.tech_.hls.selectPlaylist();
1226 1219
1227 QUnit.deepEqual(playlist.attributes.RESOLUTION, 1220 QUnit.deepEqual(playlist.attributes.RESOLUTION,
......