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

package/package.json

@@ -130,5 +130,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.62.0"
   },
-  "version": "1.5.13-0.canary.10406"
+  "version": "1.5.13-0.canary.10410"
 }

package/src/hls.ts

@@ -80,7 +80,7 @@ export default class Hls implements HlsEventEmitter {
   private emeController: EMEController;
   private cmcdController: CMCDController;
   private _media: HTMLMediaElement | null = null;
-  private url: string | null = null;
+  private _url: string | null = null;
   private triggeringException?: boolean;
 
   /**
@@ -370,7 +370,7 @@ export default class Hls implements HlsEventEmitter {
     this.detachMedia();
     this.removeAllListeners();
     this._autoLevelCapping = -1;
-    this.url = null;
+    this._url = null;
 
     this.networkControllers.forEach((component) => component.destroy());
     this.networkControllers.length = 0;
@@ -408,8 +408,8 @@ export default class Hls implements HlsEventEmitter {
   loadSource(url: string) {
     this.stopLoad();
     const media = this.media;
-    const loadedSource = this.url;
-    const loadingSource = (this.url = buildAbsoluteURL(
+    const loadedSource = this._url;
+    const loadingSource = (this._url = buildAbsoluteURL(
       self.location.href,
       url,
       {
@@ -431,6 +431,13 @@ export default class Hls implements HlsEventEmitter {
     this.trigger(Events.MANIFEST_LOADING, { url: url });
   }
 
+  /**
+   * Gets the currently loaded URL
+   */
+  public get url(): string | null {
+    return this._url;
+  }
+
   /**
    * Start loading data from the stream source.
    * Depending on default config, client starts loading automatically when a source is set.

package/src/remux/mp4-remuxer.ts

@@ -1069,56 +1069,6 @@ export default class MP4Remuxer implements Remuxer {
     this.isAudioContiguous = true;
     return audioData;
   }
-
-  remuxEmptyAudio(
-    track: DemuxedAudioTrack,
-    timeOffset: number,
-    contiguous: boolean,
-    videoData: Fragment,
-  ): RemuxedTrack | undefined {
-    const inputTimeScale: number = track.inputTimeScale;
-    const mp4timeScale: number = track.samplerate
-      ? track.samplerate
-      : inputTimeScale;
-    const scaleFactor: number = inputTimeScale / mp4timeScale;
-    const nextAudioPts: number | null = this.nextAudioPts;
-    // sync with video's timestamp
-    const initDTS = this._initDTS as RationalTimestamp;
-    const init90kHz = (initDTS.baseTime * 90000) / initDTS.timescale;
-    const startDTS: number =
-      (nextAudioPts !== null
-        ? nextAudioPts
-        : (videoData.startDTS as number) * inputTimeScale) + init90kHz;
-    const endDTS: number =
-      (videoData.endDTS as number) * inputTimeScale + init90kHz;
-    // one sample's duration value
-    const frameDuration: number = scaleFactor * AAC_SAMPLES_PER_FRAME;
-    // samples count of this segment's duration
-    const nbSamples: number = Math.ceil((endDTS - startDTS) / frameDuration);
-    // silent frame
-    const silentFrame: Uint8Array | undefined = 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;
-    }
-
-    const samples: Array<any> = [];
-    for (let i = 0; i < nbSamples; i++) {
-      const stamp = startDTS + i * frameDuration;
-      samples.push({ unit: silentFrame, pts: stamp, dts: stamp });
-    }
-    track.samples = samples;
-
-    return this.remuxAudio(track, timeOffset, contiguous, false);
-  }
 }
 
 export function normalizePts(value: number, reference: number | null): number {

package/src/utils/codecs.ts

@@ -206,16 +206,20 @@ export function pickMostCompleteCodecName(
 
 export function convertAVC1ToAVCOTI(codec: string) {
   // Convert avc1 codec string from RFC-4281 to RFC-6381 for MediaSource.isTypeSupported
-  const avcdata = codec.split('.');
-  if (avcdata.length > 2) {
-    let result = avcdata.shift() + '.';
-    result += parseInt(avcdata.shift() as string).toString(16);
-    result += ('000' + parseInt(avcdata.shift() as string).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.
+  const codecs = codec.split(',');
+  for (let i = 0; i < codecs.length; i++) {
+    const avcdata = codecs[i].split('.');
+    if (avcdata.length > 2) {
+      let result = avcdata.shift() + '.';
+      result += parseInt(avcdata.shift() as string).toString(16);
+      result += (
+        '000' + parseInt(avcdata.shift() as string).toString(16)
+      ).slice(-4);
+      codecs[i] = result;
+    }
   }
-  return codec;
+  return codecs.join(',');
 }
 
 export interface TypeSupported {