Skip to content

V
vlc
Commit 339e21d5 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: introduce hqdn3d in the effects UI

parent 704ec204
Show whitespace changes
Inline Side-by-side
Showing with 234 additions and 94 deletions
modules/gui/qt4/components/extended_panels.cpp
View file @ 339e21d5
...@@ -203,11 +203,17 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) : ...@@ -203,11 +203,17 @@ ExtVideo::ExtVideo( intf_thread_t *_p_intf, QTabWidget *_parent ) :
SETUP_VFILTER( mirror ) SETUP_VFILTER( mirror )
SETUP_VFILTER( gaussianblur ) SETUP_VFILTER( gaussianblur )
SETUP_VFILTER_OPTION( gaussianbluSigmaSlider, valueChanged( int ) ) SETUP_VFILTER_OPTION( gaussianblurSigmaSlider, valueChanged( int ) )
SETUP_VFILTER( antiflicker ) SETUP_VFILTER( antiflicker )
SETUP_VFILTER_OPTION( antiflickerSofteningSizeSlider, valueChanged( int ) ) SETUP_VFILTER_OPTION( antiflickerSofteningSizeSlider, valueChanged( int ) )
SETUP_VFILTER( hqdn3d )
SETUP_VFILTER_OPTION( hqdn3dLumaSpatSlider, valueChanged( int ) )
SETUP_VFILTER_OPTION( hqdn3dLumaTempSlider, valueChanged( int ) )
SETUP_VFILTER_OPTION( hqdn3dChromaSpatSlider, valueChanged( int ) )
SETUP_VFILTER_OPTION( hqdn3dChromaTempSlider, valueChanged( int ) )
if( module_exists( "atmo" ) ) if( module_exists( "atmo" ) )
{ {
...@@ -585,9 +591,9 @@ void ExtVideo::setWidgetValue( QObject *widget ) ...@@ -585,9 +591,9 @@ void ExtVideo::setWidgetValue( QObject *widget )
void ExtVideo::updateFilterOptions() void ExtVideo::updateFilterOptions()
{ {
QString module = ModuleFromWidgetName( sender()->parent() ); QString module = ModuleFromWidgetName( sender()->parent() );
//std::cout << "Module name: " << module.toStdString() << std::endl; //msg_Dbg( p_intf, "Module name: %s", qtu( module ) );
QString option = OptionFromWidgetName( sender() ); QString option = OptionFromWidgetName( sender() );
//std::cout << "Option name: " << option.toStdString() << std::endl; //msg_Dbg( p_intf, "Option name: %s", qtu( option ) );
vlc_object_t *p_obj = ( vlc_object_t * ) vlc_object_t *p_obj = ( vlc_object_t * )
vlc_object_find_name( p_intf->p_libvlc, qtu( module ) ); vlc_object_find_name( p_intf->p_libvlc, qtu( module ) );
......
modules/gui/qt4/ui/video_effects.ui
View file @ 339e21d5
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>550</width> <width>654</width>
<height>327</height> <height>345</height>
</rect> </rect>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
...@@ -1554,11 +1554,57 @@ ...@@ -1554,11 +1554,57 @@
<attribute name="title"> <attribute name="title">
<string>Advanced</string> <string>Advanced</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_12"> <layout class="QGridLayout" name="gridLayout_7">
<item row="3" column="0" rowspan="3"> <item row="2" column="1" rowspan="2">
<widget class="QGroupBox" name="motionblurEnable"> <layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QCheckBox" name="anaglyphEnable">
<property name="text">
<string>Anaglyph 3D</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="mirrorEnable">
<property name="text">
<string>Mirror</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="psychedelicEnable">
<property name="text">
<string>Psychedelic</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="waveEnable">
<property name="text">
<string>Waves</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="rippleEnable">
<property name="text">
<string>Water effect</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="motiondetectEnable">
<property name="text">
<string>Motion detect</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QGroupBox" name="gaussianblurEnable">
<property name="title"> <property name="title">
<string>Motion blur</string> <string>Spatial blur</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
...@@ -1566,11 +1612,11 @@ ...@@ -1566,11 +1612,11 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_16"> <layout class="QGridLayout" name="gridLayout_17">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_34"> <widget class="QLabel" name="label_35">
<property name="text"> <property name="text">
<string>Factor</string> <string>Sigma</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>blurFactorSlider</cstring> <cstring>blurFactorSlider</cstring>
...@@ -1578,7 +1624,7 @@ ...@@ -1578,7 +1624,7 @@
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QSlider" name="blurFactorSlider"> <widget class="QSlider" name="gaussianblurSigmaSlider">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
...@@ -1602,34 +1648,54 @@ ...@@ -1602,34 +1648,54 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="3" column="2"> <item row="1" column="0">
<widget class="QCheckBox" name="motiondetectEnable"> <widget class="QGroupBox" name="motionblurEnable">
<property name="text"> <property name="title">
<string>Motion detect</string> <string>Motion blur</string>
</property> </property>
</widget> <property name="checkable">
</item> <bool>true</bool>
<item row="5" column="2"> </property>
<widget class="QCheckBox" name="psychedelicEnable"> <property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout_16">
<item row="0" column="0">
<widget class="QLabel" name="label_34">
<property name="text"> <property name="text">
<string>Psychedelic</string> <string>Factor</string>
</property>
<property name="buddy">
<cstring>blurFactorSlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="9" column="0"> <item row="0" column="1">
<spacer name="verticalSpacer_4"> <widget class="QSlider" name="blurFactorSlider">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<number>80</number>
</property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="tickPosition">
<size> <enum>QSlider::TicksBelow</enum>
<width>20</width>
<height>40</height>
</size>
</property> </property>
</spacer> <property name="tickInterval">
<number>16</number>
</property>
</widget>
</item> </item>
<item row="2" column="0"> </layout>
</widget>
</item>
<item row="0" column="0">
<widget class="QGroupBox" name="antiflickerEnable"> <widget class="QGroupBox" name="antiflickerEnable">
<property name="title"> <property name="title">
<string>Anti-Flickering</string> <string>Anti-Flickering</string>
...@@ -1676,16 +1742,10 @@ ...@@ -1676,16 +1742,10 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="2"> <item row="0" column="1" rowspan="2">
<widget class="QGroupBox" name="cloneEnable"> <widget class="QGroupBox" name="hqdn3dEnable">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title"> <property name="title">
<string>Clone</string> <string>Denoiser</string>
</property> </property>
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
...@@ -1693,61 +1753,115 @@ ...@@ -1693,61 +1753,115 @@
<property name="checked"> <property name="checked">
<bool>false</bool> <bool>false</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QGridLayout" name="gridLayout_12">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="label_9"> <widget class="QLabel" name="label_44">
<property name="text"> <property name="text">
<string>Number of clones</string> <string>Spatial luma strength</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>cloneCountSpin</cstring> <cstring>blurFactorSlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="1" colspan="2">
<widget class="QSpinBox" name="cloneCountSpin"> <widget class="QSlider" name="hqdn3dLumaSpatSlider">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
<property name="maximum">
<number>127</number>
</property>
<property name="value"> <property name="value">
<number>2</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> <item row="1" column="0" colspan="2">
<widget class="QLabel" name="label_45">
<property name="text">
<string>Temporal luma strength</string>
</property>
<property name="buddy">
<cstring>blurFactorSlider</cstring>
</property>
</widget> </widget>
</item> </item>
<item row="4" column="2"> <item row="1" column="2">
<widget class="QCheckBox" name="rippleEnable"> <widget class="QSlider" name="hqdn3dLumaTempSlider">
<property name="minimum">
<number>1</number>
</property>
<property name="maximum">
<number>127</number>
</property>
<property name="value">
<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>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="label_46">
<property name="text"> <property name="text">
<string>Water effect</string> <string>Spatial chroma strength</string>
</property>
<property name="buddy">
<cstring>blurFactorSlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="0" rowspan="2"> <item row="2" column="2">
<widget class="QGroupBox" name="gaussianblurEnable"> <widget class="QSlider" name="hqdn3dChromaSpatSlider">
<property name="title"> <property name="minimum">
<string>Spatial blur</string> <number>1</number>
</property> </property>
<property name="checkable"> <property name="maximum">
<bool>true</bool> <number>127</number>
</property> </property>
<property name="checked"> <property name="value">
<bool>false</bool> <number>80</number>
</property> </property>
<layout class="QGridLayout" name="gridLayout_17"> <property name="orientation">
<item row="0" column="0"> <enum>Qt::Horizontal</enum>
<widget class="QLabel" name="label_35"> </property>
<property name="tickPosition">
<enum>QSlider::TicksBelow</enum>
</property>
<property name="tickInterval">
<number>16</number>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_47">
<property name="text"> <property name="text">
<string>Sigma</string> <string>Temporal chroma strength</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>blurFactorSlider</cstring> <cstring>blurFactorSlider</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="3" column="2">
<widget class="QSlider" name="gaussianbluSigmaSlider"> <widget class="QSlider" name="hqdn3dChromaTempSlider">
<property name="minimum"> <property name="minimum">
<number>1</number> <number>1</number>
</property> </property>
...@@ -1771,25 +1885,45 @@ ...@@ -1771,25 +1885,45 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="6" column="2"> <item row="3" column="0">
<widget class="QCheckBox" name="mirrorEnable"> <widget class="QGroupBox" name="cloneEnable">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Clone</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<widget class="QLabel" name="label_9">
<property name="text"> <property name="text">
<string>Mirror</string> <string>Number of clones</string>
</property>
<property name="buddy">
<cstring>cloneCountSpin</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="7" column="2"> <item row="0" column="1">
<widget class="QCheckBox" name="waveEnable"> <widget class="QSpinBox" name="cloneCountSpin">
<property name="text"> <property name="minimum">
<string>Waves</string> <number>1</number>
</property>
<property name="value">
<number>2</number>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="2"> </layout>
<widget class="QCheckBox" name="anaglyphEnable">
<property name="text">
<string>Anaglyph 3D</string>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
......
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