Skip to content

Commit

Permalink
#800 make it possible to disable b-frames from the client using the s…
Browse files Browse the repository at this point in the history
…ame XPRA_B_FRAMES env var

git-svn-id: https://xpra.org/svn/Xpra/trunk@12890 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
totaam committed Jun 22, 2016
1 parent 3788582 commit 63e9e21
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/xpra/client/ui_client_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def add_legacy_names(codecs):
PAINT_FAULT_RATE = int(os.environ.get("XPRA_PAINT_FAULT_INJECTION_RATE", "0"))
PAINT_FAULT_TELL = os.environ.get("XPRA_PAINT_FAULT_INJECTION_TELL", "1")=="1"

B_FRAMES = os.environ.get("XPRA_B_FRAMES", "1")=="1"

#LOG_INFO_RESPONSE = ("^window.*position", "^window.*size$")
LOG_INFO_RESPONSE = os.environ.get("XPRA_LOG_INFO_RESPONSE", "")
Expand Down Expand Up @@ -1449,6 +1450,10 @@ def make_hello(self):
"greedy" : CLIPBOARD_GREEDY,
"set_enabled" : True,
})
if B_FRAMES:
video_b_frames = ["h264"] #only tested with dec_avcodec2
else:
video_b_frames = []
updict(capabilities, "encoding", {
"flush" : True,
"scaling.control" : self.video_scaling,
Expand All @@ -1457,7 +1462,7 @@ def make_hello(self):
#TODO: check for csc support (swscale only?)
"video_reinit" : True,
"video_scaling" : True,
"video_b_frames" : ["h264"], #only tested with dec_avcodec2
"video_b_frames" : video_b_frames,
"webp_leaks" : False,
"transparency" : self.has_transparency(),
"rgb24zlib" : True,
Expand Down

0 comments on commit 63e9e21

Please sign in to comment.