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

refactoring

Browse Source
This commit is contained in:
Devaev Maxim 2021-02-03 20:40:02 +03:00
parent 18805b3499
commit db4dc5de45
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kvmd/apps/vnc/server.py
View File

@ -201,7 +201,7 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
logger.info("[streamer] %s: Streaming ...", self._remote) logger.info("[streamer] %s: Streaming ...", self._remote)
streaming = True streaming = True
if frame["online"]: if frame["online"]:
await self.__send_fb_real(frame, streamer.get_format()) await self.__send_fb_real(frame)
else: else:
await self.__send_fb_stub("No signal") await self.__send_fb_stub("No signal")
except StreamerError as err: except StreamerError as err:
@ -230,27 +230,27 @@ class _Client(RfbClient): # pylint: disable=too-many-instance-attributes
get_logger(0).info("[streamer] %s: Using default %s", self._remote, streamer) get_logger(0).info("[streamer] %s: Using default %s", self._remote, streamer)
return streamer return streamer
async def __send_fb_real(self, frame: Dict, fmt: int) -> None: async def __send_fb_real(self, frame: Dict) -> None:
async with self.__lock: async with self.__lock:
if self.__fb_requested: if self.__fb_requested:
if not (await self.__resize_fb_unsafe(frame)): if not (await self.__resize_fb_unsafe(frame)):
return return
if fmt == StreamFormats.JPEG: if frame["format"] == StreamFormats.JPEG:
await self._send_fb_jpeg(frame["data"]) await self._send_fb_jpeg(frame["data"])
elif fmt == StreamFormats.H264: elif frame["format"] == StreamFormats.H264:
if not self._encodings.has_h264: if not self._encodings.has_h264:
self.__fb_h264_data = b"" self.__fb_h264_data = b""
raise StreamerPermError("The client doesn't want to accept H264 anymore") raise StreamerPermError("The client doesn't want to accept H264 anymore")
await self._send_fb_h264(self.__fb_h264_data) await self._send_fb_h264(self.__fb_h264_data)
else: else:
raise RuntimeError(f"Unknown format: {fmt}") raise RuntimeError(f"Unknown format: {frame['format']}")
self.__fb_stub = None self.__fb_stub = None
self.__fb_requested = False self.__fb_requested = False
self.__fb_h264_data = b"" self.__fb_h264_data = b""
elif self._encodings.has_h264 and fmt == StreamFormats.H264: elif self._encodings.has_h264 and frame["format"] == StreamFormats.H264:
if frame["key"]: if frame["key"]:
self.__fb_h264_data = frame["data"] self.__fb_h264_data = frame["data"]
elif len(self.__fb_h264_data) + len(frame["data"]) > 4194304: # 4Mb elif len(self.__fb_h264_data) + len(frame["data"]) > 4194304: # 4Mb

1
kvmd/clients/streamer.py
View File

@ -114,6 +114,7 @@ class HttpStreamerClient(BaseStreamerClient):
"width": int(frame.headers["X-UStreamer-Width"]), "width": int(frame.headers["X-UStreamer-Width"]),
"height": int(frame.headers["X-UStreamer-Height"]), "height": int(frame.headers["X-UStreamer-Height"]),
"data": data, "data": data,
"format": StreamFormats.JPEG,
} }
except Exception as err: # Тут бывают и ассерты, и KeyError, и прочая херня except Exception as err: # Тут бывают и ассерты, и KeyError, и прочая херня
if isinstance(err, StreamerTempError): if isinstance(err, StreamerTempError):