-from Screens.Screen import Screen
-from Plugins.Plugin import PluginDescriptor
-
from enigma import eTimer
-
-from Components.ActionMap import ActionMap
-from Components.Label import Label
-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, ConfigSelection, ConfigSubDict, ConfigYesNo
+from Components.config import config, ConfigSelection, ConfigSubDict, ConfigYesNo
from Tools.CList import CList
modes = { } # a list of (high-level) modes for a certain port.
- rates["PAL"] = { "50Hz": { 50: "pal", 60: "pal"},
- "60Hz": { 50: "pal60", 60: "pal60"},
- "multi": { 50: "pal", 60: "pal60"} }
- rates["NTSC"] = { "60Hz": { 50: "ntsc", 60: "ntsc"} }
- rates["Multi"] = { "multi": { 50: "pal", 60: "ntsc"} }
- rates["720p"] = { "50Hz": { 50: "720p50", 60: "720p50"},
- "60Hz": { 50: "720p", 60: "720p"},
- "multi": { 50: "720p50", 60: "720p"} }
- rates["1080i"] = { "50Hz": { 50: "1080i50", 60: "1080i50"},
- "60Hz": { 50: "1080i", 60: "1080i"},
- "multi": { 50: "1080i50", 60: "1080i"} }
+ rates["PAL"] = { "50Hz": { 50: "pal" },
+ "60Hz": { 60: "pal60" },
+ "multi": { 50: "pal", 60: "pal60" } }
+
+ rates["NTSC"] = { "60Hz": { 60: "ntsc" } }
+
+ rates["Multi"] = { "multi": { 50: "pal", 60: "ntsc" } }
+
+ rates["480i"] = { "60Hz": { 60: "480i" } }
+
+ rates["576i"] = { "50Hz": { 50: "576i" } }
+
+ rates["480p"] = { "60Hz": { 60: "480p" } }
+
+ rates["576p"] = { "50Hz": { 50: "576p" } }
+
+ rates["720p"] = { "50Hz": { 50: "720p50" },
+ "60Hz": { 60: "720p" },
+ "multi": { 50: "720p50", 60: "720p" } }
+
+ rates["1080i"] = { "50Hz": { 50: "1080i50" },
+ "60Hz": { 60: "1080i" },
+ "multi": { 50: "1080i50", 60: "1080i" } }
+
rates["PC"] = {
- "1024x768": { 60: "1024x768"}, # not possible on DM7025
- "800x600" : { 60: "800x600"}, # also not possible
- "720x480" : { 60: "720x480"},
- "720x576" : { 60: "720x576"},
- "1280x720": { 60: "1280x720"},
- "1280x720 multi": { 50: "1280x720_50", 60: "1280x720"},
+ "1024x768": { 60: "1024x768" }, # not possible on DM7025
+ "800x600" : { 60: "800x600" }, # also not possible
+ "720x480" : { 60: "720x480" },
+ "720x576" : { 60: "720x576" },
+ "1280x720": { 60: "1280x720" },
+ "1280x720 multi": { 50: "1280x720_50", 60: "1280x720" },
"1920x1080": { 60: "1920x1080"},
- "1920x1080 multi": { 50: "1920x1080", 60: "1920x1080_50"},
+ "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"}
+ "1366x768 multi" : { 50: "1366x768", 60: "1366x768_50" },
+ "1280x768": { 60: "1280x768" },
+ "640x480" : { 60: "640x480" }
}
modes["Scart"] = ["PAL", "NTSC", "Multi"]
- modes["YPbPr"] = ["720p", "1080i"]
- modes["DVI"] = ["720p", "1080i", "PC"]
+ modes["YPbPr"] = ["720p", "1080i", "576p", "480p", "576i", "480i"]
+ modes["DVI"] = ["720p", "1080i", "576p", "480p", "576i", "480i"]
+ modes["DVI-PC"] = ["PC"]
widescreen_modes = set(["720p", "1080i"])
+ def getOutputAspect(self):
+ ret = (16,9)
+ port = config.av.videoport.value
+ if port not in config.av.videomode:
+ print "current port not available in getOutputAspect!!! force 16:9"
+ else:
+ 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:
+ pass
+ else:
+ aspect = {"16_9": "16:9", "16_10": "16:10"}[config.av.aspect.value]
+ if aspect == "16:10":
+ ret = (16,10)
+ elif is_auto:
+ try:
+ aspect_str = open("/proc/stb/vmpeg/0/aspect", "r").read()
+ if aspect_str == "1": # 4:3
+ ret = (4,3)
+ except IOError:
+ pass
+ else: # 4:3
+ ret = (4,3)
+ return ret
+
def __init__(self):
self.last_modes_preferred = [ ]
self.on_hotplug = CList()
+ self.current_mode = None
+ self.current_port = None
self.readAvailableModes()
+ if self.modes.has_key("DVI-PC") and not self.getModeList("DVI-PC"):
+ print "remove DVI-PC because of not existing modes"
+ del self.modes["DVI-PC"]
+
self.createConfig()
# self.on_hotplug.append(self.createConfig)
self.readPreferredModes()
+ # take over old AVSwitch component :)
+ from Components.AVSwitch import AVSwitch
+# config.av.colorformat.notifiers = [ ]
+ config.av.aspectratio.notifiers = [ ]
+ config.av.tvsystem.notifiers = [ ]
+ config.av.wss.notifiers = [ ]
+ AVSwitch.getOutputAspect = self.getOutputAspect
+
config.av.aspect.addNotifier(self.updateAspect)
+ config.av.wss.addNotifier(self.updateAspect)
config.av.policy_169.addNotifier(self.updateAspect)
config.av.policy_43.addNotifier(self.updateAspect)
print "setMode - port:", port, "mode:", mode, "rate:", rate
# we can ignore "port"
self.current_mode = mode
+ self.current_port = port
modes = self.rates[mode][rate]
mode_50 = modes.get(50)
self.updateAspect(None)
def saveMode(self, port, mode, rate):
+ print "saveMode", port, mode, rate
config.av.videoport.value = port
+ config.av.videoport.save()
config.av.videomode[port].value = mode
+ config.av.videomode[port].save()
config.av.videorate[mode].value = rate
+ config.av.videorate[mode].save()
def isPortAvailable(self, port):
# fixme
rate = config.av.videorate[mode].value
self.setMode(port, mode, rate)
-
def updateAspect(self, cfgelement):
# determine aspect = {any,4:3,16:9,16:10}
force_widescreen = self.isWidescreenMode(port, mode)
- is_widescreen = force_widescreen or config.av.aspect.value in ["16_9", "16_10"]
+ is_widescreen = force_widescreen or config.av.aspect.value in ("16_9", "16_10")
is_auto = config.av.aspect.value == "auto"
+ policy2 = "policy" # use main policy
if is_widescreen:
if force_widescreen:
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]
+ policy2 = {"letterbox": "letterbox", "panscan": "panscan", "scale": "bestfit"}[config.av.policy_169.value]
elif is_auto:
aspect = "any"
policy = "bestfit"
aspect = "4:3"
policy = {"letterbox": "letterbox", "panscan": "panscan", "scale": "bestfit"}[config.av.policy_169.value]
- print "-> setting aspect, policy", aspect, policy
+ if not config.av.wss.value:
+ wss = "auto(4:3_off)"
+ else:
+ wss = "auto"
+
+ print "-> setting aspect, policy, policy2, wss", aspect, policy, policy2, wss
open("/proc/stb/video/aspect", "w").write(aspect)
open("/proc/stb/video/policy", "w").write(policy)
+ open("/proc/stb/denc/0/wss", "w").write(wss)
+ try:
+ open("/proc/stb/video/policy2", "w").write(policy2)
+ except IOError:
+ pass
config.av.edid_override = ConfigYesNo(default = False)
video_hw = VideoHardware()
git.cweiske.de / enigma2.git / blobdiff