@desynova-digital/player 3.13.26 → 3.13.28

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/components/Shortcut.js +23 -18
  2. package/components/Video.js +2 -19
  3. package/components/marking-controls/MarkInControl.js +6 -3
  4. package/components/marking-controls/MarkOutControl.js +6 -3
  5. package/package.json +1 -1
  6. package/utils/index.js +1 -0
package/components/Shortcut.js CHANGED
@@ -8,6 +8,7 @@ var _react = require("react");
8
8
  var _propTypes = require("prop-types");
9
9
  var _lodash = require("lodash");
10
10
  var _hotkeysJs = _interopRequireDefault(require("hotkeys-js"));
11
+ var _utils = require("../utils");
11
12
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
12
13
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
13
14
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -291,10 +292,12 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
291
292
  onAddMarker = _this$props4.onAddMarker,
292
293
  playerReadOnlyMode = _this$props4.playerReadOnlyMode,
293
294
  disablePlayerActions = _this$props4.disablePlayerActions,
294
- playerSelectedMarker = _this$props4.playerSelectedMarker;
295
+ playerSelectedMarker = _this$props4.playerSelectedMarker,
296
+ frameRate = _this$props4.frameRate;
295
297
  if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
296
298
  return;
297
299
  }
300
+ var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
298
301
  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
299
302
  args[_key - 2] = arguments[_key];
300
303
  }
@@ -312,29 +315,29 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
312
315
  });
313
316
  }
314
317
  markerArr.filter(function (marker) {
315
- if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
318
+ if (currentAdjustedTime >= marker.start_time && currentAdjustedTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
316
319
  createPoint = false;
317
320
  }
318
321
  });
319
322
  }
320
- if (!createPoint && playerSelectedMarker.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
323
+ if (!createPoint && playerSelectedMarker.markerType === 'update' && currentAdjustedTime > player.selectedMarker.leftMarker && currentAdjustedTime < player.selectedMarker.rightMarker) {
321
324
  createPoint = true;
322
325
  }
323
326
  if (createPoint) {
324
- if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && player.currentTime < playerSelectedMarker.rightMarker) {
327
+ if (playerSelectedMarker.rightMarker < 0 || playerSelectedMarker.rightMarker > -1 && currentAdjustedTime < playerSelectedMarker.rightMarker) {
325
328
  // actions.handleMarkerPointChange(
326
329
  // player.markerType !== 'update' ? 'add' : 'update',
327
330
  // 'left',
328
- // player.currentTime
331
+ // currentAdjustedTime
329
332
  // );
330
333
  var data = {
331
334
  markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
332
335
  markerPos: 'left',
333
- currentTime: player.currentTime
336
+ currentTime: currentAdjustedTime
334
337
  };
335
- onAddMarker(player.currentTime, -1, '', true, data);
338
+ onAddMarker(currentAdjustedTime, -1, '', true, data);
336
339
  if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
337
- onAddMarker(player.currentTime, playerSelectedMarker.rightMarker, 'update');
340
+ onAddMarker(currentAdjustedTime, playerSelectedMarker.rightMarker, 'update');
338
341
  }
339
342
  }
340
343
  }
@@ -352,10 +355,12 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
352
355
  onAddMarker = _this$props5.onAddMarker,
353
356
  playerReadOnlyMode = _this$props5.playerReadOnlyMode,
354
357
  disablePlayerActions = _this$props5.disablePlayerActions,
355
- playerSelectedMarker = _this$props5.playerSelectedMarker;
358
+ playerSelectedMarker = _this$props5.playerSelectedMarker,
359
+ frameRate = _this$props5.frameRate;
356
360
  if (playerReadOnlyMode || disablePlayerActions.includes('marking_controls')) {
357
361
  return;
358
362
  }
363
+ var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
359
364
  for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
360
365
  args[_key2 - 2] = arguments[_key2];
361
366
  }
@@ -378,37 +383,37 @@ var Shortcut = exports["default"] = /*#__PURE__*/function (_Component) {
378
383
  });
379
384
  }
380
385
  markerArr.filter(function (marker) {
381
- if (player.currentTime >= marker.start_time && player.currentTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && player.currentTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && player.currentTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
386
+ if (currentAdjustedTime >= marker.start_time && currentAdjustedTime <= marker.end_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > marker.start_time && playerSelectedMarker.leftMarker < marker.start_time || playerSelectedMarker.leftMarker > -1 && currentAdjustedTime < marker.start_time && playerSelectedMarker.leftMarker > marker.end_time) {
382
387
  createPoint = false;
383
388
  }
384
389
  });
385
390
  }
386
- if (!createPoint && playerSelectedMarker.markerType === 'update' && player.currentTime > player.selectedMarker.leftMarker && player.currentTime < player.selectedMarker.rightMarker) {
391
+ if (!createPoint && playerSelectedMarker.markerType === 'update' && currentAdjustedTime > player.selectedMarker.leftMarker && currentAdjustedTime < player.selectedMarker.rightMarker) {
387
392
  createPoint = true;
388
393
  }
389
- if (createPoint && playerSelectedMarker.leftMarker > -1 && player.currentTime > playerSelectedMarker.leftMarker) {
394
+ if (createPoint && playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > playerSelectedMarker.leftMarker) {
390
395
  // actions.handleMarkerPointChange(
391
396
  // markerType: player.markerType !== 'update' ? 'add' : 'update',
392
397
  // markerPos: 'right',
393
- // currentTime: player.currentTime
398
+ // currentTime: currentAdjustedTime
394
399
  // );
395
400
  var _data = {
396
401
  markerType: playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length ? 'update' : 'add',
397
402
  markerPos: 'right',
398
- currentTime: player.currentTime
403
+ currentTime: currentAdjustedTime
399
404
  };
400
405
  if (playerSelectedMarker.leftMarker > -1 && playerSelectedMarker.rightMarker > -1 && (!playerSelectedMarker.markerCreate || playerSelectedMarker.markerType === 'update' || playerSelectedMarker.data && Object.keys(playerSelectedMarker.data).length)) {
401
- onAddMarker(playerSelectedMarker.leftMarker, player.currentTime, 'update', false, _data);
406
+ onAddMarker(playerSelectedMarker.leftMarker, currentAdjustedTime, 'update', false, _data);
402
407
  }
403
408
  //Commented for CN-632.
404
409
  // if (player.controlType === 'default') {
405
- // onMarkerSelect(player.leftMarker, player.currentTime);
410
+ // onMarkerSelect(player.leftMarker, currentAdjustedTime);
406
411
  // }
407
412
  }
408
413
  }
409
- if (playerSelectedMarker.leftMarker > -1 && player.currentTime > -1 && playerSelectedMarker.markerCreate && createPoint && player.currentTime > playerSelectedMarker.leftMarker) {
414
+ if (playerSelectedMarker.leftMarker > -1 && currentAdjustedTime > -1 && playerSelectedMarker.markerCreate && createPoint && currentAdjustedTime > playerSelectedMarker.leftMarker) {
410
415
  // actions.handleMarkerPointChange('create');
411
- onAddMarker(playerSelectedMarker.leftMarker, player.currentTime, '', false, {
416
+ onAddMarker(playerSelectedMarker.leftMarker, currentAdjustedTime, '', false, {
412
417
  markerType: 'create'
413
418
  });
414
419
  }
package/components/Video.js CHANGED
@@ -161,7 +161,6 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
161
161
  _this.handleKeypress = _this.handleKeypress.bind(_assertThisInitialized(_this));
162
162
  _this.audioVisualizer = _this.audioVisualizer.bind(_assertThisInitialized(_this));
163
163
  _this.checkWatermark = _this.checkWatermark.bind(_assertThisInitialized(_this));
164
- _this.handleAdjustingVideoAsPerFrame = _this.handleAdjustingVideoAsPerFrame.bind(_assertThisInitialized(_this));
165
164
  return _this;
166
165
  }
167
166
  _createClass(Video, [{
@@ -551,10 +550,11 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
551
550
  value: function seek(time) {
552
551
  try {
553
552
  var updatedTime = 0;
553
+ var frameRate = this.props.frameRate;
554
554
  if (time < 0) {
555
555
  updatedTime = 0;
556
556
  } else {
557
- updatedTime = time > this.video.duration ? this.video.duration : this.handleAdjustingVideoAsPerFrame(time);
557
+ updatedTime = time > this.video.duration ? this.video.duration : (0, _utils.handleAdjustingVideoAsPerFrame)(time, frameRate);
558
558
  }
559
559
  this.video.currentTime = updatedTime;
560
560
  } catch (e) {
@@ -722,23 +722,6 @@ var Video = exports["default"] = /*#__PURE__*/function (_Component) {
722
722
  style.right = data && data.text_alignment === 'text_aligned_right' ? '0px' : '';
723
723
  return style;
724
724
  }
725
-
726
- /**
727
- *
728
- * @param {Number} currentTime current time of video
729
- * @returns adjusting the current time to the nearest frame
730
- */
731
- }, {
732
- key: "handleAdjustingVideoAsPerFrame",
733
- value: function handleAdjustingVideoAsPerFrame(currentTime) {
734
- var frameRate = this.props.frameRate;
735
- var frameDuration = 1 / frameRate;
736
- var milliSeconds = currentTime - Math.floor(currentTime);
737
- var frameNumber = Math.round(milliSeconds / frameDuration);
738
- var updatedMilliseconds = frameNumber * frameDuration;
739
- var adjustedTimeInSeconds = Math.trunc(currentTime) + updatedMilliseconds;
740
- return adjustedTimeInSeconds;
741
- }
742
725
  }, {
743
726
  key: "displaySubtitle",
744
727
  value: function displaySubtitle(marker) {
package/components/marking-controls/MarkInControl.js CHANGED
@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
9
9
  var _propTypes = require("prop-types");
10
10
  var _styledComponents = _interopRequireDefault(require("styled-components"));
11
11
  var _components = require("@desynova-digital/components");
12
+ var _utils = require("../../utils");
12
13
  var _templateObject;
13
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
14
15
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -83,15 +84,17 @@ var MarkInControl = exports["default"] = /*#__PURE__*/function (_Component) {
83
84
  var _this$props2 = this.props,
84
85
  player = _this$props2.player,
85
86
  actions = _this$props2.actions,
86
- onAddMarker = _this$props2.onAddMarker;
87
+ onAddMarker = _this$props2.onAddMarker,
88
+ frameRate = _this$props2.frameRate;
87
89
  // actions.handleMarkerPointChange('add', 'left', player.currentTime);
88
90
  if (onAddMarker) {
91
+ var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
89
92
  var data = {
90
93
  markerType: player.markerType !== 'update' ? 'add' : 'update',
91
94
  markerPos: 'left',
92
- currentTime: player.currentTime
95
+ currentTime: currentAdjustedTime
93
96
  };
94
- onAddMarker(player.currentTime, -1, '', true, data);
97
+ onAddMarker(currentAdjustedTime, -1, '', true, data);
95
98
  }
96
99
  }
97
100
  }, {
package/components/marking-controls/MarkOutControl.js CHANGED
@@ -9,6 +9,7 @@ var _react = _interopRequireWildcard(require("react"));
9
9
  var _styledComponents = _interopRequireDefault(require("styled-components"));
10
10
  var _propTypes = require("prop-types");
11
11
  var _components = require("@desynova-digital/components");
12
+ var _utils = require("../../utils");
12
13
  var _templateObject;
13
14
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
14
15
  function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
@@ -90,7 +91,8 @@ var MarkOutControl = exports["default"] = /*#__PURE__*/function (_Component) {
90
91
  leftMarker = _this$props2.leftMarker,
91
92
  controlType = _this$props2.controlType,
92
93
  onMarkerSelect = _this$props2.onMarkerSelect,
93
- onAddMarker = _this$props2.onAddMarker;
94
+ onAddMarker = _this$props2.onAddMarker,
95
+ frameRate = _this$props2.frameRate;
94
96
  if (leftMarker > -1 && player.currentTime > leftMarker) {
95
97
  // actions.handleMarkerPointChange('add', 'right', player.currentTime);
96
98
  //Commented for CN-632.
@@ -98,12 +100,13 @@ var MarkOutControl = exports["default"] = /*#__PURE__*/function (_Component) {
98
100
  // onMarkerSelect(leftMarker, player.currentTime);
99
101
  // }
100
102
  // actions.handleMarkerPointChange('create');
103
+ var currentAdjustedTime = (0, _utils.handleAdjustingVideoAsPerFrame)(player.currentTime, frameRate);
101
104
  var data = {
102
105
  markerType: player.markerType !== 'update' ? 'add' : 'update',
103
106
  markerPos: 'right',
104
- currentTime: player.currentTime
107
+ currentTime: currentAdjustedTime
105
108
  };
106
- onAddMarker(leftMarker, player.currentTime, player.markerType !== 'update' ? 'add' : 'update', false, data);
109
+ onAddMarker(leftMarker, currentAdjustedTime, player.markerType !== 'update' ? 'add' : 'update', false, data);
107
110
  // onAddMarker(leftMarker, player.currentTime);
108
111
  }
109
112
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@desynova-digital/player",
3
- "version": "3.13.26",
3
+ "version": "3.13.28",
4
4
  "description": "Video Player Package for Contido Application",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/utils/index.js CHANGED
@@ -87,6 +87,7 @@ function secondsToTime() {
87
87
  function timeToSeconds() {
88
88
  var time = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '00:00:00:00';
89
89
  var frameRate = arguments.length > 1 ? arguments[1] : undefined;
90
+ if (!time) return 0;
90
91
  var timeObj = time.split(':'); // split it at the colons
91
92
 
92
93
  // minutes are worth 60 seconds. Hours are worth 60 minutes.