videomail-client 5.1.2 → 5.2.1

package/src/js/wrappers/visuals/recorder.js

@@ -88,8 +88,6 @@ const Recorder = function (visuals, replay, defaultOptions = {}) {
   let recordingBufferLength
   let recordingBuffer
 
-  const timeControlEnabled = Boolean(options.video.timeControl)
-
   function writeStream(buffer, opts) {
     if (stream) {
       if (stream.destroyed) {
@@ -814,8 +812,7 @@ const Recorder = function (visuals, replay, defaultOptions = {}) {
   }
 
   function getAvgFps() {
-    // see https://github.com/hapticdata/animitter/issues/3
-    return (loop.getFrameCount() / loop.getElapsedTime()) * 1000
+    return (framesCount / getIntervalSum()) * 1000
   }
 
   this.getRecordingStats = function () {
@@ -945,7 +942,7 @@ const Recorder = function (visuals, replay, defaultOptions = {}) {
       params.eventType = e.type
     }
 
-    debug('pause()', params)
+    debug(`pause() at frame ${framesCount}`, params)
 
     userMedia.pause()
     loop.stop()
@@ -960,7 +957,7 @@ const Recorder = function (visuals, replay, defaultOptions = {}) {
   }
 
   this.resume = function () {
-    debug('Recorder: resume()')
+    debug(`Recorder: resume() with frame ${framesCount}`)
 
     stopPings()
 
@@ -993,7 +990,6 @@ const Recorder = function (visuals, replay, defaultOptions = {}) {
       if (!self.isPaused() && stream && ctx) {
         if (framesCount === 0) {
           self.emit(Events.SENDING_FIRST_FRAME)
-          debug('Recorder: time control is', timeControlEnabled.toString())
         }
 
         framesCount++
@@ -1009,17 +1005,8 @@ const Recorder = function (visuals, replay, defaultOptions = {}) {
 
         bytesSum += recordingBufferLength
 
-        let frameBuffer
-
-        if (timeControlEnabled) {
-          const timeControlBuffer = Buffer.from(
-            stringify({ frameNumber: framesCount, milliseconds: Date.now() })
-          )
-
-          frameBuffer = Buffer.concat([recordingBuffer, timeControlBuffer])
-        } else {
-          frameBuffer = recordingBuffer
-        }
+        const frameControlBuffer = Buffer.from(stringify({ frameNumber: framesCount }))
+        const frameBuffer = Buffer.concat([recordingBuffer, frameControlBuffer])
 
         writeStream(frameBuffer, {
           frameNumber: framesCount,
@@ -1094,6 +1081,13 @@ const Recorder = function (visuals, replay, defaultOptions = {}) {
 
     self.emit(Events.RECORDING, framesCount)
 
+    // see https://github.com/hapticdata/animitter/issues/3
+    loop.on('update', function (deltaTime, elapsedTime) {
+      // x1000 because of milliseconds
+      const avgFPS = (framesCount / elapsedTime) * 1000
+      debug('Recorder: avgFps =', Math.round(avgFPS))
+    })
+
     loop.start()
   }