[优化mpvplayer示例中的GPU设置功能]：对mpvplayer示例程序进行了改进，新增了硬件加速(H/W)和GPU API选项的动态菜单，并更新了相关设置方法。

RealChuan · RealChuan · commit 4e8cd86a55db · 2024-06-17T15:46:34.000+08:00
- 移除了`gpuAction`的实现，并替换为两个新的函数`createHWMenu`和`createGpuApiMenu`，用于动态创建硬件加速和GPU API选项的菜单。
- 在`MpvPlayer`类中新增了硬件加速和GPU API相关的函数，包括获取可用选项列表、设置和获取当前选项。
- 更新了`MainWindow`的`initMenu`函数，使用新的菜单创建函数添加硬件加速和GPU API选项到菜单中。
- 修改了`onRenderChanged`函数，移除了旧的逻辑，替换为使用新的硬件加速和GPU API设置。
- 更新了`MpvPlayer`的析构函数和`previewwidget.cc`中的`MpvPlayer`初始化逻辑，使用新的硬件加速设置。
diff --git a/examples/mpvplayer/mainwindow.cc b/examples/mpvplayer/mainwindow.cc
@@ -52,8 +52,6 @@ class MainWindow::MainWindowPrivate
         //playlistView->setMaximumWidth(250);
 
         menu = new QMenu(q_ptr);
-        gpuAction = new QAction(QCoreApplication::translate("MainWindowPrivate", "H/W"), q_ptr);
-        gpuAction->setCheckable(true);
         videoMenu = new QMenu(QCoreApplication::translate("MainWindowPrivate", "Video"), q_ptr);
         audioMenu = new QMenu(QCoreApplication::translate("MainWindowPrivate", "Audio"), q_ptr);
         subMenu = new QMenu(QCoreApplication::translate("MainWindowPrivate", "Subtitles"), q_ptr);
@@ -77,6 +75,46 @@ class MainWindow::MainWindowPrivate
 
     ~MainWindowPrivate() = default;
 
+    auto createHWMenu() -> QMenu *
+    {
+        hwdecGroup = new QActionGroup(q_ptr);
+        hwdecGroup->setExclusive(true);
+        auto *menu = new QMenu(QCoreApplication::translate("MainWindowPrivate", "H/W"), q_ptr);
+        auto hwdecs = mpvPlayer->hwdecs();
+        for (const auto &hwdec : std::as_const(hwdecs)) {
+            auto *action = new QAction(hwdec, q_ptr);
+            action->setCheckable(true);
+            hwdecGroup->addAction(action);
+            menu->addAction(action);
+        }
+        hwdecGroup->actions().at(1)->setChecked(true);
+        q_ptr->connect(hwdecGroup, &QActionGroup::triggered, q_ptr, [this](QAction *action) {
+            mpvPlayer->setHwdec(action->text());
+        });
+
+        return menu;
+    }
+
+    auto createGpuApiMenu() -> QMenu *
+    {
+        gpuApiGroup = new QActionGroup(q_ptr);
+        gpuApiGroup->setExclusive(true);
+        auto *menu = new QMenu(QCoreApplication::translate("MainWindowPrivate", "Gpu Api"), q_ptr);
+        auto gpuApis = mpvPlayer->gpuApis();
+        for (const auto &gpuApi : std::as_const(gpuApis)) {
+            auto *action = new QAction(gpuApi, q_ptr);
+            action->setCheckable(true);
+            gpuApiGroup->addAction(action);
+            menu->addAction(action);
+        }
+        gpuApiGroup->actions().at(0)->setChecked(true);
+        q_ptr->connect(gpuApiGroup, &QActionGroup::triggered, q_ptr, [this](QAction *action) {
+            mpvPlayer->setGpuApi(action->text());
+        });
+
+        return menu;
+    }
+
     auto createtoneMappingMenu() -> QMenu *
     {
         auto *group = new QActionGroup(q_ptr);
@@ -269,7 +307,8 @@ class MainWindow::MainWindowPrivate
     PlaylistModel *playlistModel;
 
     QMenu *menu;
-    QAction *gpuAction;
+    QActionGroup *hwdecGroup;
+    QActionGroup *gpuApiGroup;
 
     QMenu *videoMenu;
     QPointer<QMenu> videoTracksMenuPtr;
@@ -421,11 +460,10 @@ void MainWindow::onChapterChanged()
 
 void MainWindow::onRenderChanged(QAction *action)
 {
-    auto value = static_cast<Mpv::MpvPlayer::GpuApiType>(action->data().toInt());
     d_ptr->mpvPlayer->initMpv(d_ptr->mpvWidget);
-    d_ptr->mpvPlayer->setGpuApi(value);
     d_ptr->mpvPlayer->setPrintToStd(true);
-    d_ptr->mpvPlayer->setUseGpu(d_ptr->gpuAction->isChecked());
+    d_ptr->mpvPlayer->setHwdec(d_ptr->hwdecGroup->checkedAction()->text());
+    d_ptr->mpvPlayer->setGpuApi(d_ptr->gpuApiGroup->checkedAction()->text());
     auto index = d_ptr->playlistModel->playlist()->currentIndex();
     if (index > -1) {
         playlistPositionChanged(d_ptr->playlistModel->playlist()->currentIndex());
@@ -721,28 +759,8 @@ void MainWindow::initMenu()
     d_ptr->menu->addAction(tr("Open Local Media"), this, &MainWindow::onOpenLocalMedia);
     d_ptr->menu->addAction(tr("Open Web Media"), this, &MainWindow::onOpenWebMedia);
 
-    d_ptr->menu->addAction(d_ptr->gpuAction);
-    connect(d_ptr->gpuAction, &QAction::toggled, d_ptr->mpvPlayer, [this](bool checked) {
-        d_ptr->mpvPlayer->setUseGpu(checked);
-    });
-    d_ptr->gpuAction->setChecked(true);
-#ifdef Q_OS_WIN
-    auto *menu = new QMenu(tr("Render"), this);
-    auto *actionGroup = new QActionGroup(this);
-    actionGroup->setExclusive(true);
-    auto metaEnum = QMetaEnum::fromType<Mpv::MpvPlayer::GpuApiType>();
-    for (int i = 0; i < metaEnum.keyCount(); i++) {
-        auto value = metaEnum.value(i);
-        auto *action = new QAction(metaEnum.valueToKey(value), this);
-        action->setData(value);
-        action->setCheckable(true);
-        actionGroup->addAction(action);
-        menu->addAction(action);
-        action->setChecked(i == 0);
-    }
-    connect(actionGroup, &QActionGroup::triggered, this, &MainWindow::onRenderChanged);
-    d_ptr->menu->addMenu(menu);
-#endif
+    d_ptr->menu->addMenu(d_ptr->createHWMenu());
+    d_ptr->menu->addMenu(d_ptr->createGpuApiMenu());
     d_ptr->menu->addMenu(d_ptr->videoMenu);
     d_ptr->menu->addMenu(d_ptr->audioMenu);
     d_ptr->menu->addMenu(d_ptr->subMenu);
diff --git a/src/mpv/mpvplayer.cc b/src/mpv/mpvplayer.cc
@@ -311,28 +311,68 @@ auto MpvPlayer::cacheSpeed() const -> double
 
 void MpvPlayer::setCacheSpeed(double speed)
 {
+    qInfo() << "cache-speed: " << speed;
     mpv::qt::set_property_async(d_ptr->mpv, "cache-speed", speed);
 }
 
-void MpvPlayer::setUseGpu(bool use)
+QStringList MpvPlayer::hwdecs() const
+{
+    static QStringList list{"no",
+                            "auto-safe",
+                            "auto",
+                            "yes",
+                            "auto-copy",
+                            "d3d11va",
+                            "d3d11va-copy",
+                            "videotoolbox",
+                            "videotoolbox-copy",
+                            "vaapi",
+                            "vaapi-copy",
+                            "nvdec",
+                            "nvdec-copy",
+                            "drm",
+                            "drm-copy",
+                            "vulkan",
+                            "vulkan-copy"};
+    // list.append(QStringList{"dxva2",
+    //                         "dxva2-copy",
+    //                         "vdpau",
+    //                         "vdpau-copy",
+    //                         "mediacodec",
+    //                         "mediacodec-copy",
+    //                         "cuda",
+    //                         "cuda-copy",
+    //                         "crystalhd",
+    //                         "rkmpp"});
+    return list;
+}
+
+void MpvPlayer::setHwdec(const QString &hwdec)
 {
-    mpv::qt::set_property_async(d_ptr->mpv, "hwdec", use ? "auto-safe" : "no");
-    //mpv::qt::set_property_async(d_ptr->mpv, "d3d11va-zero-copy", "yes");
+    qInfo() << "hwdec: " << hwdec;
+    mpv::qt::set_property_async(d_ptr->mpv, "hwdec", hwdec);
 }
 
-void MpvPlayer::setGpuApi(GpuApiType type)
+QString MpvPlayer::hwdec() const
 {
-    QString typeStr;
-    switch (type) {
-    case Opengl: typeStr = "opengl"; break;
-    case Vulkan: typeStr = "vulkan"; break;
-#ifdef Q_OS_WIN
-    case D3d11: typeStr = "d3d11"; break;
-#endif
-    default: typeStr = "auto"; break;
-    }
-    mpv::qt::set_property(d_ptr->mpv, "gpu-api", typeStr);
-    qInfo() << "GpuApi: " << typeStr;
+    return mpv::qt::get_property(d_ptr->mpv, "hwdec").toString();
+}
+
+QStringList MpvPlayer::gpuApis() const
+{
+    static QStringList list{"auto", "opengl", "vulkan", "d3d11"};
+    return list;
+}
+
+void MpvPlayer::setGpuApi(const QString &gpuApi)
+{
+    qInfo() << "gpu-api: " << gpuApi;
+    mpv::qt::set_property_async(d_ptr->mpv, "gpu-api", gpuApi);
+}
+
+QString MpvPlayer::gpuApi() const
+{
+    return mpv::qt::get_property(d_ptr->mpv, "gpu-api").toString();
 }
 
 void MpvPlayer::setVolume(int value)
diff --git a/src/mpv/mpvplayer.hpp b/src/mpv/mpvplayer.hpp
@@ -14,16 +14,6 @@ class MPV_LIB_EXPORT MpvPlayer : public QObject
 {
     Q_OBJECT
 public:
-    enum GpuApiType {
-        Auto,
-        Opengl,
-        Vulkan,
-#ifdef Q_OS_WIN
-        D3d11
-#endif
-    };
-    Q_ENUM(GpuApiType)
-
     explicit MpvPlayer(QObject *parent = nullptr);
     ~MpvPlayer() override;
 
@@ -64,8 +54,13 @@ class MPV_LIB_EXPORT MpvPlayer : public QObject
     [[nodiscard]] auto cacheSpeed() const -> double; // seconds
     void setCacheSpeed(double speed);                // bytes / seconds
 
-    void setUseGpu(bool use);
-    void setGpuApi(GpuApiType type);
+    [[nodiscard]] auto hwdecs() const -> QStringList;
+    void setHwdec(const QString &hwdec);
+    [[nodiscard]] auto hwdec() const -> QString;
+
+    [[nodiscard]] auto gpuApis() const -> QStringList;
+    void setGpuApi(const QString &gpuApi);
+    [[nodiscard]] auto gpuApi() const -> QString;
 
     void setVolume(int value);
     [[nodiscard]] auto volume() const -> int;
diff --git a/src/mpv/previewwidget.cc b/src/mpv/previewwidget.cc
@@ -21,7 +21,7 @@ class PreviewWidget::PreviewWidgetPrivate
         mpvWidget = new Mpv::MpvOpenglWidget(mpvPlayer, owner);
         mpvPlayer->initMpv(nullptr);
 #endif
-        mpvPlayer->setUseGpu(true);
+        mpvPlayer->setHwdec("auto-safe");
         mpvPlayer->setCache(false);
         mpvPlayer->pauseAsync();
     }

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ class PreviewWidget::PreviewWidgetPrivate`
`21`	`21`	`mpvWidget = new Mpv::MpvOpenglWidget(mpvPlayer, owner);`
`22`	`22`	`mpvPlayer->initMpv(nullptr);`
`23`	`23`	`#endif`
`24`		`- mpvPlayer->setUseGpu(true);`
	`24`	`+ mpvPlayer->setHwdec("auto-safe");`
`25`	`25`	`mpvPlayer->setCache(false);`
`26`	`26`	`mpvPlayer->pauseAsync();`
`27`	`27`	`}`