Merge branch 'mltframework:master' into work/qtblend-size

Author: j-b-m

src/framework/mlt_multitrack.c

@@ -3,7 +3,7 @@
  * \brief multitrack service class
  * \see mlt_multitrack_s
  *
- * Copyright (C) 2003-2020 Meltytech, LLC
+ * Copyright (C) 2003-2025 Meltytech, LLC
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -583,11 +583,15 @@ static int producer_get_frame(mlt_producer parent, mlt_frame_ptr frame, int inde
         // Get the speed
         double speed = mlt_properties_get_double(producer_properties, "_speed");
 
-        // Make sure we're at the same point
-        mlt_producer_seek(producer, position);
+        if (hide == 3) {
+            *frame = mlt_frame_init(MLT_PRODUCER_SERVICE(producer));
+        } else {
+            // Make sure we're at the same point
+            mlt_producer_seek(producer, position);
 
-        // Get the frame from the producer
-        mlt_service_get_frame(MLT_PRODUCER_SERVICE(producer), frame, 0);
+            // Get the frame from the producer
+            mlt_service_get_frame(MLT_PRODUCER_SERVICE(producer), frame, 0);
+        }
 
         // Indicate speed of this producer
         mlt_properties properties = MLT_FRAME_PROPERTIES(*frame);

src/tests/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(CMAKE_AUTOMOC ON)
 
-foreach(QT_TEST_NAME animation audio events filter frame image playlist producer properties repository service tractor xml)
+foreach(QT_TEST_NAME animation audio events filter frame image multitrack playlist producer properties repository service tractor xml)
   add_executable(test_${QT_TEST_NAME} test_${QT_TEST_NAME}/test_${QT_TEST_NAME}.cpp)
   target_compile_options(test_${QT_TEST_NAME} PRIVATE ${MLT_COMPILE_OPTIONS})
   target_link_libraries(test_${QT_TEST_NAME} PRIVATE Qt${QT_MAJOR_VERSION}::Core Qt${QT_MAJOR_VERSION}::Test mlt++)

src/tests/test_animation/test_animation.pro

@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2025 Meltytech, LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with consumer library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <mlt++/Mlt.h>
+#include <QtTest>
+using namespace Mlt;
+
+class TestMultitrack : public QObject
+{
+    Q_OBJECT
+
+    Profile profile;
+
+public:
+    TestMultitrack()
+        : profile("dv_pal")
+    {
+        Factory::init();
+    }
+
+private Q_SLOTS:
+
+    void TestConstructor()
+    {
+        mlt_multitrack multitrack = mlt_multitrack_init();
+        QVERIFY(multitrack != nullptr);
+
+        Multitrack multiTrack(multitrack);
+        QVERIFY(multiTrack.get_multitrack() == multitrack);
+
+        mlt_multitrack_close(multitrack);
+    }
+
+    void ConnectAndDisconnect()
+    {
+        mlt_multitrack multitrack = mlt_multitrack_init();
+        Producer producer(profile, "color");
+
+        Multitrack multiTrack(multitrack);
+        QVERIFY(multiTrack.connect(producer, 0) == 0);
+        QCOMPARE(multiTrack.count(), 1);
+
+        QVERIFY(multiTrack.disconnect(0) == 0);
+        QCOMPARE(multiTrack.count(), 0);
+
+        mlt_multitrack_close(multitrack);
+    }
+
+    void InsertAndClip()
+    {
+        mlt_multitrack multitrack = mlt_multitrack_init();
+        Producer producer(profile, "color");
+
+        Multitrack multiTrack(multitrack);
+        QVERIFY(multiTrack.insert(producer, 0) == 0);
+        QCOMPARE(multiTrack.count(), 1);
+
+        QVERIFY(multiTrack.clip(::mlt_whence_relative_start, 0) == 0);
+
+        mlt_multitrack_close(multitrack);
+    }
+
+    void GetTrack()
+    {
+        mlt_multitrack multitrack = mlt_multitrack_init();
+        Producer producer(profile, "color");
+
+        Multitrack multiTrack(multitrack);
+        QVERIFY(multiTrack.insert(producer, 0) == 0);
+
+        Producer *track = multiTrack.track(0);
+        QVERIFY(track != nullptr);
+        QCOMPARE(track->get_producer(), producer.get_producer());
+        delete track;
+
+        mlt_multitrack_close(multitrack);
+    }
+
+    void GetFrame()
+    {
+        mlt_multitrack multitrack = mlt_multitrack_init();
+        Producer producer(profile, "color");
+
+        Multitrack multiTrack(multitrack);
+        QVERIFY(multiTrack.connect(producer, 0) == 0);
+
+        auto position = 3;
+        multiTrack.seek(position);
+        auto frame = multiTrack.get_frame();
+        QVERIFY(frame != nullptr);
+        QCOMPARE(frame->get_position(), position);
+        // The color producer created the frame
+        QCOMPARE(frame->get_int("progressive"), 1);
+        delete frame;
+
+        // Test hiding and muting the producer
+        producer.set("hide", 3);
+        frame = multiTrack.get_frame();
+        QVERIFY(frame != nullptr);
+        // Returns a dummy frame
+        QCOMPARE(frame->get_int("progressive"), 0);
+        delete frame;
+
+        mlt_multitrack_close(multitrack);
+    }
+};
+
+QTEST_APPLESS_MAIN(TestMultitrack)
+
+#include "test_multitrack.moc"