add playback controls

Author: ddennedy

scripts/build-shotcut-msys2.sh

@@ -1240,7 +1240,7 @@ function deploy
 
   log Copying some libs from Qt
   if [ "$DEBUG_BUILD" != "1" -o "$SDK" = "1" ]; then
-    cmd cp -p "$QTDIR"/bin/Qt6{Charts,Concurrent,Core,Core5Compat,Gui,Multimedia,Network,OpenGL,OpenGLWidgets,Qml,QmlMeta,QmlModels,QmlWorkerScript,Quick,QuickControls2*,QuickDialogs2,QuickDialogs2QuickImpl,QuickDialogs2Utils,QuickLayouts,QuickTemplates2,QuickWidgets,Sql,Svg,SvgWidgets,UiTools,WebSockets,Widgets,Xml}.dll .
+    cmd cp -p "$QTDIR"/bin/Qt6{Charts,Concurrent,Core,Core5Compat,Gui,Multimedia,MultimediaQuick,Network,OpenGL,OpenGLWidgets,Qml,QmlMeta,QmlModels,QmlWorkerScript,Quick,QuickControls2*,QuickDialogs2,QuickDialogs2QuickImpl,QuickDialogs2Utils,QuickLayouts,QuickShapes,QuickTemplates2,QuickWidgets,Sql,Svg,SvgWidgets,UiTools,WebSockets,Widgets,Xml}.dll .
   fi
 
   if [ "$ENABLE_GLAXNIMATE" = "1" ]; then

scripts/build-shotcut.sh

@@ -1202,7 +1202,7 @@ function install_shotcut_linux {
   cmd install -p -c COPYING "$FINAL_INSTALL_DIR"
   cmd install -p -c "$QTDIR"/translations/qt_*.qm "$FINAL_INSTALL_DIR"/share/shotcut/translations
   cmd install -p -c "$QTDIR"/translations/qtbase_*.qm "$FINAL_INSTALL_DIR"/share/shotcut/translations
-  cmd install -p -c "$QTDIR"/lib/libQt6{Charts,Concurrent,Core,Core5Compat,DBus,Gui,LabsFolderListModel,Multimedia,Network,OpenGL,OpenGLWidgets,Qml,QmlMeta,QmlModels,QmlWorkerScript,Quick,QuickControls2*,QuickDialogs2,QuickDialogs2QuickImpl,QuickDialogs2Utils,QuickLayouts,QuickTemplates2,QuickWidgets,Sql,Svg,SvgWidgets,UiTools,WaylandClient,WaylandEglClientHwIntegration,WebSockets,Widgets,Xml,X11Extras,XcbQpa}.so.6 "$FINAL_INSTALL_DIR"/lib
+  cmd install -p -c "$QTDIR"/lib/libQt6{Charts,Concurrent,Core,Core5Compat,DBus,Gui,LabsFolderListModel,Multimedia,MultimediaQuick,Network,OpenGL,OpenGLWidgets,Qml,QmlMeta,QmlModels,QmlWorkerScript,Quick,QuickControls2*,QuickDialogs2,QuickDialogs2QuickImpl,QuickDialogs2Utils,QuickLayouts,QuickShapes,QuickTemplates2,QuickWidgets,Sql,Svg,SvgWidgets,UiTools,WaylandClient,WaylandEglClientHwIntegration,WebSockets,Widgets,Xml,X11Extras,XcbQpa}.so.6 "$FINAL_INSTALL_DIR"/lib
   cmd install -p -c "$QTDIR"/lib/lib{icudata,icui18n,icuuc}.so* "$FINAL_INSTALL_DIR"/lib
   cmd install -d "$FINAL_INSTALL_DIR"/lib/qt6/sqldrivers
   cmd cp -a "$QTDIR"/plugins/{egldeviceintegrations,generic,iconengines,imageformats,multimedia,platforminputcontexts,platforms,platformthemes,tls,wayland-decoration-client,wayland-graphics-integration-client,wayland-shell-integration,xcbglintegrations} "$FINAL_INSTALL_DIR"/lib/qt6

src/hdrpreviewwindow.cpp

@@ -19,8 +19,14 @@
 
 #include "actions.h"
 #include "mainwindow.h"
+#include "mltcontroller.h"
+#include "player.h"
 #include "qmltypes/qmlutilities.h"
 
+#ifdef Q_OS_WIN
+#include <windows.h>
+#endif
+
 #include <private/qrhi_p.h>
 #include <QDebug>
 #include <QDir>
@@ -44,6 +50,19 @@ static float hlgOetf(float linear)
     return a * logf(12.0f * linear - b) + c;
 }
 
+static QString formatTimecode(int frames, double fps)
+{
+    if (frames < 0 || fps <= 0.0)
+        return QStringLiteral("00:00");
+    const int totalSec = static_cast<int>(frames / fps);
+    const int h = totalSec / 3600;
+    const int m = (totalSec % 3600) / 60;
+    const int s = totalSec % 60;
+    if (h > 0)
+        return QString("%1:%2:%3").arg(h).arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0'));
+    return QString("%1:%2").arg(m, 2, 10, QChar('0')).arg(s, 2, 10, QChar('0'));
+}
+
 HdrPreviewWindow::HdrPreviewWindow(QWindow *parent)
     : QQuickView(QmlUtilities::sharedEngine(), parent)
 {
@@ -64,6 +83,8 @@ HdrPreviewWindow::HdrPreviewWindow(QWindow *parent)
 
     resize(960, 540);
 
+    connect(this, &QWindow::windowStateChanged, this, [this]() { emit fullScreenChanged(); });
+
 #ifdef Q_OS_MACOS
     // Override NSScreen.maximumExtendedDynamicRangeColorComponentValue so that
     // Qt's video shader outputs > 1.0 values (HDR) on the first frame, which
@@ -113,9 +134,160 @@ void HdrPreviewWindow::pushFrame(const QVideoFrame &frame)
         }
         updateHdrGain();
         m_videoSink->setVideoFrame(frame);
+
+        // Track playback position from frame timestamp
+        const qint64 pts = frame.startTime(); // microseconds
+        const double fps = MLT.profile().fps();
+        if (pts >= 0 && fps > 0.0) {
+            const int frameNum = qRound(pts * fps / 1000000.0);
+            if (m_videoPosition != frameNum) {
+                m_videoPosition = frameNum;
+                emit videoPositionChanged();
+            }
+        }
+        // Track duration from the active producer
+        if (auto *prod = MLT.producer()) {
+            const int len = qMax(0, prod->get_length() - 1);
+            if (m_videoDuration != len) {
+                m_videoDuration = len;
+                emit videoDurationChanged();
+            }
+        }
+    }
+}
+
+void HdrPreviewWindow::triggerPlayPause()
+{
+    Actions["playerPlayPauseAction"]->trigger();
+}
+
+void HdrPreviewWindow::triggerRewind()
+{
+    Actions["playerRewindAction"]->trigger();
+}
+
+void HdrPreviewWindow::triggerFastForward()
+{
+    Actions["playerFastForwardAction"]->trigger();
+}
+
+void HdrPreviewWindow::toggleFullScreen()
+{
+    if (windowStates() & Qt::WindowFullScreen) {
+        setWindowStates(Qt::WindowNoState);
+        if (m_normalGeometry.isValid())
+            setGeometry(m_normalGeometry);
+    } else {
+        m_normalGeometry = geometry();
+        showFullScreen();
+    }
+}
+
+QString HdrPreviewWindow::positionText() const
+{
+    return formatTimecode(m_videoPosition, MLT.profile().fps());
+}
+
+QString HdrPreviewWindow::durationText() const
+{
+    return formatTimecode(m_videoDuration, MLT.profile().fps());
+}
+
+void HdrPreviewWindow::seekToFrame(int frame)
+{
+    MAIN.player()->seek(frame);
+}
+
+void HdrPreviewWindow::setPlaying(bool playing)
+{
+    if (m_isPlaying != playing) {
+        m_isPlaying = playing;
+        emit playingChanged();
     }
 }
 
+bool HdrPreviewWindow::nativeEvent(const QByteArray &eventType, void *message, qintptr *result)
+{
+#ifdef Q_OS_WIN
+    if (eventType == "windows_generic_MSG") {
+        MSG *msg = static_cast<MSG *>(message);
+        if (msg->message == WM_SIZING && !(windowStates() & Qt::WindowFullScreen)) {
+            const int darNum = MLT.profile().display_aspect_num();
+            const int darDen = MLT.profile().display_aspect_den();
+            if (darNum > 0 && darDen > 0) {
+                RECT *r = reinterpret_cast<RECT *>(msg->lParam);
+                // Measure the actual frame overhead from the live window state.
+                // AdjustWindowRectEx under-reports the DWM extended frame on
+                // Windows 10/11, leading to a wrong client-area AR calculation.
+                RECT curWin, curClient;
+                GetWindowRect(msg->hwnd, &curWin);
+                GetClientRect(msg->hwnd, &curClient);
+                const int fw = (curWin.right - curWin.left) - (curClient.right - curClient.left);
+                const int fh = (curWin.bottom - curWin.top) - (curClient.bottom - curClient.top);
+                const int clientW = (r->right - r->left) - fw;
+                const int clientH = (r->bottom - r->top) - fh;
+                const bool heightPrimary = (msg->wParam == WMSZ_TOP || msg->wParam == WMSZ_BOTTOM);
+                if (heightPrimary) {
+                    // Height drives: adjust width from the right
+                    r->right = r->left + qRound((double) clientH * darNum / darDen) + fw;
+                } else {
+                    // Width drives: adjust height
+                    const int newH = qRound((double) clientW * darDen / darNum) + fh;
+                    const bool fromTop = (msg->wParam == WMSZ_TOPLEFT
+                                          || msg->wParam == WMSZ_TOPRIGHT);
+                    if (fromTop)
+                        r->top = r->bottom - newH;
+                    else
+                        r->bottom = r->top + newH;
+                }
+                *result = TRUE;
+                return true;
+            }
+        }
+    }
+#endif
+    return QQuickView::nativeEvent(eventType, message, result);
+}
+
+void HdrPreviewWindow::resizeEvent(QResizeEvent *event)
+{
+    QQuickView::resizeEvent(event);
+#ifndef Q_OS_WIN
+    // On Windows, WM_SIZING handles AR constraining smoothly.
+    // On other platforms, snap to the correct AR after each resize.
+    if (windowStates() & Qt::WindowFullScreen)
+        return;
+    const QSize newSize = event->size();
+    const QSize oldSize = event->oldSize();
+    if (!oldSize.isValid())
+        return;
+    const int darNum = MLT.profile().display_aspect_num();
+    const int darDen = MLT.profile().display_aspect_den();
+    if (darNum <= 0 || darDen <= 0)
+        return;
+    // Infer which axis the user is dragging by which changed proportionally more
+    const double wChange = qAbs((double) (newSize.width() - oldSize.width())
+                                / qMax(oldSize.width(), 1));
+    const double hChange = qAbs((double) (newSize.height() - oldSize.height())
+                                / qMax(oldSize.height(), 1));
+    int targetW, targetH;
+    if (wChange >= hChange) {
+        targetW = newSize.width();
+        targetH = qRound((double) targetW * darDen / darNum);
+    } else {
+        targetH = newSize.height();
+        targetW = qRound((double) targetH * darNum / darDen);
+    }
+    if (targetW != newSize.width() || targetH != newSize.height()) {
+        // Defer to avoid recursion
+        QTimer::singleShot(0, this, [this, targetW, targetH]() {
+            if (!(windowStates() & Qt::WindowFullScreen))
+                resize(targetW, targetH);
+        });
+    }
+#endif
+}
+
 void HdrPreviewWindow::keyPressEvent(QKeyEvent *event)
 {
     // Forward to MainWindow for J/K/L transport handling

src/hdrpreviewwindow.h

@@ -21,6 +21,9 @@
 #include <QKeyEvent>
 #include <QPointer>
 #include <QQuickView>
+#include <QRect>
+#include <QResizeEvent>
+#include <QString>
 #include <QTimer>
 #include <QVideoFrame>
 #include <QVideoSink>
@@ -29,24 +32,49 @@ class HdrPreviewWindow : public QQuickView
 {
     Q_OBJECT
     Q_PROPERTY(float hdrGain READ hdrGain NOTIFY hdrGainChanged)
+    Q_PROPERTY(bool playing READ isPlaying NOTIFY playingChanged)
+    Q_PROPERTY(bool fullScreen READ isFullScreen NOTIFY fullScreenChanged)
+    Q_PROPERTY(int videoPosition READ videoPosition NOTIFY videoPositionChanged)
+    Q_PROPERTY(int videoDuration READ videoDuration NOTIFY videoDurationChanged)
+    Q_PROPERTY(QString positionText READ positionText NOTIFY videoPositionChanged)
+    Q_PROPERTY(QString durationText READ durationText NOTIFY videoDurationChanged)
 
 public:
     explicit HdrPreviewWindow(QWindow *parent = nullptr);
     ~HdrPreviewWindow();
 
     Q_INVOKABLE void setVideoSink(QVideoSink *sink);
     float hdrGain() const { return m_hdrGain; }
+    bool isPlaying() const { return m_isPlaying; }
+    bool isFullScreen() const { return windowStates() & Qt::WindowFullScreen; }
+    int videoPosition() const { return m_videoPosition; }
+    int videoDuration() const { return m_videoDuration; }
+    QString positionText() const;
+    QString durationText() const;
+
+    Q_INVOKABLE void triggerPlayPause();
+    Q_INVOKABLE void triggerRewind();
+    Q_INVOKABLE void triggerFastForward();
+    Q_INVOKABLE void toggleFullScreen();
+    Q_INVOKABLE void seekToFrame(int frame);
 
 public slots:
     void pushFrame(const QVideoFrame &frame);
     void setHlg(bool isHlg);
+    void setPlaying(bool playing);
 
 signals:
     void hdrGainChanged();
+    void playingChanged();
+    void fullScreenChanged();
+    void videoPositionChanged();
+    void videoDurationChanged();
 
 protected:
     void keyPressEvent(QKeyEvent *event) override;
     void keyReleaseEvent(QKeyEvent *event) override;
+    bool nativeEvent(const QByteArray &eventType, void *message, qintptr *result) override;
+    void resizeEvent(QResizeEvent *event) override;
 
 private slots:
     void checkEdrHeadroom();
@@ -58,9 +86,13 @@ private slots:
     QTimer m_edrTimer;
     bool m_loggedSwapChain{false};
     bool m_isHlg{false};
+    bool m_isPlaying{false};
     float m_lastLoggedHeadroom{0.0f};
     int m_edrCheckCount{0};
     float m_hdrGain{1.0f};
+    QRect m_normalGeometry;
+    int m_videoPosition{0};
+    int m_videoDuration{0};
 };
 
 #endif // HDRPREVIEWWINDOW_H

src/mainwindow.cpp

@@ -1290,6 +1290,10 @@ void MainWindow::setupSettingsMenu()
                         &Mlt::VideoWidget::hlgActiveChanged,
                         m_hdrPreviewWindow,
                         &HdrPreviewWindow::setHlg);
+                auto *win = m_hdrPreviewWindow;
+                connect(m_player, &Player::played, win, [win](double) { win->setPlaying(true); });
+                connect(m_player, &Player::paused, win, [win](int) { win->setPlaying(false); });
+                connect(m_player, &Player::stopped, win, [win]() { win->setPlaying(false); });
                 connect(m_hdrPreviewWindow,
                         &QWindow::visibleChanged,
                         this,

src/mainwindow.h

@@ -86,6 +86,7 @@ class MainWindow : public QMainWindow
     QString fileName() const { return m_currentFile; }
     bool isSourceClipMyProject(QString resource = MLT.resource(), bool withDialog = true);
     bool keyframesDockIsVisible() const;
+    Player *player() const { return m_player; }
 
     void keyPressEvent(QKeyEvent *);
     void keyReleaseEvent(QKeyEvent *);