Merge pull request #529 from tenacex/initial-blacklist-bug

Initial blacklist bug

@@ -90,6 +90,7 @@
         dispose,
         dispose,
         mediaUpdateTimeout,
         mediaUpdateTimeout,
         request,
         request,
+        playlistRequestError,
         haveMetadata;
         haveMetadata;
 
 
       PlaylistLoader.prototype.init.call(this);
       PlaylistLoader.prototype.init.call(this);
@@ -102,27 +103,36 @@
         throw new Error('A non-empty playlist URL is required');
         throw new Error('A non-empty playlist URL is required');
       }
       }
 
 
+      playlistRequestError = function(xhr, url, startingState) {
+        loader.setBandwidth(request || xhr);
+
+        // any in-flight request is now finished
+        request = null;
+        
+        if (startingState) {
+          loader.state = startingState;
+        }
+
+        loader.error = {
+          playlist: loader.master.playlists[url],
+          status: xhr.status,
+          message: 'HLS playlist request error at URL: ' + url,
+          responseText: xhr.responseText,
+          code: (xhr.status >= 500) ? 4 : 2
+        };
+        loader.trigger('error');
+      };
+
       // update the playlist loader's state in response to a new or
       // update the playlist loader's state in response to a new or
       // updated playlist.
       // updated playlist.
-      haveMetadata = function(error, xhr, url) {
+
+      haveMetadata = function(xhr, url) {
         var parser, refreshDelay, update;
         var parser, refreshDelay, update;
 
 
         loader.setBandwidth(request || xhr);
         loader.setBandwidth(request || xhr);
 
 
         // any in-flight request is now finished
         // any in-flight request is now finished
         request = null;
         request = null;
-
-        if (error) {
-          loader.error = {
-            playlist: loader.master.playlists[url],
-            status: xhr.status,
-            message: 'HLS playlist request error at URL: ' + url,
-            responseText: xhr.responseText,
-            code: (xhr.status >= 500) ? 4 : 2
-          };
-          return loader.trigger('error');
-        }
-
         loader.state = 'HAVE_METADATA';
         loader.state = 'HAVE_METADATA';
 
 
         parser = new videojs.m3u8.Parser();
         parser = new videojs.m3u8.Parser();
@@ -252,12 +262,12 @@
           uri: resolveUrl(loader.master.uri, playlist.uri),
           uri: resolveUrl(loader.master.uri, playlist.uri),
           withCredentials: withCredentials
           withCredentials: withCredentials
         }, function(error, request) {
         }, function(error, request) {
-          haveMetadata(error, request, playlist.uri);
-
           if (error) {
           if (error) {
-            return;
+            return playlistRequestError(request, playlist.uri, startingState);
           }
           }
 
 
+          haveMetadata(request, playlist.uri);
+
           // fire loadedmetadata the first time a media playlist is loaded
           // fire loadedmetadata the first time a media playlist is loaded
           if (startingState === 'HAVE_MASTER') {
           if (startingState === 'HAVE_MASTER') {
             loader.trigger('loadedmetadata');
             loader.trigger('loadedmetadata');
@@ -289,7 +299,10 @@
           uri: resolveUrl(loader.master.uri, loader.media().uri),
           uri: resolveUrl(loader.master.uri, loader.media().uri),
           withCredentials: withCredentials
           withCredentials: withCredentials
         }, function(error, request) {
         }, function(error, request) {
-          haveMetadata(error, request, loader.media().uri);
+          if (error) {
+            return playlistRequestError(request, loader.media().uri);
+          }
+          haveMetadata(request, loader.media().uri);
         });
         });
       });
       });
 
 
@@ -349,7 +362,7 @@
           }]
           }]
         };
         };
         loader.master.playlists[srcUrl] = loader.master.playlists[0];
         loader.master.playlists[srcUrl] = loader.master.playlists[0];
-        haveMetadata(null, req, srcUrl);
+        haveMetadata(req, srcUrl);
         return loader.trigger('loadedmetadata');
         return loader.trigger('loadedmetadata');
       });
       });
     };
     };

@@ -1296,6 +1296,28 @@ test('blacklists switching from video-only playlists to video+audio', function()
   equal(videoAudioPlaylist.excludeUntil, Infinity, 'excluded incompatible playlist');
   equal(videoAudioPlaylist.excludeUntil, Infinity, 'excluded incompatible playlist');
 });
 });
 
 
+test('After an initial media playlist 404s, we fire loadedmetadata once we successfully load a playlist', function() {
+  var count = 0;
+  player.src({
+    src: 'manifest/master.m3u8',
+    type: 'application/vnd.apple.mpegurl'
+  });
+  openMediaSource(player);
+  player.tech_.hls.bandwidth = 20000;
+  player.on('loadedmetadata', function() {
+    count += 1;
+  });
+  standardXHRResponse(requests.shift());      //master
+  equal(count, 0, 
+    'loadedMedia not triggered before requesting playlist');
+  requests.shift().respond(404);              //media           
+  equal(count, 0, 
+    'loadedMedia not triggered after playlist 404');
+  standardXHRResponse(requests.shift());      //media
+  equal(count, 1, 
+    'loadedMedia triggered after successful recovery from 404');
+});
+
 test('does not blacklist compatible H.264 codec strings', function() {
 test('does not blacklist compatible H.264 codec strings', function() {
   var master;
   var master;
   player.src({
   player.src({