timingsrc 1.2.5 → 1.2.7

package/build/es2019/module.js.map

@@ -1 +1 @@
-{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,0CAA0C,EAAE,MAAM,uDAAuD,CAAC;AACnH,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,sDAAsD,CAAC;AAC5G,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAExC,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAEjC,MAAM,CAAC,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,0BAA0B,CAAC,CAAC;AAE5F,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,KAAK,EAAE,IAAI,EAAE,oBAAoB,CAAC,IAAI,OAAO,EAAE,CAAC,EAAE,qBAAqB,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC;AAE5I,MAAM,CAAC,MAAM,oCAAoC,GAAG,0CAA0C,CAC1F,cAAc,EACd,QAAQ,EACR,EAAE,EACF,kBAAkB,CACrB,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,yBAAyB,CACjD,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,oCAAoC,EACpC,oCAAoC,EACpC,YAAY,EAAE,CACjB,CAAC"}
+{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,EAAE,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,0BAA0B,EAAE,MAAM,eAAe,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,oBAAoB,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC/D,OAAO,EAAE,0CAA0C,EAAE,MAAM,uDAAuD,CAAC;AACnH,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AACrE,OAAO,EAAE,wBAAwB,EAAE,MAAM,kCAAkC,CAAC;AAC5E,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,oCAAoC,EAAE,MAAM,sDAAsD,CAAC;AAC5G,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AACxC,OAAO,EAAE,2BAA2B,EAAE,MAAM,6CAA6C,CAAC;AAE1F,OAAO,EAAE,kBAAkB,EAAE,CAAC;AAE9B,OAAO,EAAE,qBAAqB,EAAE,CAAC;AAEjC,MAAM,CAAC,MAAM,oBAAoB,GAAG,2BAA2B,CAAC,0BAA0B,CAAC,CAAC;AAE5F,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,KAAK,EAAE,IAAI,EAAE,oBAAoB,CAAC,IAAI,OAAO,EAAE,CAAC,EAAE,qBAAqB,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC;AAE5I,MAAM,CAAC,MAAM,oCAAoC,GAAG,0CAA0C,CAC1F,cAAc,EACd,QAAQ,EACR,EAAE,EACF,kBAAkB,CACrB,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,yBAAyB,CACjD,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,oBAAoB,EACpB,oCAAoC,EACpC,oCAAoC,EACpC,2BAA2B,EAC3B,YAAY,EAAE,CACjB,CAAC"}

package/build/es2019/types/index.d.ts

@@ -1,20 +1,4 @@
-export * from './default-timingsrc-factory';
-export * from './determine-supported-playback-rate-values-function';
-export * from './pause-function';
-export * from './play-function';
 export * from './prepare-timing-state-vector-function';
-export * from './set-current-time-factory';
-export * from './set-current-time-function';
-export * from './set-playback-rate-factory';
-export * from './set-playback-rate-function';
-export * from './set-timingsrc-factory';
-export * from './set-timingsrc-function';
-export * from './set-timingsrc-with-custom-update-function-factory';
-export * from './set-timingsrc-with-custom-update-function-function';
 export * from './update-function';
-export * from './update-gradually-factory';
-export * from './update-media-element-factory';
-export * from './update-stepwise-factory';
-export * from './update-stepwise-factory-factory';
-export * from './window-factory';
+export * from './update-vector-with-custom-state';
 //# sourceMappingURL=index.d.ts.map

package/build/es2019/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qDAAqD,CAAC;AACpE,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wCAAwC,CAAC;AACvD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,wCAAwC,CAAC;AACvD,cAAc,mBAAmB,CAAC;AAClC,cAAc,mCAAmC,CAAC"}

package/build/es2019/types/index.js

@@ -1,20 +1,4 @@
-export * from './default-timingsrc-factory';
-export * from './determine-supported-playback-rate-values-function';
-export * from './pause-function';
-export * from './play-function';
 export * from './prepare-timing-state-vector-function';
-export * from './set-current-time-factory';
-export * from './set-current-time-function';
-export * from './set-playback-rate-factory';
-export * from './set-playback-rate-function';
-export * from './set-timingsrc-factory';
-export * from './set-timingsrc-function';
-export * from './set-timingsrc-with-custom-update-function-factory';
-export * from './set-timingsrc-with-custom-update-function-function';
 export * from './update-function';
-export * from './update-gradually-factory';
-export * from './update-media-element-factory';
-export * from './update-stepwise-factory';
-export * from './update-stepwise-factory-factory';
-export * from './window-factory';
+export * from './update-vector-with-custom-state';
 //# sourceMappingURL=index.js.map

package/build/es2019/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,qDAAqD,CAAC;AACpE,cAAc,kBAAkB,CAAC;AACjC,cAAc,iBAAiB,CAAC;AAChC,cAAc,wCAAwC,CAAC;AACvD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,0BAA0B,CAAC;AACzC,cAAc,qDAAqD,CAAC;AACpE,cAAc,sDAAsD,CAAC;AACrE,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,gCAAgC,CAAC;AAC/C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,mCAAmC,CAAC;AAClD,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":"AAAA,cAAc,wCAAwC,CAAC;AACvD,cAAc,mBAAmB,CAAC;AAClC,cAAc,mCAAmC,CAAC"}

package/build/es2019/types/update-function.d.ts

@@ -1,4 +1,4 @@
 import { ITimingStateVector } from 'timing-object';
 import { IUpdateVector } from '../interfaces';
-export declare type TUpdateFunction = (timingStateVector: ITimingStateVector, currentTime: number) => IUpdateVector;
+export declare type TUpdateFunction<UpdateVectorWithCustomState extends IUpdateVector> = (timingStateVector: ITimingStateVector, currentTime: number, previousUpdateVectorWithCustomState: null | UpdateVectorWithCustomState) => UpdateVectorWithCustomState;
 //# sourceMappingURL=update-function.d.ts.map

package/build/es2019/types/update-function.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-function.d.ts","sourceRoot":"","sources":["../../../src/types/update-function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,oBAAY,eAAe,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,EAAE,WAAW,EAAE,MAAM,KAAK,aAAa,CAAC"}
+{"version":3,"file":"update-function.d.ts","sourceRoot":"","sources":["../../../src/types/update-function.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C,oBAAY,eAAe,CAAC,2BAA2B,SAAS,aAAa,IAAI,CAC7E,iBAAiB,EAAE,kBAAkB,EACrC,WAAW,EAAE,MAAM,EACnB,mCAAmC,EAAE,IAAI,GAAG,2BAA2B,KACtE,2BAA2B,CAAC"}

package/build/es2019/types/update-vector-with-custom-state.d.ts

@@ -0,0 +1,3 @@
+import { TUpdateFunction } from './update-function';
+export declare type TUpdateVectorWithCustomState<UpdateFunction> = UpdateFunction extends TUpdateFunction<infer UpdateVectorWithCustomState> ? UpdateVectorWithCustomState : never;
+//# sourceMappingURL=update-vector-with-custom-state.d.ts.map

package/build/es2019/types/update-vector-with-custom-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-vector-with-custom-state.d.ts","sourceRoot":"","sources":["../../../src/types/update-vector-with-custom-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,oBAAY,4BAA4B,CAAC,cAAc,IAAI,cAAc,SAAS,eAAe,CAAC,MAAM,2BAA2B,CAAC,GAC9H,2BAA2B,GAC3B,KAAK,CAAC"}

package/build/es2019/types/update-vector-with-custom-state.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=update-vector-with-custom-state.js.map

package/build/es2019/types/update-vector-with-custom-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"update-vector-with-custom-state.js","sourceRoot":"","sources":["../../../src/types/update-vector-with-custom-state.ts"],"names":[],"mappings":""}

package/build/es5/bundle.js

@@ -1,21 +1,25 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('subscribable-things'), require('timing-object'), require('@babel/runtime/helpers/slicedToArray'), require('@babel/runtime/helpers/defineProperty')) :
-    typeof define === 'function' && define.amd ? define(['exports', 'subscribable-things', 'timing-object', '@babel/runtime/helpers/slicedToArray', '@babel/runtime/helpers/defineProperty'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.timingsrc = {}, global.subscribableThings, global.timingObject, global._slicedToArray, global._defineProperty));
-})(this, (function (exports, subscribableThings, timingObject, _slicedToArray, _defineProperty) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('subscribable-things'), require('timing-object'), require('@babel/runtime/helpers/slicedToArray')) :
+    typeof define === 'function' && define.amd ? define(['exports', 'subscribable-things', 'timing-object', '@babel/runtime/helpers/slicedToArray'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.timingsrc = {}, global.subscribableThings, global.timingObject, global._slicedToArray));
+})(this, (function (exports, subscribableThings, timingObject, _slicedToArray) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
     var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
-    var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty);
+
+    var createComputeVelocity = function createComputeVelocity(timeConstant) {
+      return function (delta, minValue, maxValue, velocity) {
+        return Math.max(minValue, Math.min(maxValue, (timeConstant - delta) / timeConstant * velocity));
+      };
+    };
 
     var DEFAULT_THRESHOLD = 1;
     var DEFAULT_TIME_CONSTANT = 0.5;
     var DEFAULT_TOLERANCE = 0.025;
-    var createDefaultSetTimingsrc = function createDefaultSetTimingsrc(createSetTimingsrc, createUpdateGradually, createUpdateStepwise, determineSupportedPlaybackRateValues, setTimingsrcWithCustomUpdateFunction, window) {
-      return window !== null && window.navigator.userAgent.includes('Safari') && !window.navigator.userAgent.includes('Chrome') ? function () {
-        return createSetTimingsrc(setTimingsrcWithCustomUpdateFunction, createUpdateStepwise(DEFAULT_TOLERANCE)).apply(void 0, arguments);
-      } : createSetTimingsrc(setTimingsrcWithCustomUpdateFunction, createUpdateGradually(determineSupportedPlaybackRateValues(window), DEFAULT_TIME_CONSTANT, DEFAULT_THRESHOLD, DEFAULT_TOLERANCE));
+    var createDefaultSetTimingsrc = function createDefaultSetTimingsrc(createComputeVelocity, createSetTimingsrc, createUpdateGradually, createUpdateStepwise, determineSupportedPlaybackRateValues, setTimingsrcWithCustomUpdateFunction, updateVectorWithNewPosition, window) {
+      var update = window !== null && window.navigator.userAgent.includes('Safari') && !window.navigator.userAgent.includes('Chrome') ? createUpdateStepwise(DEFAULT_TOLERANCE) : createUpdateGradually(createComputeVelocity(DEFAULT_TIME_CONSTANT), determineSupportedPlaybackRateValues(window), DEFAULT_THRESHOLD, DEFAULT_TOLERANCE, updateVectorWithNewPosition);
+      return createSetTimingsrc(setTimingsrcWithCustomUpdateFunction, update);
     };
 
     var createSetCurrentTime = function createSetCurrentTime(currentTimeAssignments) {
@@ -52,18 +56,18 @@
     var createSetTimingsrcWithCustomUpdateFunction = function createSetTimingsrcWithCustomUpdateFunction(animationFrame, document, on, updateMediaElement) {
       return function (mediaElement, timingObject, updateFunction) {
         var prepareTimingStateVector = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
+        var previousUpdateVectorWithCustomState = null;
 
         var update = function update() {
           var currentTime = mediaElement.currentTime,
               duration = mediaElement.duration,
               playbackRate = mediaElement.playbackRate;
           var timingStateVector = timingObject.query();
-
-          var _updateFunction = updateFunction(prepareTimingStateVector === null ? timingStateVector : prepareTimingStateVector(timingStateVector), currentTime),
-              position = _updateFunction.position,
-              velocity = _updateFunction.velocity;
-
+          previousUpdateVectorWithCustomState = updateFunction(prepareTimingStateVector === null ? timingStateVector : prepareTimingStateVector(timingStateVector), currentTime, previousUpdateVectorWithCustomState);
           var sanitizedDuration = typeof duration === 'number' && !isNaN(duration) ? duration : 0;
+          var _previousUpdateVector = previousUpdateVectorWithCustomState,
+              position = _previousUpdateVector.position,
+              velocity = _previousUpdateVector.velocity;
           updateMediaElement(currentTime, sanitizedDuration, mediaElement, playbackRate, position, velocity);
         };
 
@@ -82,17 +86,23 @@
       };
     };
 
-    var createUpdateGradually = function createUpdateGradually(_ref, timeConstant, threshold, tolerance) {
+    var createUpdateGradually = function createUpdateGradually(computeVelocity, _ref, threshold, tolerance, updateVectorWithNewPosition) {
       var _ref2 = _slicedToArray__default["default"](_ref, 2),
           minValue = _ref2[0],
           maxValue = _ref2[1];
 
-      return function (_ref3, currentTime) {
+      return function (_ref3, currentTime, previousUpdateVectorWithCustomState) {
         var position = _ref3.position,
             velocity = _ref3.velocity;
 
+        var _ref4 = previousUpdateVectorWithCustomState !== null && previousUpdateVectorWithCustomState !== void 0 ? previousUpdateVectorWithCustomState : {
+          mediaElementDelay: 0
+        },
+            mediaElementDelay = _ref4.mediaElementDelay;
+
         if (velocity < minValue || velocity > maxValue) {
           return {
+            mediaElementDelay: mediaElementDelay,
             position: position,
             velocity: 0
           };
@@ -100,6 +110,7 @@
 
         if (position < 0 || velocity === 0) {
           return {
+            mediaElementDelay: mediaElementDelay,
             position: position,
             velocity: velocity
           };
@@ -109,20 +120,38 @@
         var absolutePositionDifference = Math.abs(positionDifference);
 
         if (absolutePositionDifference > threshold) {
-          return {
-            position: position,
-            velocity: velocity
-          };
+          var _ref5 = previousUpdateVectorWithCustomState !== null && previousUpdateVectorWithCustomState !== void 0 ? previousUpdateVectorWithCustomState : {
+            position: null
+          },
+              lastPosition = _ref5.position;
+
+          if (positionDifference < 0 || positionDifference > mediaElementDelay) {
+            if (lastPosition === currentTime) {
+              mediaElementDelay += absolutePositionDifference;
+            }
+
+            return updateVectorWithNewPosition(mediaElementDelay, position, function (nextPosition) {
+              return computeVelocity(nextPosition - position, minValue, maxValue, velocity);
+            });
+          }
+
+          if (lastPosition !== currentTime) {
+            return updateVectorWithNewPosition(mediaElementDelay - absolutePositionDifference, position, function (nextPosition) {
+              return computeVelocity(nextPosition - position, minValue, maxValue, velocity);
+            });
+          }
         }
 
         if (absolutePositionDifference > tolerance) {
           return {
+            mediaElementDelay: mediaElementDelay,
             position: currentTime,
-            velocity: Math.max(minValue, Math.min(maxValue, (timeConstant - positionDifference) / timeConstant * velocity))
+            velocity: computeVelocity(positionDifference, minValue, maxValue, velocity)
           };
         }
 
         return {
+          mediaElementDelay: mediaElementDelay,
           position: currentTime,
           velocity: velocity
         };
@@ -166,67 +195,133 @@
       };
     };
 
-    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__default["default"](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 MAXIMUM_PLAYHEAD_DIFFERENCE = 0.5;
     var createUpdateStepwiseFactory = function createUpdateStepwiseFactory(translateTimingStateVector) {
       return function (tolerance) {
-        var lastMotionUpdate = null;
-        var lastPlayheadDifference = 0;
-        var mediaElementDelay = 0;
-        return function (timingStateVector, currentTime) {
+        return function (timingStateVector, currentTime, previousUpdateVectorWithCustomState) {
+          var _ref = previousUpdateVectorWithCustomState !== null && previousUpdateVectorWithCustomState !== void 0 ? previousUpdateVectorWithCustomState : {
+            lastAppliedPostion: 0,
+            lastAppliedTimestamp: 0,
+            lastAppliedVelocity: 0,
+            lastPlayheadDifference: 0,
+            mediaElementDelay: 0,
+            numberOfDetectedResets: 0,
+            numberOfExpectedResets: 1
+          },
+              lastAppliedPostion = _ref.lastAppliedPostion,
+              lastAppliedTimestamp = _ref.lastAppliedTimestamp,
+              lastAppliedVelocity = _ref.lastAppliedVelocity,
+              lastPlayheadDifference = _ref.lastPlayheadDifference,
+              mediaElementDelay = _ref.mediaElementDelay,
+              numberOfDetectedResets = _ref.numberOfDetectedResets,
+              numberOfExpectedResets = _ref.numberOfExpectedResets;
+
           if (timingStateVector.position < 0 || timingStateVector.velocity === 0) {
-            lastMotionUpdate = null;
+            lastAppliedPostion = timingStateVector.position;
+            lastAppliedVelocity = timingStateVector.velocity;
             return {
-              position: timingStateVector.position,
-              velocity: timingStateVector.velocity
+              lastAppliedPostion: lastAppliedPostion,
+              lastAppliedTimestamp: 0,
+              lastAppliedVelocity: lastAppliedVelocity,
+              lastPlayheadDifference: lastPlayheadDifference,
+              mediaElementDelay: mediaElementDelay,
+              numberOfDetectedResets: numberOfDetectedResets,
+              numberOfExpectedResets: numberOfExpectedResets,
+              position: lastAppliedPostion,
+              velocity: lastAppliedVelocity
             };
-          }
-
-          if (lastMotionUpdate !== null) {
-            var playheadDifference = Math.abs(currentTime - lastMotionUpdate.position); // Bug #4: Safari decreases currentTime after playing for about 200 milliseconds.
-
-            if (lastPlayheadDifference - 0.01 < playheadDifference && lastPlayheadDifference < 0.5) {
+          } // Bug #4: Safari decreases currentTime after playing for about 200 milliseconds.
+
+
+          if (lastAppliedVelocity === timingStateVector.velocity && lastPlayheadDifference < MAXIMUM_PLAYHEAD_DIFFERENCE) {
+            var playheadDifference = Math.abs(currentTime - lastAppliedPostion) * lastAppliedVelocity;
+
+            if (playheadDifference < MAXIMUM_PLAYHEAD_DIFFERENCE) {
+              if (playheadDifference + 0.001 > lastPlayheadDifference) {
+                lastPlayheadDifference = playheadDifference;
+
+                if (numberOfDetectedResets < numberOfExpectedResets) {
+                  return {
+                    lastAppliedPostion: lastAppliedPostion,
+                    lastAppliedTimestamp: lastAppliedTimestamp,
+                    lastAppliedVelocity: lastAppliedVelocity,
+                    lastPlayheadDifference: lastPlayheadDifference,
+                    mediaElementDelay: mediaElementDelay,
+                    numberOfDetectedResets: numberOfDetectedResets,
+                    numberOfExpectedResets: numberOfExpectedResets,
+                    position: currentTime,
+                    velocity: lastAppliedVelocity
+                  };
+                }
+              } else {
+                lastPlayheadDifference = playheadDifference;
+                numberOfDetectedResets += 1;
+
+                if (numberOfDetectedResets <= numberOfExpectedResets) {
+                  return {
+                    lastAppliedPostion: lastAppliedPostion,
+                    lastAppliedTimestamp: lastAppliedTimestamp,
+                    lastAppliedVelocity: lastAppliedVelocity,
+                    lastPlayheadDifference: lastPlayheadDifference,
+                    mediaElementDelay: mediaElementDelay,
+                    numberOfDetectedResets: numberOfDetectedResets,
+                    numberOfExpectedResets: numberOfExpectedResets,
+                    position: currentTime,
+                    velocity: lastAppliedVelocity
+                  };
+                }
+
+                numberOfExpectedResets += 1;
+              }
+            } else {
               lastPlayheadDifference = playheadDifference;
-              return {
-                position: currentTime,
-                velocity: lastMotionUpdate.velocity
-              };
+              numberOfExpectedResets = Math.max(numberOfDetectedResets, 1);
             }
-
-            lastPlayheadDifference = Number.POSITIVE_INFINITY;
+          } else {
+            lastAppliedTimestamp = 0;
           }
 
           var positionDifference = Math.abs(currentTime - timingStateVector.position);
-
-          if (positionDifference > tolerance) {
-            if (lastMotionUpdate !== null) {
-              var elapsedTime = timingStateVector.timestamp - lastMotionUpdate.timestamp;
-
-              var _translateTimingState = translateTimingStateVector(_objectSpread({
-                acceleration: 0
-              }, lastMotionUpdate), elapsedTime),
+          var velocityHasChanged = lastAppliedVelocity === 0 || lastAppliedVelocity < 0 && timingStateVector.velocity > 0 || lastAppliedVelocity > 0 && timingStateVector.velocity < 0;
+
+          if (positionDifference > tolerance || velocityHasChanged) {
+            if (lastAppliedTimestamp > 0) {
+              var elapsedTime = timingStateVector.timestamp - lastAppliedTimestamp;
+
+              var _translateTimingState = translateTimingStateVector({
+                acceleration: 0,
+                position: lastAppliedPostion,
+                timestamp: lastAppliedTimestamp,
+                velocity: lastAppliedVelocity
+              }, elapsedTime),
                   position = _translateTimingState.position;
 
               mediaElementDelay = position - currentTime;
             }
 
-            var positioWithDelay = timingStateVector.position + mediaElementDelay;
-            lastMotionUpdate = {
-              position: positioWithDelay,
-              timestamp: timingStateVector.timestamp,
-              velocity: timingStateVector.velocity
-            };
-            lastPlayheadDifference = 0;
+            lastAppliedPostion = timingStateVector.position + mediaElementDelay;
+            lastAppliedVelocity = timingStateVector.velocity;
             return {
-              position: positioWithDelay,
-              velocity: timingStateVector.velocity
+              lastAppliedPostion: lastAppliedPostion,
+              lastAppliedTimestamp: timingStateVector.timestamp,
+              lastAppliedVelocity: lastAppliedVelocity,
+              lastPlayheadDifference: 0,
+              mediaElementDelay: mediaElementDelay,
+              numberOfDetectedResets: 0,
+              numberOfExpectedResets: numberOfExpectedResets,
+              position: lastAppliedPostion,
+              velocity: lastAppliedVelocity
             };
           }
 
-          lastMotionUpdate = null;
           return {
+            lastAppliedPostion: lastAppliedPostion,
+            lastAppliedTimestamp: lastAppliedTimestamp,
+            lastAppliedVelocity: lastAppliedVelocity,
+            lastPlayheadDifference: lastPlayheadDifference,
+            mediaElementDelay: mediaElementDelay,
+            numberOfDetectedResets: numberOfDetectedResets,
+            numberOfExpectedResets: numberOfExpectedResets,
             position: currentTime,
             velocity: timingStateVector.velocity
           };
@@ -278,10 +373,19 @@
       }
     };
 
+    var updateVectorWithNewPosition = function updateVectorWithNewPosition(mediaElementDelay, position, updateVelocity) {
+      var nextPosition = position + mediaElementDelay;
+      return {
+        mediaElementDelay: mediaElementDelay,
+        position: nextPosition,
+        velocity: updateVelocity(nextPosition)
+      };
+    };
+
     var createUpdateStepwise = createUpdateStepwiseFactory(timingObject.translateTimingStateVector);
     var updateMediaElement = createUpdateMediaElement(pause, play, createSetCurrentTime(new WeakMap()), createSetPlaybackRate(new WeakMap()));
     var setTimingsrcWithCustomUpdateFunction = createSetTimingsrcWithCustomUpdateFunction(subscribableThings.animationFrame, document, subscribableThings.on, updateMediaElement);
-    var setTimingsrc = createDefaultSetTimingsrc(createSetTimingsrc, createUpdateGradually, createUpdateStepwise, determineSupportedPlaybackRateValues, setTimingsrcWithCustomUpdateFunction, createWindow());
+    var setTimingsrc = createDefaultSetTimingsrc(createComputeVelocity, createSetTimingsrc, createUpdateGradually, createUpdateStepwise, determineSupportedPlaybackRateValues, setTimingsrcWithCustomUpdateFunction, updateVectorWithNewPosition, createWindow());
 
     exports.createSetTimingsrc = createSetTimingsrc;
     exports.createUpdateGradually = createUpdateGradually;

package/package.json

@@ -9,30 +9,30 @@
         }
     },
     "dependencies": {
-        "@babel/runtime": "^7.18.9",
-        "subscribable-things": "^2.1.6",
-        "timing-object": "^3.1.47",
+        "@babel/runtime": "^7.19.0",
+        "subscribable-things": "^2.1.7",
+        "timing-object": "^3.1.48",
         "tslib": "^2.4.0"
     },
     "description": "A library to synchronize a MediaElement with a TimingObject.",
     "devDependencies": {
-        "@babel/core": "^7.18.13",
+        "@babel/core": "^7.19.1",
         "@babel/plugin-external-helpers": "^7.18.6",
-        "@babel/plugin-transform-runtime": "^7.18.10",
-        "@babel/preset-env": "^7.18.10",
-        "@commitlint/cli": "^17.1.1",
+        "@babel/plugin-transform-runtime": "^7.19.1",
+        "@babel/preset-env": "^7.19.1",
+        "@commitlint/cli": "^17.1.2",
         "@commitlint/config-angular": "^17.1.0",
         "@rollup/plugin-babel": "^5.3.1",
         "chai": "^4.3.6",
         "commitizen": "^4.2.5",
         "cz-conventional-changelog": "^3.3.0",
-        "eslint": "^8.23.0",
-        "eslint-config-holy-grail": "^52.0.29",
+        "eslint": "^8.23.1",
+        "eslint-config-holy-grail": "^52.0.33",
         "grunt": "^1.5.3",
         "grunt-cli": "^1.4.3",
         "grunt-sh": "^0.2.0",
         "husky": "^8.0.1",
-        "karma": "^6.4.0",
+        "karma": "^6.4.1",
         "karma-browserstack-launcher": "^1.6.0",
         "karma-chrome-launcher": "^3.1.1",
         "karma-firefox-launcher": "^2.1.2",
@@ -45,14 +45,14 @@
         "prettier": "^2.7.1",
         "pretty-quick": "^3.1.3",
         "rimraf": "^3.0.2",
-        "rollup": "^2.78.1",
+        "rollup": "^2.79.1",
         "sinon": "^14.0.0",
         "sinon-chai": "^3.7.0",
-        "ts-loader": "^9.3.1",
-        "tsconfig-holy-grail": "^11.1.34",
+        "ts-loader": "^9.4.1",
+        "tsconfig-holy-grail": "^11.1.36",
         "tslint": "^6.1.3",
-        "tslint-config-holy-grail": "^53.2.31",
-        "typescript": "^4.8.2",
+        "tslint-config-holy-grail": "^53.2.33",
+        "typescript": "^4.8.3",
         "webpack": "^5.74.0"
     },
     "files": [
@@ -75,5 +75,5 @@
         "test": "grunt lint && grunt test"
     },
     "types": "build/es2019/module.d.ts",
-    "version": "1.2.5"
+    "version": "1.2.7"
 }

package/src/factories/compute-velocity.ts

@@ -0,0 +1,2 @@
+export const createComputeVelocity = (timeConstant: number) => (delta: number, minValue: number, maxValue: number, velocity: number) =>
+    Math.max(minValue, Math.min(maxValue, ((timeConstant - delta) / timeConstant) * velocity));

package/src/factories/default-set-timingsrc.ts

@@ -1,26 +1,37 @@
-import { TDefaultSetTimingsrcFactory, TSetTimingsrcFunction } from '../types';
+import type { determineSupportedPlaybackRateValues as determineSupportedPlaybackRateValuesFunction } from '../functions/determine-supported-playback-rate-values';
+import type { updateVectorWithNewPosition as updateVectorWithNewPositionFunction } from '../functions/update-vector-with-new-position';
+import { TUpdateFunction, TUpdateVectorWithCustomState } from '../types';
+import type { createComputeVelocity as createComputeVelocityFunction } from './compute-velocity';
+import type { createSetTimingsrc as createSetTimingsrcFunction } from './set-timingsrc';
+import type { createSetTimingsrcWithCustomUpdateFunction } from './set-timingsrc-with-custom-update-function';
+import type { createUpdateGradually as createUpdateGraduallyFunction } from './update-gradually';
+import type { createUpdateStepwiseFactory } from './update-stepwise-factory';
+import type { createWindow } from './window';
 
 const DEFAULT_THRESHOLD = 1;
 const DEFAULT_TIME_CONSTANT = 0.5;
 const DEFAULT_TOLERANCE = 0.025;
 
-export const createDefaultSetTimingsrc: TDefaultSetTimingsrcFactory = (
-    createSetTimingsrc,
-    createUpdateGradually,
-    createUpdateStepwise,
-    determineSupportedPlaybackRateValues,
-    setTimingsrcWithCustomUpdateFunction,
-    window
-) =>
-    window !== null && window.navigator.userAgent.includes('Safari') && !window.navigator.userAgent.includes('Chrome')
-        ? (...args: Parameters<TSetTimingsrcFunction>) =>
-              createSetTimingsrc(setTimingsrcWithCustomUpdateFunction, createUpdateStepwise(DEFAULT_TOLERANCE))(...args)
-        : createSetTimingsrc(
-              setTimingsrcWithCustomUpdateFunction,
-              createUpdateGradually(
+export const createDefaultSetTimingsrc = (
+    createComputeVelocity: typeof createComputeVelocityFunction,
+    createSetTimingsrc: typeof createSetTimingsrcFunction,
+    createUpdateGradually: typeof createUpdateGraduallyFunction,
+    createUpdateStepwise: ReturnType<typeof createUpdateStepwiseFactory>,
+    determineSupportedPlaybackRateValues: typeof determineSupportedPlaybackRateValuesFunction,
+    setTimingsrcWithCustomUpdateFunction: ReturnType<typeof createSetTimingsrcWithCustomUpdateFunction>,
+    updateVectorWithNewPosition: typeof updateVectorWithNewPositionFunction,
+    window: ReturnType<typeof createWindow>
+) => {
+    const update =
+        window !== null && window.navigator.userAgent.includes('Safari') && !window.navigator.userAgent.includes('Chrome')
+            ? createUpdateStepwise(DEFAULT_TOLERANCE)
+            : createUpdateGradually(
+                  createComputeVelocity(DEFAULT_TIME_CONSTANT),
                   determineSupportedPlaybackRateValues(window),
-                  DEFAULT_TIME_CONSTANT,
                   DEFAULT_THRESHOLD,
-                  DEFAULT_TOLERANCE
-              )
-          );
+                  DEFAULT_TOLERANCE,
+                  updateVectorWithNewPosition
+              );
+
+    return createSetTimingsrc(setTimingsrcWithCustomUpdateFunction, <TUpdateFunction<TUpdateVectorWithCustomState<typeof update>>>update);
+};

package/src/factories/set-current-time.ts

@@ -1,7 +1,5 @@
-import { TSetCurrentTimeFactory } from '../types';
-
-export const createSetCurrentTime: TSetCurrentTimeFactory = (currentTimeAssignments) => {
-    return (mediaElement, previousValue, nextValue) => {
+export const createSetCurrentTime = (currentTimeAssignments: WeakMap<HTMLMediaElement, [number, number]>) => {
+    return (mediaElement: HTMLMediaElement, previousValue: number, nextValue: number) => {
         const currentTimeAssignment = currentTimeAssignments.get(mediaElement);
 
         if (

package/src/factories/set-playback-rate.ts

@@ -1,7 +1,5 @@
-import { TSetPlaybackRateFactory } from '../types';
-
-export const createSetPlaybackRate: TSetPlaybackRateFactory = (playbackRateAssignments) => {
-    return (mediaElement, previousValue, nextValue) => {
+export const createSetPlaybackRate = (playbackRateAssignments: WeakMap<HTMLMediaElement, [number, number]>) => {
+    return (mediaElement: HTMLMediaElement, previousValue: number, nextValue: number) => {
         const playbackRateAssignment = playbackRateAssignments.get(mediaElement);
 
         if (

package/src/factories/set-timingsrc-with-custom-update-function.ts

@@ -1,20 +1,35 @@
-import { TSetTimingsrcWithCustomUpdateFunctionFactory } from '../types';
+import type { TAnimationFrameFunction, TOnFunction } from 'subscribable-things';
+import type { ITimingObject } from 'timing-object';
+import { IUpdateVector } from '../interfaces';
+import { TPrepareTimingStateVectorFunction, TUpdateFunction } from '../types';
+import type { createUpdateMediaElement } from './update-media-element';
 
-export const createSetTimingsrcWithCustomUpdateFunction: TSetTimingsrcWithCustomUpdateFunctionFactory = (
-    animationFrame,
-    document,
-    on,
-    updateMediaElement
+export const createSetTimingsrcWithCustomUpdateFunction = (
+    animationFrame: TAnimationFrameFunction,
+    document: Document,
+    on: TOnFunction,
+    updateMediaElement: ReturnType<typeof createUpdateMediaElement>
 ) => {
-    return (mediaElement, timingObject, updateFunction, prepareTimingStateVector = null) => {
+    return <UpdateVectorWithCustomState extends IUpdateVector>(
+        mediaElement: HTMLMediaElement,
+        timingObject: ITimingObject,
+        updateFunction: TUpdateFunction<UpdateVectorWithCustomState>,
+        prepareTimingStateVector: null | TPrepareTimingStateVectorFunction = null
+    ) => {
+        let previousUpdateVectorWithCustomState: null | UpdateVectorWithCustomState = null;
+
         const update = () => {
             const { currentTime, duration, playbackRate } = mediaElement;
             const timingStateVector = timingObject.query();
-            const { position, velocity } = updateFunction(
+
+            previousUpdateVectorWithCustomState = updateFunction(
                 prepareTimingStateVector === null ? timingStateVector : prepareTimingStateVector(timingStateVector),
-                currentTime
+                currentTime,
+                previousUpdateVectorWithCustomState
             );
+
             const sanitizedDuration = typeof duration === 'number' && !isNaN(duration) ? duration : 0;
+            const { position, velocity } = previousUpdateVectorWithCustomState;
 
             updateMediaElement(currentTime, sanitizedDuration, mediaElement, playbackRate, position, velocity);
         };