fix: Fix external image track mime type (#7333)

shaka-project · Sep 18, 2024 · d40d9fa · d40d9fa
1 parent 6d74d9f
commit d40d9fa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/lib/player.js b/lib/player.js
@@ -5566,14 +5566,21 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       references.push(reference);
     }
 
+    let segmentMimeType = mimeType;
+    if (references.length) {
+      segmentMimeType = await shaka.net.NetworkingUtils.getMimeType(
+          references[0].getUris()[0],
+          this.networkingEngine_, this.config_.manifest.retryParameters);
+    }
+
     /** @type {shaka.extern.Stream} */
     const stream = {
       id: this.nextExternalStreamId_++,
       originalId: null,
       groupId: null,
       createSegmentIndex: () => Promise.resolve(),
       segmentIndex: new shaka.media.SegmentIndex(references),
-      mimeType: mimeType || '',
+      mimeType: segmentMimeType || '',
       codecs: '',
       kind: '',
       encrypted: false,
@@ -5597,7 +5604,7 @@ shaka.Player = class extends shaka.util.FakeEventTarget {
       external: true,
       fastSwitching: false,
       fullMimeTypes: new Set([shaka.util.MimeUtils.getFullType(
-          mimeType || '', '')]),
+          segmentMimeType || '', '')]),
     };
 
     if (this.loadMode_ == shaka.Player.LoadMode.SRC_EQUALS) {

diff --git a/test/player_integration.js b/test/player_integration.js
@@ -1336,6 +1336,8 @@ describe('Player', () => {
 
           expect(player.getImageTracks()).toEqual([newTrack]);
 
+          expect(newTrack.mimeType).toBe('image/jpeg');
+
           const thumbnail1 = await player.getThumbnails(newTrack.id, 0);
           expect(thumbnail1.startTime).toBe(0);
           expect(thumbnail1.duration).toBe(5);
@@ -1374,6 +1376,8 @@ describe('Player', () => {
 
           expect(player.getImageTracks()).toEqual([newTrack]);
 
+          expect(newTrack.mimeType).toBe('image/jpeg');
+
           const thumbnail1 = await player.getThumbnails(newTrack.id, 0);
           expect(thumbnail1.startTime).toBe(0);
           expect(thumbnail1.duration).toBe(5);

diff --git a/test/player_src_equals_integration.js b/test/player_src_equals_integration.js
@@ -453,6 +453,8 @@ describe('Player Src Equals', () => {
 
           expect(player.getImageTracks()).toEqual([newTrack]);
 
+          expect(newTrack.mimeType).toBe('image/jpeg');
+
           const thumbnail1 = await player.getThumbnails(newTrack.id, 0);
           expect(thumbnail1.startTime).toBe(0);
           expect(thumbnail1.duration).toBe(5);
@@ -491,6 +493,8 @@ describe('Player Src Equals', () => {
 
           expect(player.getImageTracks()).toEqual([newTrack]);
 
+          expect(newTrack.mimeType).toBe('image/jpeg');
+
           const thumbnail1 = await player.getThumbnails(newTrack.id, 0);
           expect(thumbnail1.startTime).toBe(0);
           expect(thumbnail1.duration).toBe(5);