64f30e95 by David LaPalomento

Merge pull request #7 from tojohnson/hotfixes

changed url and added fixes to manifest parseing
2 parents a810eb63 a2b2cd63
......@@ -52,7 +52,7 @@
videojs.options.flash.swf = 'node_modules/videojs-media-sources/video-js-with-mse.swf';
video = videojs('video',{},function(){
this.playbackController = new window.videojs.hls.HLSPlaybackController(this);
this.playbackController.loadManifest('test/fixtures/bipbop.m3u8', function(data) {
this.playbackController.loadManifest('http://localhost:7070/test/basic-playback/zencoder/gogo/manifest.m3u8', function(data) {
console.log(data);
});
});
......
......@@ -20,7 +20,15 @@
// register external callbacks
self.rendition = function(rendition) {
self.currentRendition = rendition;
self.loadManifest(self.currentRendition.url, self.onM3U8LoadComplete, self.onM3U8LoadError, self.onM3U8Update);
self.loadManifestWithMediaSources(self.currentRendition.url, self.onM3U8LoadComplete, self.onM3U8LoadError, self.onM3U8Update);
};
self.loadManifestWithMediaSources = function(manifestUrl,onDataCallback) {
self.manifestController = new ManifestController();
self.manifestController.loadManifest(manifestUrl, self.onM3U8LoadComplete, self.onM3U8LoadError, self.onM3U8Update);
if (onDataCallback) {
self.manifestLoadCompleteCallback = onDataCallback;
}
};
self.loadManifest = function(manifestUrl, onDataCallback) {
......
......@@ -55,7 +55,7 @@
if (self.getTagValue(value) === "VOD" ||
self.getTagValue(value) === "EVENT") {
data.playlistType = self.getTagValue(value);
data.isPlaylist = true;
} else {
data.invalidReasons.push("Invalid Playlist Type Value");
}
......