slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.3' into 5.4

Browse Source 
Conflicts:
	src/gsttools/qgstreamervideoinputdevicecontrol.cpp
	src/plugins/gstreamer/camerabin/camerabinserviceplugin.cpp
	src/plugins/gstreamer/mediacapture/qgstreamercaptureserviceplugin.cpp

Change-Id: Ic854589562d2deeaa0ebf75840cb8a2ee32e99de
This commit is contained in:
Frederik Gladhorn
2014-08-28 16:25:20 +02:00
parent 80ba1d635d 1dba07b602
commit 659f238bbb
38 changed files with 436 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectMagnify.qml
View File

@@ -31,7 +31,8 @@
**
****************************************************************************/
import QtQuick 2.0
import QtQuick 2.1
import QtQuick.Window 2.1
Effect {
id: root
@@ -49,6 +50,7 @@ Effect {
property real posX: -1
property real posY: -1
property real pixDens: Screen.pixelDensity
QtObject {
id: d

4
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectRipple.qml
View File

@@ -31,7 +31,8 @@
**
****************************************************************************/
import QtQuick 2.0
import QtQuick 2.1
import QtQuick.Window 2.1
Effect {
parameters: ListModel {
@@ -48,6 +49,7 @@ Effect {
// Transform slider values, and bind result to shader uniforms
property real amplitude: parameters.get(0).value * 0.03
property real n: parameters.get(1).value * 7
property real pixDens: Screen.pixelDensity
property real time: 0
NumberAnimation on time { loops: Animation.Infinite; from: 0; to: Math.PI * 2; duration: 600 }

2
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/EffectSelectionList.qml
View File

@@ -43,7 +43,7 @@ ListModel {
ListElement { name: "Emboss"; source: "EffectEmboss.qml" }
ListElement { name: "Glow"; source: "EffectGlow.qml" }
ListElement { name: "Isolate"; source: "EffectIsolate.qml" }
//ListElement { name: "Magnify"; source: "EffectMagnify.qml" }
ListElement { name: "Magnify"; source: "EffectMagnify.qml" }
ListElement { name: "Page curl"; source: "EffectPageCurl.qml" }
ListElement { name: "Pixelate"; source: "EffectPixelate.qml" }
ListElement { name: "Posterize"; source: "EffectPosterize.qml" }