v19.2.4

Fixing tracks/streams config
flussonic · Feb 27, 2019 · 5fa9038 · 5fa9038
1 parent 591be0c
commit 5fa9038
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 24 deletions.
diff --git a/dist/FlussonicMsePlayer.js b/dist/FlussonicMsePlayer.js
@@ -701,7 +701,7 @@ var MSEPlayer = function () {
  _createClass(MSEPlayer, null, [{
  key: 'version',
  get: function get() {
- return "19.2.3";
+ return "19.2.4";
  }
  }]);
 
@@ -727,6 +727,8 @@ var MSEPlayer = function () {
 
  this.opts.errorsBeforeStop = this.opts.errorsBeforeStop ? this.opts.errorsBeforeStop : DEFAULT_ERRORS_BEFORE_STOP;
 
+ this.videoTracksType = 'streams';
+
  if (typeof this.opts.errorsBeforeStop !== 'number' || isNaN(this.opts.errorsBeforeStop)) {
  throw new Error('invalid errorsBeforeStop param, should be number');
  }
@@ -833,16 +835,15 @@ var MSEPlayer = function () {
  if (!Array.isArray(tracks)) {
  console.error('tracks should be an Array instance: ["v1", "a1"]');
  }
-
  var videoTracksStr = tracks.filter(function (id) {
- var stream = _this.mediaInfo.streams.find(function (s) {
+ var stream = _this.mediaInfo[_this.videoTracksType].find(function (s) {
  return id === s['track_id'];
  });
  return !!stream && stream.content === TYPE_CONTENT_VIDEO;
  }).join('');
 
  var audioTracksStr = tracks.filter(function (id) {
- var stream = _this.mediaInfo.streams.find(function (s) {
+ var stream = _this.mediaInfo[_this.videoTracksType].find(function (s) {
  return id === s['track_id'];
  });
  return !!stream && stream.content === TYPE_CONTENT_AUDIO;
@@ -1218,7 +1219,12 @@ var MSEPlayer = function () {
  this.sb.setTracksByType(data);
 
  var metadata = data.metadata;
- var streams = data.metadata.tracks || data.metadata.streams;
+
+ var streams = data.metadata.streams;
+ if (data.metadata.tracks) {
+ streams = data.metadata.tracks;
+ this.videoTracksType = 'tracks';
+ }
 
  var activeStreams = {};
 
@@ -1256,7 +1262,7 @@ var MSEPlayer = function () {
  if (!this.mediaInfo) {
  return;
  }
- return this.mediaInfo.streams.filter(function (s) {
+ return this.mediaInfo[this.videoTracksType].filter(function (s) {
  return s.content === TYPE_CONTENT_VIDEO;
  });
  };
@@ -1265,7 +1271,7 @@ var MSEPlayer = function () {
  if (!this.mediaInfo) {
  return;
  }
- return this.mediaInfo.streams.filter(function (s) {
+ return this.mediaInfo[this.videoTracksType].filter(function (s) {
  return s.content === TYPE_CONTENT_AUDIO;
  });
  };

diff --git a/dist/FlussonicMsePlayer.min.js b/dist/FlussonicMsePlayer.min.js
diff --git a/examples/simple/public/FlussonicMsePlayer.js b/examples/simple/public/FlussonicMsePlayer.js
@@ -701,7 +701,7 @@ var MSEPlayer = function () {
  _createClass(MSEPlayer, null, [{
  key: 'version',
  get: function get() {
- return "19.2.3";
+ return "19.2.4";
  }
  }]);
 
@@ -727,6 +727,8 @@ var MSEPlayer = function () {
 
  this.opts.errorsBeforeStop = this.opts.errorsBeforeStop ? this.opts.errorsBeforeStop : DEFAULT_ERRORS_BEFORE_STOP;
 
+ this.videoTracksType = 'streams';
+
  if (typeof this.opts.errorsBeforeStop !== 'number' || isNaN(this.opts.errorsBeforeStop)) {
  throw new Error('invalid errorsBeforeStop param, should be number');
  }
@@ -833,16 +835,15 @@ var MSEPlayer = function () {
  if (!Array.isArray(tracks)) {
  console.error('tracks should be an Array instance: ["v1", "a1"]');
  }
-
  var videoTracksStr = tracks.filter(function (id) {
- var stream = _this.mediaInfo.streams.find(function (s) {
+ var stream = _this.mediaInfo[_this.videoTracksType].find(function (s) {
  return id === s['track_id'];
  });
  return !!stream && stream.content === TYPE_CONTENT_VIDEO;
  }).join('');
 
  var audioTracksStr = tracks.filter(function (id) {
- var stream = _this.mediaInfo.streams.find(function (s) {
+ var stream = _this.mediaInfo[_this.videoTracksType].find(function (s) {
  return id === s['track_id'];
  });
  return !!stream && stream.content === TYPE_CONTENT_AUDIO;
@@ -1218,7 +1219,12 @@ var MSEPlayer = function () {
  this.sb.setTracksByType(data);
 
  var metadata = data.metadata;
- var streams = data.metadata.tracks || data.metadata.streams;
+
+ var streams = data.metadata.streams;
+ if (data.metadata.tracks) {
+ streams = data.metadata.tracks;
+ this.videoTracksType = 'tracks';
+ }
 
  var activeStreams = {};
 
@@ -1256,7 +1262,7 @@ var MSEPlayer = function () {
  if (!this.mediaInfo) {
  return;
  }
- return this.mediaInfo.streams.filter(function (s) {
+ return this.mediaInfo[this.videoTracksType].filter(function (s) {
  return s.content === TYPE_CONTENT_VIDEO;
  });
  };
@@ -1265,7 +1271,7 @@ var MSEPlayer = function () {
  if (!this.mediaInfo) {
  return;
  }
- return this.mediaInfo.streams.filter(function (s) {
+ return this.mediaInfo[this.videoTracksType].filter(function (s) {
  return s.content === TYPE_CONTENT_AUDIO;
  });
  };

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@flussonic/flussonic-mse-player",
- "version": "19.2.3",
+ "version": "19.2.4",
  "description": "Media Source Extension support for Flussonic.",
  "main": "./dist/FlussonicMsePlayer.js",
  "keywords": [

diff --git a/src/modules/MsePlayer.external.js b/src/modules/MsePlayer.external.js
@@ -60,6 +60,8 @@ export default class MSEPlayer {
 
  this.opts.errorsBeforeStop = this.opts.errorsBeforeStop ? this.opts.errorsBeforeStop : DEFAULT_ERRORS_BEFORE_STOP
 
+ this.videoTracksType = 'streams'
+
  if (typeof this.opts.errorsBeforeStop !== 'number' || isNaN(this.opts.errorsBeforeStop)) {
  throw new Error('invalid errorsBeforeStop param, should be number')
  }
@@ -171,17 +173,16 @@ export default class MSEPlayer {
  if (!Array.isArray(tracks)) {
  console.error('tracks should be an Array instance: ["v1", "a1"]')
  }
-
  const videoTracksStr = tracks
  .filter(id => {
- const stream = this.mediaInfo.streams.find(s => id === s['track_id'])
+ const stream = this.mediaInfo[this.videoTracksType].find(s => id === s['track_id'])
  return !!stream && stream.content === TYPE_CONTENT_VIDEO
  })
  .join('')
 
  const audioTracksStr = tracks
  .filter(id => {
- const stream = this.mediaInfo.streams.find(s => id === s['track_id'])
+ const stream = this.mediaInfo[this.videoTracksType].find(s => id === s['track_id'])
  return !!stream && stream.content === TYPE_CONTENT_AUDIO
  })
  .join('')
@@ -555,7 +556,12 @@ export default class MSEPlayer {
  this.sb.setTracksByType(data)
 
  const metadata = data.metadata
- const streams = data.metadata.tracks || data.metadata.streams
+
+ let streams = data.metadata.streams
+ if (data.metadata.tracks) {
+ streams = data.metadata.tracks
+ this.videoTracksType = 'tracks';
+ }
 
  const activeStreams = {}
 
@@ -593,14 +599,14 @@ export default class MSEPlayer {
  if (!this.mediaInfo) {
  return
  }
- return this.mediaInfo.streams.filter(s => s.content === TYPE_CONTENT_VIDEO)
+ return this.mediaInfo[this.videoTracksType].filter(s => s.content === TYPE_CONTENT_VIDEO)
  }
 
  getAudioTracks() {
  if (!this.mediaInfo) {
  return
  }
- return this.mediaInfo.streams.filter(s => s.content === TYPE_CONTENT_AUDIO)
+ return this.mediaInfo[this.videoTracksType].filter(s => s.content === TYPE_CONTENT_AUDIO)
  }
 
  /**