ShaderEffectState

rectalogic · Jan 7, 2024 · 95cbdda · 95cbdda
1 parent 1ed889a
commit 95cbdda
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 18 deletions.
diff --git a/src/MediaFX/CMakeLists.txt b/src/MediaFX/CMakeLists.txt
@@ -53,6 +53,7 @@ qt_add_qml_module(mediafx
     qml/sequence.js
     qml/MediaSequence.qml
     qml/MultiEffectState.qml
+    qml/ShaderEffectState.qml
     qml/effects/MediaMixer.qml
     qml/effects/CrossFadeMixer.qml
     qml/effects/LumaMixer.qml

diff --git a/src/MediaFX/qml/MultiEffectState.qml b/src/MediaFX/qml/MultiEffectState.qml
@@ -18,23 +18,24 @@ import QtQuick.Effects
 import QtMultimedia
 
 State {
+    id: root
     default required property MultiEffect effect
     required property VideoOutput videoOutput
 
-    Component.onCompleted: effect.visible = false
+    Component.onCompleted: root.effect.visible = false
 
     ParentChange {
-        parent: videoOutput.parent
-        target: effect
+        parent: root.videoOutput.parent
+        target: root.effect
     }
     PropertyChanges {
-        anchors.fill: videoOutput
-        source: videoOutput
+        anchors.fill: root.videoOutput
+        source: root.videoOutput
         visible: true
-        target: effect
+        target: root.effect
     }
     PropertyChanges {
         visible: false
-        target: videoOutput
+        target: root.videoOutput
     }
 }
diff --git a/src/MediaFX/qml/ShaderEffectState.qml b/src/MediaFX/qml/ShaderEffectState.qml
@@ -0,0 +1,29 @@
+// Copyright (C) 2024 Andrew Wason
+//
+// This file is part of mediaFX.
+//
+// mediaFX is free software: you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the Free Software Foundation,
+// either version 3 of the License, or (at your option) any later version.
+//
+// mediaFX is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+// without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+// See the GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License along with mediaFX.
+// If not, see <https://www.gnu.org/licenses/>.
+
+import QtQuick
+import QtMultimedia
+
+State {
+    id: root
+    required property VideoOutput videoOutput
+    default required property Component effect
+
+    PropertyChanges {        
+        layer.enabled: true
+        layer.effect: root.effect
+        target: root.videoOutput
+    }
+}
diff --git a/tests/qml/animated.qml b/tests/qml/animated.qml
@@ -23,7 +23,8 @@ Item {
         name: "reanchored"
 
         AnchorChanges {
-            anchors: { bottom: container.bottom; right: container.right; }
+            anchors.bottom: container.bottom
+            anchors.right: container.right
             target: rect
         }
     }

diff --git a/tests/qml/video-shadereffect.qml b/tests/qml/video-shadereffect.qml
@@ -27,26 +27,21 @@ Item {
             videoClip.clipEnded.connect(MediaManager.finishEncoding);
         }
     }
+
     VideoOutput {
         id: videoOutput
 
         anchors.fill: parent
         Media.clip: videoClip
-        layer.enabled: false
-
-        // layer.samplerName: "source"
 
-        layer.effect: ShaderEffect {
-            fragmentShader: "grayscale.frag.qsb"
-        }
-        states: State {
+        states: ShaderEffectState {
             name: "filter"
             // From 1-2 sec into the video, switch to greyscale
             when: (videoClip.clipCurrentTime.containedBy(1000, 2000))
 
-            PropertyChanges {
-                layer.enabled: true
-                target: videoOutput
+            videoOutput: videoOutput
+            ShaderEffect {
+                fragmentShader: "grayscale.frag.qsb"
             }
         }
     }