Support turbo2.

[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / VideoEnhancement / plugin.py

diff --git a/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py b/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
old mode 100755 (executable)
new mode 100644 (file)
index 0276e04..a568ac1
--- a/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/VideoEnhancement/plugin.py
@@ -11,19 +11,19 @@ from os import path as os_path
 class VideoEnhancementSetup(Screen, ConfigListScreen):
 
        skin = """
-               <screen name="VideoEnhancementSetup" position="center,center" size="560,430" title="VideoEnhancementSetup">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
-               <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
-               <widget name="config" position="5,50" size="550,340" scrollbarMode="showOnDemand" />
-               <ePixmap pixmap="skin_default/div-h.png" position="0,390" zPosition="1" size="560,2" />
-               <widget source="introduction" render="Label" position="5,400" size="550,25" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
-       </screen>"""
+               <screen name="VideoEnhancementSetup" position="center,center" size="560,440" title="VideoEnhancementSetup">
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/yellow.png" position="280,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="420,0" size="140,40" alphatest="on" />
+                       <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+                       <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+                       <widget source="key_yellow" render="Label" position="280,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
+                       <widget source="key_blue" render="Label" position="420,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" transparent="1" />
+                       <widget name="config" position="5,50" size="550,350" scrollbarMode="showOnDemand" />
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,400" zPosition="1" size="560,2" />
+                       <widget source="introduction" render="Label" position="5,410" size="550,30" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
+               </screen>"""
 
        def __init__(self, session):
                Screen.__init__(self, session)
@@ -66,6 +66,8 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                self.oldMosquito_noise = config.pep.mosquito_noise_reduction.value
                self.oldDigital_contour = config.pep.digital_contour_removal.value
                self.oldScaler_sharpness = config.av.scaler_sharpness.value
+               self.oldScaler_vertical_dejagging = config.pep.scaler_vertical_dejagging.value
+               self.oldSmooth = config.pep.smooth.value
                self.oldSplit = config.pep.split.value
                self.oldSharpness = config.pep.sharpness.value
                self.oldAuto_flesh = config.pep.auto_flesh.value
@@ -91,6 +93,8 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                self.hueEntry = addToConfigList(_("Hue"), config.pep.hue)
                self.brightnessEntry = addToConfigList(_("Brightness"), config.pep.brightness)
                self.scaler_sharpnessEntry = addToConfigList(_("Scaler sharpness"), config.av.scaler_sharpness)
+               self.scaler_vertical_dejaggingEntry = addToConfigList(_("Scaler vertical dejagging"), config.pep.scaler_vertical_dejagging)
+               self.smoothEntry = addToConfigList(_("Smooth"), config.pep.smooth)
                self.splitEntry = addToConfigList(_("Split preview mode"), config.pep.split, True)
                add_to_xtdlist = self.splitEntry is not None
                self.sharpnessEntry = addToConfigList(_("Sharpness"), config.pep.sharpness, add_to_xtdlist)
@@ -120,6 +124,8 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                current = self["config"].getCurrent()
                if current == self.splitEntry:
                        ConfigListScreen.keyLeft(self)
+               elif (current == self.scaler_vertical_dejaggingEntry) or (current == self.smoothEntry):
+                       ConfigListScreen.keyLeft(self)
                elif current != self.splitEntry and current in self.xtdlist:
                        self.previewlist = [
                                current,
@@ -138,6 +144,8 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                current = self["config"].getCurrent()
                if current == self.splitEntry:
                        ConfigListScreen.keyRight(self)
+               elif (current == self.scaler_vertical_dejaggingEntry) or (current == self.smoothEntry):
+                       ConfigListScreen.keyRight(self)
                elif current != self.splitEntry and current in self.xtdlist:
                        self.previewlist = [
                                current,
@@ -152,6 +160,7 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                        maxvalue = current[1].max
                        self.session.openWithCallback(self.PreviewClosed, VideoEnhancementPreview, configEntry = self.previewlist, oldSplitMode = None, maxValue = maxvalue)
 
+
        def confirm(self, confirmed):
                if not confirmed:
                        print "not confirmed"
@@ -195,6 +204,10 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                                config.pep.digital_contour_removal.setValue(self.oldDigital_contour)
                        if self.scaler_sharpnessEntry is not None:
                                config.av.scaler_sharpness.setValue(self.oldScaler_sharpness)
+                       if self.scaler_vertical_dejaggingEntry is not None:
+                               config.pep.scaler_vertical_dejagging.setValue(self.oldScaler_vertical_dejagging)
+                       if self.smoothEntry is not None:
+                               config.pep.smooth.setValue(self.oldSmooth)
                        if self.splitEntry is not None:
                                config.pep.split.setValue('off')
                        if self.sharpnessEntry is not None:
@@ -232,6 +245,10 @@ class VideoEnhancementSetup(Screen, ConfigListScreen):
                                config.pep.digital_contour_removal.setValue(0)
                        if self.scaler_sharpnessEntry is not None:
                                config.av.scaler_sharpness.setValue(13)
+                       if self.scaler_vertical_dejaggingEntry is not None:
+                               config.pep.scaler_vertical_dejagging.setValue(False)
+                       if self.smoothEntry is not None:
+                               config.pep.smooth.setValue(False)
                        if self.splitEntry is not None:
                                config.pep.split.setValue('off')
                        if self.sharpnessEntry is not None:
@@ -270,14 +287,14 @@ class VideoEnhancementPreview(Screen, ConfigListScreen):
 
        skin = """
                <screen name="VideoEnhancementPreview" position="center,360" size="560,170" title="VideoEnhancementPreview">
-               <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
-               <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
-               <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
-               <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
-               <widget name="config" position="5,50" size="550,80" scrollbarMode="showOnDemand" />
-               <ePixmap pixmap="skin_default/div-h.png" position="0,130" zPosition="1" size="560,2" />
-               <widget source="introduction" render="Label" position="0,140" size="550,25" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
-       </screen>"""
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="0,0" size="140,40" alphatest="on" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="140,0" size="140,40" alphatest="on" />
+                       <widget source="key_red" render="Label" position="0,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" transparent="1" />
+                       <widget source="key_green" render="Label" position="140,0" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" transparent="1" />
+                       <widget name="config" position="5,50" size="550,80" scrollbarMode="showOnDemand" />
+                       <ePixmap pixmap="skin_default/div-h.png" position="0,130" zPosition="1" size="560,2" />
+                       <widget source="introduction" render="Label" position="0,140" size="550,25" zPosition="10" font="Regular;21" halign="center" valign="center" backgroundColor="#25062748" transparent="1" />
+               </screen>"""
 
        def __init__(self, session, configEntry = None, oldSplitMode = None, maxValue = None):
                Screen.__init__(self, session)
@@ -394,5 +411,5 @@ def startSetup(menuid):
 def Plugins(**kwargs):
        list = []
        if config.usage.setup_level.index >= 2 and os_path.exists("/proc/stb/vmpeg/0/pep_apply"):
-               list.append(PluginDescriptor(name=_("Videoenhancement Setup"), description=_("Advanced Video Enhancement Setup"), where = PluginDescriptor.WHERE_MENU, fnc=startSetup))
+               list.append(PluginDescriptor(name=_("Videoenhancement Setup"), description=_("Advanced Video Enhancement Setup"), where = PluginDescriptor.WHERE_MENU, needsRestart = False, fnc=startSetup))
        return list