GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2025-12-12 01:00:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

hdmi: decreased stream restart

Browse Source
This commit is contained in:
Devaev Maxim 2019-09-30 07:55:32 +03:00
parent 5b8ac7ba70
commit bcae85c8b9
7 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/kvmd/main/v0-hdmi.yaml
View File

@ -28,6 +28,8 @@ kvmd:
type: disabled
streamer:
sync_delay: 0
init_delay: 1
desired_fps: 30
max_fps: 60
unix: /run/kvmd/ustreamer.sock

2
configs/kvmd/main/v1-hdmi.yaml
View File

@ -30,6 +30,8 @@ kvmd:
device: /dev/kvmd-msd
streamer:
sync_delay: 0
init_delay: 1
desired_fps: 30
max_fps: 60
unix: /run/kvmd/ustreamer.sock

2
configs/kvmd/main/v2-hdmi.yaml
View File

@ -26,6 +26,8 @@ kvmd:
type: otg
streamer:
sync_delay: 0
init_delay: 1
desired_fps: 30
max_fps: 60
unix: /run/kvmd/ustreamer.sock

7
kvmd/apps/__init__.py
View File

@ -51,6 +51,7 @@ from ..yamlconf.loader import load_yaml_file
from ..validators.basic import valid_bool
from ..validators.basic import valid_number
from ..validators.basic import valid_float_f0
from ..validators.basic import valid_float_f01
from ..validators.auth import valid_users_list
@ -224,9 +225,9 @@ def _get_config_scheme() -> Dict:
"cap_pin": Option(-1, type=valid_gpio_pin_optional),
"conv_pin": Option(-1, type=valid_gpio_pin_optional),
"sync_delay": Option(1.0, type=valid_float_f01),
"init_delay": Option(3.0, type=valid_float_f01),
"init_restart_after": Option(0.0, type=(lambda arg: valid_number(arg, min=0.0, type=float))),
"sync_delay": Option(1.0, type=valid_float_f0),
"init_delay": Option(3.0, type=valid_float_f0),
"init_restart_after": Option(0.0, type=valid_float_f0),
"shutdown_delay": Option(10.0, type=valid_float_f01),
"state_poll": Option(1.0, type=valid_float_f01),

4
kvmd/validators/basic.py
View File

@ -74,6 +74,10 @@ def valid_int_f1(arg: Any) -> int:
return int(valid_number(arg, min=1))
def valid_float_f0(arg: Any) -> float:
return float(valid_number(arg, min=0, type=float))
def valid_float_f01(arg: Any) -> float:
return float(valid_number(arg, min=0.1, type=float))

2
testenv/main.yaml
View File

@ -25,6 +25,8 @@ kvmd:
streamer:
cap_pin: 17
conv_pin: 18
sync_delay: 0
init_delay: 1
init_restart_after: 1
desired_fps: 30
max_fps: 40

15
testenv/tests/validators/test_basic.py
View File

@ -29,6 +29,7 @@ from kvmd.validators import ValidatorError
from kvmd.validators.basic import valid_bool
from kvmd.validators.basic import valid_number
from kvmd.validators.basic import valid_int_f1
from kvmd.validators.basic import valid_float_f0
from kvmd.validators.basic import valid_float_f01
from kvmd.validators.basic import valid_string_list
@ -95,6 +96,20 @@ def test_fail__valid_int_f1(arg: Any) -> None:
print(valid_int_f1(arg))
# =====
@pytest.mark.parametrize("arg", [0, 1, 5, "5 ", "5.0 "])
def test_ok__valid_float_f0(arg: Any) -> None:
value = valid_float_f0(arg)
assert type(value) == float # pylint: disable=unidiomatic-typecheck
assert value == float(str(arg).strip())
@pytest.mark.parametrize("arg", ["test", "", None, -6, "-6"])
def test_fail__valid_float_f0(arg: Any) -> None:
with pytest.raises(ValidatorError):
print(valid_float_f0(arg))
# =====
@pytest.mark.parametrize("arg", [0.1, 1, 5, "5 ", "5.0 "])
def test_ok__valid_float_f01(arg: Any) -> None: