@eluvio/elv-client-js 4.2.33 → 4.2.36

package/dist/src/client/LiveConf.js

@@ -221,7 +221,8 @@ var LiveConf = /*#__PURE__*/function () {
      *
      * Live input formats have fixed timebase:
      * - MPEG-TS/SRT input stream timebase is 90000
-     * - RTMP input stream timebase is 1000 and gets translated to 16000 if not otherwise specified
+     * - RTMP input stream timebase is 1000 and gets translated to match the frame rate
+     *   (eg. 24000 @24fps, 30000 @30fps/29.97fps, 60000 @60fps/59.94fps)
      *
      * This causes frame duration irregularities for certain frame rates.
      * For example RTMP 60fps has frames of durations 16 and 17.  MPEG-TS 59.94fps has frames of
@@ -232,10 +233,13 @@ var LiveConf = /*#__PURE__*/function () {
      * to make the math possible.  This adjustment is also required for live-to-vod conversion.
      *
      * For example for MPEG-TS 59.94fps, the mez segment timebase needs to be 60000
-     * (and resulting frame duration is 1001) and for RTMP 60fps the timebase needs to be 15360 (resulting frame
-     * duration is 256).
+     * (and resulting frame duration is 1001) and for RTMP 60fps the timebase is set to 60000
+     * (resulting frame duration is 1000). For every supported RTMP frame rate, the video timebase is
+     * set equal to the source timescale, with a frame duration of 1000 (1001 for the *000/1001
+     * fractional rates).
      *
-     * @sourceTimescale - adjusted source video stream timescale (eg. MPEGTS 90000, RTMP 16000 )
+     * @sourceTimescale - adjusted source video stream timescale (eg. MPEGTS 90000; ignored for RTMP,
+     *   which derives its own timebase per frame rate in calcSegDurationRtmp)
      * @sampleRate - audio sample rate (commonly 48000 but can be different)
      * @audioCodec - audio codec as a string (eg. "aac")
      * @return - segment encoding parameters
@@ -350,57 +354,64 @@ var LiveConf = /*#__PURE__*/function () {
     }
   }, {
     key: "calcSegDurationRtmp",
-    value: function calcSegDurationRtmp(_ref5) {
-      var sourceTimescale = _ref5.sourceTimescale;
+    value: function calcSegDurationRtmp() {
       var videoStream = this.getStreamDataForCodecType("video");
       var frameRate = videoStream.frame_rate;
       var seg = {};
       switch (frameRate) {
         case "24":
-          seg.videoTimeBase = 768; // Note 1536 produces low output bitrate
-          seg.videoFrameDurationTs = 512;
-          seg.video = this.calcOutputTimebase(seg.videoTimeBase) * 30;
+          seg.videoTimeBase = 24000;
+          seg.videoFrameDurationTs = 1000;
+          seg.video = seg.videoTimeBase * 30;
           seg.keyint = 48;
           seg.duration = "30";
           break;
         case "25":
-          seg.video = sourceTimescale * 30;
+          seg.videoTimeBase = 25000;
+          seg.videoFrameDurationTs = 1000;
+          seg.video = seg.videoTimeBase * 30;
           seg.keyint = 50;
           seg.duration = "30";
           break;
         case "30":
-          seg.videoTimeBase = 960; // Output timebase: 15360
-          seg.videoFrameDurationTs = 512;
-          seg.video = this.calcOutputTimebase(seg.videoTimeBase) * 30;
+          seg.videoTimeBase = 30000;
+          seg.videoFrameDurationTs = 1000;
+          seg.video = seg.videoTimeBase * 30;
           seg.keyint = 60;
           seg.duration = "30";
           break;
         case "30000/1001":
-          seg.video = sourceTimescale * 30.03;
+          seg.videoTimeBase = 30000;
+          seg.videoFrameDurationTs = 1001;
+          seg.video = seg.videoTimeBase * 30.03;
           seg.keyint = 60;
           seg.duration = "30.03";
           break;
         case "48":
-          seg.videoTimeBase = 1536; // Output timebase: 12288
-          seg.videoFrameDurationTs = 256;
-          seg.video = this.calcOutputTimebase(seg.videoTimeBase) * 30;
+          seg.videoTimeBase = 48000;
+          seg.videoFrameDurationTs = 1000;
+          seg.video = seg.videoTimeBase * 30;
           seg.keyint = 96;
           seg.duration = "30";
           break;
         case "50":
-          seg.video = sourceTimescale * 30;
+          seg.videoTimeBase = 50000;
+          seg.videoFrameDurationTs = 1000;
+          seg.video = seg.videoTimeBase * 30;
           seg.keyint = 100;
           seg.duration = "30";
           break;
         case "60":
-          seg.videoTimeBase = 960; // Output timebase: 15360
-          seg.videoFrameDurationTs = 256;
-          seg.video = this.calcOutputTimebase(seg.videoTimeBase) * 30;
+          seg.videoTimeBase = 60000;
+          seg.videoFrameDurationTs = 1000;
+          seg.video = seg.videoTimeBase * 30;
           seg.keyint = 120;
           seg.duration = "30";
           break;
         case "60000/1001":
-          seg.video = sourceTimescale * 30.03;
+          seg.videoTimeBase = 60000;
+          seg.videoFrameDurationTs = 1001;
+          seg.video = seg.videoTimeBase * 30.03;
           seg.keyint = 120;
           seg.duration = "30.03";
           break;
@@ -432,8 +443,8 @@ var LiveConf = /*#__PURE__*/function () {
      */
   }, {
     key: "MapCustomProfileToLiveConfig",
-    value: function MapCustomProfileToLiveConfig(_ref6) {
-      var customProfile = _ref6.customProfile;
+    value: function MapCustomProfileToLiveConfig(_ref5) {
+      var customProfile = _ref5.customProfile;
       if (!customProfile) return {};
       var CompactDeep = function CompactDeep(obj) {
         if (obj === null || _typeof(obj) !== "object" || Array.isArray(obj)) {
@@ -469,9 +480,9 @@ var LiveConf = /*#__PURE__*/function () {
     */
   }, {
     key: "generateAudioStreamsConfig",
-    value: function generateAudioStreamsConfig(_ref7) {
+    value: function generateAudioStreamsConfig(_ref6) {
       var _liveRecordingConfigP, _liveRecordingConfigP2;
-      var liveRecordingConfigProfile = _ref7.liveRecordingConfigProfile;
+      var liveRecordingConfigProfile = _ref6.liveRecordingConfigProfile;
       var ladderProfile = (liveRecordingConfigProfile === null || liveRecordingConfigProfile === void 0 || (_liveRecordingConfigP = liveRecordingConfigProfile.playout_config) === null || _liveRecordingConfigP === void 0 ? void 0 : _liveRecordingConfigP.ladder_specs) || DefaultABRLadder;
       var audioSettings = liveRecordingConfigProfile === null || liveRecordingConfigProfile === void 0 || (_liveRecordingConfigP2 = liveRecordingConfigProfile.recording_stream_config) === null || _liveRecordingConfigP2 === void 0 ? void 0 : _liveRecordingConfigP2.audio;
       var audioStreams = {};
@@ -513,9 +524,9 @@ var LiveConf = /*#__PURE__*/function () {
     */
   }, {
     key: "generateLiveConf",
-    value: function generateLiveConf(_ref8) {
-      var _customSettings$liveR, _customSettings$liveR2, _ladder_specs$video;
-      var customSettings = _ref8.customSettings;
+    value: function generateLiveConf(_ref7) {
+      var _customSettings$liveR, _customXcParams$enc_h, _customXcParams$enc_w, _customRecordingParam, _customRecordingParam2, _customSettings$liveR2, _customXcParams$video, _customSettings$liveR3, _ladder_specs$video;
+      var customSettings = _ref7.customSettings;
       // Saved config overrides defaults and is preserved on reconfiguration
       var conf = R.clone(LiveconfTemplate);
       if (this.currentLiveRecordingMeta) {
@@ -540,6 +551,10 @@ var LiveConf = /*#__PURE__*/function () {
       var videoStream = this.getStreamDataForCodecType("video");
       var sourceTimescale;
 
+      // Custom profile values take precedence over computed defaults
+      var customRecordingParams = (_customSettings$liveR = customSettings.liveRecordingConfigProfile) === null || _customSettings$liveR === void 0 ? void 0 : _customSettings$liveR.recording_params;
+      var customXcParams = customRecordingParams === null || customRecordingParams === void 0 ? void 0 : customRecordingParams.xc_params;
+
       // Fill in liveconf all formats have in common
       conf.live_recording.fabric_config.ingress_node_api = this.nodeUrl || null;
       conf.live_recording.fabric_config.ingress_node_id = this.nodeId || null;
@@ -548,8 +563,10 @@ var LiveConf = /*#__PURE__*/function () {
       conf.live_recording.recording_config.recording_params.description = "Ingest stream ".concat(fileName);
       conf.live_recording.recording_config.recording_params.name = "Ingest stream ".concat(fileName);
       conf.live_recording.recording_config.recording_params.xc_params.sample_rate = sampleRate;
-      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;
+
+      // Encoding dimensions default to the source but are overridden by profile values if present
+      conf.live_recording.recording_config.recording_params.xc_params.enc_height = (_customXcParams$enc_h = customXcParams === null || customXcParams === void 0 ? void 0 : customXcParams.enc_height) !== null && _customXcParams$enc_h !== void 0 ? _customXcParams$enc_h : videoStream.height;
+      conf.live_recording.recording_config.recording_params.xc_params.enc_width = (_customXcParams$enc_w = customXcParams === null || customXcParams === void 0 ? void 0 : customXcParams.enc_width) !== null && _customXcParams$enc_w !== void 0 ? _customXcParams$enc_w : videoStream.width;
       for (var i = 0; i < Object.keys(audioStreams).length; i++) {
         conf.live_recording.recording_config.recording_params.xc_params.audio_index[i] = parseInt(Object.keys(audioStreams)[i]);
       }
@@ -560,12 +577,12 @@ var LiveConf = /*#__PURE__*/function () {
       // Fill in specifics for protocol
       switch (this.getFormat()) {
         case "mpegts":
-          sourceTimescale = 90000;
+          sourceTimescale = (_customRecordingParam = customRecordingParams === null || customRecordingParams === void 0 ? void 0 : customRecordingParams.source_timescale) !== null && _customRecordingParam !== void 0 ? _customRecordingParam : 90000;
           conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
           break;
         case "rtmp":
         case "flv":
-          sourceTimescale = 16000;
+          sourceTimescale = (_customRecordingParam2 = customRecordingParams === null || customRecordingParams === void 0 ? void 0 : customRecordingParams.source_timescale) !== null && _customRecordingParam2 !== void 0 ? _customRecordingParam2 : 16000;
           conf.live_recording.recording_config.recording_params.source_timescale = sourceTimescale;
           break;
         case "hls":
@@ -577,7 +594,7 @@ var LiveConf = /*#__PURE__*/function () {
       }
       switch (this.getProtocol()) {
         case "srt":
-          if (!((_customSettings$liveR = customSettings.liveRecordingConfigProfile) !== null && _customSettings$liveR !== void 0 && (_customSettings$liveR = _customSettings$liveR.recording_params) !== null && _customSettings$liveR !== void 0 && _customSettings$liveR.live_delay_nano)) {
+          if (!((_customSettings$liveR2 = customSettings.liveRecordingConfigProfile) !== null && _customSettings$liveR2 !== void 0 && (_customSettings$liveR2 = _customSettings$liveR2.recording_params) !== null && _customSettings$liveR2 !== void 0 && _customSettings$liveR2.live_delay_nano)) {
             conf.live_recording.recording_config.recording_params.live_delay_nano = 6000000000;
           }
           break;
@@ -591,23 +608,27 @@ var LiveConf = /*#__PURE__*/function () {
       // Segment conditioning parameters
       conf.live_recording.recording_config.recording_params.xc_params.seg_duration = segDurations.duration;
       conf.live_recording.recording_config.recording_params.xc_params.audio_seg_duration_ts = segDurations.audio;
-      conf.live_recording.recording_config.recording_params.xc_params.video_seg_duration_ts = segDurations.video;
+      conf.live_recording.recording_config.recording_params.xc_params.video_seg_duration_ts = (_customXcParams$video = customXcParams === null || customXcParams === void 0 ? void 0 : customXcParams.video_seg_duration_ts) !== null && _customXcParams$video !== void 0 ? _customXcParams$video : segDurations.video;
       conf.live_recording.recording_config.recording_params.xc_params.force_keyint = segDurations.keyint;
 
-      // Optional override output timebase and frame duration (ts)
-      if (segDurations.videoTimeBase) {
-        conf.live_recording.recording_config.recording_params.xc_params.video_time_base = segDurations.videoTimeBase;
+      // These must be recomputed from scratch on every (re)configuration to avoid stale values
+      if (R.isNil(customXcParams === null || customXcParams === void 0 ? void 0 : customXcParams.video_time_base)) {
+        if (segDurations.videoTimeBase) {
+          conf.live_recording.recording_config.recording_params.xc_params.video_time_base = segDurations.videoTimeBase;
 
-        // Note 'source_timescale' needs to be set to the output timebase and is used by playout
-        conf.live_recording.recording_config.recording_params.source_timescale = this.calcOutputTimebase(segDurations.videoTimeBase);
+          // Note 'source_timescale' needs to be set to the output timebase and is used by playout
+          if (R.isNil(customRecordingParams === null || customRecordingParams === void 0 ? void 0 : customRecordingParams.source_timescale)) {
+            conf.live_recording.recording_config.recording_params.source_timescale = this.calcOutputTimebase(segDurations.videoTimeBase);
+          }
+        } else {
+          conf.live_recording.recording_config.recording_params.xc_params.video_time_base = null;
+        }
       }
-      if (segDurations.videoFrameDurationTs) {
-        conf.live_recording.recording_config.recording_params.xc_params.video_frame_duration_ts = segDurations.videoFrameDurationTs;
+      if (R.isNil(customXcParams === null || customXcParams === void 0 ? void 0 : customXcParams.video_frame_duration_ts)) {
+        conf.live_recording.recording_config.recording_params.xc_params.video_frame_duration_ts = segDurations.videoFrameDurationTs || null;
       }
-      var ladder_specs = (_customSettings$liveR2 = customSettings.liveRecordingConfigProfile) === null || _customSettings$liveR2 === void 0 || (_customSettings$liveR2 = _customSettings$liveR2.playout_config) === null || _customSettings$liveR2 === void 0 ? void 0 : _customSettings$liveR2.ladder_specs;
+      var ladder_specs = (_customSettings$liveR3 = customSettings.liveRecordingConfigProfile) === null || _customSettings$liveR3 === void 0 || (_customSettings$liveR3 = _customSettings$liveR3.playout_config) === null || _customSettings$liveR3 === void 0 ? void 0 : _customSettings$liveR3.ladder_specs;
       var ladderProfile = (ladder_specs === null || ladder_specs === void 0 || (_ladder_specs$video = ladder_specs.video) === null || _ladder_specs$video === void 0 ? void 0 : _ladder_specs$video.length) > 0 ? ladder_specs : 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;
 
       // Reset ladder specs (updating existing stream will carry over old specs
       conf.live_recording.recording_config.recording_params.ladder_specs = [];