hls.js 1.6.0-beta.3.0.canary.10979 → 1.6.0-beta.3.0.canary.10981

package/package.json

@@ -134,5 +134,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.109.2"
   },
-  "version": "1.6.0-beta.3.0.canary.10979"
+  "version": "1.6.0-beta.3.0.canary.10981"
 }

package/src/config.ts

@@ -15,6 +15,7 @@ import { TimelineController } from './controller/timeline-controller';
 import Cues from './utils/cues';
 import FetchLoader, { fetchSupported } from './utils/fetch-loader';
 import { requestMediaKeySystemAccess } from './utils/mediakeys-helper';
+import { stringify } from './utils/safe-json-stringify';
 import XhrLoader from './utils/xhr-loader';
 import type { MediaKeySessionContext } from './controller/eme-controller';
 import type Hls from './hls';
@@ -688,7 +689,7 @@ export function mergeConfig(
       logger.warn(
         `hls.js config: "${report.join(
           '", "',
-        )}" setting(s) are deprecated, use "${policyName}": ${JSON.stringify(
+        )}" setting(s) are deprecated, use "${policyName}": ${stringify(
           userConfig[policyName],
         )}`,
       );

package/src/controller/abr-controller.ts

@@ -8,6 +8,7 @@ import {
   requiresMediaCapabilitiesDecodingInfo,
   SUPPORTED_INFO_DEFAULT,
 } from '../utils/mediacapabilities-helper';
+import { isHEVC } from '../utils/mp4-tools';
 import {
   type AudioTracksByGroup,
   type CodecSetTier,
@@ -15,6 +16,7 @@ import {
   getCodecTiers,
   getStartCodecTier,
 } from '../utils/rendition-helper';
+import { stringify } from '../utils/safe-json-stringify';
 import type Hls from '../hls';
 import type { Fragment } from '../loader/fragment';
 import type { Part } from '../loader/fragment';
@@ -764,7 +766,7 @@ class AbrController extends Logger implements AbrComponentAPI {
         : videoRanges[0];
       currentFrameRate = minFramerate;
       currentBw = Math.max(currentBw, minBitrate);
-      this.log(`picked start tier ${JSON.stringify(startTier)}`);
+      this.log(`picked start tier ${stringify(startTier)}`);
     } else {
       currentCodecSet = level?.codecSet;
       currentVideoRange = level?.videoRange;
@@ -803,7 +805,7 @@ class AbrController extends Logger implements AbrComponentAPI {
             currentBw,
             audioPreference,
           ) ||
-            levelInfo.videoCodec?.substring(0, 4) === 'hvc1') // Force media capabilities check for HEVC to avoid failure on Windows
+            isHEVC(levelInfo.videoCodec)) // Force media capabilities check for HEVC to avoid failure on Windows
         ) {
           levelInfo.supportedPromise = getMediaDecodingInfoPromise(
             levelInfo,
@@ -821,11 +823,11 @@ class AbrController extends Logger implements AbrComponentAPI {
               this.warn(
                 `MediaCapabilities decodingInfo error: "${
                   decodingInfo.error
-                }" for level ${index} ${JSON.stringify(decodingInfo)}`,
+                }" for level ${index} ${stringify(decodingInfo)}`,
               );
             } else if (!decodingInfo.supported) {
               this.warn(
-                `Unsupported MediaCapabilities decodingInfo result for level ${index} ${JSON.stringify(
+                `Unsupported MediaCapabilities decodingInfo result for level ${index} ${stringify(
                   decodingInfo,
                 )}`,
               );

package/src/controller/audio-stream-controller.ts

@@ -797,13 +797,15 @@ class AudioStreamController
           this.state = State.IDLE;
         }
         break;
+      case ErrorDetails.BUFFER_ADD_CODEC_ERROR:
       case ErrorDetails.BUFFER_APPEND_ERROR:
-      case ErrorDetails.BUFFER_FULL_ERROR:
-        if (!data.parent || data.parent !== 'audio') {
+        if (data.parent !== 'audio') {
           return;
         }
-        if (data.details === ErrorDetails.BUFFER_APPEND_ERROR) {
-          this.resetLoadingState();
+        this.resetLoadingState();
+        break;
+      case ErrorDetails.BUFFER_FULL_ERROR:
+        if (data.parent !== 'audio') {
           return;
         }
         if (this.reduceLengthAndFlushBuffer(data)) {
@@ -954,7 +956,7 @@ class AudioStreamController
     }
     const track = tracks.audio;
 
-    track.id = 'audio';
+    track.id = PlaylistLevelType.AUDIO;
 
     const variantAudioCodecs = currentLevel.audioCodec;
     this.log(

package/src/controller/buffer-controller.ts

@@ -15,6 +15,7 @@ import {
   isCompatibleTrackChange,
   isManagedMediaSource,
 } from '../utils/mediasource-helper';
+import { stringify } from '../utils/safe-json-stringify';
 import type { FragmentTracker } from './fragment-tracker';
 import type { HlsConfig } from '../config';
 import type Hls from '../hls';
@@ -353,8 +354,8 @@ export default class BufferController extends Logger implements ComponentAPI {
       }
       this
         .log(`attachTransferred: (bufferCodecEventsTotal ${this.bufferCodecEventsTotal})
-required tracks: ${JSON.stringify(requiredTracks, (key, value) => (key === 'initSegment' ? undefined : value))};
-transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'initSegment' ? undefined : value))}}`);
+required tracks: ${stringify(requiredTracks, (key, value) => (key === 'initSegment' ? undefined : value))};
+transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSegment' ? undefined : value))}}`);
       if (!isCompatibleTrackChange(transferredTracks, requiredTracks)) {
         // destroy attaching media source
         data.mediaSource = null;
@@ -1322,7 +1323,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
   private checkPendingTracks() {
     const { bufferCodecEventsTotal, pendingTrackCount, tracks } = this;
     this.log(
-      `checkPendingTracks (pending: ${pendingTrackCount} codec events expected: ${bufferCodecEventsTotal}) ${JSON.stringify(tracks)}`,
+      `checkPendingTracks (pending: ${pendingTrackCount} codec events expected: ${bufferCodecEventsTotal}) ${stringify(tracks)}`,
     );
     // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once.
     // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after
@@ -1335,7 +1336,6 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
       } else {
         // ok, let's create them now !
         this.createSourceBuffers();
-        this.bufferCreated();
       }
     }
   }
@@ -1391,7 +1391,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
         const mimeType = `${track.container};codecs=${codec}`;
         track.codec = codec;
         this.log(
-          `creating sourceBuffer(${mimeType})${this.currentOp(type) ? ' Queued' : ''} ${JSON.stringify(track)}`,
+          `creating sourceBuffer(${mimeType})${this.currentOp(type) ? ' Queued' : ''} ${stringify(track)}`,
         );
         try {
           const sb = mediaSource.addSourceBuffer(
@@ -1408,6 +1408,10 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
           this.error(
             `error while trying to add sourceBuffer: ${error.message}`,
           );
+          // remove init segment from queue and delete track info
+          this.shiftAndExecuteNext(type);
+          this.operationQueue?.removeBlockers();
+          delete this.tracks[type];
           this.hls.trigger(Events.ERROR, {
             type: ErrorTypes.MEDIA_ERROR,
             details: ErrorDetails.BUFFER_ADD_CODEC_ERROR,
@@ -1415,12 +1419,14 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
             error,
             sourceBufferName: type,
             mimeType: mimeType,
+            parent: track.id as PlaylistLevelType,
           });
-          break;
+          return;
         }
         this.trackSourceBuffer(type, track);
       }
     }
+    this.bufferCreated();
   }
 
   private getTrackCodec(track: BaseTrack, trackName: SourceBufferName): string {
@@ -1449,7 +1455,7 @@ transfer tracks: ${JSON.stringify(transferredTracks, (key, value) => (key === 'i
       id: track.id,
       listeners: [],
     };
-
+    this.removeBufferListeners(type);
     this.addBufferListener(type, 'updatestart', this.onSBUpdateStart);
     this.addBufferListener(type, 'updateend', this.onSBUpdateEnd);
     this.addBufferListener(type, 'error', this.onSBUpdateError);

package/src/controller/content-steering-controller.ts

@@ -13,6 +13,7 @@ import {
 import { AttrList } from '../utils/attr-list';
 import { reassignFragmentLevelIndexes } from '../utils/level-helper';
 import { Logger } from '../utils/logger';
+import { stringify } from '../utils/safe-json-stringify';
 import type { RetryConfig } from '../config';
 import type Hls from '../hls';
 import type { NetworkComponentAPI } from '../types/component-api';
@@ -221,9 +222,9 @@ export default class ContentSteeringController
             data.error.message
           }") with content-steering for Pathway: ${errorPathway} levels: ${
             levels ? levels.length : levels
-          } priorities: ${JSON.stringify(
+          } priorities: ${stringify(
             pathwayPriority,
-          )} penalized: ${JSON.stringify(this.penalizedPathways)}`,
+          )} penalized: ${stringify(this.penalizedPathways)}`,
         );
       }
     }

package/src/controller/eme-controller.ts

@@ -27,6 +27,7 @@ import {
   type PsshInvalidResult,
 } from '../utils/mp4-tools';
 import { base64Decode } from '../utils/numeric-encoding-utils';
+import { stringify } from '../utils/safe-json-stringify';
 import { strToUtf8array } from '../utils/utf8-utils';
 import type { EMEControllerConfig, HlsConfig, LoadPolicy } from '../config';
 import type Hls from '../hls';
@@ -254,7 +255,7 @@ class EMEController extends Logger implements ComponentAPI {
     let keySystemAccess = keySystemAccessPromises?.keySystemAccess;
     if (!keySystemAccess) {
       this.log(
-        `Requesting encrypted media "${keySystem}" key-system access with config: ${JSON.stringify(
+        `Requesting encrypted media "${keySystem}" key-system access with config: ${stringify(
           mediaKeySystemConfigs,
         )}`,
       );
@@ -519,7 +520,7 @@ class EMEController extends Logger implements ComponentAPI {
           details: ErrorDetails.KEY_SYSTEM_NO_CONFIGURED_LICENSE,
           fatal: true,
         },
-        `Missing key-system license configuration options ${JSON.stringify({
+        `Missing key-system license configuration options ${stringify({
           drmSystems: this.config.drmSystems,
         })}`,
       );

package/src/controller/error-controller.ts

@@ -3,6 +3,7 @@ import { ErrorDetails, ErrorTypes } from '../errors';
 import { Events } from '../events';
 import { HdcpLevels } from '../types/level';
 import { PlaylistContextType, PlaylistLevelType } from '../types/loader';
+import { getCodecsForMimeType } from '../utils/codecs';
 import {
   getRetryConfig,
   isTimeoutError,
@@ -506,6 +507,19 @@ export default class ErrorController
       data.errorAction.resolved = true;
       // Stream controller is responsible for this but won't switch on false start
       this.hls.nextLoadLevel = this.hls.nextAutoLevel;
+      if (
+        data.details === ErrorDetails.BUFFER_ADD_CODEC_ERROR &&
+        data.mimeType &&
+        data.sourceBufferName !== 'audiovideo'
+      ) {
+        const codec = getCodecsForMimeType(data.mimeType);
+        const levels = this.hls.levels;
+        for (let i = levels.length; i--; ) {
+          if (levels[i][`${data.sourceBufferName}Codec`] === codec) {
+            this.hls.removeLevel(i);
+          }
+        }
+      }
     }
   }
 }

package/src/controller/gap-controller.ts

@@ -8,6 +8,7 @@ import {
   addEventListener,
   removeEventListener,
 } from '../utils/event-listener-helper';
+import { stringify } from '../utils/safe-json-stringify';
 import type { InFlightData } from './base-stream-controller';
 import type { InFlightFragments } from '../hls';
 import type Hls from '../hls';
@@ -486,7 +487,7 @@ export default class GapController extends TaskLoop {
       const error = new Error(
         `Playback stalling at @${
           media.currentTime
-        } due to low buffer (${JSON.stringify(bufferInfo)})`,
+        } due to low buffer (${stringify(bufferInfo)})`,
       );
       this.warn(error.message);
       hls.trigger(Events.ERROR, {

package/src/controller/id3-track-controller.ts

@@ -6,6 +6,7 @@ import {
   isSCTE35Attribute,
 } from '../loader/date-range';
 import { MetadataSchema } from '../types/demuxer';
+import { stringify } from '../utils/safe-json-stringify';
 import {
   clearCurrentCues,
   removeCuesInRange,
@@ -54,7 +55,7 @@ function createCueWithDataFields(
     cue = new Cue(
       startTime,
       endTime,
-      JSON.stringify(type ? { type, ...data } : data),
+      stringify(type ? { type, ...data } : data),
     );
   }
   return cue;

package/src/controller/level-controller.ts

@@ -12,6 +12,7 @@ import {
   videoCodecPreferenceValue,
 } from '../utils/codecs';
 import { reassignFragmentLevelIndexes } from '../utils/level-helper';
+import { stringify } from '../utils/safe-json-stringify';
 import type ContentSteeringController from './content-steering-controller';
 import type Hls from '../hls';
 import type {
@@ -248,7 +249,7 @@ export default class LevelController extends BasePlaylistController {
         if (this.hls) {
           if (data.levels.length) {
             this.warn(
-              `One or more CODECS in variant not supported: ${JSON.stringify(
+              `One or more CODECS in variant not supported: ${stringify(
                 data.levels[0].attrs,
               )}`,
             );

package/src/controller/stream-controller.ts

@@ -1015,13 +1015,15 @@ export default class StreamController
           this.state = State.IDLE;
         }
         break;
+      case ErrorDetails.BUFFER_ADD_CODEC_ERROR:
       case ErrorDetails.BUFFER_APPEND_ERROR:
-      case ErrorDetails.BUFFER_FULL_ERROR:
-        if (!data.parent || data.parent !== 'main') {
+        if (data.parent !== 'main') {
           return;
         }
-        if (data.details === ErrorDetails.BUFFER_APPEND_ERROR) {
-          this.resetLoadingState();
+        this.resetLoadingState();
+        break;
+      case ErrorDetails.BUFFER_FULL_ERROR:
+        if (data.parent !== 'main') {
           return;
         }
         if (this.reduceLengthAndFlushBuffer(data)) {
@@ -1416,7 +1418,7 @@ export default class StreamController
         );
       }
       audio.levelCodec = audioCodec;
-      audio.id = 'main';
+      audio.id = PlaylistLevelType.MAIN;
       this.log(
         `Init audio buffer, container:${
           audio.container
@@ -1428,7 +1430,7 @@ export default class StreamController
     }
     if (video) {
       video.levelCodec = currentLevel.videoCodec;
-      video.id = 'main';
+      video.id = PlaylistLevelType.MAIN;
       const parsedVideoCodec = video.codec;
       if (parsedVideoCodec?.length === 4) {
         // Make up for passthrough-remuxer not being able to parse full codec

package/src/demux/transmuxer-interface.ts

@@ -14,6 +14,7 @@ import { ErrorDetails, ErrorTypes } from '../errors';
 import { Events } from '../events';
 import { PlaylistLevelType } from '../types/loader';
 import { getM2TSSupportedAudioTypes } from '../utils/codecs';
+import { stringify } from '../utils/safe-json-stringify';
 import type { WorkerContext } from './inject-worker';
 import type { HlsEventEmitter, HlsListeners } from '../events';
 import type Hls from '../hls';
@@ -95,7 +96,7 @@ export default class TransmuxerInterface {
             cmd: 'init',
             typeSupported: m2tsTypeSupported,
             id,
-            config: JSON.stringify(config),
+            config: stringify(config),
           });
         } catch (err) {
           logger.warn(
@@ -143,7 +144,7 @@ export default class TransmuxerInterface {
         resetNo: instanceNo,
         typeSupported: m2tsTypeSupported,
         id: this.id,
-        config: JSON.stringify(config),
+        config: stringify(config),
       });
     }
   }

package/src/utils/cea-608-parser.ts

@@ -1,3 +1,4 @@
+import { stringify } from './safe-json-stringify';
 import { logger } from '../utils/logger';
 import type OutputFilter from './output-filter';
 
@@ -593,10 +594,7 @@ export class CaptionScreen {
   }
 
   setPAC(pacData: PACData) {
-    this.logger.log(
-      VerboseLevel.INFO,
-      () => 'pacData = ' + JSON.stringify(pacData),
-    );
+    this.logger.log(VerboseLevel.INFO, () => 'pacData = ' + stringify(pacData));
     let newRow = pacData.row - 1;
     if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) {
       newRow = this.nrRollUpRows - 1;
@@ -650,10 +648,7 @@ export class CaptionScreen {
    * Set background/extra foreground, but first do back_space, and then insert space (backwards compatibility).
    */
   setBkgData(bkgData: Partial<PenStyles>) {
-    this.logger.log(
-      VerboseLevel.INFO,
-      () => 'bkgData = ' + JSON.stringify(bkgData),
-    );
+    this.logger.log(VerboseLevel.INFO, () => 'bkgData = ' + stringify(bkgData));
     this.backSpace();
     this.setPen(bkgData);
     this.insertChar(0x20); // Space
@@ -951,7 +946,7 @@ class Cea608Channel {
     } else {
       styles.foreground = 'white';
     }
-    this.logger.log(VerboseLevel.INFO, 'MIDROW: ' + JSON.stringify(styles));
+    this.logger.log(VerboseLevel.INFO, 'MIDROW: ' + stringify(styles));
     this.writeScreen.setPen(styles);
   }
 

package/src/utils/codecs.ts

@@ -1,4 +1,9 @@
 import { getMediaSource } from './mediasource-helper';
+import { isHEVC } from './mp4-tools';
+
+export const userAgentHevcSupportIsInaccurate = () => {
+  return /\(Windows.+Firefox\//i.test(navigator.userAgent);
+};
 
 // from http://mp4ra.org/codecs.html
 // values indicate codec selection preference (lower is higher priority)
@@ -121,8 +126,12 @@ export function videoCodecPreferenceValue(
 }
 
 export function codecsSetSelectionPreferenceValue(codecSet: string): number {
+  const limitedHevcSupport = userAgentHevcSupportIsInaccurate();
   return codecSet.split(',').reduce((num, fourCC) => {
-    const preferenceValue = sampleEntryCodesISO.video[fourCC];
+    const lowerPriority = limitedHevcSupport && isHEVC(fourCC);
+    const preferenceValue = lowerPriority
+      ? 9
+      : sampleEntryCodesISO.video[fourCC];
     if (preferenceValue) {
       return (preferenceValue * 2 + num) / (num ? 3 : 2);
     }
@@ -272,3 +281,7 @@ export function getM2TSSupportedAudioTypes(
       : false,
   };
 }
+
+export function getCodecsForMimeType(mimeType: string): string {
+  return mimeType.replace(/^.+codecs=["']?([^"']+).*$/, '$1');
+}

package/src/utils/level-helper.ts

@@ -3,6 +3,7 @@
  */
 
 import { logger } from './logger';
+import { stringify } from './safe-json-stringify';
 import { DateRange } from '../loader/date-range';
 import { assignProgramDateTime, mapDateRanges } from '../loader/m3u8-parser';
 import type { Fragment, MediaFragment, Part } from '../loader/fragment';
@@ -344,7 +345,7 @@ function mergeDateRanges(
         }
       } else {
         logger.warn(
-          `Ignoring invalid Playlist Delta Update DATERANGE tag: "${JSON.stringify(
+          `Ignoring invalid Playlist Delta Update DATERANGE tag: "${stringify(
             deltaDateRanges[id].attr,
           )}"`,
         );

package/src/utils/mediacapabilities-helper.ts

@@ -1,4 +1,10 @@
-import { fillInMissingAV01Params, mimeTypeForCodec } from './codecs';
+import {
+  fillInMissingAV01Params,
+  getCodecsForMimeType,
+  mimeTypeForCodec,
+  userAgentHevcSupportIsInaccurate,
+} from './codecs';
+import { isHEVC } from './mp4-tools';
 import type { AudioTracksByGroup } from './rendition-helper';
 import type { Level, VideoRange } from '../types/level';
 import type { AudioSelectionOption } from '../types/media-playlist';
@@ -115,10 +121,31 @@ export function getMediaDecodingInfoPromise(
       baseVideoConfiguration.transferFunction =
         videoRange.toLowerCase() as TransferFunction;
     }
-
+    const videoCodecsArray = videoCodecs.split(',');
+    // Override Windows Firefox HEVC MediaCapabilities result (https://github.com/video-dev/hls.js/issues/7046)
+    const ua = navigator.userAgent;
+    if (
+      videoCodecsArray.some((videoCodec) => isHEVC(videoCodec)) &&
+      userAgentHevcSupportIsInaccurate()
+    ) {
+      return Promise.resolve({
+        supported: false,
+        configurations,
+        decodingInfoResults: [
+          {
+            supported: false,
+            smooth: false,
+            powerEfficient: false,
+          },
+        ],
+        error: new Error(
+          `Overriding Windows Firefox HEVC MediaCapabilities result based on user-agent sting: (${ua})`,
+        ),
+      });
+    }
     configurations.push.apply(
       configurations,
-      videoCodecs.split(',').map((videoCodec) => ({
+      videoCodecsArray.map((videoCodec) => ({
         type: 'media-source',
         video: {
           ...baseVideoConfiguration,
@@ -187,7 +214,7 @@ function getMediaDecodingInfoKey(config: MediaDecodingConfiguration): string {
   const { audio, video } = config;
   const mediaConfig = video || audio;
   if (mediaConfig) {
-    const codec = mediaConfig.contentType.split('"')[1];
+    const codec = getCodecsForMimeType(mediaConfig.contentType);
     if (video) {
       return `r${video.height}x${video.width}f${Math.ceil(video.framerate)}${
         video.transferFunction || 'sd'

package/src/utils/mp4-tools.ts

@@ -1012,12 +1012,11 @@ export function parseSamples(
   return seiSamples;
 }
 
-function isHEVC(codec: string) {
+export function isHEVC(codec: string | undefined) {
   if (!codec) {
     return false;
   }
-  const delimit = codec.indexOf('.');
-  const baseCodec = delimit < 0 ? codec : codec.substring(0, delimit);
+  const baseCodec = codec.substring(0, 4);
   return (
     baseCodec === 'hvc1' ||
     baseCodec === 'hev1' ||

package/src/utils/rendition-helper.ts

@@ -1,6 +1,7 @@
 import { codecsSetSelectionPreferenceValue } from './codecs';
 import { getVideoSelectionOptions } from './hdr';
 import { logger } from './logger';
+import { stringify } from './safe-json-stringify';
 import type Hls from '../hls';
 import type { Level, VideoRange } from '../types/level';
 import type {
@@ -165,9 +166,7 @@ export function getStartCodecTier(
         ) {
           logStartCodecCandidateIgnored(
             candidate,
-            `no variants with VIDEO-RANGE of ${JSON.stringify(
-              videoRanges,
-            )} found`,
+            `no variants with VIDEO-RANGE of ${stringify(videoRanges)} found`,
           );
           return selected;
         }

package/src/utils/safe-json-stringify.ts

@@ -1,6 +1,11 @@
-const replacer = () => {
+const omitCircularRefsReplacer = (
+  replacer: ((this: any, key: string, value: any) => any) | undefined,
+) => {
   const known = new WeakSet();
   return (_, value) => {
+    if (replacer) {
+      value = replacer(_, value);
+    }
     if (typeof value === 'object' && value !== null) {
       if (known.has(value)) {
         return;
@@ -11,5 +16,7 @@ const replacer = () => {
   };
 };
 
-export const stringify = <T>(object: T): string =>
-  JSON.stringify(object, replacer());
+export const stringify = <T>(
+  object: T,
+  replacer?: (this: any, key: string, value: any) => any,
+): string => JSON.stringify(object, omitCircularRefsReplacer(replacer));