Fix parsing of multiple codecs when converting from AVC1 to AVCOTI

(cherry picked from commit 9c4eba9)

src/utils/codecs.ts

@@ -198,14 +198,18 @@ 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(',');
 }

tests/index.js

@@ -38,6 +38,7 @@ import './unit/loader/playlist-loader';
 import './unit/utils/attr-list';
 import './unit/utils/binary-search';
 import './unit/utils/buffer-helper';
+import './unit/utils/codecs';
 import './unit/utils/error-helper';
 import './unit/utils/discontinuities';
 import './unit/utils/exp-golomb';

tests/unit/utils/codecs.ts

@@ -0,0 +1,24 @@
+import { expect } from 'chai';
+import { convertAVC1ToAVCOTI } from '../../../src/utils/codecs';
+
+describe('codecs', function () {
+  it('convert codec string from AVC1 to AVCOTI', function () {
+    expect(convertAVC1ToAVCOTI('avc1.66.30')).to.equal('avc1.42001e');
+  });
+
+  it('convert list of codecs string from AVC1 to AVCOTI', function () {
+    expect(convertAVC1ToAVCOTI('avc1.77.30,avc1.66.30')).to.equal(
+      'avc1.4d001e,avc1.42001e',
+    );
+  });
+
+  it('does not convert string if it is already converted', function () {
+    expect(convertAVC1ToAVCOTI('avc1.64001E')).to.equal('avc1.64001E');
+  });
+
+  it('does not convert list of codecs string if it is already converted', function () {
+    expect(convertAVC1ToAVCOTI('avc1.64001E,avc1.64001f')).to.equal(
+      'avc1.64001E,avc1.64001f',
+    );
+  });
+});