X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=blobdiff_plain;f=lib%2Fpython%2FComponents%2FAVSwitch.py;h=8f4255b817c099178f8eeb7cdb8fc3cfe5d8c073;hp=a8e471ba645e2322a3802ef35d4aac8468a62c0a;hb=4531ea135c84d78d96d66a08b67f1f5e09475c55;hpb=ed40f6f85c9c07c3c1224ae20601082c0309a631 diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py index a8e471b..8f4255b 100644 --- a/lib/python/Components/AVSwitch.py +++ b/lib/python/Components/AVSwitch.py @@ -1,33 +1,44 @@ -from config import config, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean -import os -from enigma import eAVSwitch +from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, \ + ConfigEnableDisable, ConfigSubsection, ConfigBoolean, ConfigNumber +from enigma import eAVSwitch, getDesktop +from SystemInfo import SystemInfo class AVSwitch: - INPUT = { "ENCODER": (0, 4), "SCART": (1, 3), "AUX": (2, 4) } - def setInput(self, input): - eAVSwitch.getInstance().setInput(self.INPUT[input][0]) - if self.INPUT[input][1] == 4: - aspect = self.getAspectRatioSetting() - self.setAspectWSS(aspect) - self.setAspectSlowBlank(aspect) - else: - eAVSwitch.getInstance().setSlowblank(self.INPUT[input][1]) - # FIXME why do we have to reset the colorformat? bug in avs-driver? - map = {"cvbs": 0, "rgb": 1, "svideo": 2, "yuv": 3} - eAVSwitch.getInstance().setColorFormat(map[config.av.colorformat.value]) + INPUT = { "ENCODER": 0, "SCART": 1, "AUX": 2 } + eAVSwitch.getInstance().setInput(INPUT[input]) def setColorFormat(self, value): eAVSwitch.getInstance().setColorFormat(value) def setAspectRatio(self, value): eAVSwitch.getInstance().setAspectRatio(value) - self.setAspectWSS(value) - self.setAspectSlowBlank(value) def setSystem(self, value): eAVSwitch.getInstance().setVideomode(value) + def getOutputAspect(self): + valstr = config.av.aspectratio.value + if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3 + return (4,3) + elif valstr == "16_9": # auto ... 4:3 or 16:9 + try: + aspect_str = open("/proc/stb/vmpeg/0/aspect", "r").read() + if aspect_str == "1": # 4:3 + return (4,3) + except IOError: + pass + elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9 + pass + elif valstr in ("16_10_letterbox", "16_10_panscan"): # 16:10 + return (16,10) + return (16,9) + + def getFramebufferScale(self): + aspect = self.getOutputAspect() + fb_size = getDesktop(0).size() + return (aspect[0] * fb_size.height(), aspect[1] * fb_size.width()) + def getAspectRatioSetting(self): valstr = config.av.aspectratio.value if valstr == "4_3_letterbox": @@ -42,35 +53,17 @@ class AVSwitch: val = 4 elif valstr == "16_10_panscan": val = 5 + elif valstr == "16_9_letterbox": + val = 6 return val def setAspectWSS(self, aspect=None): - if aspect is None: - aspect = self.getAspectRatioSetting() - if aspect == 0 or aspect == 1: # letterbox or panscan - value = 3 # 4:3_full_format - elif aspect == 2: # 16:9 - if not config.av.wss.value: - value = 2 # auto(4:3_off) - else: - value = 1 # auto - elif aspect == 3: # always 16:9 - value = 4 # 16:9_full_format - elif aspect == 4 or aspect == 5: # 16:10 - value = 10 # 14:9_full_format + if not config.av.wss.value: + value = 2 # auto(4:3_off) + else: + value = 1 # auto eAVSwitch.getInstance().setWSS(value) - def setAspectSlowBlank(self, aspect=None): - if aspect is None: - aspect = self.getAspectRatioSetting() - if aspect == 0 or aspect == 1: # letterbox or panscan - value = 2 # 12 V - elif aspect == 2: # 16:9 - value = 4 # auto - elif aspect == 3 or aspect == 4 or aspect == 5: # always 16:9 - value = 1 # 6V - eAVSwitch.getInstance().setSlowblank(value) - def InitAVSwitch(): config.av = ConfigSubsection() config.av.yuvenabled = ConfigBoolean(default=False) @@ -87,11 +80,39 @@ def InitAVSwitch(): "16_9": _("16:9"), "16_9_always": _("16:9 always"), "16_10_letterbox": _("16:10 Letterbox"), - "16_10_panscan": _("16:10 PanScan")}, + "16_10_panscan": _("16:10 PanScan"), + "16_9_letterbox": _("16:9 Letterbox")}, default = "4_3_letterbox") + + config.av.aspect = ConfigSelection(choices={ + "4_3": _("4:3"), + "16_9": _("16:9"), + "16_10": _("16:10"), + "auto": _("Automatic")}, + default = "auto") + config.av.policy_169 = ConfigSelection(choices={ + # TRANSLATORS: (aspect ratio policy: black bars on top/bottom) in doubt, keep english term. + "letterbox": _("Letterbox"), + # TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term + "panscan": _("Pan&Scan"), + # TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect) + "scale": _("Just Scale")}, + default = "letterbox") + config.av.policy_43 = ConfigSelection(choices={ + # TRANSLATORS: (aspect ratio policy: black bars on left/right) in doubt, keep english term. + "pillarbox": _("Pillarbox"), + # TRANSLATORS: (aspect ratio policy: cropped content on left/right) in doubt, keep english term + "panscan": _("Pan&Scan"), + # TRANSLATORS: (aspect ratio policy: display as fullscreen, with stretching the left/right) + "nonlinear": _("Nonlinear"), + # TRANSLATORS: (aspect ratio policy: display as fullscreen, even if this breaks the aspect) + "scale": _("Just Scale")}, + default = "pillarbox") config.av.tvsystem = ConfigSelection(choices = {"pal": _("PAL"), "ntsc": _("NTSC"), "multinorm": _("multinorm")}, default="pal") config.av.wss = ConfigEnableDisable(default = True) config.av.defaultac3 = ConfigYesNo(default = False) + config.av.generalAC3delay = ConfigNumber(default = 0) + config.av.generalPCMdelay = ConfigNumber(default = 0) config.av.vcrswitch = ConfigEnableDisable(default = False) iAVSwitch = AVSwitch() @@ -101,7 +122,7 @@ def InitAVSwitch(): iAVSwitch.setColorFormat(map[configElement.value]) def setAspectRatio(configElement): - map = {"4_3_letterbox": 0, "4_3_panscan": 1, "16_9": 2, "16_9_always": 3, "16_10_letterbox": 4, "16_10_panscan": 5} + map = {"4_3_letterbox": 0, "4_3_panscan": 1, "16_9": 2, "16_9_always": 3, "16_10_letterbox": 4, "16_10_panscan": 5, "16_9_letterbox" : 6} iAVSwitch.setAspectRatio(map[configElement.value]) def setSystem(configElement): @@ -118,3 +139,30 @@ def InitAVSwitch(): config.av.wss.addNotifier(setWSS) iAVSwitch.setInput("ENCODER") # init on startup + SystemInfo["ScartSwitch"] = eAVSwitch.getInstance().haveScartSwitch() + + try: + can_downmix = open("/proc/stb/audio/ac3_choices", "r").read()[:-1].find("downmix") != -1 + except: + can_downmix = False + + SystemInfo["CanDownmixAC3"] = can_downmix + if can_downmix: + def setAC3Downmix(configElement): + open("/proc/stb/audio/ac3", "w").write(configElement.value and "downmix" or "passthrough") + config.av.downmix_ac3 = ConfigYesNo(default = True) + config.av.downmix_ac3.addNotifier(setAC3Downmix) + + try: + can_osd_alpha = open("/proc/stb/video/alpha", "r") and True or False + except: + can_osd_alpha = False + + SystemInfo["CanChangeOsdAlpha"] = can_osd_alpha + + def setAlpha(config): + open("/proc/stb/video/alpha", "w").write(str(config.value)) + + if can_osd_alpha: + config.av.osd_alpha = ConfigSlider(default=255, limits=(0,255)) + config.av.osd_alpha.addNotifier(setAlpha)