Merge branch 'master' into refactoring_effects

BUG: 374739

CMakeLists.txt

@@ -2,17 +2,29 @@ project(Kdenlive)
 
 # An odd patch version number means development version, while an even one means
 # stable release. An additional number can be used for bugfix-only releases.
-set(KDENLIVE_VERSION 0.9.99)
-cmake_minimum_required(VERSION 2.8.12)
+
+# KDE Application Version, managed by release script
+set (KDE_APPLICATIONS_VERSION_MAJOR "17")
+set (KDE_APPLICATIONS_VERSION_MINOR "03")
+set (KDE_APPLICATIONS_VERSION_MICRO "70")
+
+set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO})
+cmake_minimum_required(VERSION 3.0)
+if(POLICY CMP0063)
+  cmake_policy(SET CMP0063 NEW)
+endif()
+if (POLICY CMP0053)
+    cmake_policy(SET CMP0053 NEW)
+endif()
 # Minimum versions of main dependencies.
-set(MLT_MIN_MAJOR_VERSION 0)
-set(MLT_MIN_MINOR_VERSION 8)
-set(MLT_MIN_PATCH_VERSION 8)
+set(MLT_MIN_MAJOR_VERSION 6)
+set(MLT_MIN_MINOR_VERSION 0)
+set(MLT_MIN_PATCH_VERSION 0)
 set(MLT_MIN_VERSION ${MLT_MIN_MAJOR_VERSION}.${MLT_MIN_MINOR_VERSION}.${MLT_MIN_PATCH_VERSION})
 
-set(QT_MIN_VERSION 5.2.0)
+set(QT_MIN_VERSION 5.5.0)
 
-find_package(ECM 1.2.0 REQUIRED CONFIG)
+find_package(ECM 5.21.0 REQUIRED CONFIG)
 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
 include(FeatureSummary)
 include(ECMInstallIcons)
@@ -20,14 +32,20 @@ include(GenerateExportHeader)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
+include(ECMOptionalAddSubdirectory)
+include(ECMMarkNonGuiExecutable)
+include(ECMAddAppIcon)
+include(ECMQtDeclareLoggingCategory)
 
+add_definitions(-DQT_NO_CAST_TO_ASCII)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
+add_definitions(-DTRANSLATION_DOMAIN=\"kdenlive\")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-SET(CMAKE_CXX_FLAGS "-fPIC")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 # To be switched on when releasing.
-option(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" OFF)
+option(RELEASE_BUILD "Remove Git revision from program version (use for stable releases)" ON)
 
 # Get current version.
 set(KDENLIVE_VERSION_STRING "${KDENLIVE_VERSION}")
@@ -37,11 +55,12 @@ if(NOT RELEASE_BUILD AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
   if(GIT_FOUND)
     exec_program(${GIT_EXECUTABLE}
       ${CMAKE_SOURCE_DIR}
-      ARGS "describe --tags"
+	ARGS "log -n 1 --pretty=format:\"%h\""
       OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
       RETURN_VALUE TAG_RESULT
     )
-    # git describe --tags failed; maybe the repository was checked with depth=1.
+
+    # git log failed; maybe the repository was checked with depth=1.
     if(NOT ${TAG_RESULT} EQUAL 0)
       exec_program(${GIT_EXECUTABLE}
         ${CMAKE_SOURCE_DIR}
@@ -60,11 +79,27 @@ include(CheckIncludeFiles)
 check_include_files(malloc.h HAVE_MALLOC_H)
 check_include_files(pthread.h HAVE_PTHREAD_H)
 
-find_package(Qt5 CONFIG REQUIRED Core DBus Test Widgets Script Svg OpenGL)
+find_package(Qt5 REQUIRED COMPONENTS Core DBus Widgets Script Svg Quick )
+find_package(Qt5 OPTIONAL_COMPONENTS WebKitWidgets QUIET)
 
-find_package(KF5 REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets 
-                            DBusAddons KIO WidgetsAddons Plotting NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes DocTools)
+find_package(KF5 5.23.0 OPTIONAL_COMPONENTS XmlGui QUIET)
+if (KF5XmlGui_FOUND)
+  message(STATUS "Found KF5 >= 5.23.0 enabling icon coloring")
+else()
+  message(STATUS "KF5 < 5.23.0 Disable icon coloring")
+  set(KF5_ICON_COMPATIBILITY TRUE)
+endif()
 
+find_package(KF5 REQUIRED COMPONENTS Archive Bookmarks CoreAddons Config ConfigWidgets 
+                            DBusAddons KIO WidgetsAddons NotifyConfig NewStuff XmlGui Notifications GuiAddons TextWidgets IconThemes Crash
+                 OPTIONAL_COMPONENTS DocTools FileMetaData)
+
+if (KF5FileMetaData_FOUND)
+  message(STATUS "Found KF5 FileMetadata to extract file metadata")
+  set(KF5_FILEMETADATA TRUE)
+else()
+  message(STATUS "KF5 FileMetadata not found, file metadata will not be available")
+endif()
 
 # Search MLT package.
 find_package(MLT ${MLT_MIN_VERSION} REQUIRED)
@@ -77,15 +112,18 @@ set_package_properties(MLT PROPERTIES
 set(MLT_PREFIX ${MLT_ROOT_DIR})
 
 add_subdirectory(data)
-add_subdirectory(doc)
+if(KF5DocTools_FOUND)
+    add_subdirectory(doc)
+endif()
 #add_subdirectory(plugins)
-#ecm_optional_add_subdirectory(po)
+ecm_optional_add_subdirectory(po)
 add_subdirectory(renderer)
 add_subdirectory(src)
 add_subdirectory(thumbnailer)
 #add_subdirectory(testingArea)
 
 
+install( FILES kdenlive.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 
 configure_file(config-kdenlive.h.cmake config-kdenlive.h @ONLY)
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)

ChangeLog

@@ -1,3 +1,50 @@
+15.08
+	Changes (~450 commits):
+	* New file format
+	  - Can load old format but not save to it: no way back
+	    wait a bit for big projects!
+	  - All data are now in MLT structures
+	    should ease exchanges with Shotcut and other editors?
+	* New monitor, using OpenGL & QML
+	  - *brings back Movit* (GPU effects), but not mandatory ;)
+	  - great *split screen* functionality to tune effect parameter
+	* Completely renewed bin manager (previously named project list)
+	  - Allows *adding effects to bin clips*, affecting all timeline instances
+	  - Free directory structure
+	  - Icon / list / tree views
+	  - More clip properties can be changed
+	  - Much work to restore all old functions :\
+	* Effects list improvements
+	  - improve sorting and marking item as favorite
+	* New audio waveform on timeline (à la Shotcut)
+	  making information more visible
+	* New duplicate clip function (cool for titles)
+	* Propose predefined monitor zoom values
+	* Fixed several look issues (sizes, colors, icons...)
+	* Refactoring: replacing XML manipulations by MLT API calls
+	  - reduces data duplication: faster, safer...
+	* Automatic builds (CI) on Linux and OSX
+	* Code checked by several static analyzers
+	* Some bugs fixed from 15.04 port (capture, effects, ...)
+
+15.04
+    Changes:
+    * Port to KDE Frameworks 5
+    * Add ripple delete function
+    * Add stem audio export
+    * Make images sequences generation more convenient
+    * Save and restore title widget size
+    * Start some refactoring
+    * Fix warnings from compiler, static analyzers, execution...
+
+    Bug fix:
+    * #3407 don't copy clips if project is also on removable drive
+    * #3408 crash on selecting clip with grouped effects
+    * #3405 crash on adding 1st clip not matching project profile
+    * #3338 import clip keyframes
+    * #3160 Autosave new projects before saving
+    * #3415 FFmpeg recording freeze
+
 0.9.10
     Changes:
     * handle VBR encoding profiles, and use it!

Messages.sh

@@ -1,9 +1,9 @@
 #!bin/sh
 
-kdenlive_subdirs="plugins renderer src src/ui"
+kdenlive_subdirs="plugins renderer data src src/ui"
 
 $EXTRACTRC --tag=name --tag=description --tag=label --tag=comment --tag=paramlistdisplay data/effects/*.xml data/kdenliveeffectscategory.rc >> rc.cpp
-$EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -o -name \*.ui` >> rc.cpp
+$EXTRACTRC `find $kdenlive_subdirs -name \*.rc -a ! -name encodingprofiles.rc -a ! -name camcorderfilters.rc -o -name \*.ui` >> rc.cpp
 
 $XGETTEXT `find $kdenlive_subdirs -name \*.cpp -o -name \*.h` *.cpp -o $podir/kdenlive.pot
 rm -f rc.cpp

README

@@ -2,7 +2,7 @@ About Kdenlive
 ==============
 
 Kdenlive is a video editing application,
-based on MLT Framework and KDE Platform 4.
+based on MLT Framework and KDE Frameworks 5
 
 Please check the project page for more information:
 https://kdenlive.org
@@ -20,7 +20,7 @@ mkdir build
 cd build
 cmake .. -DCMAKE_INSTALL_PREFIX=/install/path
 make -j4
-sudo make install
+make install
 
 and then run
 /install/path/bin/kdenlive

cmake/modules/FindGLEW.cmake

@@ -1,105 +0,0 @@
-# Copyright (c) 2009 Boudewijn Rempt <boud@valdyas.org>                                                                                          
-#                                                                                                                                                
-# Redistribution and use is allowed according to the terms of the BSD license.                                                                   
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file. 
-# 
-# - try to find glew library and include files
-#  GLEW_INCLUDE_DIR, where to find GL/glew.h, etc.
-#  GLEW_LIBRARIES, the libraries to link against
-#  GLEW_FOUND, If false, do not try to use GLEW.
-# Also defined, but not for general use are:
-#  GLEW_GLEW_LIBRARY = the full path to the glew library.
-
-IF (WIN32)
-
-  IF(CYGWIN)
-
-    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h)
-
-    FIND_LIBRARY( GLEW_GLEW_LIBRARY glew32
-      ${OPENGL_LIBRARY_DIR}
-      /usr/lib/w32api
-      /usr/X11R6/lib
-    )
-
-
-  ELSE(CYGWIN)
-  
-    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
-      $ENV{GLEW_ROOT_PATH}/include
-    )
-
-    FIND_LIBRARY( GLEW_GLEW_LIBRARY
-      NAMES glew glew32
-      PATHS
-      $ENV{GLEW_ROOT_PATH}/lib
-      ${OPENGL_LIBRARY_DIR}
-    )
-
-  ENDIF(CYGWIN)
-
-ELSE (WIN32)
-
-  IF (APPLE)
-# These values for Apple could probably do with improvement.
-    FIND_PATH( GLEW_INCLUDE_DIR glew.h
-      /System/Library/Frameworks/GLEW.framework/Versions/A/Headers
-      ${OPENGL_LIBRARY_DIR}
-    )
-    SET(GLEW_GLEW_LIBRARY "-framework GLEW" CACHE STRING "GLEW library for OSX")
-    SET(GLEW_cocoa_LIBRARY "-framework Cocoa" CACHE STRING "Cocoa framework for OSX")
-  ELSE (APPLE)
-
-    FIND_PATH( GLEW_INCLUDE_DIR GL/glew.h
-      /usr/include/GL
-      /usr/openwin/share/include
-      /usr/openwin/include
-      /usr/X11R6/include
-      /usr/include/X11
-      /opt/graphics/OpenGL/include
-      /opt/graphics/OpenGL/contrib/libglew
-    )
-
-    FIND_LIBRARY( GLEW_GLEW_LIBRARY GLEW
-      /usr/openwin/lib
-      /usr/X11R6/lib
-    )
-
-  ENDIF (APPLE)
-
-ENDIF (WIN32)
-
-SET( GLEW_FOUND "NO" )
-IF(GLEW_INCLUDE_DIR)
-  IF(GLEW_GLEW_LIBRARY)
-    # Is -lXi and -lXmu required on all platforms that have it?
-    # If not, we need some way to figure out what platform we are on.
-    SET( GLEW_LIBRARIES
-      ${GLEW_GLEW_LIBRARY}
-      ${GLEW_cocoa_LIBRARY}
-    )
-    SET( GLEW_FOUND "YES" )
-
-#The following deprecated settings are for backwards compatibility with CMake1.4
-    SET (GLEW_LIBRARY ${GLEW_LIBRARIES})
-    SET (GLEW_INCLUDE_PATH ${GLEW_INCLUDE_DIR})
-
-  ENDIF(GLEW_GLEW_LIBRARY)
-ENDIF(GLEW_INCLUDE_DIR)
-
-IF(GLEW_FOUND)
-  IF(NOT GLEW_FIND_QUIETLY)
-    MESSAGE(STATUS "Found Glew: ${GLEW_LIBRARIES}")
-  ENDIF(NOT GLEW_FIND_QUIETLY)
-ELSE(GLEW_FOUND)
-  IF(GLEW_FIND_REQUIRED)
-    MESSAGE(FATAL_ERROR "Could not find Glew")
-  ENDIF(GLEW_FIND_REQUIRED)
-ENDIF(GLEW_FOUND)
-
-MARK_AS_ADVANCED(
-  GLEW_INCLUDE_DIR
-  GLEW_GLEW_LIBRARY
-  GLEW_Xmu_LIBRARY
-  GLEW_Xi_LIBRARY
-)

cmake/modules/FindOpenGLES.cmake

@@ -0,0 +1,52 @@
+# - Try to find OpenGLES
+# Once done this will define
+#  
+#  OPENGLES_FOUND           - system has OpenGLES and EGL
+#  OPENGL_EGL_FOUND         - system has EGL
+#  OPENGLES_INCLUDE_DIR     - the GLES include directory
+#  OPENGLES_LIBRARY	    - the GLES library
+#  OPENGLES_EGL_INCLUDE_DIR - the EGL include directory
+#  OPENGLES_EGL_LIBRARY	    - the EGL library
+#  OPENGLES_LIBRARIES       - all libraries needed for OpenGLES
+#  OPENGLES_INCLUDES        - all includes needed for OpenGLES
+
+FIND_PATH(OPENGLES_INCLUDE_DIR GLES2/gl2.h
+  /usr/openwin/share/include
+  /opt/graphics/OpenGL/include /usr/X11R6/include
+  /usr/include
+)
+
+FIND_LIBRARY(OPENGLES_LIBRARY
+  NAMES GLESv2
+  PATHS /opt/graphics/OpenGL/lib
+        /usr/openwin/lib
+        /usr/shlib /usr/X11R6/lib
+        /usr/lib
+)
+
+FIND_PATH(OPENGLES_EGL_INCLUDE_DIR EGL/egl.h
+  /usr/openwin/share/include
+  /opt/graphics/OpenGL/include /usr/X11R6/include
+  /usr/include
+)
+
+FIND_LIBRARY(OPENGLES_EGL_LIBRARY
+    NAMES EGL
+    PATHS /usr/shlib /usr/X11R6/lib
+          /usr/lib
+)
+
+SET(OPENGL_EGL_FOUND "NO")
+IF(OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+    SET(OPENGL_EGL_FOUND "YES")
+ENDIF()
+
+SET(OPENGLES_FOUND "NO")
+IF(OPENGLES_LIBRARY AND OPENGLES_INCLUDE_DIR AND
+   OPENGLES_EGL_LIBRARY AND OPENGLES_EGL_INCLUDE_DIR)
+    SET(OPENGLES_LIBRARIES ${OPENGLES_LIBRARY} ${OPENGLES_LIBRARIES}
+                           ${OPENGLES_EGL_LIBRARY})
+    SET(OPENGLES_INCLUDES ${OPENGLES_INCLUDE_DIR} ${OPENGLES_EGL_INCLUDE_DIR})
+    SET(OPENGLES_FOUND "YES")
+ENDIF()
+

data/CMakeLists.txt

@@ -1,8 +1,16 @@
 add_subdirectory(effects)
+add_subdirectory(generators)
+add_subdirectory(transitions)
 add_subdirectory(icons)
 add_subdirectory(lumas)
 add_subdirectory(man)
 add_subdirectory(titles)
+add_subdirectory(profiles)
+
+if (KF5_ICON_COMPATIBILITY)
+  add_subdirectory(pics)
+endif()
+
 install(FILES
   banner.png
   blacklisted_effects.txt
@@ -18,15 +26,18 @@ install(FILES
   timeline_vthumbs.png
   kdenliveeffectscategory.rc
   kdenlivetranscodingrc
+# Qml are now embedded as Qt resources from /src/uiresources.qrc
+#  kdenlivemonitor.qml
+#  kdenliveclipmonitor.qml
+#  kdenlivemonitoreffectscene.qml
+#  kdenlivemonitorcornerscene.qml
+#  kdenlivemonitorsplit.qml
   DESTINATION ${DATA_INSTALL_DIR}/kdenlive)
 install(FILES  kdenlive.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
 install(FILES kdenlive_projectprofiles.knsrc kdenlive_renderprofiles.knsrc kdenlive_wipes.knsrc kdenlive_titles.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
-install(FILES kdenliveui.rc DESTINATION ${KXMLGUI_INSTALL_DIR}/kdenlive)
 install(FILES profiles.xml DESTINATION ${DATA_INSTALL_DIR}/kdenlive/export)
-install(FILES kdenlive.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata)
-install(FILES kdenlive.xpm DESTINATION share/pixmaps)
-install(FILES kdenlive.menu DESTINATION share/menu RENAME kdenlive)
-install(FILES kdenlive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES org.kde.kdenlive.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
+install(FILES org.kde.kdenlive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
 
 find_package(SharedMimeInfo REQUIRED)
 install(FILES kdenlive.xml westley.xml DESTINATION ${XDG_MIME_INSTALL_DIR})

data/EffectToolBar.qml

@@ -0,0 +1,70 @@
+import QtQuick.Controls 1.3
+import QtQuick.Controls.Styles 1.3
+import QtQuick 2.0
+
+Rectangle {
+    id: effecttoolbar
+    objectName: "effecttoolbar"
+    width: fullscreenButton.width
+    height: fullscreenButton.height * 5 + zoomSlider.height + 2
+    SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+    color: Qt.rgba(myPalette.window.r, myPalette.window.g, myPalette.window.b, 0.7)
+    radius: 4
+    border.color : Qt.rgba(0, 0, 0, 0.3)
+    border.width: 1
+
+    function setZoom(zoom) {
+        if (zoom >= 1) {
+            zoomSlider.value = zoom + 2
+        } else if (zoom == 0.5) {
+            zoomSlider.value = 2
+        } else if (zoom == 0.25) {
+            zoomSlider.value = 1
+        } else if (zoom == 0.125) {
+            zoomSlider.value = 0
+        }
+    }
+
+    Column {
+        ToolButton {
+            id: fullscreenButton
+            objectName: "fullScreen"
+            iconName: "view-fullscreen"
+            tooltip: "Switch Full Screen"
+        }
+        ToolButton {
+            objectName: "nextKeyframe"
+            iconName: "go-next"
+            tooltip: "Go to Next Keyframe"
+        }
+        ToolButton {
+            objectName: "prevKeyframe"
+            iconName: "go-previous"
+            tooltip: "Go to Previous Keyframe"
+        }
+        ToolButton {
+            objectName: "addKeyframe"
+            iconName: "list-add"
+            tooltip: "Add Keyframe"
+        }
+        ToolButton {
+            objectName: "removeKeyframe"
+            iconName: "list-remove"
+            tooltip: "Remove Keyframe"
+        }
+        Slider {
+            id: zoomSlider
+            signal zoomChanged(real value)
+            anchors.horizontalCenter:parent.horizontalCenter
+            objectName: "zoomSlider"
+            orientation: Qt.Vertical
+            height: fullscreenButton.height * 3
+            maximumValue: 5.0
+            stepSize: 1.0
+            value: 3.0
+            onValueChanged: {
+                zoomSlider.zoomChanged(value);
+            }
+        }
+    }
+}

data/SceneToolBar.qml

@@ -0,0 +1,70 @@
+import QtQuick.Controls 1.3
+import QtQuick.Controls.Styles 1.3
+import QtQuick 2.0
+
+Rectangle {
+    id: scenetoolbar
+    objectName: "scenetoolbar"
+    width: fullscreenButton.width
+    height: fullscreenButton.height * 5 + zoomSlider.height + 2
+    SystemPalette { id: myPalette; colorGroup: SystemPalette.Active }
+    color: Qt.rgba(myPalette.window.r, myPalette.window.g, myPalette.window.b, 0.7)
+    radius: 4
+    border.color : Qt.rgba(0, 0, 0, 0.3)
+    border.width: 1
+
+    function setZoom(zoom) {
+        if (zoom >= 1) {
+            zoomSlider.value = zoom + 2
+        } else if (zoom == 0.5) {
+            zoomSlider.value = 2
+        } else if (zoom == 0.25) {
+            zoomSlider.value = 1
+        } else if (zoom == 0.125) {
+            zoomSlider.value = 0
+        }
+    }
+
+    Column {
+        ToolButton {
+            id: fullscreenButton
+            objectName: "fullScreen"
+            iconName: "view-fullscreen"
+            tooltip: "Switch Full Screen"
+        }
+        ToolButton {
+            objectName: "nextSnap"
+            iconName: "go-next"
+            tooltip: "Go to Next Snap Point"
+        }
+        ToolButton {
+            objectName: "prevSnap"
+            iconName: "go-previous"
+            tooltip: "Go to Previous Snap Point"
+        }
+        ToolButton {
+            objectName: "addMarker"
+            iconName: "list-add"
+            tooltip: "Add Marker"
+        }
+        ToolButton {
+            objectName: "removeMarker"
+            iconName: "list-remove"
+            tooltip: "Remove Marker"
+        }
+        Slider {
+            id: zoomSlider
+            signal zoomChanged(real value)
+            anchors.horizontalCenter:parent.horizontalCenter
+            objectName: "zoomSlider"
+            orientation: Qt.Vertical
+            height: fullscreenButton.height * 3
+            maximumValue: 5.0
+            stepSize: 1.0
+            value: 3.0
+            onValueChanged: {
+                zoomSlider.zoomChanged(value);
+            }
+        }
+    }
+}

data/blacklisted_effects.txt

@@ -74,6 +74,19 @@ frei0r.vectorscope
 frei0r.vertigo
 frei0r.vignette
 
+#Movit effects with XML UI
+movit.blur
+movit.sharpen
+movit.diffusion
+movit.glow
+movit.lift_gamma_gain
+movit.mirror
+movit.opacity
+movit.rect
+movit.saturation
+movit.unsharp_mask
+movit.vignette
+movit.white_balance
 
 #MLT effects with XML UI
 channelcopy
@@ -87,6 +100,10 @@ rotoscoping
 wave
 vignette
 volume
+lift_gamma_gain
+audiowaveform
+audiowave
+qtblend
 
 #Effects not usable with a simple GUI
 sox
@@ -100,8 +117,67 @@ region
 resize
 resample
 mono
-
+transition
 
 # Effects need extra GUI to create the resulting melt.xml with the corrected content
 videostab
 videostab2
+
+# Unimplemented/unusable Avfilter Effects
+avfilter.abench
+avfilter.adelay
+avfilter.aemphasis
+avfilter.aeval
+avfilter.afade
+avfilter.afftfilt
+avfilter.aformat
+avfilter.ssim
+avfilter.ass
+avfilter.bbox
+avfilter.bench
+
+# Crashing avfilters (would require an XML file to correctly define parameters
+avfilter.acompressor
+avfilter.aecho
+avfilter.agate
+avfilter.ametadata
+avfilter.arealtime
+avfilter.areverse
+avfilter.ashowinfo
+avfilter.channelmap
+avfilter.chorus
+avfilter.curves
+avfilter.drawtext
+avfilter.earwax
+avfilter.fade
+avfilter.field
+avfilter.fieldhint
+avfilter.fieldorder
+avfilter.find_rect
+avfilter.geq
+avfilter.hflip
+avfilter.metadata
+avfilter.negate
+avfilter.nnedi
+avfilter.qp
+avfilter.realtime
+avfilter.removelogo
+avfilter.reverse
+avfilter.showinfo
+avfilter.stereo3d
+avfilter.subtitles
+avfilter.super2xsai
+avfilter.swapuv
+avfilter.vectorscope
+avfilter.vflip
+avfilter.vignette
+avfilter.volume
+avfilter.volumedetect
+
+# Avfilter Effects with XML
+avfilter.acompressor
+avfilter.aecho
+avfilter.agate
+avfilter.lut3d
+avfilter.selectivecolor
+

data/blacklisted_transitions.txt

@@ -1,8 +1,11 @@
 # redundant transitions
 frei0r.composition
+frei0r.cairoblend
+frei0r.cairoaffineblend
+qtblend
 
 # unusable transitions (parameters required, not implemented in Kdenlive)
 frei0r.alphainjection
 frei0r.blend
 frei0r.xfade0r
-
+webvfx

data/effects/CMakeLists.txt

@@ -1,7 +1,10 @@
 INSTALL (FILES 
 
 audiowave.xml
+audiowaveform.xml
 automask.xml
+audiobalance.xml
+audiopan.xml
 boxblur.xml
 brightness.xml
 channelcopy.xml
@@ -103,17 +106,32 @@ frei0r_vertigo.xml
 frei0r_vignette.xml
 frei0r_facebl0r.xml
 frei0r_facedetect.xml
-gain.xml
 fade_from_black.xml
 fade_to_black.xml
+gain.xml
+lift_gamma_gain.xml
+movit_blur.xml
+movit_deconvolution_sharpen.xml
+movit_diffusion.xml
+movit_glow.xml
+movit_lift_gamma_gain.xml
+movit_mirror.xml
+movit_opacity.xml
+movit_rect.xml
+movit_saturation.xml
+movit_unsharp_mask.xml
+movit_vignette.xml
+movit_white_balance.xml
+qtblend.xml
+rotoscoping.xml
 speed.xml
+swapchannels.xml
 tcolor.xml
 vignette.xml
-swapchannels.xml
-audiobalance.xml
-audiopan.xml
-rotoscoping.xml
+tracker.xml
+
 
 DESTINATION ${DATA_INSTALL_DIR}/kdenlive/effects)
 
 add_subdirectory(update)
+add_subdirectory(avfilter)

data/effects/README

@@ -39,7 +39,7 @@ Line 2:
 Line 3:
     - name of the effect that will appear to the user
 Line 4:
-    - Short description of the effect to be shown in the effect list
+    - Short description of the effect to be shown in the effects list
     - Additionally a <full> part can be added inside. It's content will be available in the effect stack (see frei0r_lightgraffiti.xml for an example):
         - supports HTML formatting (requires the use of CDATA)
 Line 5:
@@ -51,6 +51,7 @@ The rest:
         - attribute "name": MLT filter parameter name
         - attribute "paramprefix": a string to be prepended to the parameter value before passing it to MLT
         - attribute "default": initial value, format depends on parameter type
+        - attribue  "optional": if it is set, it means that this parameter can have an empty value. So then loading a project, don't set its value to default
         - attribute "type": widget (GUI) to use
             - "fixed":
                 - sets a (MLT filter) parameter, but does not expose it to the user (no GUI)
@@ -68,6 +69,9 @@ The rest:
             - "bool": 
                 - true/false
                 - represented by a checkbox
+            - "switch":
+                - 2 possible options defined by strings (max / min)
+                - represented by a checkbox
             - "list":
                 - multiple choice
                 - represented by a drop-down menu
@@ -105,6 +109,8 @@ The rest:
             - "url":
                 - url/path
                 - represented by button to open "file open" dialog
+                - additional attributes:
+                     - "filter": Filter for file extensions. Example : "*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files" or as using mimetype: "image/png text/html"
             - "wipe":
                 - special GUI for the wipe transition makes it possible to select a direction of a slide
             - "addedgeometry":
@@ -122,6 +128,8 @@ The rest:
                     - "keywordsdisplay": list of names to use for the values separated by semicolon
             - "fontfamily":
                 - Font typeface entry
+            - "readonly" :
+                - Data (usually an animated geometry) that can be pasted to clipboard or dragged/dropped on another geometry parameter. Cannot be modified directly by user.
 ==========
 
 ==========

data/effects/audiowaveform.xml

@@ -0,0 +1,20 @@
+<!DOCTYPE kpartgui>
+<effect tag="audiowaveform" id="audiowaveform" type="audio">
+	<name>Audio Waveform Filter</name>
+	<author>Brian Matherly</author>
+	<parameter type="color" name="bgcolor" default="0x00000000" alpha="1">
+          <name>Background Color</name>
+	</parameter>
+        <parameter type="color" name="color.1" default="0xffffffff" alpha="1">
+          <name>Foreground Color</name>
+        </parameter>
+	<parameter type="constant" name="thickness" max="20" min="0" default="0">
+		<name>Line Thickness</name>
+	</parameter>
+        <parameter type="geometry" name="rect" default="0 0:100% 100%" fixed="1" opacity="false">
+                <name>Rectangle</name>
+        </parameter>
+        <parameter type="bool" name="fill" default="0">
+                <name>Fill</name>
+        </parameter>
+</effect>

data/effects/avfilter/CMakeLists.txt

@@ -0,0 +1,8 @@
+INSTALL (FILES 
+
+acompressor.xml
+aecho.xml
+agate.xml
+selectivecolor.xml
+avfilter_lut3d.xml
+DESTINATION ${DATA_INSTALL_DIR}/kdenlive/effects)

data/effects/avfilter/acompressor.xml

@@ -0,0 +1,42 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.acompressor" type="audio">
+	<name>Compressor (avfilter)</name>
+	<description>Audio Compressor</description>
+	<author>libavfilter</author>
+	<parameter type="constant" name="av.level_in" max="64" min="0.016" default="1" decimals="3">
+		<name>Input Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.threshold" max="1" min="0.001" default="0.125" decimals="3">
+		<name>Threshold</name>
+	</parameter>
+        <parameter type="constant" name="av.ratio" max="20" min="1" default="2">
+		<name>Ratio</name>
+	</parameter>
+        <parameter type="constant" name="av.attack" max="2000" min="0.01" default="20" decimals="3">
+		<name>Attack</name>
+	</parameter>
+        <parameter type="constant" name="av.release" max="9000" min="0.01" default="250" decimals="3">
+		<name>Release</name>
+	</parameter>
+        <parameter type="constant" name="av.makeup" max="64" min="1" default="2">
+		<name>Make Up Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.knee" max="8" min="1" default="2.828" decimals="3">
+		<name>Knee</name>
+	</parameter>
+        <parameter type="list" name="av.link" default="0" paramlist="0;1">
+	   <paramlistdisplay>Average,Maximum</paramlistdisplay>
+		<name>Link Type</name>
+	</parameter>
+        <parameter type="list" name="av.detection" default="0" paramlist="0;1">
+	   <paramlistdisplay>Peak,Rms</paramlistdisplay>
+		<name>Detection</name>
+	</parameter>
+        <parameter type="constant" name="av.level_sc" max="64" min="0.016" default="1" decimals="3">
+		<name>Sidechain Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.mix" max="1" min="0" default="1" decimals="3">
+		<name>Mix</name>
+	</parameter>
+</effect>
+

data/effects/avfilter/aecho.xml

@@ -0,0 +1,19 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.aecho" type="audio">
+	<name>Echo (avfilter)</name>
+	<description>Add Echo</description>
+	<author>libavfilter</author>
+	<parameter type="constant" name="av.in_gain" max="1" min="0" default="0.6" decimals="3">
+		<name>Input Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.out_gain" max="1" min="0" default="0.3" decimals="3">
+		<name>Output Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.delays" max="90000" min="0" default="1000">
+		<name>Delay</name>
+	</parameter>
+        <parameter type="constant" name="av.decays" max="1" min="0" default="0.5" decimals="2">
+		<name>Decay</name>
+	</parameter>
+</effect>
+

data/effects/avfilter/agate.xml

@@ -0,0 +1,39 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.agate" type="audio">
+	<name>Gate (avfilter)</name>
+	<description>Audio Gate</description>
+	<author>libavfilter</author>
+	<parameter type="constant" name="av.level_in" max="64" min="0.016" default="1" decimals="3">
+		<name>Input Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.range" max="1" min="0" default="0.061" decimals="3">
+		<name>Range</name>
+	</parameter>
+        <parameter type="constant" name="av.threshold" max="1" min="0" default="0.125" decimals="3">
+		<name>Threshold</name>
+	</parameter>
+        <parameter type="constant" name="av.ratio" max="9000" min="1" default="1">
+		<name>Ratio</name>
+	</parameter>
+        <parameter type="constant" name="av.attack" max="9000" min="0.01" default="20" decimals="3" suffif="ms">
+		<name>Attack</name>
+	</parameter>
+        <parameter type="constant" name="av.release" max="9000" min="0.01" default="250" decimals="3" suffif="ms">
+		<name>Release</name>
+	</parameter>
+        <parameter type="constant" name="av.makeup" max="64" min="1" default="1">
+		<name>Make Up Gain</name>
+	</parameter>
+        <parameter type="constant" name="av.knee" max="8" min="1" default="2.828" decimals="3">
+		<name>Knee</name>
+	</parameter>
+        <parameter type="list" name="av.detection" default="0" paramlist="0;1">
+	   <paramlistdisplay>Peak,Rms</paramlistdisplay>
+		<name>Detection</name>
+	</parameter>
+        <parameter type="list" name="av.link" default="0" paramlist="0;1">
+	   <paramlistdisplay>Average,Maximum</paramlistdisplay>
+		<name>Link Type</name>
+	</parameter>
+</effect>
+

data/effects/avfilter/avfilter_lut3d.xml

@@ -0,0 +1,15 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.lut3d" id="avfilter.lut3d">
+	<name>Apply LUT</name>
+  <description>Apply a Look Up Table (LUT) to the video.
+  <full><![CDATA[A LUT is an easy way to correct the color of a video. Supported formats: .3dl (AfterEffects), .cube (Iridas), .dat(DaVinci), .m3d (Pandora)]]></full></description>
+	<author>libavfilter</author>
+  <parameter type="url" name="av.file" filter="*.cube *.3dl *.dat *.m3d|LUT files">
+		<name>LUT file to apply</name>
+	</parameter>
+  <parameter type="list" name="av.interp" default="0" paramlist="nearest;trilinear;tetrahedral ">
+		<name>Interpolation Mode</name>
+	  <paramlistdisplay>Nearest, Trilinear, Tetrahedral</paramlistdisplay>
+	</parameter>
+</effect>
+

data/effects/avfilter/selectivecolor.xml

@@ -0,0 +1,38 @@
+<!DOCTYPE kpartgui>
+<effect tag="avfilter.selectivecolor" id="avfilter.selectivecolor">
+	<name>CMYK adjust (avfilter)</name>
+	<description>Apply CMYK correction to specific color ranges</description>
+	<author>libavfilter</author>
+	<parameter type="cmyk" name="av.reds" default="">
+		<name>Reds</name>
+	</parameter>
+        <parameter type="cmyk" name="av.yellows" default="">
+		<name>Yellows</name>
+	</parameter>
+        <parameter type="cmyk" name="av.greens" default="">
+		<name>Greens</name>
+	</parameter>
+        <parameter type="cmyk" name="av.cyans" default="">
+		<name>Cyans</name>
+	</parameter>
+        <parameter type="cmyk" name="av.blues" default="">
+		<name>Blues</name>
+	</parameter>
+        <parameter type="cmyk" name="av.magentas" default="">
+		<name>Magentas</name>
+	</parameter>
+        <parameter type="cmyk" name="av.whites" default="">
+		<name>Whites</name>
+	</parameter>
+        <parameter type="cmyk" name="av.neutrals" default="">
+		<name>Neutrals</name>
+	</parameter>
+        <parameter type="cmyk" name="av.blacks" default="">
+		<name>Blacks</name>
+	</parameter>
+        <parameter type="list" name="av.correction_method" default="0" paramlist="0;1">
+	   <paramlistdisplay>Absolute,Relative</paramlistdisplay>
+		<name>Correction Method</name>
+	</parameter>
+</effect>
+

data/effects/brightness.xml

@@ -3,7 +3,7 @@
 	<name>Brightness (keyframable)</name>
 	<description>Change image brightness with keyframes</description>
 	<author>Charles Yates</author>
-	<parameter type="keyframe" name="intensity" max="300" min="0" default="100" factor="100">
+	<parameter type="animated" name="level" max="400" min="0" default="1" factor="100">
 		<name>Intensity</name>
 	</parameter>
 </effect>

data/effects/chroma.xml

@@ -1,12 +1,12 @@
 <!DOCTYPE kpartgui>
 <effect tag="chroma" id="chroma">
-	<name>Blue Screen</name>
+	<name>Chroma Key</name>
 	<description>Make selected color transparent</description>
 	<author>Charles Yates</author>
 	<parameter type="color" name="key" default="0x0000ffff">
 		<name>Color key</name>
 	</parameter>
-	<parameter type="constant" name="variance" max="100" min="0" factor="100" default="15">
+	<parameter type="constant" name="variance" max="1000" min="0" factor="1000" default="150">
 		<name>Variance</name>
 	</parameter>
 </effect>

data/effects/dynamictext.xml

@@ -3,7 +3,7 @@
     <name>Dynamic Text</name>
     <description>Overlay text with keywords replaced</description>
     <author>Brian Matherly</author>
-    <parameter type="geometry" name="geometry" default="0%/0%:100%x100%:100" fixed="0">
+    <parameter type="geometry" name="geometry" default="0 0:%width %height:100" fixed="0">
         <name>Geometry</name>
     </parameter>
     <parameter type="fontfamily" name="family" default="DejaVu Sans">

data/effects/frei0r_colgate.xml

@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<effect tag="frei0r.colgate" id="frei0r.colgate">
+<effect tag="frei0r.colgate" id="frei0r.colgate" context="nomovit">
     <name>White Balance (LMS space)</name>
     <description>Do simple color correction, in a physically meaningful
 way</description>

data/effects/frei0r_curves.xml

@@ -1,117 +1,117 @@
 <!DOCTYPE kpartgui>
 <group>
-    <effect tag="frei0r.curves" id="frei0r.curves">
-	<name>Curves</name>
-	<description>Color curves adjustment</description>
-	<author>Maksim Golovkin</author>
-        <parameter type="list" name="Channel" default="0" paramlist="0;1;2;3">
-                <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
-		<name>Channel</name>
-	</parameter>
-        <parameter type="list" name="Luma formula" default="1" paramlist="0;1">
-                <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
-                <name>Luma formula</name>
-        </parameter>
-        
-        <!-- No actual parameter: Represents the curve widget -->
-        <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5" />
+  <effect tag="frei0r.curves" id="frei0r.curves">
+	  <name>Curves</name>
+	  <description>Color curves adjustment</description>
+	  <author>Maksim Golovkin</author>
+    <parameter type="list" name="Channel" default="0" paramlist="0;1;2;3">
+      <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
+		  <name>Channel</name>
+	  </parameter>
+    <parameter type="list" name="Luma formula" default="1" paramlist="0;1">
+      <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
+      <name>Luma formula</name>
+    </parameter>
 
-	<parameter type="fixed" name="Curve point number" default="2" min="2" max="5">
-		<name>Number of curve points</name>
-	</parameter>
-	<parameter type="fixed" name="Point 1 input value" default="0" min="0" max="1">
-		<name>Point 1 input value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 1 output value" default="0" min="0" max="1">
-		<name>Point 1 output value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 2 input value" default="1" min="0" max="1">
-		<name>Point 2 input value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 2 output value" default="1" min="0" max="1">
-		<name>Point 2 output value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 3 input value" default="0" min="0" max="1">
-		<name>Point 3 input value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 3 output value" default="0" min="0" max="1">
-		<name>Point 3 output value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 4 input value" default="0" min="0" max="1">
-		<name>Point 4 input value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 4 output value" default="0" min="0" max="1">
-		<name>Point 4 output value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 5 input value" default="0" min="0" max="1">
-		<name>Point 5 input value</name>
-	</parameter>
-	<parameter type="fixed" name="Point 5 output value" default="0" min="0" max="1">
-		<name>Point 5 output value</name>
-	</parameter>
-	<parameter type="bool" name="Show curves" default="0">
-                <name>Show graph in picture</name>
-        </parameter>
-        <parameter type="list" name="Graph position" default="3" paramlist="0;1;2;3">
-                <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
-                <name>Graph position</name>
-        </parameter>
-    </effect>
-    <effect LC_NUMERIC="C" tag="frei0r.curves" id="frei0r.curves" version="0.3">
-        <name>Curves</name>
-        <description>Color curves adjustment</description>
-        <author>Maksim Golovkin</author>
-        <parameter type="list" name="Channel" default="0" paramlist="0;1;2;3">
-                <paramlistdisplay>Red,Green,Blue,Luma</paramlistdisplay>
-                <name>Channel</name>
-        </parameter>
-        <parameter type="list" name="Luma formula" default="1" paramlist="0;1">
-                <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
-                <name>Luma formula</name>
-        </parameter>
-        
-        <!-- No actual parameter: Represents the curve widget -->
-        <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5" />
+    <!-- No actual parameter: Represents the curve widget -->
+    <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5" />
 
-        <parameter type="fixed" name="Curve point number" default="0.2" min="0.2" max="0.5">
-                <name>Number of curve points</name>
-        </parameter>
-        <parameter type="fixed" name="Point 1 input value" default="0" min="0" max="1">
-                <name>Point 1 input value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 1 output value" default="0" min="0" max="1">
-                <name>Point 1 output value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 2 input value" default="1" min="0" max="1">
-                <name>Point 2 input value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 2 output value" default="1" min="0" max="1">
-                <name>Point 2 output value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 3 input value" default="0" min="0" max="1">
-                <name>Point 3 input value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 3 output value" default="0" min="0" max="1">
-                <name>Point 3 output value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 4 input value" default="0" min="0" max="1">
-                <name>Point 4 input value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 4 output value" default="0" min="0" max="1">
-                <name>Point 4 output value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 5 input value" default="0" min="0" max="1">
-                <name>Point 5 input value</name>
-        </parameter>
-        <parameter type="fixed" name="Point 5 output value" default="0" min="0" max="1">
-                <name>Point 5 output value</name>
-        </parameter>
-        <parameter type="bool" name="Show curves" default="0">
-                <name>Show graph in picture</name>
-        </parameter>
-        <parameter type="list" name="Graph position" default="0.3" paramlist="0;0.1;0.2;0.3">
-                <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
-                <name>Graph position</name>
-        </parameter>
-    </effect>
+	  <parameter type="fixed" name="Curve point number" default="2" min="2" max="5">
+		  <name>Number of curve points</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 1 input value" default="0" min="0" max="1">
+		  <name>Point 1 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 1 output value" default="0" min="0" max="1">
+		  <name>Point 1 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 2 input value" default="1" min="0" max="1">
+		  <name>Point 2 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 2 output value" default="1" min="0" max="1">
+		  <name>Point 2 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 3 input value" default="0" min="0" max="1">
+		  <name>Point 3 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 3 output value" default="0" min="0" max="1">
+		  <name>Point 3 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 4 input value" default="0" min="0" max="1">
+		  <name>Point 4 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 4 output value" default="0" min="0" max="1">
+		  <name>Point 4 output value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 5 input value" default="0" min="0" max="1">
+		  <name>Point 5 input value</name>
+	  </parameter>
+	  <parameter type="fixed" name="Point 5 output value" default="0" min="0" max="1">
+		  <name>Point 5 output value</name>
+	  </parameter>
+	  <parameter type="bool" name="Show curves" default="0">
+      <name>Show graph in picture</name>
+    </parameter>
+    <parameter type="list" name="Graph position" default="3" paramlist="0;1;2;3">
+      <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
+      <name>Graph position</name>
+    </parameter>
+  </effect>
+  <effect LC_NUMERIC="C" tag="frei0r.curves" id="frei0r.curves" version="0.3">
+    <name>Curves</name>
+    <description>Color curves adjustment</description>
+    <author>Maksim Golovkin</author>
+    <parameter type="list" name="Channel" default="0.5" paramlist="0.5;0;0.1;0.2;0.3;0.4;0.6;0.71">
+      <paramlistdisplay>RGB,Red,Green,Blue,Alpha,Luma,Hue,Saturation</paramlistdisplay>
+      <name>Channel</name>
+    </parameter>
+    <parameter type="list" name="Luma formula" default="1" paramlist="0;1">
+      <paramlistdisplay>Rec. 601,Rec. 709</paramlistdisplay>
+      <name>Luma formula</name>
+    </parameter>
+    
+    <!-- No actual parameter: Represents the curve widget -->
+    <parameter type="curve" default="0" depends="Channel" number="Curve point number" inpoints="Point %i input value" outpoints="Point %i output value" min="1" max="5" />
+
+    <parameter type="fixed" name="Curve point number" default="0.2" min="0.2" max="0.5">
+      <name>Number of curve points</name>
+    </parameter>
+    <parameter type="fixed" name="Point 1 input value" default="0" min="0" max="1">
+      <name>Point 1 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 1 output value" default="0" min="0" max="1">
+      <name>Point 1 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 2 input value" default="1" min="0" max="1">
+      <name>Point 2 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 2 output value" default="1" min="0" max="1">
+      <name>Point 2 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 3 input value" default="0" min="0" max="1">
+      <name>Point 3 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 3 output value" default="0" min="0" max="1">
+      <name>Point 3 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 4 input value" default="0" min="0" max="1">
+      <name>Point 4 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 4 output value" default="0" min="0" max="1">
+      <name>Point 4 output value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 5 input value" default="0" min="0" max="1">
+      <name>Point 5 input value</name>
+    </parameter>
+    <parameter type="fixed" name="Point 5 output value" default="0" min="0" max="1">
+      <name>Point 5 output value</name>
+    </parameter>
+    <parameter type="bool" name="Show curves" default="0">
+      <name>Show graph in picture</name>
+    </parameter>
+    <parameter type="list" name="Graph position" default="0.3" paramlist="0;0.1;0.2;0.3">
+      <paramlistdisplay>Top Left,Top Right,Bottom Left,Bottom Right</paramlistdisplay>
+      <name>Graph position</name>
+    </parameter>
+  </effect>
 </group>

data/effects/frei0r_mask0mate.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.mask0mate" id="frei0r.mask0mate" type="video" unique="1">
-	<name>Mask0Mate</name>
+	<name>Rectangular Alpha mask</name>
 	<description>Creates an square alpha-channel mask</description>
 	<author>Richard Spindler</author>
 	<parameter type="constant" name="Left" max="1000" min="0" default="0" factor="1000">

data/effects/frei0r_pr0be.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect LC_NUMERIC="C" tag="frei0r.pr0be" id="frei0r.pr0be">
-        <name>pr0be</name>
+        <name>Video values</name>
         <description>Measure video values</description>
         <author>Marko Cebokli</author>
         

data/effects/frei0r_pr0file.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect LC_NUMERIC="C" tag="frei0r.pr0file" id="frei0r.pr0file">
-        <name>pr0file</name>
+        <name>Oscilloscope</name>
         <description>2D video oscilloscope</description>
         <author>Marko Cebokli</author>
         

data/effects/frei0r_scale0tilt.xml

@@ -1,19 +1,19 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.scale0tilt" id="frei0r.scale0tilt">
-	<name>Crop, Scale and Position</name>
+	<name>Crop, Scale and Tilt</name>
 	<description>Scales, Tilts and Crops an Image</description>
 	<author>Richard Spindler</author>
 	<parameter type="constant" name="Clip left" max="%width-1" min="0" default="0" factor="%width">
-		<name>Clip left</name>
+		<name>Crop left</name>
 	</parameter>
 	<parameter type="constant" name="Clip right" max="%width-1" min="0" default="0" factor="%width">
-		<name>Clip right</name>
+		<name>Crop right</name>
 	</parameter>
 	<parameter type="constant" name="Clip top" max="%height-1" min="0" default="0" factor="%height">
-		<name>Clip top</name>
+		<name>Crop top</name>
 	</parameter>
 	<parameter type="constant" name="Clip bottom" max="%height-1" min="0" default="0" factor="%height">
-		<name>Clip bottom</name>
+		<name>Crop bottom</name>
 	</parameter>
 	<parameter type="constant" name="Scale X" max="1000" min="1" default="50" factor="100">
 		<name>Scale X</name>

data/effects/frei0r_select0r.xml

@@ -9,7 +9,7 @@
                     <name>Color to select</name>
             </parameter>
         
-            <parameter type="bool" name="Invert selection" default="0">
+            <parameter type="bool" name="Invert selection" default="1">
                     <name>Invert selection</name>
             </parameter>    
         
@@ -56,7 +56,7 @@
                     <name>Color to select</name>
             </parameter>
         
-            <parameter type="bool" name="Invert selection" default="0">
+            <parameter type="bool" name="Invert selection" default="1">
                     <name>Invert selection</name>
             </parameter>
 

data/effects/frei0r_threelay0r.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.threelay0r" id="frei0r.threelay0r">
-	<name>threelay0r</name>
+	<name>3-level Threshold</name>
 	<description>Dynamic 3-level thresholding</description>
 	<author>Hedde Bosman</author>
 </effect>

data/effects/frei0r_threshold0r.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.threshold0r" id="frei0r.threshold0r">
-	<name>Threshold0r</name>
+	<name>Threshold</name>
 	<description>Thresholds a source image</description>
 	<author>Jean-Sebastien Senecal</author>
 	<parameter type="simplekeyframe" name="Threshold" max="1000" min="0" default="200" factor="1000">

data/effects/frei0r_twolay0r.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="frei0r.twolay0r" id="frei0r.twolay0r">
-	<name>twolay0r</name>
+	<name>Binarize dynamically</name>
 	<description>Dynamic thresholding</description>
 	<author>Martin Bayer</author>
 </effect>

data/effects/gamma.xml

@@ -3,7 +3,7 @@
 	<name>Gamma</name>
 	<description>Change gamma color value</description>
 	<author>Charles Yates</author>
-	<parameter type="constant" name="gamma" max="300" min="1" default="100" factor="100">
+	<parameter type="animated" name="gamma" max="300" min="1" default="1" factor="100">
 		<name>Gamma</name>
 	</parameter>
 </effect>

data/effects/lift_gamma_gain.xml

@@ -0,0 +1,32 @@
+<!DOCTYPE kpartgui>
+<effect tag="lift_gamma_gain" id="lift_gamma_gain">
+        <name>Lift/gamma/gain</name>
+        <author>Brian Matherly</author>
+        <parameter type="double" name="lift_r" default="0" min="0" max="500" factor="100">
+                <name>Lift: Red</name>
+        </parameter>
+        <parameter type="double" name="lift_g" default="0" min="0" max="500" factor="100">
+                <name>Lift: Green</name>
+        </parameter>
+        <parameter type="double" name="lift_b" default="0" min="0" max="500" factor="100">
+                <name>Lift: Blue</name>
+        </parameter>
+        <parameter type="double" name="gamma_r" default="100" min="0" max="500" factor="100">
+                <name>Gamma: Red</name>
+        </parameter>
+        <parameter type="double" name="gamma_g" default="100" min="0" max="500" factor="100">
+                <name>Gamma: Green</name>
+        </parameter>
+        <parameter type="double" name="gamma_b" default="100" min="0" max="500" factor="100">
+                <name>Gamma: Blue</name>
+        </parameter>
+        <parameter type="double" name="gain_r" default="100" min="0" max="500" factor="100">
+                <name>Gain: Red</name>
+        </parameter>
+        <parameter type="double" name="gain_g" default="100" min="0" max="500" factor="100">
+                <name>Gain: Green</name>
+        </parameter>
+        <parameter type="double" name="gain_b" default="100" min="0" max="500" factor="100">
+                <name>Gain: Blue</name>
+        </parameter>
+</effect>

data/effects/movit_blur.xml

@@ -1,9 +1,8 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.blur" id="movit.blur">
-	<name>Movit: Blur</name>
-	<description>Blur</description>
+	<name>Blur (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="radius" default="150" min="0" max="1000" factor="10">
+	<parameter type="animated" name="radius" default="3" min="0" max="1000" factor="10">
 		<name>Radius</name>
 	</parameter>
 </effect>

data/effects/movit_deconvolution_sharpen.xml

@@ -1,21 +1,20 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.sharpen" id="movit.sharpen">
-	<name>Movit: Deconvolution sharpen</name>
-	<description>Sharpens in a more intelligent way</description>
+	<name>Deconvolution sharpen (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="matrix_size" default="5" min="1" max="10" factor="1">
+	<parameter type="animated" name="matrix_size" default="5" min="1" max="10" factor="1">
 		<name>Matrix size</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="circle_radius" default="200" min="0" max="1000" factor="100">
+	<parameter type="animated" name="circle_radius" default="2" min="0" max="1000" factor="100">
 		<name>Circle radius</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="gaussian_radius" default="0" min="0" max="1000" factor="100">
+	<parameter type="animated" name="gaussian_radius" default="0" min="0" max="1000" factor="100">
 		<name>Gaussian radius</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="correlation" default="950" min="0" max="1000" factor="1000">
+	<parameter type="animated" name="correlation" default="0.95" min="0" max="1000" factor="1000">
 		<name>Correlation</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="noise" default="10" min="0" max="1000" factor="1000">
+	<parameter type="animated" name="noise" default="0.01" min="0" max="1000" factor="1000">
 		<name>Noise</name>
 	</parameter>
 </effect>

data/effects/movit_diffusion.xml

@@ -1,12 +1,11 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.diffusion" id="movit.diffusion">
-	<name>Movit: Diffusion</name>
-	<description>Diffusion</description>
+	<name>Diffusion (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="radius" default="150" min="0" max="1000" factor="10">
+	<parameter type="animated" name="radius" default="3" min="0" max="1000" factor="10">
 		<name>Radius</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="mix" default="30" min="0" max="1000" factor="100">
+	<parameter type="animated" name="mix" default="0.3" min="0" max="1000" factor="100">
 		<name>Mix amount</name>
 	</parameter>
 </effect>

data/effects/movit_glow.xml

@@ -1,15 +1,14 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.glow" id="movit.glow">
-	<name>Movit: Glow</name>
-	<description>Glow</description>
+	<name>Glow (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="radius" default="200" min="0" max="1000" factor="10">
+	<parameter type="animated" name="radius" default="20" min="0" max="1000" factor="10">
 		<name>Radius</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="blur_mix" default="100" min="0" max="1000" factor="100">
+	<parameter type="animated" name="blur_mix" default="1" min="0" max="1000" factor="100">
 		<name>Glow strength</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="highlight_cutoff" default="20" min="0" max="100" factor="100">
+	<parameter type="animated" name="highlight_cutoff" default="0.2" min="0" max="100" factor="100">
 		<name>Highlight cutoff threshold</name>
 	</parameter>
 </effect>

data/effects/movit_lift_gamma_gain.xml

@@ -1,33 +1,32 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.lift_gamma_gain" id="movit.lift_gamma_gain">
-	<name>Movit: Lift/gamma/gain</name>
-	<description>Do simple color grading</description>
-	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="lift_r" default="0" min="0" max="500" factor="100">
-		<name>Lift: Red</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="lift_g" default="0" min="0" max="500" factor="100">
-		<name>Lift: Green</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="lift_b" default="0" min="0" max="500" factor="100">
-		<name>Lift: Blue</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="gamma_r" default="100" min="0" max="500" factor="100">
-		<name>Gamma: Red</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="gamma_g" default="100" min="0" max="500" factor="100">
-		<name>Gamma: Green</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="gamma_b" default="100" min="0" max="500" factor="100">
-		<name>Gamma: Blue</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="gain_r" default="100" min="0" max="500" factor="100">
-		<name>Gain: Red</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="gain_g" default="100" min="0" max="500" factor="100">
-		<name>Gain: Green</name>
-	</parameter>
-	<parameter type="simplekeyframe" name="gain_b" default="100" min="0" max="500" factor="100">
-		<name>Gain: Blue</name>
-	</parameter>
+        <name>Lift/gamma/gain (GPU)</name>
+        <author>Steinar H. Gunderson</author>
+        <parameter type="double" name="lift_r" default="0" min="0" max="500" factor="100">
+                <name>Lift: Red</name>
+        </parameter>
+        <parameter type="double" name="lift_g" default="0" min="0" max="500" factor="100">
+                <name>Lift: Green</name>
+        </parameter>
+        <parameter type="double" name="lift_b" default="0" min="0" max="500" factor="100">
+                <name>Lift: Blue</name>
+        </parameter>
+        <parameter type="double" name="gamma_r" default="100" min="0" max="500" factor="100">
+                <name>Gamma: Red</name>
+        </parameter>
+        <parameter type="double" name="gamma_g" default="100" min="0" max="500" factor="100">
+                <name>Gamma: Green</name>
+        </parameter>
+        <parameter type="double" name="gamma_b" default="100" min="0" max="500" factor="100">
+                <name>Gamma: Blue</name>
+        </parameter>
+        <parameter type="double" name="gain_r" default="100" min="0" max="500" factor="100">
+                <name>Gain: Red</name>
+        </parameter>
+        <parameter type="double" name="gain_g" default="100" min="0" max="500" factor="100">
+                <name>Gain: Green</name>
+        </parameter>
+        <parameter type="double" name="gain_b" default="100" min="0" max="500" factor="100">
+                <name>Gain: Blue</name>
+        </parameter>
 </effect>

data/effects/movit_lift_gamma_gain2.xml

@@ -1,7 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.lift_gamma_gain" id="movit.lift_gamma_gain2">
 	<name>Movit: Lift/gamma/gain (colors)</name>
-	<description>Do simple color grading</description>
 	<author>Steinar H. Gunderson</author>
 	<parameter type="double" name="lift_r" default="0" min="0" max="500" factor="100">
 		<name>Lift: Red</name>

data/effects/movit_mirror.xml

@@ -1,6 +1,5 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.mirror" id="movit.mirror">
-	<name>Movit: Mirror</name>
-	<description>Flips the image horizontally</description>
+	<name>Mirror (GPU)</name>
 	<author>Steinar H. Gunderson</author>
 </effect>

data/effects/movit_opacity.xml

@@ -1,9 +1,8 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.opacity" id="movit.opacity">
-	<name>Movit: Opacity</name>
-	<description>Change the opacity of the image</description>
+	<name>Opacity (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="opacity" default="100" min="0" max="200" factor="100">
+	<parameter type="animated" name="opacity" default="1" min="0" max="200" factor="100">
 		<name>Opacity</name>
 	</parameter>
 </effect>

data/effects/movit_rect.xml

@@ -0,0 +1,11 @@
+<!DOCTYPE kpartgui>
+<effect tag="movit.rect" id="movit.rect">
+	<name>Pan and Zoom (GPU)</name>
+	<author>Steinar H. Gunderson</author>
+	<parameter type="animatedrect" name="rect" default="0 0 %width %height" opacity="false">
+		<name>Rectangle</name>
+	</parameter>
+	<parameter type="bool" name="fill" default="1" min="0" max="1">
+		<name>Allow upscale</name>
+	</parameter>
+</effect>

data/effects/movit_saturation.xml

@@ -1,9 +1,8 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.saturation" id="movit.saturation">
-	<name>Movit: Saturation</name>
-	<description>Saturate or desaturate the image</description>
+	<name>Saturation (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="saturation" default="100" min="0" max="1000" factor="100">
+	<parameter type="animated" name="saturation" default="1" min="0" max="1000" factor="100">
 		<name>Saturation</name>
 	</parameter>
 </effect>

data/effects/movit_unsharp_mask.xml

@@ -1,12 +1,11 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.unsharp_mask" id="movit.unsharp_mask">
-	<name>Movit: Unsharp mask</name>
-	<description>Sharpens the image by subtracting a blurred copy</description>
+	<name>Unsharp mask (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="radius" default="150" min="0" max="1000" factor="10">
+	<parameter type="animated" name="radius" default="15" min="0" max="1000" factor="10">
 		<name>Radius</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="radius" default="50" min="0" max="1000" factor="100">
+	<parameter type="animated" name="radius" default="0.5" min="0" max="1000" factor="100">
 		<name>Amount</name>
 	</parameter>
 </effect>

data/effects/movit_vignette.xml

@@ -1,12 +1,11 @@
 <!DOCTYPE kpartgui>
 <effect tag="movit.vignette" id="movit.vignette">
-	<name>Movit: Vignette</name>
-	<description>Vignette</description>
+	<name>Vignette (GPU)</name>
 	<author>Steinar H. Gunderson</author>
-	<parameter type="simplekeyframe" name="radius" default="300" min="0" max="1000" factor="1000">
+	<parameter type="animated" name="radius" default="0.3" min="0" max="1000" factor="1000">
 		<name>Radius</name>
 	</parameter>
-	<parameter type="simplekeyframe" name="inner_radius" default="300" min="0" max="1000" factor="1000">
+	<parameter type="animated" name="inner_radius" default="0.3" min="0" max="1000" factor="1000">
 		<name>Inner radius</name>
 	</parameter>
 </effect>

data/effects/movit_white_balance.xml

@@ -1,15 +1,12 @@
 <!DOCTYPE kpartgui>
-<group>
-    <effect tag="movit.white_balance" id="movit.white_balance">
-	<name>Movit: White balance</name>
-	<description>Adjust the white balance / color temperature</description>
-	<author>Steinar H. Gunderson</author>
-	<parameter type="color" name="neutral_color" default="0xffffffff">
-		<name>Neutral Color</name>
-	</parameter>
-        <parameter type="simplekeyframe" name="color_temperature" default="6500" min="1500" max="15000" factor="1">
-		<name>Color Temperature</name>
-	</parameter>
-    </effect>
-</group>
+<effect tag="movit.white_balance" id="movit.white_balance">
+    <name>White Balance (GPU)</name>
+    <author>Steinar H. Gunderson</author>
+    <parameter type="color" name="neutral_color" default="0x7f7f7fff">
+	<name>Neutral Color</name>
+    </parameter>
+    <parameter type="animated" name="color_temperature" default="6500" min="1000" max="15000" factor="1">
+	<name>Color Temperature</name>
+    </parameter>
+</effect>
 

data/effects/pan_zoom.xml

@@ -1,9 +1,9 @@
 <!DOCTYPE kpartgui>
-<effect tag="affine" id="pan_zoom" type="video">
-	<name>Pan and Zoom</name>
+<effect tag="affine" id="pan_zoom" type="video" context="nomovit">
+	<name>Position and Zoom</name>
 	<description>Adjust size and position of clip</description>
 	<author>Charles Yates</author>
-	<parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" opacity="false">
+	<parameter type="geometry" name="transition.geometry" default="0 0 %width %height" opacity="false">
 		<name>Rectangle</name>
 	</parameter>
         <parameter type="bool" name="transition.distort" default="0">

data/effects/qtblend.xml

@@ -0,0 +1,21 @@
+<!DOCTYPE kpartgui>
+<effect tag="qtblend" id="qtblend">
+        <name>Transform</name>
+        <description>Position, scale and opacity.</description>
+        <author>Jean-Baptiste Mardelle</author>
+	<parameter type="animatedrect" name="rect" default="0 0 %width %height 1">
+		<name>Rectangle</name>
+	</parameter>
+        <parameter type="animated" name="rotation" max="360" min="-360" default="0" notintimeline="1">
+                <name>Rotation</name>
+        </parameter>
+        <parameter type="list" name="compositing" default="0" paramlist="0;11;12;13;14;15;16;17;18;19;20;21;22;23;24;25;26;27;28;29;6;8">
+	   <paramlistdisplay>Alpha blend,Xor,Plus,Multiply,Screen,Overlay,Darken,Lighten,Color dodge,Color burn,Hard light,Soft light,Difference,Exclusion,Bitwise or,Bitwise and,Bitwise xor,Bitwise nor,Bitwise nand,Bitwise not xor,Destination in,Destination out</paramlistdisplay>
+		<name>Compositing</name>
+	</parameter>
+        <parameter type="bool" name="distort" default="0" min="0" max="1">
+		<name>Distort</name>
+	</parameter>
+</effect>
+
+

data/effects/region.xml

@@ -6,7 +6,7 @@
 	<parameter type="url" name="resource" default="">
 		<name>Url</name>
 	</parameter>
-	<parameter type="geometry" name="composite.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
+	<parameter type="geometry" name="composite.geometry" default="0 0:100% 100%" fixed="1" opacity="false">
 		<name>Pan and Zoom</name>
 	</parameter>
 	<parameter type="fixed" name="filter_only" min="1" max="1" default="1" />

data/effects/rotation.xml

@@ -33,7 +33,7 @@
 	<parameter type="constant" name="transition.shear_y" max="200" min="-200" default="0" factor="10">
 		<name>Animate Shear Y</name>
 	</parameter>
-	<parameter type="geometry" name="transition.geometry" default="0%,0%:100%x100%" fixed="1" opacity="false">
+	<parameter type="geometry" name="transition.geometry" default="0 0:100% 100%" fixed="1" opacity="false">
 		<name>Pan and Zoom</name>
 	</parameter>
 	<parameter type="color" name="background" default="colour:0x00000000" alpha="1" paramprefix="colour:">

data/effects/rotoscoping.xml

@@ -17,7 +17,7 @@
         <parameter type="bool" name="invert" default="0">
             <name>Invert</name>
         </parameter>
-        
+
         <!--<parameter type="bool" name="track" default="0">
             <name>Track</name>
         </parameter>-->
@@ -25,7 +25,7 @@
         <parameter type="constant" name="feather" max="500" min="0" default="0">
             <name>Feather width</name>
         </parameter>
-        
+
         <parameter type="constant" name="feather_passes" max="20" min="1" default="1">
             <name>Feathering passes</name>
         </parameter>

data/effects/speed.xml

@@ -1,12 +1,9 @@
 <!DOCTYPE kpartgui>
-<effect tag="framebuffer" id="speed" type="video" unique="1">
+<effect tag="timewarp" id="speed" type="av" unique="1">
 	<name>Speed</name>
 	<description>Make clip play faster or slower</description>
-	<author>Jean-Baptiste Mardelle</author>
-	<parameter type="constant" name="speed" max="10000" min="1" default="100" factor="100" suffix="%">
+	<author>Brian Matherly</author>
+	<parameter type="constant" name="speed" max="2000" min="-2000" default="100" factor="100" suffix="%">
 		<name>Speed</name>
 	</parameter>
-	<parameter type="constant" name="strobe" max="100" min="1" default="1">
-		<name>Stroboscope</name>
-	</parameter>
 </effect>

data/effects/threshold.xml

@@ -1,6 +1,6 @@
 <!DOCTYPE kpartgui>
 <effect tag="threshold" id="threshold">
-	<name>Threshold</name>
+	<name>Binarize</name>
 	<description>Make monochrome clip</description>
 	<author>Charles Yates</author>
 	<parameter type="constant" name="midpoint" max="255" min="0" default="128">

data/effects/tracker.xml

@@ -0,0 +1,40 @@
+<!DOCTYPE kpartgui>
+<effect tag="opencv.tracker" id="opencv.tracker" condition="results" sync_in_out="1">
+	<name>Motion Tracker</name>
+	<description>Select a zone to follow its movements</description>
+	<author>Jean-Baptiste Mardelle</author>
+	<parameter type="geometry" name="rect" default="50%,50%:25%x25%" fixed="1" opacity="false" conditional="1">
+		<name>Rectangle</name>
+	</parameter>
+        <parameter type="list" name="algo" default="KCF" paramlist="KCF;MIL;BOOSTING;TLD" conditional="1">
+	   <paramlistdisplay>KCF,MIL,Boosting,TLD</paramlistdisplay>
+		<name>Tracker algorithm</name>
+	</parameter>
+        <parameter type="list" name="shape" default="0" paramlist="0;1;2">
+	   <paramlistdisplay>Rectangle,Ellipse,Arrow</paramlistdisplay>
+		<name>Frame shape</name>
+	</parameter>
+	<parameter type="constant" name="shape_width" max="100" min="-1" default="1" suffix="pixels">
+		<name>Shape width</name>
+	</parameter>
+	<parameter type="color" name="shape_color" default="0xff0000ff">
+		<name>Shape color</name>
+	</parameter>
+        <parameter type="constant" name="blur" max="200" min="0" default="0">
+		<name>Blur</name>
+	</parameter>
+        <parameter type="list" name="blur_type" default="0" paramlist="0;1">
+	   <paramlistdisplay>Median Blur,Gaussian Blur</paramlistdisplay>
+		<name>Blur type</name>
+	</parameter>
+        <parameter type="readonly" name="results" value="">
+            <name>Tracking data</name>
+	</parameter>
+	<conditionalinfo>Filter is in preview mode. Click Analyse to see real effect</conditionalinfo>
+        <parameter type="filterjob" filtertag="opencv.tracker" filterparams="%params" consumer="null" consumerparams=" all=1 terminate_on_pause=1">
+		<jobparam name="key">results</jobparam>
+		<jobparam name="finalfilter">opencv.tracker</jobparam>
+                <jobparam name="displaydataname">Motion tracking</jobparam>
+		<name conditional="Reset">Analyse</name>
+	</parameter>
+</effect>

data/effects/update/frei0r.curves.js

@@ -2,7 +2,7 @@
 var update = new Object();
 
 update["Graph position"] = new Array(new Array(0.3, function(v, d) { return this.upd1(v, d); }));
-update["Curve point number"] = update["Graph position"];
+update["Curve point number"] = new Array(new Array(0.2, function(v, d) { return this.upd1(v, d); }));
 
 function upd1(value, isDowngrade) {
     if (isDowngrade)

data/effects/volume.xml

@@ -1,9 +1,9 @@
 <!DOCTYPE kpartgui>
-<effect tag="volume" id="volume" type="audio">
+<effect tag="volume" id="volume" type="audio" version="0.2">
 	<name>Volume (keyframable)</name>
 	<description>Adjust audio volume with keyframes</description>
 	<author>Dan Dennedy</author>
-	<parameter type="keyframe" name="gain" starttag="gain" max="300" min="0" default="100" factor="100">
+	<parameter type="animated" name="level" max="60" min="-60" default="0" suffix="dB">
 		<name>Gain</name>
 	</parameter>
 </effect>

data/encodingprofiles.rc

@@ -1,13 +1,27 @@
 [decklink]
+x264=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov
 DNxHD=vcodec=dnxhd vb=145000k acodec=pcm_s16le threads=%threads;mov
-Normal MPEG=vcodec=mpeg2video qscale=10 acodec=mp2 ac=2 ab=128k ar=48000 threads=%threads;mpg
+MPEG=qscale=4 ab=192k vcodec=mpeg2video acodec=mp2 threads=%threads;mpg
 
 [proxy]
-Normal MPEG=-f mpegts -acodec libmp3lame -ac 2 -ab 128k -vcodec mpeg2video -g 5 -s 640x480 -qscale 7;ts
+x264=-vf scale=640:-1 -g 5 -crf 25 -ab 128k -vcodec libx264 -acodec libvorbis -preset veryfast;mov
+MPEG=-vf scale=640:-1 -g 5 -qscale 6 -ab 128k -vcodec mpeg2video -acodec mp2;mpg
 
 [screengrab]
-X246 mute=-vcodec libx264 -preset fast -threads 0;mkv
-X246 with audio=-i pulse -acodec libvorbis -ab 256k -vcodec libx264 -preset fast -threads 0;mkv
+X264 mute=-crf 25 -vcodec libx264 -preset veryfast -threads 0;mov
+X264 with audio=-i pulse -crf 25 -ab 192k -vcodec libx264 -acodec libvorbis -preset veryfast -threads 0;mov
 
 [video4linux]
-Normal MPEG=acodec=mp2 ab=128k ar=48000 vcodec=mpeg2video minrate=0 vb=4000k;mpg
+x264=crf=25 ab=192k vcodec=libx264 acodec=libvorbis ab=192k preset=veryfast threads=%threads;mov
+MPEG=qscale=4 ab=192k vcodec=mpeg2video acodec=mp2 threads=%threads;mpg
+
+[timelinepreview]
+DNxHD 1080p 23.976fps=r=23.976 s=1920x1080 vb=36M threads=0 vcodec=dnxhd;mov
+DNxHD 1080p 24fps=r=24 s=1920x1080 vb=36M threads=0 vcodec=dnxhd;mov
+DNxHD 1080p 25fps=r=25 s=1920x1080 vb=36M threads=0 vcodec=dnxhd;mov
+DNxHD 1080p 29.97fps=r=29.97 s=1920x1080 vb=45M threads=0 vcodec=dnxhd;mov
+DNxHD 1080p 30fps=r=30 s=1920x1080 vb=45M threads=0 vcodec=dnxhd;mov
+DNxHD 1080p 50fps=r=50 s=1920x1080 vb=72M threads=0 vcodec=dnxhd;mov
+DNxHD 1080p 59.94fps=r=59.94 s=1920x1080 vb=90M threads=0 vcodec=dnxhd;mov
+DNxHD 1080p 60fps=r=60 s=1920x1080 vb=90M threads=0 vcodec=dnxhd;mov
+MJPEG=f=avi vcodec=mjpeg progressive=1 qscale=1;avi

data/generators/CMakeLists.txt

@@ -0,0 +1,7 @@
+INSTALL (FILES
+
+count.xml
+noise.xml
+frei0r_test_pat_b.xml
+
+DESTINATION ${DATA_INSTALL_DIR}/kdenlive/generators)

data/generators/count.xml

@@ -0,0 +1,23 @@
+<!DOCTYPE kpartgui>
+<generator tag="count" id="count" updateonduration="1">
+	<name>Counter</name>
+	<description>Generate frames with a counter and synchronized tone. The counter can go up or down.</description>
+	<author>Brian Matherly</author>
+        <parameter type="switch" name="direction" default="down" min="down" max="up">
+            <name>Count up</name>
+        </parameter>
+        <parameter type="switch" name="background" default="clock" min="clock" max="none">
+            <name>No background</name>
+        </parameter>
+        <parameter type="list" name="style" default="seconds+1" paramlist="seconds;seconds+1;frames;timecode;clock">
+		  <paramlistdisplay>Seconds to 0,Seconds to 1,Frames,Timecode,Clock</paramlistdisplay>
+		  <name>Counter Style</name>
+        </parameter>
+        <parameter type="list" name="sound" default="silent" paramlist="silent;2pop;frame0">
+		  <paramlistdisplay>Silent,1kHz beep before end,1kHz beep each second</paramlistdisplay>
+		  <name>Sound</name>
+        </parameter>
+        <parameter type="bool" name="drop" default="0" min="0" max="1">
+            <name>Drop frame timecode</name>
+        </parameter>
+</generator>

data/generators/frei0r_test_pat_b.xml

@@ -0,0 +1,10 @@
+<!DOCTYPE kpartgui>
+<generator tag="frei0r.test_pat_B" id="frei0r.test_pat_B">
+	<name>Color Bars</name>
+	<description>Generates test card lookalikes</description>
+	<author>Marko Cebokli</author>
+        <parameter type="list" name="0" default="0" paramlist="0;1;2;3;4;5;6;7">
+		  <paramlistdisplay>PAL color bars,PAL color bars with red,95% BBC color bars,75% EBU color bars,SMPTE color bars,Philips PM5544,FuBK,Simplified FuBK</paramlistdisplay>
+		  <name>Bar Type</name>
+	    </parameter>
+</generator>

data/generators/noise.xml

@@ -0,0 +1,7 @@
+<!DOCTYPE kpartgui>
+<generator tag="noise" id="noise">
+	<name>White Noise</name>
+	<description>White noise producer</description>
+	<author>Charles Yates</author>
+</generator>
+