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

edidconf: Allow CEA blocks duplicating

Browse Source
This commit is contained in:
Maxim Devaev 2024-02-15 20:53:12 +02:00
parent 89b2ec8490
commit ea5205116e
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
kvmd/apps/edidconf/__init__.py
View File

@ -207,20 +207,21 @@ class _Edid:
def get_audio(self) -> bool: def get_audio(self) -> bool:
(cbs, _) = self.__parse_cea() (cbs, _) = self.__parse_cea()
return ( audio = False
_CEA_AUDIO in cbs speakers = False
and _CEA_SPEAKERS in cbs for cb in cbs:
and self.__get_basic_audio() if cb.tag == _CEA_AUDIO:
) audio = True
elif cb.tag == _CEA_SPEAKERS:
speakers = True
return (audio and speakers and self.__get_basic_audio())
def set_audio(self, enabled: bool) -> None: def set_audio(self, enabled: bool) -> None:
(cbs, dtds) = self.__parse_cea() (cbs, dtds) = self.__parse_cea()
cbs = [cb for cb in cbs if cb.tag not in [_CEA_AUDIO, _CEA_SPEAKERS]]
if enabled: if enabled:
cbs[_CEA_AUDIO] = _CeaBlock(_CEA_AUDIO, b"\x09\x7f\x07") cbs.append(_CeaBlock(_CEA_AUDIO, b"\x09\x7f\x07"))
cbs[_CEA_SPEAKERS] = _CeaBlock(_CEA_SPEAKERS, b"\x01\x00\x00") cbs.append(_CeaBlock(_CEA_SPEAKERS, b"\x01\x00\x00"))
else:
cbs.pop(_CEA_AUDIO, None)
cbs.pop(_CEA_SPEAKERS, None)
self.__replace_cea(cbs, dtds) self.__replace_cea(cbs, dtds)
self.__set_basic_audio(enabled) self.__set_basic_audio(enabled)
@ -233,19 +234,18 @@ class _Edid:
else: else:
self.__data[_CEA + 3] &= (0xFF - 0b01000000) # ~X self.__data[_CEA + 3] &= (0xFF - 0b01000000) # ~X
def __parse_cea(self) -> tuple[dict[int, _CeaBlock], bytes]: def __parse_cea(self) -> tuple[list[_CeaBlock], bytes]:
cea = self.__data[_CEA:] cea = self.__data[_CEA:]
dtd_begin = cea[2] dtd_begin = cea[2]
if dtd_begin == 0: if dtd_begin == 0:
return ({}, b"") return ([], b"")
cbs: dict[int, _CeaBlock] = {} cbs: list[_CeaBlock] = []
if dtd_begin > 4: if dtd_begin > 4:
raw = cea[4:dtd_begin] raw = cea[4:dtd_begin]
while len(raw) != 0: while len(raw) != 0:
cb = _CeaBlock.first_from_raw(raw) cb = _CeaBlock.first_from_raw(raw)
assert cb.tag not in cbs, f"Duplicating CEA block: {cb.tag}" cbs.append(cb)
cbs[cb.tag] = cb
raw = raw[cb.size:] raw = raw[cb.size:]
dtds = b"" dtds = b""
@ -257,9 +257,9 @@ class _Edid:
return (cbs, dtds) return (cbs, dtds)
def __replace_cea(self, cbs: dict[int, _CeaBlock], dtds: bytes) -> None: def __replace_cea(self, cbs: list[_CeaBlock], dtds: bytes) -> None:
cbs_packed = b"" cbs_packed = b""
for cb in cbs.values(): for cb in cbs:
cbs_packed += cb.pack() cbs_packed += cb.pack()
raw = cbs_packed + dtds raw = cbs_packed + dtds