fix: Compare normalized codecs in codec switching checks (shaka-project#7143)

willdharris · web-flow · commit 01545f4c3eb5 · 2024-08-08T11:51:02.000-07:00
Resolves shaka-project#7140.
diff --git a/lib/media/media_source_engine.js b/lib/media/media_source_engine.js
@@ -2004,7 +2004,7 @@ shaka.media.MediaSourceEngine = class {
       return false;
     }
     const MimeUtils = shaka.util.MimeUtils;
-    const currentCodec = MimeUtils.getCodecBase(
+    const currentCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));
     const currentBasicType = MimeUtils.getBasicType(
         this.sourceBufferTypes_[contentType]);
@@ -2046,7 +2046,7 @@ shaka.media.MediaSourceEngine = class {
       }
     }
 
-    const newCodec = MimeUtils.getCodecBase(
+    const newCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(newMimeType));
     const newBasicType = MimeUtils.getBasicType(newMimeType);
 
@@ -2105,7 +2105,7 @@ shaka.media.MediaSourceEngine = class {
       return false;
     }
     const MimeUtils = shaka.util.MimeUtils;
-    const currentCodec = MimeUtils.getCodecBase(
+    const currentCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));
     const currentBasicType = MimeUtils.getBasicType(
         this.sourceBufferTypes_[contentType]);
@@ -2132,7 +2132,7 @@ shaka.media.MediaSourceEngine = class {
       }
     }
 
-    const newCodec = MimeUtils.getCodecBase(
+    const newCodec = MimeUtils.getNormalizedCodec(
         MimeUtils.getCodecs(newMimeType));
     const newBasicType = MimeUtils.getBasicType(newMimeType);
 

Original file line number	Diff line number	Diff line change
`@@ -2004,7 +2004,7 @@ shaka.media.MediaSourceEngine = class {`
`2004`	`2004`	`return false;`
`2005`	`2005`	`}`
`2006`	`2006`	`const MimeUtils = shaka.util.MimeUtils;`
`2007`		`- const currentCodec = MimeUtils.getCodecBase(`
	`2007`	`+ const currentCodec = MimeUtils.getNormalizedCodec(`
`2008`	`2008`	`MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));`
`2009`	`2009`	`const currentBasicType = MimeUtils.getBasicType(`
`2010`	`2010`	`this.sourceBufferTypes_[contentType]);`
`@@ -2046,7 +2046,7 @@ shaka.media.MediaSourceEngine = class {`
`2046`	`2046`	`}`
`2047`	`2047`	`}`
`2048`	`2048`
`2049`		`- const newCodec = MimeUtils.getCodecBase(`
	`2049`	`+ const newCodec = MimeUtils.getNormalizedCodec(`
`2050`	`2050`	`MimeUtils.getCodecs(newMimeType));`
`2051`	`2051`	`const newBasicType = MimeUtils.getBasicType(newMimeType);`
`2052`	`2052`
`@@ -2105,7 +2105,7 @@ shaka.media.MediaSourceEngine = class {`
`2105`	`2105`	`return false;`
`2106`	`2106`	`}`
`2107`	`2107`	`const MimeUtils = shaka.util.MimeUtils;`
`2108`		`- const currentCodec = MimeUtils.getCodecBase(`
	`2108`	`+ const currentCodec = MimeUtils.getNormalizedCodec(`
`2109`	`2109`	`MimeUtils.getCodecs(this.sourceBufferTypes_[contentType]));`
`2110`	`2110`	`const currentBasicType = MimeUtils.getBasicType(`
`2111`	`2111`	`this.sourceBufferTypes_[contentType]);`
`@@ -2132,7 +2132,7 @@ shaka.media.MediaSourceEngine = class {`
`2132`	`2132`	`}`
`2133`	`2133`	`}`
`2134`	`2134`
`2135`		`- const newCodec = MimeUtils.getCodecBase(`
	`2135`	`+ const newCodec = MimeUtils.getNormalizedCodec(`
`2136`	`2136`	`MimeUtils.getCodecs(newMimeType));`
`2137`	`2137`	`const newBasicType = MimeUtils.getBasicType(newMimeType);`
`2138`	`2138`