improve x-Motion tracking

Author: arch

funscript_editor/algorithms/funscriptgenerator.py

@@ -296,11 +296,11 @@ def calculate_score(self) -> None:
             We use x0,y0 from the predicted tracking boxes to create a diff score
         """
         if self.params.track_men:
-            self.score['x'] = [m[0] - w[0] for w, m in zip(self.bboxes['Woman'], self.bboxes['Men'])]
+            self.score['x'] = [w[0] - m[0] for w, m in zip(self.bboxes['Woman'], self.bboxes['Men'])]
             self.score['y'] = [m[1] - w[1] for w, m in zip(self.bboxes['Woman'], self.bboxes['Men'])]
-            self.score['d'] = [np.sqrt(np.sum((np.array(m[:2]) - np.array(w[:2])) ** 2, axis=0)) for w, m in zip(bboxes['Woman'], bboxes['Men'])]
+            self.score['d'] = [np.sqrt(np.sum((np.array(m[:2]) - np.array(w[:2])) ** 2, axis=0)) for w, m in zip(self.bboxes['Woman'], self.bboxes['Men'])]
         else:
-            self.score['x'] = [max([x[0] for x in self.bboxes['Woman']]) - w[0] for w in self.bboxes['Woman']]
+            self.score['x'] = [w[0] - min([x[0] for x in self.bboxes['Woman']]) for w in self.bboxes['Woman']]
             self.score['y'] = [max([x[1] for x in self.bboxes['Woman']]) - w[1] for w in self.bboxes['Woman']]
             # TODO: how to calc d?
 

funscript_editor/config/hyperparameter.yaml

@@ -51,26 +51,26 @@ bottom_threshold: 2.5
 # x-Movement #
 ##############
 
-# Shift predicted right points by given frame number. Positive values delay the position
-# and negative values result in an earlier position.
-shift_right_points: 0
-
 # Shift predicted left points by given frame number. Positive values delay the position
 # and negative values result in an earlier position.
 shift_left_points: 0
 
+# Shift predicted right points by given frame number. Positive values delay the position
+# and negative values result in an earlier position.
+shift_right_points: 0
+
 # An fix offset to the left points (positive values move the point right and negative values
 # move the point left). The offset respect the user defined upper and lower limit.
-left_points_offset: 0.0
+left_points_offset: -10.0
 
 # An fix offset to the right points (positive values move the point right and negative values
 # move the point left). The offset respect the user defined upper and lower limit.
-right_points_offset: 0.0
-
-# Define the right threshold. All right points greater than (max - threshold) will be set to
-# the specified max value. Set 0.0 to disable this function.
-right_threshold: 0.0
+right_points_offset: 10.0
 
 # Define the left threshold. All left points lower than (min + threshold) will be set to
 # the specified min value. Set 0.0 to disable this function.
-left_threshold: 0.0
+left_threshold: 2.5
+
+# Define the right threshold. All right points greater than (max - threshold) will be set to
+# the specified max value. Set 0.0 to disable this function.
+right_threshold: 2.5

funscript_editor/config/settings.yaml

@@ -26,4 +26,4 @@ preview_scaling: 0.6
 # Available Options:
 # - 'flat': 2D Videos
 # - 'vr_he_sbs': 3D VR Side-By-Side Video
-projection: 'vr_he_sbs'
+projection: 'flat'

funscript_editor/ui/funscript_editor_window.py

@@ -291,9 +291,12 @@ def __generate_funscript(self):
         if self.funscript is None: return
         if self.video_player is None: return
         if self.video_player.get_video_file is None: return
-        start_frame = self.video_player.get_current_frame \
-                if self.funscript.get_last_action_time() < self.video_player.get_current_timestamp_in_millis \
-                else self.video_player.millisec_to_frame(self.funscript.get_last_action_time())
+        start_frame = self.video_player.get_current_frame
+        next_action = self.funscript.get_next_action(self.video_player.get_current_timestamp_in_millis+100)
+        if next_action['at'] > self.video_player.get_current_timestamp_in_millis+100:
+            end_frame = self.video_player.millisec_to_frame(next_action['at'])
+        else:
+            end_frame = -1
 
         reply = QtWidgets.QMessageBox.question(None, 'Track Men', 'Do you want to track the Men? ',
                 QtWidgets.QMessageBox.Yes | QtWidgets.QMessageBox.No, QtWidgets.QMessageBox.No)
@@ -304,6 +307,7 @@ def __generate_funscript(self):
                 FunscriptGeneratorParameter(
                     video_path = self.video_player.get_video_file,
                     start_frame = start_frame,
+                    end_frame = end_frame,
                     track_men = trackMen
                 ),
                 self.funscript)