Enable TS Assets in demo asset list

The Transport Stream assets (Art of Motion(HLS,TS) and Sintel(HLS,TS,4k)) were disabled in the demo app, because the assets were only filtered by native platform support. Backported to v2.3.x Closes #1214. Change-Id: I03b60df291813b4669889fc8f8500627d206b28a
shaka-project · Mar 21, 2018 · d987557 · d987557
1 parent 12c771b
commit d987557
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 13 deletions.
diff --git a/demo/common/demo_utils.js b/demo/common/demo_utils.js
@@ -74,3 +74,23 @@ ShakaDemoUtils.addLicenseRequestHeaders_ =
     request.headers[k] = headers[k];
   }
 };
+
+
+/**
+ * Return true if the current content is Transport Stream.
+ * Used to decide if caption button is shown all the time in the demo,
+ * and whether to show 'Default Text' as a Text Track option.
+ *
+ * @param {shaka.Player} player
+ * @return {boolean}
+ */
+ShakaDemoUtils.isTsContent = function(player) {
+  var activeTracks = player.getVariantTracks().filter(function(track) {
+    return track.active == true;
+  });
+  var activeTrack = activeTracks[0];
+  if (activeTrack) {
+    return activeTrack.mimeType == 'video/mp2t';
+  }
+  return false;
+};
diff --git a/lib/media/media_source_engine.js b/lib/media/media_source_engine.js
@@ -111,8 +111,8 @@ shaka.media.MediaSourceEngine.isStreamSupported = function(stream) {
       stream.mimeType, stream.codecs);
   var extendedMimeType = shaka.util.MimeUtils.getExtendedType(stream);
   return shaka.text.TextEngine.isTypeSupported(fullMimeType) ||
-         MediaSource.isTypeSupported(extendedMimeType) ||
-         shaka.media.Transmuxer.isSupported(stream.type, fullMimeType);
+      MediaSource.isTypeSupported(extendedMimeType) ||
+      shaka.media.Transmuxer.isSupported(fullMimeType, stream.type);
 };
 
 
@@ -172,9 +172,9 @@ shaka.media.MediaSourceEngine.probeSupport = function() {
   ];
 
   testMimeTypes.forEach(function(type) {
-    support[type] =
-        shaka.text.TextEngine.isTypeSupported(type) ||
-        MediaSource.isTypeSupported(type);
+    support[type] = shaka.text.TextEngine.isTypeSupported(type) ||
+        MediaSource.isTypeSupported(type) ||
+        shaka.media.Transmuxer.isSupported(type);
     var basicType = type.split(';')[0];
     support[basicType] = support[basicType] || support[type];
   });
@@ -271,7 +271,7 @@ shaka.media.MediaSourceEngine.prototype.init = function(streamsByType) {
       this.reinitText(mimeType);
     } else {
       if (!MediaSource.isTypeSupported(mimeType) &&
-          shaka.media.Transmuxer.isSupported(contentType, mimeType)) {
+          shaka.media.Transmuxer.isSupported(mimeType, contentType)) {
         this.transmuxers_[contentType] = new shaka.media.Transmuxer();
         mimeType =
             shaka.media.Transmuxer.convertTsCodecs(contentType, mimeType);

diff --git a/lib/media/transmuxer.js b/lib/media/transmuxer.js
@@ -66,14 +66,22 @@ shaka.media.Transmuxer.prototype.destroy = function() {
 
 /**
  * Check if the content type is Transport Stream, and if muxjs is loaded.
- * @param {string} contentType
  * @param {string} mimeType
+ * @param {string=} contentType
  * @return {boolean}
  */
-shaka.media.Transmuxer.isSupported = function(contentType, mimeType) {
-  return window.muxjs && shaka.media.Transmuxer.isTsContainer(mimeType) &&
-      MediaSource.isTypeSupported(
-          shaka.media.Transmuxer.convertTsCodecs(contentType, mimeType));
+shaka.media.Transmuxer.isSupported = function(mimeType, contentType) {
+  if (!window.muxjs || !shaka.media.Transmuxer.isTsContainer(mimeType)) {
+    return false;
+  }
+  var convertTsCodecs = shaka.media.Transmuxer.convertTsCodecs;
+  if (contentType) {
+    return MediaSource.isTypeSupported(convertTsCodecs(contentType, mimeType));
+  }
+  const ContentType = shaka.util.ManifestParserUtils.ContentType;
+  return MediaSource.isTypeSupported(
+             convertTsCodecs(ContentType.AUDIO, mimeType)) ||
+      MediaSource.isTypeSupported(convertTsCodecs(ContentType.VIDEO, mimeType));
 };
 
 

diff --git a/test/media/media_source_engine_unit.js b/test/media/media_source_engine_unit.js
@@ -80,6 +80,9 @@ describe('MediaSourceEngine', function() {
     };
 
     shaka.text.TextEngine = createMockTextEngineCtor();
+    shaka.media.Transmuxer.isSupported = function(mimeType, contentType) {
+      return mimeType == 'tsMimetype';
+    };
   });
 
   afterAll(function() {

diff --git a/test/media/transmuxer_integration.js b/test/media/transmuxer_integration.js
@@ -64,8 +64,8 @@ describe('Transmuxer', function() {
   describe('isSupported', function() {
     var isSupported = shaka.media.Transmuxer.isSupported;
     it('returns whether the content type is supported', function() {
-      expect(isSupported(ContentType.VIDEO, mp4MimeType)).toBeFalsy();
-      expect(isSupported(ContentType.VIDEO, transportStreamVideoMimeType))
+      expect(isSupported(mp4MimeType, ContentType.VIDEO)).toBeFalsy();
+      expect(isSupported(transportStreamVideoMimeType, ContentType.VIDEO))
           .toBeTruthy();
     });
   });