hls.js 1.5.13-0.canary.10406 → 1.5.13-0.canary.10410

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.10406");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.5.13-0.canary.10410");
       } 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) {
@@ -29952,7 +29922,7 @@
       this.emeController = void 0;
       this.cmcdController = void 0;
       this._media = null;
-      this.url = null;
+      this._url = null;
       this.triggeringException = void 0;
       var logger = this.logger = enableLogs(userConfig.debug || false, 'Hls instance');
       var config = this.config = mergeConfig(Hls.DefaultConfig, userConfig, logger);
@@ -30117,7 +30087,7 @@
       this.detachMedia();
       this.removeAllListeners();
       this._autoLevelCapping = -1;
-      this.url = null;
+      this._url = null;
       this.networkControllers.forEach(function (component) {
         return component.destroy();
       });
@@ -30159,8 +30129,8 @@
     _proto.loadSource = function loadSource(url) {
       this.stopLoad();
       var media = this.media;
-      var loadedSource = this.url;
-      var loadingSource = this.url = urlToolkitExports.buildAbsoluteURL(self.location.href, url, {
+      var loadedSource = this._url;
+      var loadingSource = this._url = urlToolkitExports.buildAbsoluteURL(self.location.href, url, {
         alwaysNormalize: true
       });
       this._autoLevelCapping = -1;
@@ -30176,13 +30146,16 @@
       });
     }
 
+    /**
+     * Gets the currently loaded URL
+     */;
     /**
      * Start loading data from the stream source.
      * Depending on default config, client starts loading automatically when a source is set.
      *
      * @param startPosition - Set the start position to stream from.
      * Defaults to -1 (None: starts from earliest point)
-     */;
+     */
     _proto.startLoad = function startLoad(startPosition) {
       if (startPosition === void 0) {
         startPosition = -1;
@@ -30276,6 +30249,11 @@
      * Get the complete list of audio tracks across all media groups
      */;
     return _createClass(Hls, [{
+      key: "url",
+      get: function get() {
+        return this._url;
+      }
+    }, {
       key: "levels",
       get: function get() {
         var levels = this.levelController.levels;
@@ -30797,7 +30775,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.13-0.canary.10406";
+        return "1.5.13-0.canary.10410";
       }
     }, {
       key: "Events",

package/dist/hls.js.d.ts

@@ -1372,7 +1372,7 @@ declare class Hls implements HlsEventEmitter {
     private emeController;
     private cmcdController;
     private _media;
-    private url;
+    private _url;
     private triggeringException?;
     /**
      * Get the video-dev/hls.js package version.
@@ -1431,6 +1431,10 @@ declare class Hls implements HlsEventEmitter {
      * Set the source URL. Can be relative or absolute.
      */
     loadSource(url: string): void;
+    /**
+     * Gets the currently loaded URL
+     */
+    get url(): string | null;
     /**
      * Start loading data from the stream source.
      * Depending on default config, client starts loading automatically when a source is set.