Skip to content

V
vlc-gpu
Commit 7ef858fe authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: video filters 

Add grain in first page, move away blur
Renaming gradfun
Tab reorder
parent 96ea9d8f
Hide whitespace changes
Inline Side-by-side
Showing with 154 additions and 102 deletions
modules/gui/qt4/components/extended_panels.cpp
View file @ 7ef858fe
...@@ -215,6 +215,9 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : ...@@ -215,6 +215,9 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
SETUP_VFILTER( gradfun ) SETUP_VFILTER( gradfun )
SETUP_VFILTER_OPTION( gradfunRadiusSlider, valueChanged( int ) ) SETUP_VFILTER_OPTION( gradfunRadiusSlider, valueChanged( int ) )
SETUP_VFILTER( grain )
SETUP_VFILTER_OPTION( grainVarianceSlider, valueChanged( int ) )
if( module_exists( "atmo" ) ) if( module_exists( "atmo" ) )
{ {
SETUP_VFILTER( atmo ) SETUP_VFILTER( atmo )
......
modules/gui/qt4/ui/video_effects.ui
View file @ 7ef858fe
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>542</width> <width>542</width>
<height>276</height> <height>286</height>
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<attribute name="title"> <attribute name="title">
<string>Basic</string> <string>Basic</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QGridLayout" name="gridLayout_8">
<item row="0" column="0" rowspan="3"> <item row="0" column="0" rowspan="3">
<widget class="QGroupBox" name="adjustEnable"> <widget class="QGroupBox" name="adjustEnable">
<property name="enabled"> <property name="enabled">
...@@ -218,9 +218,9 @@ ...@@ -218,9 +218,9 @@
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="1" column="1">
<widget class="QGroupBox" name="motionblurEnable"> <widget class="QGroupBox" name="gradfunEnable">
<property name="title"> <property name="title">
<string>Motion blur</string> <string>Banding removal</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
...@@ -228,27 +228,27 @@ ...@@ -228,27 +228,27 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="_3"> <layout class="QGridLayout" name="gridLayout_2">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_34"> <widget class="QLabel" name="label_32">
<property name="text"> <property name="text">
<string>Factor</string> <string>Radius</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>blurFactorSlider</cstring> <cstring>gradfunRadiusSlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="blurFactorSlider"> <widget class="QSlider" name="gradfunRadiusSlider">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>4</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>127</number> <number>32</number>
</property> </property>
<property name="value"> <property name="pageStep">
<number>80</number> <number>4</number>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
...@@ -257,7 +257,7 @@ ...@@ -257,7 +257,7 @@
<enum>QSlider::TicksBelow</enum> <enum>QSlider::TicksBelow</enum>
</property> </property>
<property name="tickInterval"> <property name="tickInterval">
<number>16</number> <number>4</number>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -265,9 +265,9 @@ ...@@ -265,9 +265,9 @@
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="2" column="1">
<widget class="QGroupBox" name="gradfunEnable"> <widget class="QGroupBox" name="grainEnable">
<property name="title"> <property name="title">
<string>Gradient</string> <string>Film Grain</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
...@@ -275,24 +275,24 @@ ...@@ -275,24 +275,24 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_2"> <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_32"> <widget class="QLabel" name="label_50">
<property name="text"> <property name="text">
<string>Radius</string> <string>Variance</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>gradfunRadiusSlider</cstring> <cstring>grainVarianceSlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="gradfunRadiusSlider"> <widget class="QSlider" name="grainVarianceSlider">
<property name="minimum"> <property name="minimum">
<number>4</number> <number>0</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>32</number> <number>40</number>
</property> </property>
<property name="pageStep"> <property name="pageStep">
<number>4</number> <number>4</number>
...@@ -436,31 +436,6 @@ ...@@ -436,31 +436,6 @@
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_5"> <layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QGroupBox" name="transformEnable">
<property name="title">
<string>Transform</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="_4">
<item row="0" column="0">
<widget class="QComboBox" name="transformTypeCombo"/>
</item>
</layout>
</widget>
</item>
<item row="0" column="1">
<widget class="QCheckBox" name="magnifyEnable">
<property name="text">
<string>Magnification/Zoom</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QGroupBox" name="rotateEnable"> <widget class="QGroupBox" name="rotateEnable">
<property name="title"> <property name="title">
<string>Rotate</string> <string>Rotate</string>
...@@ -472,7 +447,17 @@ ...@@ -472,7 +447,17 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout">
<item row="0" column="1"> <item row="1" column="0">
<widget class="QLabel" name="label_28">
<property name="text">
<string>Angle</string>
</property>
<property name="buddy">
<cstring>rotateAngleDial</cstring>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QDial" name="rotateAngleDial"> <widget class="QDial" name="rotateAngleDial">
<property name="maximum"> <property name="maximum">
<number>359</number> <number>359</number>
...@@ -485,20 +470,28 @@ ...@@ -485,20 +470,28 @@
</property> </property>
</widget> </widget>
</item> </item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="transformEnable">
<property name="title">
<string>Transform</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="_4">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_28"> <widget class="QComboBox" name="transformTypeCombo"/>
<property name="text">
<string>Angle</string>
</property>
<property name="buddy">
<cstring>rotateAngleDial</cstring>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="0" column="1">
<widget class="QGroupBox" name="puzzleEnable"> <widget class="QGroupBox" name="puzzleEnable">
<property name="title"> <property name="title">
<string>Puzzle game</string> <string>Puzzle game</string>
...@@ -566,6 +559,13 @@ ...@@ -566,6 +559,13 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="1">
<widget class="QCheckBox" name="magnifyEnable">
<property name="text">
<string>Magnification/Zoom</string>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
...@@ -573,7 +573,7 @@ ...@@ -573,7 +573,7 @@
<string>Color</string> <string>Color</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_7">
<item row="0" column="0"> <item row="0" column="0" rowspan="2">
<widget class="QGroupBox" name="colorthresEnable"> <widget class="QGroupBox" name="colorthresEnable">
<property name="title"> <property name="title">
<string>Color threshold</string> <string>Color threshold</string>
...@@ -639,7 +639,7 @@ ...@@ -639,7 +639,7 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1" rowspan="2" colspan="2">
<widget class="QGroupBox" name="gradientEnable"> <widget class="QGroupBox" name="gradientEnable">
<property name="title"> <property name="title">
<string>Gradient</string> <string>Gradient</string>
...@@ -678,10 +678,10 @@ ...@@ -678,10 +678,10 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="0" rowspan="5"> <item row="0" column="3">
<widget class="QGroupBox" name="extractEnable"> <widget class="QGroupBox" name="posterizeEnable">
<property name="title"> <property name="title">
<string>Color extraction</string> <string>Posterize</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
...@@ -689,28 +689,34 @@ ...@@ -689,28 +689,34 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_6"> <widget class="QLabel" name="label_33">
<property name="text"> <property name="text">
<string>Color</string> <string>Posterize level</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QLineEdit" name="extractComponentText"> <widget class="QSpinBox" name="posterizeLevelSpin">
<property name="inputMask"> <property name="minimum">
<string>&gt;HHHHHH;#</string> <number>2</number>
</property>
<property name="maximum">
<number>256</number>
</property>
<property name="value">
<number>3</number>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="1" column="3" rowspan="3">
<widget class="QGroupBox" name="posterizeEnable"> <widget class="QGroupBox" name="motionblurEnable">
<property name="title"> <property name="title">
<string>Posterize</string> <string>Motion blur</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
...@@ -718,69 +724,110 @@ ...@@ -718,69 +724,110 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QGridLayout" name="_3">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_33"> <widget class="QLabel" name="label_34">
<property name="text"> <property name="text">
<string>Posterize level</string> <string>Factor</string>
</property>
<property name="buddy">
<cstring>blurFactorSlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSpinBox" name="posterizeLevelSpin"> <widget class="QSlider" name="blurFactorSlider">
<property name="minimum"> <property name="minimum">
<number>2</number> <number>1</number>
</property> </property>
<property name="maximum"> <property name="maximum">
<number>256</number> <number>127</number>
</property> </property>
<property name="value"> <property name="value">
<number>3</number> <number>80</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>16</number>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="2" column="0" rowspan="6">
<widget class="QGroupBox" name="extractEnable">
<property name="title">
<string>Color extraction</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Color</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLineEdit" name="extractComponentText">
<property name="inputMask">
<string>&gt;HHHHHH;#</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="1">
<widget class="QCheckBox" name="invertEnable"> <widget class="QCheckBox" name="invertEnable">
<property name="text"> <property name="text">
<string>Invert colors</string> <string>Invert colors</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="4" column="3">
<widget class="QCheckBox" name="rippleEnable"> <widget class="QCheckBox" name="rippleEnable">
<property name="text"> <property name="text">
<string>Water effect</string> <string>Water effect</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="5" column="3">
<widget class="QCheckBox" name="motiondetectEnable"> <widget class="QCheckBox" name="waveEnable">
<property name="text"> <property name="text">
<string>Motion detect</string> <string>Waves</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="5" column="1">
<widget class="QCheckBox" name="waveEnable"> <widget class="QCheckBox" name="psychedelicEnable">
<property name="text"> <property name="text">
<string>Waves</string> <string>Psychedelic</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="3" column="1">
<widget class="QCheckBox" name="noiseEnable"> <widget class="QCheckBox" name="motiondetectEnable">
<property name="text"> <property name="text">
<string>Noise</string> <string>Motion detect</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="4" column="1">
<widget class="QCheckBox" name="psychedelicEnable"> <widget class="QCheckBox" name="noiseEnable">
<property name="text"> <property name="text">
<string>Psychedelic</string> <string>Noise</string>
</property> </property>
</widget> </widget>
</item> </item>
...@@ -1527,27 +1574,28 @@ ...@@ -1527,27 +1574,28 @@
<tabstop>gammaSlider</tabstop> <tabstop>gammaSlider</tabstop>
<tabstop>sharpenEnable</tabstop> <tabstop>sharpenEnable</tabstop>
<tabstop>sharpenSigmaSlider</tabstop> <tabstop>sharpenSigmaSlider</tabstop>
<tabstop>motionblurEnable</tabstop>
<tabstop>blurFactorSlider</tabstop>
<tabstop>gradfunEnable</tabstop> <tabstop>gradfunEnable</tabstop>
<tabstop>gradfunRadiusSlider</tabstop> <tabstop>gradfunRadiusSlider</tabstop>
<tabstop>grainEnable</tabstop>
<tabstop>grainVarianceSlider</tabstop>
<tabstop>cropTopPx</tabstop> <tabstop>cropTopPx</tabstop>
<tabstop>cropLeftPx</tabstop> <tabstop>cropLeftPx</tabstop>
<tabstop>cropRightPx</tabstop> <tabstop>cropRightPx</tabstop>
<tabstop>cropBotPx</tabstop> <tabstop>cropBotPx</tabstop>
<tabstop>topBotCropSync</tabstop> <tabstop>topBotCropSync</tabstop>
<tabstop>leftRightCropSync</tabstop> <tabstop>leftRightCropSync</tabstop>
<tabstop>transformEnable</tabstop>
<tabstop>transformTypeCombo</tabstop>
<tabstop>rotateEnable</tabstop> <tabstop>rotateEnable</tabstop>
<tabstop>rotateAngleDial</tabstop> <tabstop>rotateAngleDial</tabstop>
<tabstop>magnifyEnable</tabstop> <tabstop>transformEnable</tabstop>
<tabstop>transformTypeCombo</tabstop>
<tabstop>puzzleEnable</tabstop> <tabstop>puzzleEnable</tabstop>
<tabstop>puzzleRowsSpin</tabstop> <tabstop>puzzleRowsSpin</tabstop>
<tabstop>puzzleColsSpin</tabstop> <tabstop>puzzleColsSpin</tabstop>
<tabstop>puzzleBlackSlotCheck</tabstop> <tabstop>puzzleBlackSlotCheck</tabstop>
<tabstop>magnifyEnable</tabstop>
<tabstop>colorthresEnable</tabstop> <tabstop>colorthresEnable</tabstop>
<tabstop>colorthresColorText</tabstop> <tabstop>colorthresColorText</tabstop>
<tabstop>eraseXSpin</tabstop>
<tabstop>colorthresSaturationthresSlider</tabstop> <tabstop>colorthresSaturationthresSlider</tabstop>
<tabstop>colorthresSimilaritythresSlider</tabstop> <tabstop>colorthresSimilaritythresSlider</tabstop>
<tabstop>extractEnable</tabstop> <tabstop>extractEnable</tabstop>
...@@ -1559,20 +1607,22 @@ ...@@ -1559,20 +1607,22 @@
<tabstop>invertEnable</tabstop> <tabstop>invertEnable</tabstop>
<tabstop>motiondetectEnable</tabstop> <tabstop>motiondetectEnable</tabstop>
<tabstop>noiseEnable</tabstop> <tabstop>noiseEnable</tabstop>
<tabstop>psychedelicEnable</tabstop>
<tabstop>posterizeEnable</tabstop> <tabstop>posterizeEnable</tabstop>
<tabstop>posterizeLevelSpin</tabstop> <tabstop>posterizeLevelSpin</tabstop>
<tabstop>waveEnable</tabstop> <tabstop>motionblurEnable</tabstop>
<tabstop>blurFactorSlider</tabstop>
<tabstop>rippleEnable</tabstop> <tabstop>rippleEnable</tabstop>
<tabstop>psychedelicEnable</tabstop> <tabstop>waveEnable</tabstop>
<tabstop>atmoEnable</tabstop> <tabstop>atmoEnable</tabstop>
<tabstop>atmoEdgeweightningSlider</tabstop> <tabstop>atmoEdgeweightningSlider</tabstop>
<tabstop>atmoBrightnessSlider</tabstop> <tabstop>atmoBrightnessSlider</tabstop>
<tabstop>atmoDarknesslimitSlider</tabstop> <tabstop>atmoDarknesslimitSlider</tabstop>
<tabstop>atmoFiltermodeCombo</tabstop>
<tabstop>atmoShowdotsCheck</tabstop>
<tabstop>atmoMeanlengthSlider</tabstop> <tabstop>atmoMeanlengthSlider</tabstop>
<tabstop>atmoMeanthresholdSlider</tabstop> <tabstop>atmoMeanthresholdSlider</tabstop>
<tabstop>atmoPercentnewSlider</tabstop> <tabstop>atmoPercentnewSlider</tabstop>
<tabstop>atmoFiltermodeCombo</tabstop>
<tabstop>atmoShowdotsCheck</tabstop>
<tabstop>wallEnable</tabstop> <tabstop>wallEnable</tabstop>
<tabstop>wallRowsSpin</tabstop> <tabstop>wallRowsSpin</tabstop>
<tabstop>wallColsSpin</tabstop> <tabstop>wallColsSpin</tabstop>
...@@ -1592,7 +1642,6 @@ ...@@ -1592,7 +1642,6 @@
<tabstop>eraseEnable</tabstop> <tabstop>eraseEnable</tabstop>
<tabstop>eraseMaskText</tabstop> <tabstop>eraseMaskText</tabstop>
<tabstop>eraseYSpin</tabstop> <tabstop>eraseYSpin</tabstop>
<tabstop>eraseXSpin</tabstop>
</tabstops> </tabstops>
<resources/> <resources/>
<connections/> <connections/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment