#631: try harder to prevent people choosing h265 or vp9

git-svn-id: https://xpra.org/svn/Xpra/trunk@7207 3bb7dfac-3a0b-4e04-842a-767bc560f471

src/xpra/client/gtk_base/gtk_tray_menu_base.py

@@ -14,7 +14,7 @@
 from xpra.gtk_common.gtk_util import set_tooltip_text, CheckMenuItem, ensure_item_selected, menuitem
 from xpra.client.client_base import EXIT_OK
 from xpra.client.gtk_base.about import about, close_about
-from xpra.codecs.loader import PREFERED_ENCODING_ORDER, ENCODINGS_HELP, ENCODINGS_TO_NAME
+from xpra.codecs.loader import PREFERED_ENCODING_ORDER, ENCODINGS_HELP, ENCODINGS_TO_NAME, HIDDEN_ENCODINGS
 from xpra.log import Logger
 log = Logger("tray")
 
@@ -543,7 +543,11 @@ def set_encodingsmenuitem(*args):
         return encodings
 
     def make_encodingssubmenu(self, handshake_complete=True):
-        encodings = [x for x in PREFERED_ENCODING_ORDER if x in self.client.get_encodings()]
+        all_encodings = [x for x in PREFERED_ENCODING_ORDER if x in self.client.get_encodings()]
+        encodings = [x for x in all_encodings if x not in HIDDEN_ENCODINGS]
+        if not encodings:
+            #all we have, show the "bad" hidden ones then!
+            encodings = all_encodings
         encodings_submenu = make_encodingsmenu(self.get_current_encoding, self.set_current_encoding, encodings, self.client.server_encodings)
         self.popup_menu_workaround(encodings_submenu)
         return encodings_submenu

src/xpra/codecs/loader.py

@@ -191,7 +191,7 @@ def has_codec(name):
 
 ENCODINGS_HELP = {
       "h264"    : "H.264 video codec",
-      "h265"    : "H.265 (HEVC) video codec (slow)",
+      "h265"    : "H.265 (HEVC) video codec (slow and buggy - do not use!)",
       "vp8"     : "VP8 video codec",
       "vp9"     : "VP9 video codec (very slow - do not use!)",
       "png"     : "Portable Network Graphics (lossless, 24bpp or 32bpp for transparency)",
@@ -204,6 +204,10 @@ def has_codec(name):
 
 HELP_ORDER = ("h264", "h265", "vp8", "vp9", "png", "png/P", "png/L", "webp", "rgb", "jpeg")
 
+#those are so useless that we don't want the user to select them by mistake
+HIDDEN_ENCODINGS = ("h265", "vp9")
+
+
 def encodings_help(encodings):
     h = []
     for e in HELP_ORDER: