add zoom factor by config

Author: arch

docs/app/docs/user-guide/config.md

@@ -28,6 +28,7 @@ Config Files:
 #### `settings.yaml`
 
 - `use_zoom` (bool): Enable or disable an additional step to zoom in the Video before selecting a tracking feature for the Woman or Men.
+- `zoom_factor:` (float): Set the desired zoom value which will be used when the zoom function is activated.
 - `use_equirectangular` (bool): Convert video in normal perspective view before apply tracking. This should improve the tracking at the border of videos, because there is the distortion very high.
 - `equirectangular_scaling` (float): scaling parameter for the equirectangular preview window. `1.0` is `1240x720`, `1.5` would be `1860x1080`, ... (Do not use to high scaling values, the perspective calculation need a lot of computer resources!)
 

funscript_editor/algorithms/funscriptgenerator.py

@@ -28,16 +28,17 @@
 class FunscriptGeneratorParameter:
     """ Funscript Generator Parameter Dataclass with default values """
     video_path: str # no default value
-    start_frame: int = 0 # default is video start
-    skip_frames: int = HYPERPARAMETER['skip_frames']
-    max_playback_fps: int = SETTINGS['max_playback_fps']
+    start_frame: int = 0 # default is video start (input: set current video position)
+    track_men: bool = True # set by userinput at start (message box)
+    skip_frames: int = max((0, int(HYPERPARAMETER['skip_frames'])))
+    max_playback_fps: int = max((0, int(SETTINGS['max_playback_fps'])))
     direction: str = SETTINGS['tracking_direction']
     use_zoom: bool = SETTINGS['use_zoom']
-    shift_bottom_points :int = HYPERPARAMETER['shift_bottom_points']
-    shift_top_points :int = HYPERPARAMETER['shift_top_points']
+    shift_bottom_points :int = int(HYPERPARAMETER['shift_bottom_points'])
+    shift_top_points :int = int(HYPERPARAMETER['shift_top_points'])
     use_equirectangular :bool = SETTINGS['use_equirectangular']
-    equirectangular_scaling :float = SETTINGS['equirectangular_scaling']
-    track_men: bool = True
+    equirectangular_scaling :float = max((0.2, float(SETTINGS['equirectangular_scaling'])))
+    zoom_factor :float = max((1.0, float(SETTINGS['zoom_factor'])))
 
 
 class FunscriptGenerator(QtCore.QThread):
@@ -453,13 +454,13 @@ def get_bbox(self, image: np.ndarray, txt: str) -> tuple:
             while True:
                 zoom_bbox = cv2.selectROI(self.window_name, self.drawText(image, "Zoom selected area"), False)
                 if zoom_bbox is None or len(zoom_bbox) == 0: continue
-                if zoom_bbox[2] < 100 or zoom_bbox[3] < 100:
+                if zoom_bbox[2] < 75 or zoom_bbox[3] < 75:
                     self.__logger.error("The selected zoom area is to small")
                     continue
                 break
 
             image = image[zoom_bbox[1]:zoom_bbox[1]+zoom_bbox[3], zoom_bbox[0]:zoom_bbox[0]+zoom_bbox[2]]
-            image = cv2.resize(image, None, fx=2, fy=2)
+            image = cv2.resize(image, None, fx=self.params.zoom_factor, fy=self.params.zoom_factor)
 
         while True:
             bbox = cv2.selectROI(self.window_name, self.drawText(image, txt), False)
@@ -468,8 +469,11 @@ def get_bbox(self, image: np.ndarray, txt: str) -> tuple:
             break
 
         if self.params.use_zoom:
-            # NOTE: we upscale the preview by 2
-            bbox = (round(bbox[0]/2)+zoom_bbox[0], round(bbox[1]/2)+zoom_bbox[1], round(bbox[2]/2), round(bbox[3]/2))
+            bbox = (round(bbox[0]/self.params.zoom_factor)+zoom_bbox[0],
+                    round(bbox[1]/self.params.zoom_factor)+zoom_bbox[1],
+                    round(bbox[2]/self.params.zoom_factor),
+                    round(bbox[3]/self.params.zoom_factor)
+                )
 
         return bbox
 
@@ -489,9 +493,6 @@ def tracking(self) -> str:
         if first_frame is None:
             return 'Video file is corrupt'
 
-        if self.params.skip_frames < 0:
-            self.params.skip_frames = 0
-
         if self.params.use_equirectangular:
             self.get_perspective_roi(first_frame)
             first_frame = Equirectangular.get_perspective(

funscript_editor/config/settings.yaml

@@ -4,6 +4,9 @@
 # feature for the Woman or Men.
 use_zoom: False
 
+# Set the desired zoom value which will be used when the zoom function is activated.
+zoom_factor: 4.0
+
 # Convert video in normal perspective view before apply tracking. This should improve the
 # tracking at the border of videos, because there is the distortion very high.
 use_equirectangular: False