fix(media): Ignore incompatible TrickMode streams (#2984)

Resolves: #2846
shaka-project · Dec 14, 2020 · 1e11c75 · 1e11c75
1 parent fb019a6
commit 1e11c75
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 6 deletions.
diff --git a/lib/dash/dash_parser.js b/lib/dash/dash_parser.js
@@ -603,14 +603,17 @@ shaka.dash.DashParser = class {
 
     // Attach trick mode tracks to normal tracks.
     for (const trickModeSet of trickModeAdaptationSets) {
-      // There may be multiple trick mode streams, but we do not currently
-      // support that.  Just choose one.
-      const trickModeVideo = trickModeSet.streams[0];
       const targetId = trickModeSet.trickModeFor;
       for (const normalSet of normalAdaptationSets) {
         if (normalSet.id == targetId) {
           for (const stream of normalSet.streams) {
-            stream.trickModeVideo = trickModeVideo;
+            const MimeUtils = shaka.util.MimeUtils;
+            // There may be multiple trick mode streams, but we do not
+            // currently support that.  Just choose one.
+            // TODO: https://github.com/google/shaka-player/issues/1528
+            stream.trickModeVideo = trickModeSet.streams.find((trickStream) =>
+              MimeUtils.getCodecBase(stream.codecs) ==
+              MimeUtils.getCodecBase(trickStream.codecs));
           }
         }
       }

diff --git a/test/dash/dash_parser_manifest_unit.js b/test/dash/dash_parser_manifest_unit.js
@@ -913,14 +913,14 @@ describe('DashParser Manifest', () => {
       '<MPD minBufferTime="PT75S">',
       '  <Period id="1" duration="PT30S">',
       '    <AdaptationSet id="1" mimeType="video/mp4">',
-      '      <Representation bandwidth="1">',
+      '      <Representation bandwidth="1" codecs="avc1.4d401f">',
       '        <SegmentTemplate media="1.mp4" duration="1" />',
       '      </Representation>',
       '    </AdaptationSet>',
       '    <AdaptationSet id="2" mimeType="video/mp4">',
       '      <EssentialProperty value="1" ',
       '        schemeIdUri="http://dashif.org/guidelines/trickmode" />',
-      '      <Representation bandwidth="1">',
+      '      <Representation bandwidth="1" codecs="avc1.4d401f">',
       '        <SegmentTemplate media="2.mp4" duration="1" />',
       '      </Representation>',
       '    </AdaptationSet>',
@@ -943,6 +943,34 @@ describe('DashParser Manifest', () => {
     }));
   });
 
+  it('ignore incompatible trickmode tracks', async () => {
+    const manifestText = [
+      '<MPD minBufferTime="PT75S">',
+      '  <Period id="1" duration="PT30S">',
+      '    <AdaptationSet id="1" mimeType="video/mp4">',
+      '      <Representation bandwidth="1" codecs="avc1.4d401f">',
+      '        <SegmentTemplate media="1.mp4" duration="1" />',
+      '      </Representation>',
+      '    </AdaptationSet>',
+      '    <AdaptationSet id="2" mimeType="video/mp4">',
+      '      <EssentialProperty value="1" ',
+      '        schemeIdUri="http://dashif.org/guidelines/trickmode" />',
+      '      <Representation bandwidth="1" codecs="foo">',
+      '        <SegmentTemplate media="2.mp4" duration="1" />',
+      '      </Representation>',
+      '    </AdaptationSet>',
+      '  </Period>',
+      '</MPD>',
+    ].join('\n');
+
+    fakeNetEngine.setResponseText('dummy://foo', manifestText);
+    /** @type {shaka.extern.Manifest} */
+    const manifest = await parser.start('dummy://foo', playerInterface);
+    expect(manifest.variants.length).toBe(1);
+    expect(manifest.textStreams.length).toBe(0);
+    expect(manifest.variants[0].video.trickModeVideo).toBeUndefined();
+  });
+
   it('skips unrecognized EssentialProperty elements', async () => {
     const manifestText = [
       '<MPD minBufferTime="PT75S">',