Refactor streaming retry conditions

This is just cleanup before we tackle real issues around StreamingEngine retry behavior. Issue #960 Change-Id: I66bb80db9ee1fd469c0aa6c089313ba4ecf75101
shaka-project · Aug 9, 2017 · 5d82b6e · 5d82b6e
1 parent 45bd547
commit 5d82b6e
Showing 1 changed file with 21 additions and 39 deletions.
diff --git a/lib/media/streaming_engine.js b/lib/media/streaming_engine.js
@@ -1339,58 +1339,40 @@ shaka.media.StreamingEngine.prototype.fetchAndAppend_ = function(
 
     mediaState.performingUpdate = false;
 
-    if (this.manifest_.presentationTimeline.isLive() &&
+    if (mediaState.type == ContentType.TEXT &&
+        this.config_.ignoreTextStreamFailures) {
+      if (error.code == shaka.util.Error.Code.BAD_HTTP_STATUS) {
+        shaka.log.warning(logPrefix,
+            'Text stream failed to download. Proceeding without it.');
+      } else {
+        shaka.log.warning(logPrefix,
+            'Text stream failed to parse. Proceeding without it.');
+      }
+
+      delete this.mediaStates_[ContentType.TEXT];
+    } else if (this.manifest_.presentationTimeline.isLive() &&
         this.config_.infiniteRetriesForLiveStreams &&
         (error.code == shaka.util.Error.Code.BAD_HTTP_STATUS ||
         error.code == shaka.util.Error.Code.HTTP_ERROR ||
         error.code == shaka.util.Error.Code.TIMEOUT)) {
-      this.handleNetworkError_(mediaState, error);
+      error.severity = shaka.util.Error.Severity.RECOVERABLE;
+      this.playerInterface_.onError(error);
+
+      shaka.log.warning(logPrefix, 'Network error. Retrying...');
+      this.scheduleUpdate_(mediaState, 4);
     } else if (error.code == shaka.util.Error.Code.QUOTA_EXCEEDED_ERROR) {
       this.handleQuotaExceeded_(mediaState, error);
     } else {
       shaka.log.error(logPrefix, 'failed fetch and append: code=' + error.code);
-      if (mediaState.type == ContentType.TEXT &&
-          this.config_.ignoreTextStreamFailures) {
-        shaka.log.warning(logPrefix,
-            'Text stream failed to parse. Proceeding without it.');
-        delete this.mediaStates_[ContentType.TEXT];
-      } else {
-        mediaState.hasError = true;
-        error.severity = shaka.util.Error.Severity.CRITICAL;
-        this.playerInterface_.onError(error);
-      }
+      mediaState.hasError = true;
+
+      error.severity = shaka.util.Error.Severity.CRITICAL;
+      this.playerInterface_.onError(error);
     }
   }.bind(this));
 };
 
 
-/**
- * Handles a network error.
- *
- * @param {shaka.media.StreamingEngine.MediaState_} mediaState
- * @param {!shaka.util.Error} error
- * @private
- */
-shaka.media.StreamingEngine.prototype.handleNetworkError_ = function(
-    mediaState, error) {
-  var ContentType = shaka.util.ManifestParserUtils.ContentType;
-  var logPrefix = shaka.media.StreamingEngine.logPrefix_(mediaState);
-  if (mediaState.type == ContentType.TEXT &&
-      this.config_.ignoreTextStreamFailures &&
-      error.code == shaka.util.Error.Code.BAD_HTTP_STATUS) {
-    shaka.log.warning(logPrefix,
-        'Text stream failed to download. Proceeding without it.');
-    delete this.mediaStates_[ContentType.TEXT];
-  } else {
-    error.severity = shaka.util.Error.Severity.RECOVERABLE;
-    this.playerInterface_.onError(error);
-
-    shaka.log.warning(logPrefix, 'Network error. Retrying...');
-    this.scheduleUpdate_(mediaState, 4);
-  }
-};
-
-
 /**
  * Handles a QUOTA_EXCEEDED_ERROR.
  *