more changes for async picture decode support

[vuplus_dvbapp] / lib / python / Components / AVSwitch.py

diff --git a/lib/python/Components/AVSwitch.py b/lib/python/Components/AVSwitch.py
index 7ac2bb9..19aca24 100644 (file)
--- a/lib/python/Components/AVSwitch.py
+++ b/lib/python/Components/AVSwitch.py
@@ -1,5 +1,5 @@
 from config import config, ConfigSlider, ConfigSelection, ConfigYesNo, ConfigEnableDisable, ConfigSubsection, ConfigBoolean
-from enigma import eAVSwitch
+from enigma import eAVSwitch, getDesktop
 from SystemInfo import SystemInfo
 
 class AVSwitch:
@@ -32,9 +32,12 @@ class AVSwitch:
                if valstr in ("4_3_letterbox", "4_3_panscan"): # 4:3
                        return 1.333333333
                elif valstr == "16_9": # auto ... 4:3 or 16:9
-                       # TODO: here we must retrieve the current video aspect ratio...
-                       # because the TV can run in 4:3 or in 16:9 mode.. (switched by wss or scart pin8)
-                       # until we have done this we always return the scale value for 16:9!!
+                       try:
+                               aspect_str = open("/proc/stb/vmpeg/0/aspect", "r").read()
+                               if aspect_str == "1": # 4:3
+                                       return 1.333333333
+                       except IOError:
+                               pass
                        return 1.777777778
                elif valstr in ("16_9_always", "16_9_letterbox"): # 16:9
                        return 1.777777778
@@ -43,6 +46,11 @@ class AVSwitch:
                print "unknown output aspect!"
                return 1.0000
 
+       def getFramebufferScale(self):
+               aspect = self.getOutputAspect()
+               fb_size = getDesktop(0).size()
+               return aspect / ((1.0 * fb_size.width()) / fb_size.height())
+
        def getAspectRatioSetting(self):
                valstr = config.av.aspectratio.value
                if valstr == "4_3_letterbox":