hls.js 1.6.0-beta.3.0.canary.10980 → 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.10980"
+  "version": "1.6.0-beta.3.0.canary.10981"
 }

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,
@@ -804,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,

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

@@ -1336,7 +1336,6 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
       } else {
         // ok, let's create them now !
         this.createSourceBuffers();
-        this.bufferCreated();
       }
     }
   }
@@ -1409,6 +1408,10 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
           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,
@@ -1416,12 +1419,14 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
             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 {
@@ -1450,7 +1455,7 @@ transfer tracks: ${stringify(transferredTracks, (key, value) => (key === 'initSe
       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/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/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/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/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' ||