X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/edf2e7b1a646ca0a35ac2bc92e97a4b4b29c74f7..ba160cb23024029aac5b35aba554aaf0ac59c072:/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py diff --git a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py index 258f78b1..ade2035d 100644 --- a/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py +++ b/lib/python/Plugins/SystemPlugins/Videomode/VideoHardware.py @@ -9,7 +9,7 @@ from Components.Pixmap import Pixmap from Screens.MessageBox import MessageBox from Screens.Setup import SetupSummary from Components.ConfigList import ConfigListScreen -from Components.config import getConfigListEntry, config, ConfigNothing, ConfigSelection, ConfigSubDict +from Components.config import getConfigListEntry, config, ConfigSelection, ConfigSubDict, ConfigYesNo from Tools.CList import CList @@ -43,27 +43,37 @@ class VideoHardware: "1920x1080": { 60: "1920x1080"}, "1920x1080 multi": { 50: "1920x1080", 60: "1920x1080_50"}, "1280x1024" : { 60: "1280x1024"}, + "1366x768" : { 60: "1366x768"}, + "1366x768 multi" : { 50: "1366x768", 60: "1366x768_50"}, + "1280x768": { 60: "1280x768"}, "640x480" : { 60: "640x480"} } modes["Scart"] = ["PAL", "NTSC", "Multi"] - modes["YPrPb"] = ["720p", "1080i"] + modes["YPbPr"] = ["720p", "1080i"] modes["DVI"] = ["720p", "1080i", "PC"] + widescreen_modes = set(["720p", "1080i"]) + def __init__(self): self.last_modes_preferred = [ ] self.on_hotplug = CList() - self.on_hotplug.append(self.createConfig) - self.ignore_preferred = False # "edid override" - self.readAvailableModes() + + self.createConfig() +# self.on_hotplug.append(self.createConfig) + self.readPreferredModes() + config.av.aspect.addNotifier(self.updateAspect) + config.av.policy_169.addNotifier(self.updateAspect) + config.av.policy_43.addNotifier(self.updateAspect) + # until we have the hotplug poll socket - self.timer = eTimer() - self.timer.timeout.get().append(self.readAvailableModes) - self.timer.start(1000) +# self.timer = eTimer() +# self.timer.callback.append(self.readPreferredModes) +# self.timer.start(1000) def readAvailableModes(self): try: @@ -84,6 +94,7 @@ class VideoHardware: if self.modes_preferred != self.last_modes_preferred: self.last_modes_preferred = self.modes_preferred + print "hotplug on dvi" self.on_hotplug("DVI") # must be DVI # check if a high-level mode with a given rate is available. @@ -91,28 +102,33 @@ class VideoHardware: rate = self.rates[mode][rate] for mode in rate.values(): # DVI modes must be in "modes_preferred" - if port == "DVI": - if mode not in self.modes_preferred and not self.ignore_preferred: - return False +# if port == "DVI": +# if mode not in self.modes_preferred and not config.av.edid_override.value: +# print "no, not preferred" +# return False if mode not in self.modes_available: return False return True - def setMode(self, port, mode, rate): + def isWidescreenMode(self, port, mode): + return mode in self.widescreen_modes + + def setMode(self, port, mode, rate, force = None): + print "setMode - port:", port, "mode:", mode, "rate:", rate # we can ignore "port" self.current_mode = mode modes = self.rates[mode][rate] mode_50 = modes.get(50) mode_60 = modes.get(60) - if mode_50 is None: + if mode_50 is None or force == 60: mode_50 = mode_60 - if mode_60 is None: + if mode_60 is None or force == 50: mode_60 = mode_50 try: - open("/proc/stb/video/videomode_60hz", "w").write(mode_50) - open("/proc/stb/video/videomode_50hz", "w").write(mode_60) + open("/proc/stb/video/videomode_50hz", "w").write(mode_50) + open("/proc/stb/video/videomode_60hz", "w").write(mode_60) except IOError: try: # fallback if no possibility to setup 50/60 hz mode @@ -120,15 +136,35 @@ class VideoHardware: except IOError: print "setting videomode failed." + try: + open("/etc/videomode", "w").write(mode_50) # use 50Hz mode (if available) for booting + except IOError: + print "writing initial videomode to /etc/videomode failed." + + self.updateAspect(None) + + def saveMode(self, port, mode, rate): + config.av.videoport.value = port + config.av.videomode[port].value = mode + config.av.videorate[mode].value = rate + def isPortAvailable(self, port): # fixme return True + def isPortUsed(self, port): + if port == "DVI": + self.readPreferredModes() + return len(self.modes_preferred) != 0 + else: + return True + def getPortList(self): return [port for port in self.modes if self.isPortAvailable(port)] # get a list with all modes, with all rates, for a given port. def getModeList(self, port): + print "getModeList for port", port res = [ ] for mode in self.modes[port]: # list all rates which are completely valid @@ -155,4 +191,71 @@ class VideoHardware: for (mode, rates) in modes: config.av.videorate[mode] = ConfigSelection(choices = rates) -video_hw = VideoHardware() \ No newline at end of file + def setConfiguredMode(self): + port = config.av.videoport.value + if port not in config.av.videomode: + print "current port not available, not setting videomode" + return + + mode = config.av.videomode[port].value + + if mode not in config.av.videorate: + print "current mode not available, not setting videomode" + return + + rate = config.av.videorate[mode].value + self.setMode(port, mode, rate) + + + def updateAspect(self, cfgelement): + # determine aspect = {any,4:3,16:9,16:10} + # determine policy = {bestfit,letterbox,panscan,nonlinear} + + # based on; + # config.av.videoport.value: current video output device + # Scart: + # config.av.aspect: + # 4_3: use policy_169 + # 16_9,16_10: use policy_43 + # auto always "bestfit" + # config.av.policy_169 + # letterbox use letterbox + # panscan use panscan + # scale use bestfit + # config.av.policy_43 + # pillarbox use panscan + # panscan use letterbox ("panscan" is just a bad term, it's inverse-panscan) + # nonlinear use nonlinear + # scale use bestfit + + port = config.av.videoport.value + if port not in config.av.videomode: + print "current port not available, not setting videomode" + return + mode = config.av.videomode[port].value + + force_widescreen = self.isWidescreenMode(port, mode) + + is_widescreen = force_widescreen or config.av.aspect.value in ["16_9", "16_10"] + is_auto = config.av.aspect.value == "auto" + + if is_widescreen: + if force_widescreen: + aspect = "16:9" + else: + aspect = {"16_9": "16:9", "16_10": "16:10"}[config.av.aspect.value] + policy = {"pillarbox": "panscan", "panscan": "letterbox", "nonlinear": "nonlinear", "scale": "bestfit"}[config.av.policy_43.value] + elif is_auto: + aspect = "any" + policy = "bestfit" + else: + aspect = "4:3" + policy = {"letterbox": "letterbox", "panscan": "panscan", "scale": "bestfit"}[config.av.policy_169.value] + + print "-> setting aspect, policy", aspect, policy + open("/proc/stb/video/aspect", "w").write(aspect) + open("/proc/stb/video/policy", "w").write(policy) + +config.av.edid_override = ConfigYesNo(default = False) +video_hw = VideoHardware() +video_hw.setConfiguredMode()