new draft code for roll prediction

Author: arch

funscript_editor/algorithms/funscriptgenerator.py

@@ -204,10 +204,9 @@ def calculate_score(self, bboxes) -> None:
                         # this should never happen
                         self.logger.error('Calculate score not implement for x=%d, y=%d', x, y)
 
-                # invert because math angle is ccw
-                inverted_roll = copy.deepcopy(score['roll'][tracker_number])
-                score['roll'][tracker_number] = -1*np.array(inverted_roll)
-
+                # invert because math angle is ccw, also scale to 0- 100
+                tmp = score['roll'][tracker_number] # we can not override the list with listcomprehention in python
+                score['roll'][tracker_number] = [-100*item/(math.pi) for item in tmp]
 
             else:
                 min_woman_x = min([x[0] for x in woman_center])
@@ -229,11 +228,19 @@ def calculate_score(self, bboxes) -> None:
 
         for metric in score.keys():
             if metric in self.funscripts.keys() and self.funscripts[metric].is_inverted():
-                self.logger.info("%s: Scale Inverted Score to 0 - 100", metric)
-                self.score[metric] = Signal.scale([-1.0 * x for x in score[metric]], 0, 100)
+                if metric == 'roll':
+                    self.logger.info("%s: Get absolute inverted Score", metric)
+                    self.score[metric] = [abs(-1.0 * item) for item in score[metric]]
+                else:
+                    self.logger.info("%s: Scale Inverted Score to 0 - 100", metric)
+                    self.score[metric] = Signal.scale([-1.0 * x for x in score[metric]], 0, 100)
             else:
-                self.logger.info("%s: Scale Score to 0 - 100", metric)
-                self.score[metric] = Signal.scale(score[metric], 0, 100)
+                if metric == 'roll':
+                    self.logger.info("%s: Get absolute Score", metric)
+                    self.score[metric] = [abs(item) for item in score[metric]]
+                else:
+                    self.logger.info("%s: Scale Score to 0 - 100", metric)
+                    self.score[metric] = Signal.scale(score[metric], 0, 100)
 
 
 
@@ -297,15 +304,21 @@ def scale_score(self, status: str, metric : str = 'y') -> None:
                     image_max = imgMax,
                     info = status,
                     title_min = metric + " Minimum",
-                    title_max = metric + " Maximum"
+                    title_max = metric + " Maximum",
+                    recommend_lower = round(min(self.score[metric])) if metric == 'roll' else 0,
+                    recommend_upper = round(max(self.score[metric])) if metric == 'roll' else 99
                 )
         else:
             self.logger.warning("Determine min and max failed")
             desired_min = 0
             desired_max = 99
 
         self.logger.info("Scale score %s to user input", metric)
-        self.score[metric] = Signal.scale(self.score[metric], desired_min, desired_max)
+
+        if metric == 'roll':
+            self.score[metric] = Signal.scale_with_center(self.score[metric], desired_min, desired_max, 50)
+        else:
+            self.score[metric] = Signal.scale(self.score[metric], desired_min, desired_max)
 
 
     def get_center(self, box: tuple) -> tuple:
@@ -583,7 +596,7 @@ def tracking(self) -> str:
                         key = self.ui.preview(
                                 last_frame,
                                 frame_num + self.params.start_frame,
-                                texte = ["Scene change detected, Press 'space' or 'enter' to continue tracking or press 'q' to finalize tracking"],
+                                texte = ["Scene change detected, 'space': continue, 'q': stop"],
                                 boxes = boxes_to_draw,
                                 beep = True
                             )
@@ -609,7 +622,7 @@ def tracking(self) -> str:
                     key = self.ui.preview(
                             last_frame,
                             frame_num + self.params.start_frame,
-                            texte = ["Press 'q' if the tracking point shifts or a video cut occured"],
+                            texte = ["Press 'q' to stop tracking"],
                             boxes = boxes_to_draw,
                         )
 

funscript_editor/algorithms/signal.py

@@ -156,6 +156,33 @@ def scale(signal: list, lower: float = 0, upper: float = 99) -> list:
         return [(float(upper) - float(lower)) * (x - signal_min) / (signal_max - signal_min) + float(lower) for x in signal]
 
 
+    @staticmethod
+    def scale_with_center(signal: list, lower: float = 0, upper: float = 99, center: float = 50) -> list:
+        """ Scale an signal (list of float or int) between given lower and upper value with respect to the real center
+
+        Args:
+            signal (list): list with float or int signal values to scale
+            lower (float): lower scale value
+            upper (float): upper scale value
+            center (float): the real center value
+
+        Returns:
+            list: list with scaled signal
+        """
+        if len(signal) == 0:
+            return signal
+
+        if len(signal) == 1:
+            return [center]
+
+        signal_min = min(signal) - center
+        signal_max = max(signal) - center
+        signal_max_offset = max(( abs(signal_min), abs(signal_max) ))
+        signal_min = center - signal_max_offset
+        signal_max = center + signal_max_offset
+
+        return [(float(upper) - float(lower)) * (x - signal_min) / (signal_max - signal_min) + float(lower) for x in signal]
+
     @staticmethod
     def scale_with_anomalies(
             signal :list,
@@ -554,4 +581,8 @@ def decimate(self,
             if len(additional_indexes) > 0:
                 decimated_indexes = self.merge_points(signal, decimated_indexes, additional_indexes)
 
+        if len(decimated_indexes) == 0 and len(signal) > 100:
+            self.logger.info("Insert start and end point")
+            decimated_indexes = [1, len(signal)-2]
+
         return decimated_indexes

funscript_editor/config/projection.yaml

@@ -12,9 +12,9 @@ vr_he_180_sbs:
   name: '3D SBS VR Video 180'
   video_filter: 'v360=input=he:in_stereo=sbs:pitch=${pitch}:yaw=${yaw}:roll=${roll}:output=flat:d_fov=${fov}:w=${width}:h=${height}'
   parameter:
-    height: 720
-    width: 1240
-    fov: 100
+    height: 800
+    width: 800
+    fov: 80
     pitch: -45
     yaw: 0
     roll: 0
@@ -36,9 +36,9 @@ vr_fisheye_200_sbs:
   name: '3D SBS VR Video Fisheye 200'
   video_filter: 'v360=input=fisheye:in_stereo=sbs:id_fov=200:pitch=${pitch}:yaw=${yaw}:roll=${roll}:output=flat:d_fov=${fov}:w=${width}:h=${height}'
   parameter:
-    height: 720
-    width: 1240
-    fov: 100
+    height: 800
+    width: 800
+    fov: 80
     pitch: -45
     yaw: 0
     roll: 0
@@ -60,9 +60,9 @@ vr_equirect_360_ou:
   name: '3D Vertical VR Video 360/180'
   video_filter: 'v360=input=equirect:in_stereo=tb:pitch=${pitch}:yaw=${yaw}:roll=${roll}:output=flat:d_fov=${fov}:w=${width}:h=${height}'
   parameter:
-    height: 720
-    width: 1240
-    fov: 100
+    height: 800
+    width: 800
+    fov: 80
     pitch: -45
     yaw: 0
     roll: 0
@@ -84,9 +84,9 @@ vr_he_180_ou:
   name: '3D Vertical VR Video 180'
   video_filter: 'v360=input=he:in_stereo=tb:pitch=${pitch}:yaw=${yaw}:roll=${roll}:output=flat:d_fov=${fov}:w=${width}:h=${height}'
   parameter:
-    height: 720
-    width: 1240
-    fov: 100
+    height: 800
+    width: 800
+    fov: 80
     pitch: -45
     yaw: 0
     roll: 0

funscript_editor/ui/opencvui.py

@@ -464,8 +464,8 @@ def min_max_selector(self,
             info: str = "",
             title_min: str = "",
             title_max: str = "",
-            lower_limit: int = 0,
-            upper_limit: int = 99,
+            recommend_lower: int = 0,
+            recommend_upper: int = 99,
             beep: bool = False) -> tuple:
         """ Min Max selection Window
 
@@ -475,23 +475,23 @@ def min_max_selector(self,
             info (str): additional info string th show on the Window
             title_min (str): title for the min selection
             title_max (str): title for the max selection
-            lower_limit (int): the lower possible value
-            upper_limit (int): the highest possible value
+            recommend_lower (int): recommend lower value
+            recommend_upper (int): recommend upper value
             beep (bool): play notification sound
 
         Returns:
             tuple: with selected (min: flaot, max float)
         """
-        cv2.createTrackbar("Min", self.window_name, lower_limit, upper_limit, lambda _: None)
-        cv2.createTrackbar("Max", self.window_name, upper_limit, upper_limit, lambda _: None)
+        cv2.createTrackbar("Min", self.window_name, recommend_lower, 99, lambda _: None)
+        cv2.createTrackbar("Max", self.window_name, recommend_upper, 99, lambda _: None)
         image = np.concatenate((image_min, image_max), axis=1)
 
         if beep:
             self.play_notification_sound()
 
         self.clear_keypress_queue()
-        trackbarValueMin = lower_limit
-        trackbarValueMax = upper_limit
+        trackbarValueMin = recommend_lower
+        trackbarValueMax = recommend_upper
         self.logger.info("Waiting for user input")
 
         while True:
@@ -502,7 +502,7 @@ def min_max_selector(self,
                 self.print_text("Set {} to {}".format('Min', trackbarValueMin))
                 self.print_text("Set {} to {}".format('Max', trackbarValueMax), text_position_x='column2')
                 self.print_text("Info: " + info)
-                self.print_text("Press 'space' or 'enter' to continue", text_position_x='column2')
+                self.print_text("Press 'space' to continue", text_position_x='column2')
                 ret = self.show(25)
 
                 if self.was_any_accept_key_pressed() or any(ret == x for x in [ord(' '), 13]):
@@ -547,7 +547,7 @@ def bbox_selector(self, image: np.ndarray, txt: str, add_center: bool = False) -
         """
         if self.params.use_zoom:
             self.set_background_image(image, copy_image=True)
-            self.print_text("Select area with Mouse and Press 'space' or 'enter' to continue")
+            self.print_text("Select area with Mouse and Press 'space' to continue")
             self.print_text("Zoom selected area")
             while True:
                 zoom_bbox = self.selectROI()
@@ -572,7 +572,7 @@ def bbox_selector(self, image: np.ndarray, txt: str, add_center: bool = False) -
             image = cv2.resize(image, None, fx=self.params.zoom_factor, fy=self.params.zoom_factor)
 
         self.set_background_image(image, copy_image=True)
-        self.print_text("Select area with Mouse and Press 'space' or 'enter' to continue")
+        self.print_text("Select area with Mouse and Press 'space' to continue")
         self.print_text(txt)
 
         while True:
@@ -660,7 +660,7 @@ def get_video_projection_config(self, image :np.ndarray, projection: str) -> dic
                     parameter_changed = False
                     preview = FFmpegStream.get_projection(image, config)
                     self.set_background_image(preview)
-                    self.print_text("Press 'space' or 'enter' to use current viewpoint")
+                    self.print_text("Press 'space' to use current viewpoint")
                     self.print_text("Press '0' (NULL) to reset view")
                     final_ui_texte = [ui_texte[k].replace('${val}', str(config['parameter'][k])) for k in ui_texte.keys()]
                     self.print_text(final_ui_texte)