add option to download ffmpeg

Author: arch

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

@@ -18,26 +18,32 @@ This create the Windows executable in `./dist`.
 
 Finally you can remove the build environment with `conda env remove -n build`
 
-## Ubuntu 20.04 LTS
+## Ubuntu 20.04 LTS, Ubuntu 21.04, Debian
 
 The OpenCV Package in Ubuntu use the GTK Backend for the preview window. This will cause freezes of the UI, because i use Qt threads in my code. The Arch Linux OpenCV library was compiled with QT (see `python3 -c "import cv2; print(cv2.getBuildInformation())"` output) so no problem here. To use the Application on Ubuntu you have to compile `OpenCV + OpenCV contrib` with `-D WITH_QT=ON` flag from source. Or simply use [miniconda](https://docs.conda.io/en/latest/miniconda.html). They include OpenCV compiled with Qt support.
 
 **NOTE:** I have also test this setup on Ubuntu 21.04 with Wayland desktop. You can use the setup instructions from Ubuntu 20.04 LTS. The application work with XWayland on the Wayland desktop!
 
 ### Miniconda
 
-After you have setup [miniconda](https://docs.conda.io/en/latest/miniconda.html) on your Ubuntu machine simply type the following commands to use Python-Funscript-Editor on Ubuntu:
+After you have setup [miniconda](https://docs.conda.io/en/latest/miniconda.html) on your machine simply type the following commands to use Python-Funscript-Editor:
 
 ```bash
 sudo apt install -y make git gcc g++ libmpv-dev libatlas-base-dev
-sudo add-apt-repository ppa:savoury1/ffmpeg4
-sudo apt install -y ffmpeg
 git clone https://github.com/michael-mueller-git/Python-Funscript-Editor.git
 cd Python-Funscript-Editor
 conda env create -f environment_ubuntu.yaml
 ```
 
-**NOTE:** The ffmpeg in the Ubuntu 20.04 LTS ppa package is too old, which means that the package does not contain the `v360` filter for VR videos. Therefore we install ffmpeg from savoury1 ppa.
+On some distributions e.g. Ubuntu 20.04 LTS, the FFmpeg package does not contain the required `v360` filter. Therefore you can download a static linked FFmpeg package for this application with `bash download_ffmpeg.sh` from project root directory. (Perform this step if you are not sure if your FFmpeg version is sufficient!).
+
+Ubuntu user can alternatively use the `savoury1` ppa:
+
+```bash
+sudo add-apt-repository ppa:savoury1/ffmpeg4
+sudo apt install -y ffmpeg
+
+```
 
 Now you can run the program direct from source code with:
 

download_ffmpeg.sh

@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "[INFO] Download ffmpeg..."
+rm -f /tmp/ffmpeg-git-amd64-static.tar.xz
+wget --show-progress -O /tmp/ffmpeg-git-amd64-static.tar.xz "https://johnvansickle.com/ffmpeg/builds/ffmpeg-git-amd64-static.tar.xz"
+
+echo "[INFO] Extract ffmpeg..."
+tmpDir=$(mktemp -d)
+tar -xf /tmp/ffmpeg-git-amd64-static.tar.xz -C ${tmpDir}
+mv -fv ${tmpDir}/ffmpeg-git*/ffmpeg ./funscript_editor/data
+if [ "$?" = "0" ]; then
+    echo "[INFO] FFmpeg is now successfully setup"
+fi
+rm -rf ${tmpDir}
+rm -f /tmp/ffmpeg-git-amd64-static.tar.xz

funscript_editor/algorithms/funscriptgenerator.py

@@ -727,12 +727,13 @@ def tracking(self) -> str:
             if last_frame is not None:
                 # Process data from last step while the next tracking points get predicted.
                 # This should improve the whole processing speed, because the tracker run in a seperate thread
-                bboxes['Woman'][frame_num-1] = bbox_woman
-                last_frame = self.draw_box(last_frame, bboxes['Woman'][frame_num-1], color=(0,255,0))
-                if self.params.supervised_tracking:
-                    last_frame = self.draw_box(last_frame, tracking_area_woman, color=(0,255,0))
+                if bbox_woman is not None:
+                    bboxes['Woman'][frame_num-1] = bbox_woman
+                    last_frame = self.draw_box(last_frame, bboxes['Woman'][frame_num-1], color=(0,255,0))
+                    if self.params.supervised_tracking:
+                        last_frame = self.draw_box(last_frame, tracking_area_woman, color=(0,255,0))
 
-                if self.params.track_men:
+                if self.params.track_men and bbox_men is not None:
                     bboxes['Men'][frame_num-1] = bbox_men
                     last_frame = self.draw_box(last_frame, bboxes['Men'][frame_num-1], color=(255,0,255))
                     if self.params.supervised_tracking:

funscript_editor/data/.gitignore

@@ -0,0 +1 @@
+ffmpeg