@eluvio/elv-client-js 4.0.104 → 4.0.107

package/dist/src/client/Files.js

@@ -2,8 +2,8 @@ var _toConsumableArray = require("@babel/runtime/helpers/toConsumableArray");
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _regeneratorRuntime = require("@babel/runtime/regenerator");
 var _asyncToGenerator = require("@babel/runtime/helpers/asyncToGenerator");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /**
  * Methods for accessing and managing access groups
  *

package/dist/src/client/LiveConf.js

@@ -1,58 +1,44 @@
 var _defineProperty = require("@babel/runtime/helpers/defineProperty");
 var _classCallCheck = require("@babel/runtime/helpers/classCallCheck");
 var _createClass = require("@babel/runtime/helpers/createClass");
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-var LadderTemplate = {
-  "2160": {
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var DefaultABRLadder = {
+  "video": [{
     bit_rate: 14000000,
     codecs: "avc1.640028,mp4a.40.2",
     height: 2160,
-    media_type: 1,
-    representation: "videovideo_3840x2160_h264@14000000",
-    stream_name: "video",
     width: 3840
-  },
-  "1080": {
+  }, {
     bit_rate: 9500000,
     codecs: "avc1.640028,mp4a.40.2",
     height: 1080,
-    media_type: 1,
-    representation: "videovideo_1920x1080_h264@9500000",
-    stream_name: "video",
-    stream_index: 0,
     width: 1920
-  },
-  "720": {
+  }, {
     bit_rate: 4500000,
     codecs: "avc1.640028,mp4a.40.2",
     height: 720,
-    media_type: 1,
-    representation: "videovideo_1280x720_h264@4500000",
-    stream_name: "video",
-    stream_index: 0,
     width: 1280
-  },
-  "540": {
+  }, {
     bit_rate: 2000000,
     codecs: "avc1.640028,mp4a.40.2",
     height: 540,
-    media_type: 1,
-    representation: "videovideo_960x540_h264@2000000",
-    stream_name: "video",
-    stream_index: 0,
     width: 960
-  },
-  "540_low": {
+  }, {
     bit_rate: 900000,
     codecs: "avc1.640028,mp4a.40.2",
     height: 540,
-    media_type: 1,
-    representation: "videovideo_960x540_h264@900000",
-    stream_name: "video",
-    stream_index: 0,
     width: 960
-  }
+  }],
+  "audio": [{
+    bit_rate: 192000,
+    channels: 2,
+    codecs: "mp4a.40.2"
+  }, {
+    bit_rate: 384000,
+    channels: 6,
+    codecs: "mp4a.40.2"
+  }]
 };
 var LiveconfTemplate = {
   live_recording: {
@@ -109,15 +95,6 @@ var LiveconfTemplate = {
     }
   }
 };
-var LadderSpecAudio = {
-  bit_rate: 384000,
-  channels: 2,
-  codecs: "mp4a.40.2",
-  media_type: 2,
-  representation: "audioaudio_aac@384000",
-  stream_name: "audio",
-  stream_index: 0
-};
 var LiveConf = /*#__PURE__*/function () {
   "use strict";
 
@@ -130,7 +107,7 @@ var LiveConf = /*#__PURE__*/function () {
     this.overwriteOriginUrl = overwriteOriginUrl;
     this.syncAudioToVideo = syncAudioToVideo;
   }
-  _createClass(LiveConf, [{
+  return _createClass(LiveConf, [{
     key: "probeKind",
     value: function probeKind() {
       var fileNameSplit = this.probeData.format.filename.split(":");
@@ -245,7 +222,6 @@ var LiveConf = /*#__PURE__*/function () {
       } else {
         seg.audio = 29.76 * 48000; // Other codecs are resampled @48000
       }
-
       return seg;
     }
 
@@ -410,7 +386,7 @@ var LiveConf = /*#__PURE__*/function () {
     value: function generateAudioStreamsConfig(_ref4) {
       var customSettings = _ref4.customSettings;
       var audioStreams = {};
-      if (customSettings && customSettings.audio) {
+      if (customSettings && customSettings.audio && Object.keys(customSettings.audio).length > 0) {
         for (var i = 0; i < Object.keys(customSettings.audio).length; i++) {
           var audioIdx = Object.keys(customSettings.audio)[i];
           var audio = customSettings.audio[audioIdx];
@@ -425,7 +401,7 @@ var LiveConf = /*#__PURE__*/function () {
       }
 
       // If no audio streams specified in custom config, set up all the suitable audio streams in the probe
-      if (!customSettings.audio) {
+      if (!customSettings.audio || Object.keys(customSettings.audio).length == 0) {
         audioStreams = this.getAudioStreamsFromProbe();
       }
       return audioStreams;
@@ -525,46 +501,53 @@ var LiveConf = /*#__PURE__*/function () {
       if (segDurations.videoFrameDurationTs) {
         conf.live_recording.recording_config.recording_params.xc_params.video_frame_duration_ts = segDurations.videoFrameDurationTs;
       }
-      switch (videoStream.height) {
-        case 2160:
-          conf.live_recording.recording_config.recording_params.ladder_specs.unshift(LadderTemplate[2160], LadderTemplate[1080], LadderTemplate[720], LadderTemplate[540], LadderTemplate["540_low"]);
-          conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[2160].bit_rate;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_height = 2160;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_width = 3840;
-          break;
-        case 1080:
-          conf.live_recording.recording_config.recording_params.ladder_specs.unshift(LadderTemplate[1080], LadderTemplate[720], LadderTemplate[540], LadderTemplate["540_low"]);
-          conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[1080].bit_rate;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_height = 1080;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_width = 1920;
-          break;
-        case 720:
-          conf.live_recording.recording_config.recording_params.ladder_specs.unshift(LadderTemplate[720], LadderTemplate[540], LadderTemplate["540_low"]);
-          conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[720].bit_rate;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_height = 720;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_width = 1280;
-          break;
-        case 540:
-          conf.live_recording.recording_config.recording_params.ladder_specs.unshift(LadderTemplate[540], LadderTemplate["540_low"]);
-          conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = LadderTemplate[540].bit_rate;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_height = 540;
-          conf.live_recording.recording_config.recording_params.xc_params.enc_width = 960;
-          break;
-        default:
-          throw new Error("ERROR: Probed stream does not conform to one of the following built in resolution ladders [4096, 2160], [1920, 1080] [1280, 720], [960, 540]");
+      var ladderProfile = customSettings.ladder_profile || DefaultABRLadder;
+      conf.live_recording.recording_config.recording_params.xc_params.enc_height = videoStream.height;
+      conf.live_recording.recording_config.recording_params.xc_params.enc_width = videoStream.width;
+
+      // Determine video recording bitrate and ABR ladder
+      var topLadderRate = 0;
+      for (var _i = 0; _i < ladderProfile.video.length; _i++) {
+        var elem = ladderProfile.video[_i];
+        if (elem.height > videoStream.height) continue;
+        if (elem.bit_rate > topLadderRate) {
+          topLadderRate = elem.bit_rate;
+        }
+        elem.media_type = 1;
+        elem.stream_name = "video";
+        elem.stream_index = 0;
+        elem.representation = "videovideo_" + elem.width + "x" + elem.height + "_h264@" + elem.bit_rate;
+        conf.live_recording.recording_config.recording_params.ladder_specs.push(elem);
       }
+      // Currently the recording bitrate is the top bitrate of the ladder (it will be configurable separately in the future)
+      conf.live_recording.recording_config.recording_params.xc_params.video_bitrate = topLadderRate;
+
+      // Determine audio recording bitrate and ABR ladder
       var globalAudioBitrate = 0;
       var nAudio = 0;
-      for (var _i = 0; _i < Object.keys(audioStreams).length; _i++) {
-        var audioLadderSpec = _objectSpread({}, LadderSpecAudio);
-        var audioIndex = Object.keys(audioStreams)[_i];
+      for (var _i2 = 0; _i2 < Object.keys(audioStreams).length; _i2++) {
+        var audioLadderSpec = {};
+        var audioIndex = Object.keys(audioStreams)[_i2];
         var audio = audioStreams[audioIndex];
-        audioLadderSpec.bit_rate = audio.recordingBitrate;
-        audioLadderSpec.representation = "audioaudio_aac@".concat(audio.recordingBitrate);
+
+        // Find ladder rung for the specific channel layout (2 or 6 channels)
+        for (var j = 0; j < ladderProfile.audio.length; j++) {
+          var _elem = ladderProfile.audio[j];
+          if (_elem.channels == audio.recordingChannels) {
+            audioLadderSpec = _objectSpread({}, _elem);
+            break;
+          }
+        }
+        if (Object.keys(audioLadderSpec).length === 0) {
+          // If no channels layout match, just use the first element in the ladder
+          audioLadderSpec = _objectSpread({}, ladderProfile.audio[0]);
+        }
+        audioLadderSpec.representation = "audioaudio_aac@".concat(audioLadderSpec.bit_rate);
         audioLadderSpec.channels = audio.recordingChannels;
         audioLadderSpec.stream_index = parseInt(audioIndex);
         audioLadderSpec.stream_name = "audio_".concat(audioIndex);
         audioLadderSpec.stream_label = audio.playoutLabel ? audio.playoutLabel : null;
+        audioLadderSpec.media_type = 2;
         conf.live_recording.recording_config.recording_params.ladder_specs.push(audioLadderSpec);
         if (audio.recordingBitrate > globalAudioBitrate) {
           globalAudioBitrate = audio.recordingBitrate;
@@ -578,6 +561,5 @@ var LiveConf = /*#__PURE__*/function () {
       return conf;
     }
   }]);
-  return LiveConf;
 }();
 exports.LiveConf = LiveConf;