Merge 81b4759b39 into ea7bbd49fe

This reverts commit 2f29d323d9.

README.md

@@ -11,9 +11,38 @@ Users of this software are expected to use this software responsibly while abidi
 
 ## New Features
 ### Resizable Preview Window
-Dynamically improve the performance by using the --resizable parameter
+
+Dynamically improve the performance by using the `--live-resizable` parameter
 ![resizable-gif](resizable.gif)
 
+### Face Mapping
+
+Track faces and change it on the fly
+
+![face_mapping_source](face_mapping_source.gif)
+
+source video
+
+![face-mapping](face_mapping.png)
+
+Tick this switch
+
+![face-mapping2](face_mapping2.png)
+
+Map the faces
+
+![face_mapping_result](face_mapping_result.gif)
+
+And see the magic!
+
+
+## Want to skip the installation and just run it?
+<details>
+Here's the link without the tedious installation script below
+
+[Windows / Nvidia](https://hacksider.gumroad.com/l/vccdmm) CUDA still required
+</details>
+
 ## How do I install it?
 
 
@@ -38,6 +67,11 @@ Then put those 2 files on the "**models**" folder
 We highly recommend to work with a  `venv`  to avoid issues.
 ```
 pip install -r requirements.txt
+```
+or try if above failed
+```
+pip install --use-pep517 -r requirements.txt
+
 ```
 For MAC OS, You have to install or upgrade python-tk package:
 ```
@@ -328,7 +362,7 @@ If you want the latest and greatest build, or want to see some new great feature
 - [ffmpeg](https://ffmpeg.org/): for making video related operations easy
 - [deepinsight](https://github.com/deepinsight): for their [insightface](https://github.com/deepinsight/insightface) project which provided a well-made library and models. Please be reminded that the [use of the model is for non-commercial research purposes only](https://github.com/deepinsight/insightface?tab=readme-ov-file#license).
 - [havok2-htwo](https://github.com/havok2-htwo) : for sharing the code for webcam
-- [GosuDRM](https://github.com/GosuDRM/nsfw-roop) : for uncensoring roop
+- [GosuDRM](https://github.com/GosuDRM) : for open version of roop
 - [pereiraroland26](https://github.com/pereiraroland26) : Multiple faces support
 - [vic4key](https://github.com/vic4key) : For supporting/contributing on this project
 - and [all developers](https://github.com/hacksider/Deep-Live-Cam/graphs/contributors) behind libraries used in this project.

modules/metadata.py

@@ -1,3 +1,3 @@
 name = 'Deep Live Cam'
-version = '1.3.0'
+version = '1.4.0'
 edition = 'Portable'

modules/ui.json

@@ -1,158 +0,0 @@
-{
-  "CTk": {
-    "fg_color": ["gray95", "gray10"]
-  },
-  "CTkToplevel": {
-    "fg_color": ["gray95", "gray10"]
-  },
-  "CTkFrame": {
-    "corner_radius": 0,
-    "border_width": 0,
-    "fg_color": ["gray90", "gray13"],
-    "top_fg_color": ["gray85", "gray16"],
-    "border_color": ["gray65", "gray28"]
-  },
-  "CTkButton": {
-    "corner_radius": 0,
-    "border_width": 0,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "hover_color": ["#3cb666", "#14375e"],
-    "border_color": ["#3e4a40", "#949A9F"],
-    "text_color": ["#f3faf6", "#f3faf6"],
-    "text_color_disabled": ["gray74", "gray60"]
-  },
-  "CTkLabel": {
-    "corner_radius": 0,
-    "fg_color": "transparent",
-    "text_color": ["gray14", "gray84"]
-  },
-  "CTkEntry": {
-    "corner_radius": 0,
-    "border_width": 2,
-    "fg_color": ["#F9F9FA", "#343638"],
-    "border_color": ["#979DA2", "#565B5E"],
-    "text_color": ["gray14", "gray84"],
-    "placeholder_text_color": ["gray52", "gray62"]
-  },
-  "CTkCheckbox": {
-    "corner_radius": 0,
-    "border_width": 3,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "border_color": ["#3e4a40", "#949A9F"],
-    "hover_color": ["#3cb666", "#14375e"],
-    "checkmark_color": ["#f3faf6", "gray90"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray60", "gray45"]
-  },
-  "CTkSwitch": {
-    "corner_radius": 1000,
-    "border_width": 3,
-    "button_length": 0,
-    "fg_color": ["#939BA2", "#4A4D50"],
-    "progress_color": ["#2aa666", "#1f538d"],
-    "button_color": ["gray36", "#D5D9DE"],
-    "button_hover_color": ["gray20", "gray100"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray60", "gray45"]
-  },
-  "CTkRadiobutton": {
-    "corner_radius": 1000,
-    "border_width_checked": 6,
-    "border_width_unchecked": 3,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "border_color": ["#3e4a40", "#949A9F"],
-    "hover_color": ["#3cb666", "#14375e"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray60", "gray45"]
-  },
-  "CTkProgressBar": {
-    "corner_radius": 1000,
-    "border_width": 0,
-    "fg_color": ["#939BA2", "#4A4D50"],
-    "progress_color": ["#2aa666", "#1f538d"],
-    "border_color": ["gray", "gray"]
-  },
-  "CTkSlider": {
-    "corner_radius": 1000,
-    "button_corner_radius": 1000,
-    "border_width": 6,
-    "button_length": 0,
-    "fg_color": ["#939BA2", "#4A4D50"],
-    "progress_color": ["gray40", "#AAB0B5"],
-    "button_color": ["#2aa666", "#1f538d"],
-    "button_hover_color": ["#3cb666", "#14375e"]
-  },
-  "CTkOptionMenu": {
-    "corner_radius": 0,
-    "fg_color": ["#2aa666", "#1f538d"],
-    "button_color": ["#3cb666", "#14375e"],
-    "button_hover_color": ["#234567", "#1e2c40"],
-    "text_color": ["#f3faf6", "#f3faf6"],
-    "text_color_disabled": ["gray74", "gray60"]
-  },
-  "CTkComboBox": {
-    "corner_radius": 0,
-    "border_width": 2,
-    "fg_color": ["#F9F9FA", "#343638"],
-    "border_color": ["#979DA2", "#565B5E"],
-    "button_color": ["#979DA2", "#565B5E"],
-    "button_hover_color": ["#6E7174", "#7A848D"],
-    "text_color": ["gray14", "gray84"],
-    "text_color_disabled": ["gray50", "gray45"]
-  },
-  "CTkScrollbar": {
-    "corner_radius": 1000,
-    "border_spacing": 4,
-    "fg_color": "transparent",
-    "button_color": ["gray55", "gray41"],
-    "button_hover_color": ["gray40", "gray53"]
-  },
-  "CTkSegmentedButton": {
-    "corner_radius": 0,
-    "border_width": 2,
-    "fg_color": ["#979DA2", "gray29"],
-    "selected_color": ["#2aa666", "#1f538d"],
-    "selected_hover_color": ["#3cb666", "#14375e"],
-    "unselected_color": ["#979DA2", "gray29"],
-    "unselected_hover_color": ["gray70", "gray41"],
-    "text_color": ["#f3faf6", "#f3faf6"],
-    "text_color_disabled": ["gray74", "gray60"]
-  },
-  "CTkTextbox": {
-    "corner_radius": 0,
-    "border_width": 0,
-    "fg_color": ["gray100", "gray20"],
-    "border_color": ["#979DA2", "#565B5E"],
-    "text_color": ["gray14", "gray84"],
-    "scrollbar_button_color": ["gray55", "gray41"],
-    "scrollbar_button_hover_color": ["gray40", "gray53"]
-  },
-  "CTkScrollableFrame": {
-    "label_fg_color": ["gray80", "gray21"]
-  },
-  "DropdownMenu": {
-    "fg_color": ["gray90", "gray20"],
-    "hover_color": ["gray75", "gray28"],
-    "text_color": ["gray14", "gray84"]
-  },
-  "CTkFont": {
-    "macOS": {
-      "family": "Avenir",
-      "size": 18,
-      "weight": "normal"
-    },
-    "Windows": {
-      "family": "Corbel",
-      "size": 18,
-      "weight": "normal"
-    },
-    "Linux": {
-      "family": "Montserrat",
-      "size": 18,
-      "weight": "normal"
-    }
-  },
-  "URL": {
-    "text_color": ["gray74", "gray60"]
-  }
-}

requirements.txt

@@ -21,3 +21,5 @@ opennsfw2==0.10.2
 protobuf==4.23.2
 tqdm==4.66.4
 gfpgan==1.3.8
+tkinterdnd2==0.4.2
+customtkinter==5.2.2