Skip to content

Commit df9d495

Browse files
author
arch
committed
update docs
1 parent e8d8a6a commit df9d495

25 files changed

+246
-418
lines changed

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

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Python Funscript Editor Config
22

3-
The configuration files for the Windows release version are located in the `funscript-editor/funscript_editor/config` directory since release `v0.0.3`. If you use the python source code directly they are located in [`funscript_editor/config`](https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/main/funscript_editor/config).
3+
The configuration files for the Windows release version are located in the `funscript-editor/funscript_editor/config` directory. If you use the python source code directly they are located in [`funscript_editor/config`](https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/main/funscript_editor/config).
44

55
## Config Files
66

7-
The directory contains several config files. The most interesting are `video_scaling.json`, `settings.yaml` and `hyperparameter.yaml`. When editing the `*.yaml` configuration files, pay attention to the formatting, otherwise the program will not work later.
7+
The directory contains several config files. The most interesting are `settings.yaml` and `hyperparameter.yaml`. When editing the `*.yaml` configuration files, pay attention to the formatting, otherwise the program will not work later.
88

99
Config Files:
1010

11-
- `hyperparameter.yaml`: hyperparameter for the prediction algorithms
11+
- `hyperparameter.yaml`: hyperparameter for the algorithms
1212
- `logging_linux.yaml`: the logging configuration for linx
1313
- `logging_windows.yaml`: the logging configuration for windows
1414
- `settings.yaml`: application settings
1515
- `ui.yaml`: user interface settings
16-
- `video_scaling.json`: scaling for the preview window
16+
- `projection.yaml`: the FFmpeg filter parameter for different video types
1717

1818
### Config Parameter
1919

@@ -33,25 +33,7 @@ Config Files:
3333

3434
- `use_zoom` (bool): Enable or disable an additional step to zoom in the Video before selecting a tracking feature for the Woman or Men.
3535
- `zoom_factor:` (float): Set the desired zoom value which will be used when the zoom function is activated.
36-
- `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.
37-
- `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!)
38-
3936
- `tracking_direction` (str): Specify the tracking direction. Allowed values are `'x'` and `'y'`.
40-
- `scaling_method` (str): Specify the scaling method for the video before apply tracking and the preview window size. Allowed values are `'auto'` and `'config'`. `'auto'`: try to calculate the scaling depending on your screen resolution. If you have a very high screen resolution e.g. 8K Monitor this option will strongly slow down the tracking speed, because all videos are scaled up/down to 8K before tracking. If you set `'config'` the scaling form `video_scaling.json` will be used. You can adjust this config to your like as described in the documentation on github.
4137
- `max_playback_fps` (int): Limit the max player speed in the tracking preview window (0 = disable limit)
42-
43-
#### `video_scaling.json`
44-
45-
The `video_scaling.json` config file specifies how the video get scaled bevor the tracking. The scaling also apply tho the preview size. If the preview to select the tracking feature is to small or to large you have to adjust this config file.
46-
47-
The entries in this config file consist of a pair of values.
48-
49-
Example config:
50-
51-
```json
52-
{ "0": 2.0, "1000": 1.0, "3500": 0.5, "5000": 0.25 }
53-
```
54-
55-
One pair in the example config is e.g. `"0": 2.0`. Each pair of values defines which scaling should be used for which video resolution. The first value, refers to the video width in pixels. Videos with size larger than 0 pixels horizontally use a scaling of `2.0`. Videos with 1000 pixel and more are scaled with `1.0`, from 3500 with `0.5` and from 5000 with `0.25`. You can enter as many values as you want and change the existing scaling.
56-
57-
It’s best to look at your screen resolution and calculate which scaling you need for which video size so that the window fits on the monitor. e.g. You have `1920x1080` screen and `5400x2700` Video, you can divide `1920 / 5400 = 0.36` → add `"5300": 0.35` to the config (the key value have to be a little bit smaller than the Video resolution to apply the correct scaling).
38+
- `preview_scaling` (float): Set the preview image scaling factor. With a value of `1.0`, the window should fill the height or width of the screen depending on the aspect ratio of the video.
39+
- `projection`: (str): Set the video type. All available options can be obtained from the `projection.yaml` file. Each root keys represent an option. Available Options: `'flat'` = 2D Videos, `'vr_he_sbs'` = 3D VR Side-By-Side Video

docs/app/site/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,5 +204,5 @@ <h4 class="modal-title" id="keyboardModalLabel">Keyboard Shortcuts</h4>
204204

205205
<!--
206206
MkDocs version : 1.1.2
207-
Build Date UTC : 2021-06-27 18:43:09.513573+00:00
207+
Build Date UTC : 2021-07-02 16:58:07.199033+00:00
208208
-->

docs/app/site/search/search_index.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs/app/site/sitemap.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url>
33
<loc>None</loc>
4-
<lastmod>2021-06-27</lastmod>
4+
<lastmod>2021-07-02</lastmod>
55
<changefreq>daily</changefreq>
66
</url><url>
77
<loc>None</loc>
8-
<lastmod>2021-06-27</lastmod>
8+
<lastmod>2021-07-02</lastmod>
99
<changefreq>daily</changefreq>
1010
</url><url>
1111
<loc>None</loc>
12-
<lastmod>2021-06-27</lastmod>
12+
<lastmod>2021-07-02</lastmod>
1313
<changefreq>daily</changefreq>
1414
</url><url>
1515
<loc>None</loc>
16-
<lastmod>2021-06-27</lastmod>
16+
<lastmod>2021-07-02</lastmod>
1717
<changefreq>daily</changefreq>
1818
</url><url>
1919
<loc>None</loc>
20-
<lastmod>2021-06-27</lastmod>
20+
<lastmod>2021-07-02</lastmod>
2121
<changefreq>daily</changefreq>
2222
</url><url>
2323
<loc>None</loc>
24-
<lastmod>2021-06-27</lastmod>
24+
<lastmod>2021-07-02</lastmod>
2525
<changefreq>daily</changefreq>
2626
</url>
2727
</urlset>

docs/app/site/sitemap.xml.gz

0 Bytes
Binary file not shown.

docs/app/site/user-guide/config/index.html

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -111,17 +111,17 @@
111111
<div class="col-md-9" role="main">
112112

113113
<h1 id="python-funscript-editor-config">Python Funscript Editor Config</h1>
114-
<p>The configuration files for the Windows release version are located in the <code>funscript-editor/funscript_editor/config</code> directory since release <code>v0.0.3</code>. If you use the python source code directly they are located in <a href="https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/main/funscript_editor/config"><code>funscript_editor/config</code></a>.</p>
114+
<p>The configuration files for the Windows release version are located in the <code>funscript-editor/funscript_editor/config</code> directory. If you use the python source code directly they are located in <a href="https://github.com/michael-mueller-git/Python-Funscript-Editor/tree/main/funscript_editor/config"><code>funscript_editor/config</code></a>.</p>
115115
<h2 id="config-files">Config Files</h2>
116-
<p>The directory contains several config files. The most interesting are <code>video_scaling.json</code>, <code>settings.yaml</code> and <code>hyperparameter.yaml</code>. When editing the <code>*.yaml</code> configuration files, pay attention to the formatting, otherwise the program will not work later.</p>
116+
<p>The directory contains several config files. The most interesting are <code>settings.yaml</code> and <code>hyperparameter.yaml</code>. When editing the <code>*.yaml</code> configuration files, pay attention to the formatting, otherwise the program will not work later.</p>
117117
<p>Config Files:</p>
118118
<ul>
119-
<li><code>hyperparameter.yaml</code>: hyperparameter for the prediction algorithms</li>
119+
<li><code>hyperparameter.yaml</code>: hyperparameter for the algorithms</li>
120120
<li><code>logging_linux.yaml</code>: the logging configuration for linx</li>
121121
<li><code>logging_windows.yaml</code>: the logging configuration for windows</li>
122122
<li><code>settings.yaml</code>: application settings</li>
123123
<li><code>ui.yaml</code>: user interface settings</li>
124-
<li><code>video_scaling.json</code>: scaling for the preview window</li>
124+
<li><code>projection.yaml</code>: the FFmpeg filter parameter for different video types</li>
125125
</ul>
126126
<h3 id="config-parameter">Config Parameter</h3>
127127
<h4 id="hyperparameteryaml"><code>hyperparameter.yaml</code></h4>
@@ -140,24 +140,11 @@ <h4 id="settingsyaml"><code>settings.yaml</code></h4>
140140
<ul>
141141
<li><code>use_zoom</code> (bool): Enable or disable an additional step to zoom in the Video before selecting a tracking feature for the Woman or Men.</li>
142142
<li><code>zoom_factor:</code> (float): Set the desired zoom value which will be used when the zoom function is activated.</li>
143-
<li><code>use_equirectangular</code> (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.</li>
144-
<li>
145-
<p><code>equirectangular_scaling</code> (float): scaling parameter for the equirectangular preview window. <code>1.0</code> is <code>1240x720</code>, <code>1.5</code> would be <code>1860x1080</code>, ... (Do not use to high scaling values, the perspective calculation need a lot of computer resources!)</p>
146-
</li>
147-
<li>
148-
<p><code>tracking_direction</code> (str): Specify the tracking direction. Allowed values are <code>'x'</code> and <code>'y'</code>.</p>
149-
</li>
150-
<li><code>scaling_method</code> (str): Specify the scaling method for the video before apply tracking and the preview window size. Allowed values are <code>'auto'</code> and <code>'config'</code>. <code>'auto'</code>: try to calculate the scaling depending on your screen resolution. If you have a very high screen resolution e.g. 8K Monitor this option will strongly slow down the tracking speed, because all videos are scaled up/down to 8K before tracking. If you set <code>'config'</code> the scaling form <code>video_scaling.json</code> will be used. You can adjust this config to your like as described in the documentation on github.</li>
143+
<li><code>tracking_direction</code> (str): Specify the tracking direction. Allowed values are <code>'x'</code> and <code>'y'</code>.</li>
151144
<li><code>max_playback_fps</code> (int): Limit the max player speed in the tracking preview window (0 = disable limit)</li>
152-
</ul>
153-
<h4 id="video_scalingjson"><code>video_scaling.json</code></h4>
154-
<p>The <code>video_scaling.json</code> config file specifies how the video get scaled bevor the tracking. The scaling also apply tho the preview size. If the preview to select the tracking feature is to small or to large you have to adjust this config file.</p>
155-
<p>The entries in this config file consist of a pair of values.</p>
156-
<p>Example config:</p>
157-
<pre><code class="language-json">{ &quot;0&quot;: 2.0, &quot;1000&quot;: 1.0, &quot;3500&quot;: 0.5, &quot;5000&quot;: 0.25 }
158-
</code></pre>
159-
<p>One pair in the example config is e.g. <code>"0": 2.0</code>. Each pair of values defines which scaling should be used for which video resolution. The first value, refers to the video width in pixels. Videos with size larger than 0 pixels horizontally use a scaling of <code>2.0</code>. Videos with 1000 pixel and more are scaled with <code>1.0</code>, from 3500 with <code>0.5</code> and from 5000 with <code>0.25</code>. You can enter as many values as you want and change the existing scaling.</p>
160-
<p>It’s best to look at your screen resolution and calculate which scaling you need for which video size so that the window fits on the monitor. e.g. You have <code>1920x1080</code> screen and <code>5400x2700</code> Video, you can divide <code>1920 / 5400 = 0.36</code> → add <code>"5300": 0.35</code> to the config (the key value have to be a little bit smaller than the Video resolution to apply the correct scaling).</p></div>
145+
<li><code>preview_scaling</code> (float): Set the preview image scaling factor. With a value of <code>1.0</code>, the window should fill the height or width of the screen depending on the aspect ratio of the video.</li>
146+
<li><code>projection</code>: (str): Set the video type. All available options can be obtained from the <code>projection.yaml</code> file. Each root keys represent an option. Available Options: <code>'flat'</code> = 2D Videos, <code>'vr_he_sbs'</code> = 3D VR Side-By-Side Video</li>
147+
</ul></div>
161148
</div>
162149
</div>
163150

-4.19 KB
Binary file not shown.
-3.29 KB
Binary file not shown.
-30.3 KB
Binary file not shown.
806 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)