From 9eb9dd57b133eafdd73eb361220e862f28455ba7 Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Tue, 28 Mar 2006 18:46:05 +0000 Subject: [PATCH] add support for 16:10 display aspect ratio --- lib/driver/avswitch.cpp | 6 ++++-- lib/python/Components/AVSwitch.py | 10 ++++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/driver/avswitch.cpp b/lib/driver/avswitch.cpp index 8110049b..f9144f24 100644 --- a/lib/driver/avswitch.cpp +++ b/lib/driver/avswitch.cpp @@ -105,10 +105,12 @@ void eAVSwitch::setAspectRatio(int ratio) 1-4:3 PanScan 2-16:9 3-16:9 forced + 4-16:9 Letterbox + 5-16:9 PanScan */ - char *aspect[] = {"4:3", "4:3", "any", "16:9"}; - char *policy[] = {"letterbox", "panscan", "bestfit", "panscan"}; + char *aspect[] = {"4:3", "4:3", "any", "16:9", "16:10", "16:10"}; + char *policy[] = {"letterbox", "panscan", "bestfit", "panscan", "letterbox", "panscan"}; int fd; if((fd = open("/proc/stb/video/aspect", O_WRONLY)) < 0) { diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py index b391dab6..19fccf54 100644 --- a/lib/python/Components/AVSwitch.py +++ b/lib/python/Components/AVSwitch.py @@ -37,6 +37,10 @@ class AVSwitch: val = 2 elif valstr == "16_9_always": val = 3 + elif valstr == "16_10_letterbox": + val = 4 + elif valstr == "16_10_panscan": + val = 5 return val def setAspectWSS(self, aspect=None): @@ -51,6 +55,8 @@ class AVSwitch: 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 eAVSwitch.getInstance().setWSS(value) def setAspectSlowBlank(self, aspect=None): @@ -60,7 +66,7 @@ class AVSwitch: value = 2 # 12 V elif aspect == 2: # 16:9 value = 4 # auto - elif aspect == 3: # always 16:9 + elif aspect == 3 or aspect == 4 or aspect == 5: # always 16:9 value = 1 # 6V eAVSwitch.getInstance().setSlowblank(value) @@ -74,7 +80,7 @@ def InitAVSwitch(): colorformat_choices = colorformat_choices[:3] config.av.colorformat = configElement("config.av.colorformat", configSelection, 1, colorformat_choices) - config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, (("4_3_letterbox", _("4:3 Letterbox")), ("4_3_panscan", _("4:3 PanScan")), ("16_9", _("16:9")), ("16_9_always", _("16:9 always"))) ) + config.av.aspectratio = configElement("config.av.aspectratio", configSelection, 0, (("4_3_letterbox", _("4:3 Letterbox")), ("4_3_panscan", _("4:3 PanScan")), ("16_9", _("16:9")), ("16_9_always", _("16:9 always")), ("16_10_letterbox", _("16:10 Letterbox")), ("16_10_panscan", _("16:10 PanScan"))) ) #config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, ("PAL", "PAL + PAL60", "Multi", "NTSC") ) config.av.tvsystem = configElement("config.av.tvsystem", configSelection, 0, (("pal", _("PAL")), ("ntsc", _("NTSC"))) ) config.av.wss = configElement("config.av.wss", configSelection, 0, (("off", _("Off")), ("on", _("On"))) ) -- 2.30.2