GithubFollow/One-KVM
1
0
Fork 0
mirror of https://github.com/mofeng-git/One-KVM.git synced 2026-02-01 10:31:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

new ustreamer

Browse Source
This commit is contained in:
Devaev Maxim
2018-11-08 05:16:17 +03:00
parent 4927d3e173
commit 363bbdac57
8 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kvmd/apps/kvmd/server.py
View File

@@ -139,7 +139,7 @@ class Server: # pylint: disable=too-many-instance-attributes
self.__reset_streamer = False
self.__streamer_quality = streamer.get_current_quality()
self.__streamer_soft_fps = streamer.get_current_soft_fps()
self.__streamer_desired_fps = streamer.get_current_desired_fps()
def run(self, host: str, port: int) -> None:
self.__hid.start()
@@ -354,9 +354,9 @@ class Server: # pylint: disable=too-many-instance-attributes
quality = request.query.get("quality")
if quality:
self.__streamer_quality = _valid_int("quality", quality, 1, 100)
soft_fps = request.query.get("soft_fps")
if soft_fps:
self.__streamer_soft_fps = _valid_int("soft_fps", soft_fps, 1, 30)
desired_fps = request.query.get("desired_fps")
if desired_fps:
self.__streamer_desired_fps = _valid_int("desired_fps", desired_fps, 0, 30)
return _json()
async def __streamer_reset_handler(self, _: aiohttp.web.Request) -> aiohttp.web.Response:
@@ -402,7 +402,7 @@ class Server: # pylint: disable=too-many-instance-attributes
cur = len(self.__sockets)
if prev == 0 and cur > 0:
if not self.__streamer.is_running():
await self.__streamer.start(self.__streamer_quality, self.__streamer_soft_fps)
await self.__streamer.start(self.__streamer_quality, self.__streamer_desired_fps)
await self.__broadcast_event("streamer_state", **self.__streamer.get_state())
elif prev > 0 and cur == 0:
shutdown_at = time.time() + self.__streamer_shutdown_delay
@@ -414,11 +414,11 @@ class Server: # pylint: disable=too-many-instance-attributes
if (
self.__reset_streamer
or self.__streamer_quality != self.__streamer.get_current_quality()
or self.__streamer_soft_fps != self.__streamer.get_current_soft_fps()
or self.__streamer_desired_fps != self.__streamer.get_current_desired_fps()
):
if self.__streamer.is_running():
await self.__streamer.stop()
await self.__streamer.start(self.__streamer_quality, self.__streamer_soft_fps, no_init_restart=True)
await self.__streamer.start(self.__streamer_quality, self.__streamer_desired_fps, no_init_restart=True)
await self.__broadcast_event("streamer_state", **self.__streamer.get_state())
self.__reset_streamer = False