fix(HLS): Fix mp4 detection when the mimetype is application/octet-stream (#8459)

Author: avelad

demo/common/assets.js

@@ -1234,6 +1234,15 @@ shakaAssets.testAssets = [
       .addFeature(shakaAssets.Feature.HLS)
       .addFeature(shakaAssets.Feature.MP2TS)
       .addFeature(shakaAssets.Feature.OFFLINE),
+  new ShakaDemoAssetInfo(
+      /* name= */ 'Art of Motion (HLS, MP4, AES-256)',
+      /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/art_of_motion.png',
+      /* manifestUri= */ 'https://jvaryhlstests.blob.core.windows.net/hlstestdata/playlist_encrypted.m3u8',
+      /* source= */ shakaAssets.Source.BITCODIN)
+      .addKeySystem(shakaAssets.KeySystem.AES128)
+      .addFeature(shakaAssets.Feature.HLS)
+      .addFeature(shakaAssets.Feature.MP4)
+      .addFeature(shakaAssets.Feature.OFFLINE),
   new ShakaDemoAssetInfo(
       /* name= */ 'Art of Motion (DASH) (external thumbnails)',
       /* iconUri= */ 'https://storage.googleapis.com/shaka-asset-icons/art_of_motion.png',

lib/hls/hls_parser.js

@@ -1149,7 +1149,6 @@ shaka.hls.HlsParser = class {
       this.getInfoFromSegment_(segment.initSegmentReference, 0),
       this.getInfoFromSegment_(segment, segmentIndex),
     ]);
-    const initMimeType = basicInfos[0].mimeType;
     const contentMimeType = basicInfos[1].mimeType;
     const initData = basicInfos[0].data;
     const data = basicInfos[1].data;
@@ -1181,9 +1180,9 @@ shaka.hls.HlsParser = class {
       if (basicInfo) {
         return basicInfo;
       }
-    } else if (validMp4Extensions.includes(extension) ||
-        validMp4MimeType.includes(contentMimeType) ||
-        (initMimeType && validMp4MimeType.includes(initMimeType))) {
+    } else if (segment.initSegmentReference ||
+        validMp4Extensions.includes(extension) ||
+        validMp4MimeType.includes(contentMimeType)) {
       const basicInfo = shaka.media.SegmentUtils.getBasicInfoFromMp4(
           initData, data, this.config_.disableText);
       if (basicInfo) {
@@ -1194,10 +1193,6 @@ shaka.hls.HlsParser = class {
       return shaka.media.SegmentUtils.getBasicInfoFromMimeType(
           contentMimeType);
     }
-    if (initMimeType) {
-      return shaka.media.SegmentUtils.getBasicInfoFromMimeType(
-          initMimeType);
-    }
     return defaultBasicInfo;
   }
 

test/hls/hls_parser_unit.js

@@ -5570,7 +5570,6 @@ describe('HlsParser', () => {
     const media = [
       '#EXTM3U\n',
       '#EXT-X-PLAYLIST-TYPE:VOD\n',
-      '#EXT-X-MAP:URI="init.test",BYTERANGE="616@0"\n',
       '#EXTINF:5,\n',
       '#EXT-X-BYTERANGE:121090@616\n',
       'main.test',