hls.js 1.6.0-beta.3.0.canary.10980 → 1.6.0-beta.3.0.canary.10982

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' ||