add quadratic interpolation

Author: arch

environment.yaml

@@ -6,6 +6,7 @@ dependencies:
   - ca-certificates=2021.5.25=haa95532_1
   - certifi=2021.5.30=py39haa95532_0
   - freetype=2.10.4=hd328e21_0
+  - icc_rt=2019.0.0=h0cc432a_1
   - icu=58.2=ha925a31_3
   - intel-openmp=2021.2.0=haa95532_616
   - jpeg=9b=hb83a4c4_2
@@ -26,6 +27,7 @@ dependencies:
   - python=3.9.5=h6244533_3
   - pyyaml=5.4.1=py39h2bbff1b_1
   - qt=5.9.7=vc14h73c81de_0
+  - scipy=1.6.2=py39h66253e8_1
   - setuptools=52.0.0=py39haa95532_0
   - sip=4.19.13=py39hd77b12b_0
   - six=1.16.0=pyhd3eb1b0_0

funscript_editor/algorithms/funscriptgenerator.py

@@ -19,6 +19,7 @@
 from datetime import datetime
 from funscript_editor.data.ffmpegstream import FFmpegStream, VideoInfo
 from funscript_editor.algorithms.kalmanfilter import KalmanFilter2D
+from scipy.interpolate import interp1d
 
 import funscript_editor.algorithms.signalprocessing as sp
 import numpy as np
@@ -222,12 +223,47 @@ def append_interpolated_bbox(self, bbox :tuple, target: str) -> None:
             target (str): the target where to save the interpolated tracking boxes
         """
         if self.params.skip_frames > 0 and len(self.bboxes[target]) > 0:
-            for i in range(1, self.params.skip_frames+1):
-                x0 = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][0], bbox[0]])
-                y0 = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][1], bbox[1]])
-                w = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][2], bbox[2]])
-                h = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][3], bbox[3]])
-                self.bboxes[target].append((x0, y0, w, h))
+            back_in_time = 2
+            if len(self.bboxes[target]) < (self.params.skip_frames+1)*back_in_time:
+                for i in range(1, self.params.skip_frames+1):
+                    # use linear interpolation for the first steps
+                    x0 = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][0], bbox[0]])
+                    y0 = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][1], bbox[1]])
+                    w = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][2], bbox[2]])
+                    h = np.interp(i, [0, self.params.skip_frames+1], [self.bboxes[target][-1][3], bbox[3]])
+                    self.bboxes[target].append((x0, y0, w, h))
+            else:
+                # switch to quadratic interpolation as soon as there is enough data for interpolation
+                x = [-1*(self.params.skip_frames+1)*back_in_time + x + 1 for x in range((self.params.skip_frames+1)*back_in_time)] \
+                        + [self.params.skip_frames+1]
+
+                fx0 = interp1d(
+                        x,
+                        [item[0] for item in self.bboxes[target][-1*(self.params.skip_frames+1)*back_in_time:]] + [bbox[0]],
+                        kind = 'quadratic'
+                    )
+
+                fy0 = interp1d(
+                        x,
+                        [item[1] for item in self.bboxes[target][-1*(self.params.skip_frames+1)*back_in_time:]] + [bbox[1]],
+                        kind = 'quadratic'
+                    )
+
+                fw = interp1d(
+                        x,
+                        [item[2] for item in self.bboxes[target][-1*(self.params.skip_frames+1)*back_in_time:]] + [bbox[2]],
+                        kind = 'quadratic'
+                    )
+
+                fh = interp1d(
+                        x,
+                        [item[3] for item in self.bboxes[target][-1*(self.params.skip_frames+1)*back_in_time:]] + [bbox[3]],
+                        kind = 'quadratic'
+                    )
+
+                for i in range(1, self.params.skip_frames+1):
+                    self.bboxes[target].append((fx0(i), fy0(i), fw(i), fh(i)))
+
         self.bboxes[target].append(bbox)
 
 
@@ -929,5 +965,10 @@ def run(self) -> None:
             return
 
         idx_dict = self.determin_change_points()
+
+        idx_list = [x for k in ['min', 'max'] for x in idx_dict[k]]
+        idx_list.sort()
+        self.plot_y_score('debug.png', idx_list)
+
         self.create_funscript(idx_dict)
         self.finished(status, True)

funscript_editor/config/settings.yaml

@@ -11,10 +11,10 @@ use_zoom: False
 zoom_factor: 4.0
 
 # Specify the tracking direction. Allowed values are `'x'` and `'y'`.
-tracking_direction: 'd'
+tracking_direction: 'y'
 
 # Limit the max player speed in the tracking preview window (0 = disable limit)
-max_playback_fps: 0
+max_playback_fps: 120
 
 # Set the preview image scaling factor. With a value of 1.0, the window should fill the height
 # or width of the screen depending on the aspect ratio of the video.

funscript_editor/ui/funscript_editor_window.py

@@ -324,9 +324,9 @@ def __funscript_generated(self, funscript, status, success):
         self.__save_funscript()
         self.video_player.show_message(status)
         if success:
-            self.__logger.info(status)
+            self.__logger.info("Completed: " + status)
         else:
-            self.__logger.error(status)
+            self.__logger.error("Failed: " + status)
 
     def __delete_current_action(self):
         if self.funscript is None: return