add more verbosity

Author: arch

funscript_editor/api.py

@@ -36,6 +36,9 @@ def generate_funscript(
     """
     setup_logging()
     logging.info("Python Funscript Generator %s", VERSION)
+    logging.info("Startup Path: %s", str(os.getcwd()))
+    logging.info("Args: video_file=%s, start_time=%s, end_time=%s, output_file=%s", \
+            str(video_file), str(start_time), str(end_time), str(output_file))
     app = QtWidgets.QApplication(sys.argv)
     generator = MinimalFunscriptGenerator(video_file, start_time, end_time, output_file)
     generator.run()

funscript_editor/data/ffmpegstream.py

@@ -101,6 +101,22 @@ def get_frame(
         return frame
 
 
+    @staticmethod
+    def get_ffmpeg_command() -> str:
+        """ Get FFmpeg binary command string
+
+        Returns:
+            str: FFmpeg command
+        """
+        ffmpeg = os.path.join(os.path.dirname(os.path.abspath(__file__)), "ffmpeg")
+        if os.path.exists(ffmpeg):
+            # use local ffmpeg
+            return ffmpeg
+        else:
+            # use ffmpeg in $PATH
+            return "ffmpeg"
+
+
     @staticmethod
     def get_projection(
             frame :np.ndarray,
@@ -121,7 +137,7 @@ def get_projection(
             video_filter = video_filter.replace('${' + k + '}', str(v))
 
         command = [
-                'ffmpeg',
+                FFmpegStream.get_ffmpeg_command(),
                 '-hide_banner',
                 '-loglevel', 'warning',
                 '-y',
@@ -264,7 +280,7 @@ def run(self) -> None:
         seek = FFmpegStream.frame_to_timestamp(self.start_frame, self.video_info.fps)
 
         command = [
-                'ffmpeg',
+                FFmpegStream.get_ffmpeg_command(),
                 '-hide_banner',
                 '-loglevel', 'warning',
                 '-ss', str(seek),