fix: do not try to use unsupported audio (#896)

videojs · Jul 10, 2020 · 7711b26 · 7711b26
1 parent 406cbcd
commit 7711b26
Show file tree

Hide file tree

Showing 11 changed files with 405 additions and 10 deletions.
diff --git a/scripts/create-test-data.js b/scripts/create-test-data.js
@@ -31,7 +31,7 @@ const getManifests = () => (fs.readdirSync(manifestsDir) || [])
   .map((f) => path.resolve(manifestsDir, f));
 
 const getSegments = () => (fs.readdirSync(segmentsDir) || [])
-  .filter((f) => ((/\.(ts|mp4|key|webm)/).test(path.extname(f))))
+  .filter((f) => ((/\.(ts|mp4|key|webm|aac|ac3)/).test(path.extname(f))))
   .map((f) => path.resolve(segmentsDir, f));
 
 const buildManifestString = function() {

diff --git a/src/master-playlist-controller.js b/src/master-playlist-controller.js
@@ -1309,7 +1309,7 @@ export class MasterPlaylistController extends videojs.EventTarget {
       codecs.video += `,${playlistCodecs.audio || media.main.audioCodec || DEFAULT_AUDIO_CODEC}`;
     }
 
-    if ((media.main.hasAudio && !media.main.isMuxed) || media.audio.hasAudio) {
+    if ((media.main.hasAudio && !media.main.isMuxed) || media.audio.hasAudio || usingAudioLoader) {
       codecs.audio = playlistCodecs.audio || media.main.audioCodec || media.audio.audioCodec || DEFAULT_AUDIO_CODEC;
       // set audio isFmp4 so we use the correct "supports" function below
       media.audio.isFmp4 = (media.main.hasAudio && !media.main.isMuxed) ? media.main.isFmp4 : media.audio.isFmp4;

diff --git a/src/media-segment-request.js b/src/media-segment-request.js
@@ -487,6 +487,16 @@ const handleSegmentBytes = ({
     return;
   }
 
+  if (typeof segment.container === 'undefined') {
+    segment.container = detectContainerForBytes(bytesAsUint8Array);
+  }
+
+  if (segment.container !== 'ts' && segment.container !== 'aac') {
+    trackInfoFn(segment, {hasAudio: false, hasVideo: false});
+    doneFn(null, segment, {});
+    return;
+  }
+
   // ts or aac
   transmuxAndNotify({
     segment,

diff --git a/src/segment-loader.js b/src/segment-loader.js
@@ -1452,7 +1452,7 @@ export default class SegmentLoader extends videojs.EventTarget {
     // When we have track info, determine what media types this loader is dealing with.
     // Guard against cases where we're not getting track info at all until we are
     // certain that all streams will provide it.
-    if ((trackInfo.hasVideo || trackInfo.hasAudio) && !shallowEqual(this.startingMedia_, trackInfo)) {
+    if (!shallowEqual(this.startingMedia_, trackInfo)) {
       this.startingMedia_ = trackInfo;
       this.logger_('trackinfo update', trackInfo);
       this.trigger('trackinfo');

diff --git a/test/master-playlist-controller.test.js b/test/master-playlist-controller.test.js
@@ -856,7 +856,7 @@ QUnit.test(
     // playlist
     this.standardXHRResponse(this.requests.shift());
     // segment
-    this.standardXHRResponse(this.requests.shift());
+    this.standardXHRResponse(this.requests.shift(), muxedSegment());
     // change the source
     this.player.src({
       src: 'manifest/master.m3u8',
@@ -3100,7 +3100,7 @@ QUnit.test('switches off subtitles on subtitle errors', function(assert) {
   // media
   this.standardXHRResponse(this.requests.shift());
   // media segment
-  this.standardXHRResponse(this.requests.shift());
+  this.standardXHRResponse(this.requests.shift(), muxedSegment());
 
   const textTracks = this.player.textTracks();