hls.js 1.5.13-0.canary.10408 → 1.5.13-0.canary.10411

package/dist/hls.js

@@ -522,7 +522,7 @@
       // Some browsers don't allow to use bind on console object anyway
       // fallback to default if needed
       try {
-        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.13-0.canary.10408");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.13-0.canary.10411");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3116,14 +3116,18 @@
   }
   function convertAVC1ToAVCOTI(codec) {
     // Convert avc1 codec string from RFC-4281 to RFC-6381 for MediaSource.isTypeSupported
-    var avcdata = codec.split('.');
-    if (avcdata.length > 2) {
-      var result = avcdata.shift() + '.';
-      result += parseInt(avcdata.shift()).toString(16);
-      result += ('000' + parseInt(avcdata.shift()).toString(16)).slice(-4);
-      return result;
+    // Examples: avc1.66.30 to avc1.42001e and avc1.77.30,avc1.66.30 to avc1.4d001e,avc1.42001e.
+    var codecs = codec.split(',');
+    for (var i = 0; i < codecs.length; i++) {
+      var avcdata = codecs[i].split('.');
+      if (avcdata.length > 2) {
+        var result = avcdata.shift() + '.';
+        result += parseInt(avcdata.shift()).toString(16);
+        result += ('000' + parseInt(avcdata.shift()).toString(16)).slice(-4);
+        codecs[i] = result;
+      }
     }
-    return codec;
+    return codecs.join(',');
   }
   function getM2TSSupportedAudioTypes(preferManagedMediaSource) {
     var MediaSource = getMediaSource(preferManagedMediaSource) || {
@@ -16135,40 +16139,6 @@
       this.isAudioContiguous = true;
       return audioData;
     };
-    _proto.remuxEmptyAudio = function remuxEmptyAudio(track, timeOffset, contiguous, videoData) {
-      var inputTimeScale = track.inputTimeScale;
-      var mp4timeScale = track.samplerate ? track.samplerate : inputTimeScale;
-      var scaleFactor = inputTimeScale / mp4timeScale;
-      var nextAudioPts = this.nextAudioPts;
-      // sync with video's timestamp
-      var initDTS = this._initDTS;
-      var init90kHz = initDTS.baseTime * 90000 / initDTS.timescale;
-      var startDTS = (nextAudioPts !== null ? nextAudioPts : videoData.startDTS * inputTimeScale) + init90kHz;
-      var endDTS = videoData.endDTS * inputTimeScale + init90kHz;
-      // one sample's duration value
-      var frameDuration = scaleFactor * AAC_SAMPLES_PER_FRAME;
-      // samples count of this segment's duration
-      var nbSamples = Math.ceil((endDTS - startDTS) / frameDuration);
-      // silent frame
-      var silentFrame = AAC.getSilentFrame(track.parsedCodec || track.manifestCodec || track.codec, track.channelCount);
-      logger.warn('[mp4-remuxer]: remux empty Audio');
-      // Can't remux if we can't generate a silent frame...
-      if (!silentFrame) {
-        logger.trace('[mp4-remuxer]: Unable to remuxEmptyAudio since we were unable to get a silent frame for given audio codec');
-        return;
-      }
-      var samples = [];
-      for (var i = 0; i < nbSamples; i++) {
-        var stamp = startDTS + i * frameDuration;
-        samples.push({
-          unit: silentFrame,
-          pts: stamp,
-          dts: stamp
-        });
-      }
-      track.samples = samples;
-      return this.remuxAudio(track, timeOffset, contiguous, false);
-    };
     return MP4Remuxer;
   }();
   function normalizePts(value, reference) {
@@ -17877,6 +17847,7 @@
       this.lastCurrentTime = media.currentTime;
     };
     _proto.doTickIdle = function doTickIdle() {
+      var _this$mainFragLoading;
       var hls = this.hls,
         levels = this.levels,
         media = this.media,
@@ -17951,12 +17922,24 @@
         this.bufferFlushed = true;
         return;
       }
-      if (this.startFragRequested && (!trackDetails.live || targetBufferTime < this.hls.liveSyncPosition)) {
-        // Request audio segments up to one fragment ahead of main buffer
-        var mainFragLoading = this.mainFragLoading;
-        var mainTargetBufferEnd = mainFragLoading ? (mainFragLoading.part || mainFragLoading.frag).end : null;
-        var atBufferSyncLimit = mainTargetBufferEnd !== null && frag.start > mainTargetBufferEnd;
-        if (atBufferSyncLimit && !frag.endList) {
+
+      // Request audio segments up to one fragment ahead of main stream-controller
+      var mainFragLoading = (_this$mainFragLoading = this.mainFragLoading) == null ? void 0 : _this$mainFragLoading.frag;
+      if (this.startFragRequested && mainFragLoading && mainFragLoading.sn !== 'initSegment' && frag.sn !== 'initSegment' && !frag.endList && (!trackDetails.live || !this.loadingParts && targetBufferTime < this.hls.liveSyncPosition)) {
+        var mainFrag = mainFragLoading;
+        if (frag.start > mainFrag.end) {
+          // Get buffered frag at target position from tracker (loaded out of sequence)
+          var mainFragAtPos = this.fragmentTracker.getFragAtPos(targetBufferTime, PlaylistLevelType.MAIN);
+          if (mainFragAtPos && mainFragAtPos.end > mainFragLoading.end) {
+            mainFrag = mainFragAtPos;
+            this.mainFragLoading = {
+              frag: mainFragAtPos,
+              targetBufferTime: null
+            };
+          }
+        }
+        var atBufferSyncLimit = frag.start > mainFrag.end;
+        if (atBufferSyncLimit) {
           return;
         }
       }
@@ -30805,7 +30788,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.13-0.canary.10408";
+        return "1.5.13-0.canary.10411";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -253,7 +253,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     protected decrypter: Decrypter;
     protected initPTS: RationalTimestamp[];
     protected buffering: boolean;
-    private loadingParts;
+    protected loadingParts: boolean;
     private loopSn?;
     constructor(hls: Hls, fragmentTracker: FragmentTracker, keyLoader: KeyLoader, logPrefix: string, playlistType: PlaylistLevelType);
     protected registerListeners(): void;