Skip to content

Commit

Permalink
sub-optimal or even buggy non-scroll encoding
Browse files Browse the repository at this point in the history
some encodings are both picture encodings and video encodings (ie: 'jpeg' and 'webp'),
so we should not be excluding them from the 'non-video' list.

the bug could be reproduced by connecting with '--encodings=scroll,webp --encoding=scroll'
  • Loading branch information
totaam committed Aug 14, 2024
1 parent cbb2211 commit 3b90fc1
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion xpra/server/window/window_video_source.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ def add(enc, encode_fn):
#these are used for non-video areas, ensure "jpeg" is used if available
#as we may be dealing with large areas still, and we want speed:
enc_options = set(self.server_core_encodings) & set(self._encoders.keys())
nv_common = (enc_options & set(self.core_encodings)) - set(self.video_encodings)
nv_common = enc_options & set(self.core_encodings) & set(self.picture_encodings)
self.non_video_encodings = preforder(nv_common)
log(f"init_encoders() server core encodings={self.server_core_encodings}, client core encodings={self.core_encodings}")
log(f" video encodings={self.video_encodings}")
Expand Down

0 comments on commit 3b90fc1

Please sign in to comment.