Add opacity option to video fade filters.

mltframework · Aug 24, 2014 · a0afc89 · a0afc89
1 parent 20e6fbb
commit a0afc89
Show file tree

Hide file tree

Showing 9 changed files with 100 additions and 16 deletions.
diff --git a/src/models/multitrackmodel.cpp b/src/models/multitrackmodel.cpp
@@ -1301,15 +1301,20 @@ void MultitrackModel::fadeIn(int trackIndex, int clipIndex, int duration)
                     } else {
                         Mlt::Filter f(MLT.profile(), "brightness");
                         f.set(kShotcutFilterProperty, "fadeInBrightness");
-                        f.set("start", 0);
-                        f.set("end", 1);
+                        QString level = QString("0=0; %1=1").arg(duration - 1);
+                        f.set("level", level.toLatin1().constData());
+                        f.set("alpha", 1);
                         info->producer->attach(f);
                         filter.reset(new Mlt::Filter(f));
                     }
                 } else if (Settings.playerGPU()) {
                     // Special handling for animation keyframes on movit.opacity.
                     QString opacity = QString("0~=0; %1=1").arg(duration - 1);
                     filter->set("opacity", opacity.toLatin1().constData());
+                } else {
+                    // Special handling for animation keyframes on brightness.
+                    QString level = QString("0=0; %1=1").arg(duration - 1);
+                    filter->set("level", level.toLatin1().constData());
                 }
                 // Adjust video filter.
                 filter->set_in_and_out(info->frame_in, info->frame_in + duration - 1);
@@ -1371,15 +1376,20 @@ void MultitrackModel::fadeOut(int trackIndex, int clipIndex, int duration)
                     } else {
                         Mlt::Filter f(MLT.profile(), "brightness");
                         f.set(kShotcutFilterProperty, "fadeOutBrightness");
-                        f.set("start", 1);
-                        f.set("end", 0);
+                        QString level = QString("0=1; %1=1").arg(duration - 1);
+                        f.set("level", level.toLatin1().constData());
+                        f.set("alpha", 1);
                         info->producer->attach(f);
                         filter.reset(new Mlt::Filter(f));
                     }
                 } else if (Settings.playerGPU()) {
                     // Special handling for animation keyframes on movit.opacity.
                     QString opacity = QString("0~=1; %1=0").arg(duration - 1);
                     filter->set("opacity", opacity.toLatin1().constData());
+                } else {
+                    // Special handling for animation keyframes on brightness.
+                    QString level = QString("0=1; %1=0").arg(duration - 1);
+                    filter->set("level", level.toLatin1().constData());
                 }
                 // Adjust video filter.
                 filter->set_in_and_out(info->frame_out - duration + 1, info->frame_out);

diff --git a/src/qml/filters/fadein_brightness/meta.qml b/src/qml/filters/fadein_brightness/meta.qml
@@ -4,7 +4,7 @@ import org.shotcut.qml 1.0
 Metadata {
     type: Metadata.Filter
     objectName: 'fadeInBrightness'
-    name: qsTr("Fade From Black")
+    name: qsTr("Fade In Video")
     mlt_service: "brightness"
     qml: "ui.qml"
 }
diff --git a/src/qml/filters/fadein_brightness/ui.qml b/src/qml/filters/fadein_brightness/ui.qml
@@ -30,11 +30,12 @@ Rectangle {
     Component.onCompleted: {
         if (filter.isNew) {
             duration = filter.framesFromTime('1:0')
-            filter.set('start', 0)
-            filter.set('end', 1)
+            filter.set('level', '0=0; %1=1'.arg(duration - 1))
+            filter.set('alpha', 1)
             filter.set('in', filter.producerIn)
             filter.set('out', filter.getDouble('in') + duration - 1)
         }
+        alphaCheckbox.checked = filter.get('alpha') != 1
     }
 
     ColumnLayout {
@@ -49,7 +50,25 @@ Rectangle {
                 maximumValue: 5000
                 value: filter.getDouble('out') - filter.getDouble('in') + 1
                 onValueChanged: {
+                    var out = filter.getDouble('in') + value - 1
                     filter.set('out', filter.getDouble('in') + value - 1)
+                    if (filter.get('alpha') != 1)
+                        filter.set('alpha', '0=0; %1=1'.arg(duration - 1))
+                    else
+                        filter.set('level', '0=0; %1=1'.arg(duration - 1))
+                }
+            }
+        }
+        CheckBox {
+            id: alphaCheckbox
+            text: qsTr('Adjust opacity instead of fade with black')
+            onClicked: {
+                if (checked) {
+                    filter.set('level', 1)
+                    filter.set('alpha', '0=0; %1=1'.arg(duration - 1))
+                } else {
+                    filter.set('level', '0=0; %1=1'.arg(duration - 1))
+                    filter.set('alpha', 1)
                 }
             }
         }

diff --git a/src/qml/filters/fadein_movit/meta.qml b/src/qml/filters/fadein_movit/meta.qml
@@ -4,7 +4,7 @@ import org.shotcut.qml 1.0
 Metadata {
     type: Metadata.Filter
     objectName: 'fadeInMovit'
-    name: qsTr("Fade From Black")
+    name: qsTr("Fade In Video")
     mlt_service: "movit.opacity"
     needsGPU: true
     qml: "ui.qml"

diff --git a/src/qml/filters/fadein_movit/ui.qml b/src/qml/filters/fadein_movit/ui.qml
@@ -35,6 +35,7 @@ Rectangle {
             filter.set('in', filter.producerIn)
             filter.set('out', filter.getDouble('in') + duration - 1)
         }
+        alphaCheckbox.checked = filter.get('alpha') != 1
     }
 
     ColumnLayout {
@@ -50,8 +51,24 @@ Rectangle {
                 value: filter.getDouble('out') - filter.getDouble('in') + 1
                 onValueChanged: {
                     var out = filter.getDouble('in') + value - 1
-                    filter.set('opacity', '0=0; %1=1'.arg(duration - 1))
                     filter.set('out', out)
+                    if (filter.get('alpha') != 1)
+                        filter.set('alpha', '0~=0; %1=1'.arg(duration - 1))
+                    else
+                        filter.set('opacity', '0~=0; %1=1'.arg(duration - 1))
+                }
+            }
+        }
+        CheckBox {
+            id: alphaCheckbox
+            text: qsTr('Adjust opacity instead of fade with black')
+            onClicked: {
+                if (checked) {
+                    filter.set('opacity', 1)
+                    filter.set('alpha', '0~=0; %1=1'.arg(duration - 1))
+                } else {
+                    filter.set('opacity', '0~=0; %1=1'.arg(duration - 1))
+                    filter.set('alpha', 1)
                 }
             }
         }

diff --git a/src/qml/filters/fadeout_brightness/meta.qml b/src/qml/filters/fadeout_brightness/meta.qml
@@ -4,7 +4,7 @@ import org.shotcut.qml 1.0
 Metadata {
     type: Metadata.Filter
     objectName: 'fadeOutBrightness'
-    name: qsTr("Fade To Black")
+    name: qsTr("Fade Out Video")
     mlt_service: "brightness"
     qml: "ui.qml"
 }
diff --git a/src/qml/filters/fadeout_brightness/ui.qml b/src/qml/filters/fadeout_brightness/ui.qml
@@ -30,11 +30,14 @@ Rectangle {
     Component.onCompleted: {
         if (filter.isNew) {
             duration = filter.framesFromTime('1:0')
-            filter.set('start', 1)
-            filter.set('end', 0)
-            filter.set('out', filter.producerOut)
-            filter.set('in', filter.getDouble('out') - duration + 1)
+            var out = filter.producerOut
+            var inFrame = out - duration + 1
+            filter.set('level', '0=1; %1=0'.arg(duration - 1))
+            filter.set('alpha', 1)
+            filter.set('in', inFrame)
+            filter.set('out', out)
         }
+        alphaCheckbox.checked = filter.get('alpha') != 1
     }
 
     ColumnLayout {
@@ -49,7 +52,25 @@ Rectangle {
                 maximumValue: 5000
                 value: filter.getDouble('out') - filter.getDouble('in') + 1
                 onValueChanged: {
-                    filter.set('in', filter.getDouble('out') - duration + 1)
+                    var inFrame = filter.getDouble('out') - duration + 1
+                    filter.set('in', inFrame)
+                    if (filter.get('alpha') != 1)
+                        filter.set('alpha', '0=1; %1=0'.arg(duration - 1))
+                    else
+                        filter.set('level', '0=1; %1=0'.arg(duration - 1))
+                }
+            }
+        }
+        CheckBox {
+            id: alphaCheckbox
+            text: qsTr('Adjust opacity instead of fade with black')
+            onClicked: {
+                if (checked) {
+                    filter.set('level', 1)
+                    filter.set('alpha', '0=1; %1=0'.arg(duration - 1))
+                } else {
+                    filter.set('level', '0=1; %1=0'.arg(duration - 1))
+                    filter.set('alpha', 1)
                 }
             }
         }

diff --git a/src/qml/filters/fadeout_movit/meta.qml b/src/qml/filters/fadeout_movit/meta.qml
@@ -4,7 +4,7 @@ import org.shotcut.qml 1.0
 Metadata {
     type: Metadata.Filter
     objectName: 'fadeOutMovit'
-    name: qsTr("Fade To Black")
+    name: qsTr("Fade Out Video")
     mlt_service: "movit.opacity"
     needsGPU: true
     qml: "ui.qml"

diff --git a/src/qml/filters/fadeout_movit/ui.qml b/src/qml/filters/fadeout_movit/ui.qml
@@ -37,6 +37,7 @@ Rectangle {
             filter.set('in', inFrame)
             filter.set('out', out)
         }
+        alphaCheckbox.checked = filter.get('alpha') != 1
     }
 
     ColumnLayout {
@@ -53,7 +54,23 @@ Rectangle {
                 onValueChanged: {
                     var inFrame = filter.getDouble('out') - duration + 1
                     filter.set('in', inFrame)
+                    if (filter.get('alpha') != 1)
+                        filter.set('alpha', '0~=1; %1=0'.arg(duration - 1))
+                    else
+                        filter.set('opacity', '0~=1; %1=0'.arg(duration - 1))
+                }
+            }
+        }
+        CheckBox {
+            id: alphaCheckbox
+            text: qsTr('Adjust opacity instead of fade with black')
+            onClicked: {
+                if (checked) {
+                    filter.set('opacity', 1)
+                    filter.set('alpha', '0~=1; %1=0'.arg(duration - 1))
+                } else {
                     filter.set('opacity', '0~=1; %1=0'.arg(duration - 1))
+                    filter.set('alpha', 1)
                 }
             }
         }