Correcting for failed tests

Some tests failed in the previous build, mostly due to syntactic
errors. Also restored a section of code in translateMediaIndex whose
absence made a test fail.

@@ -99,7 +99,7 @@ videojs.Hls.setMediaIndexForLive = function(selectedPlaylist) {
   }
   }
 
 
   return tailIterator;
   return tailIterator;
-}
+};
 
 
 videojs.Hls.prototype.handleSourceOpen = function() {
 videojs.Hls.prototype.handleSourceOpen = function() {
   // construct the video data buffer and set the appropriate MIME type
   // construct the video data buffer and set the appropriate MIME type
@@ -795,8 +795,7 @@ videojs.Hls.getPlaylistTotalDuration = function(playlist) {
  * playlist
  * playlist
  */
  */
 videojs.Hls.translateMediaIndex = function(mediaIndex, original, update) {
 videojs.Hls.translateMediaIndex = function(mediaIndex, original, update) {
-  var
-    i,
+  var i,
       originalSegment,
       originalSegment,
       translatedMediaIndex;
       translatedMediaIndex;
 
 
@@ -804,14 +803,24 @@ videojs.Hls.translateMediaIndex = function(mediaIndex, original, update) {
   if (mediaIndex === 0) {
   if (mediaIndex === 0) {
     return 0;
     return 0;
   }
   }
+
   if (!(update && update.segments)) {
   if (!(update && update.segments)) {
     // let the media index be zero when there are no segments defined
     // let the media index be zero when there are no segments defined
     return 0;
     return 0;
   }
   }
 
 
-  translatedMediaIndex = (mediaIndex + (original.mediaSequence - update.mediaSequence))
+  // try to sync based on URI
+  i = update.segments.length;
+  originalSegment = original.segments[mediaIndex - 1];
+  while (i--) {
+    if (originalSegment.uri === update.segments[i].uri) {
+      return i + 1;
+    }
+  }
+
+  translatedMediaIndex = (mediaIndex + (original.mediaSequence - update.mediaSequence));
 
 
-  if (update.duration() === Infinity && translatedMediaIndex >= update.segments.length) {
+  if (update.duration === Infinity && translatedMediaIndex >= update.segments.length) {
     // recalculate the live point if the streams are too far out of sync
     // recalculate the live point if the streams are too far out of sync
     return videojs.Hls.setMediaIndexForLive(update) + 1;
     return videojs.Hls.setMediaIndexForLive(update) + 1;
   }
   }