Release/eagle

assets/resources/data/lowEffectSettings.json

@@ -12,9 +12,9 @@
                     "options": [
                         {
                             "key": "crash",
-                            "type": "combobox",
+                            "type": "checkbox",
                             "hide": true,
-                            "default": 0
+                            "default": false
                         }
                     ]
                 }
@@ -149,35 +149,9 @@
                             "items": [
                                 "Auto select (Recommended)",
                                 "Hardware decoding",
-                                "Software decoding",
-                                "Customize"
+                                "Software decoding"
                             ],
                             "default": 0
-                        },
-                        {
-                            "key": "Effect",
-                            "name": "Rendering engine",
-                            "type": "effectCombobox",
-                            "items": [
-                                "",
-                                "OpenGL",
-                                "MPV"
-                            ],
-                            "default": 0
-                        },
-                        {
-                            "key": "Videoout",
-                            "name": "Video out",
-                            "hide": false,
-                            "type": "videoOutCombobox",
-                            "default": 0
-                        },
-                        {
-                            "key": "Decodemode",
-                            "name": "Decode mode",
-                            "hide": false,
-                            "type": "decoderCombobox",
-                            "default": 0
                         }
                     ]
                 },

assets/resources/data/settings.json

@@ -12,9 +12,9 @@
                     "options": [
                         {
                             "key": "crash",
-                            "type": "combobox",
+                            "type": "checkbox",
                             "hide": true,
-                            "default": 0
+                            "default": false
                         }
                     ]
                 }
@@ -156,35 +156,9 @@
                             "items": [
                                 "Auto select (Recommended)",
                                 "Hardware decoding",
-                                "Software decoding",
-                                "Customize"
+                                "Software decoding"
                             ],
                             "default": 0
-                        },
-                        {
-                            "key": "Effect",
-                            "name": "Rendering engine",
-                            "type": "effectCombobox",
-                            "items": [
-                                " ",
-                                "OpenGL",
-                                "MPV"
-                            ],
-                            "default": 0
-                        },
-                        {
-                            "key": "Videoout",
-                            "name": "Video out",
-                            "hide": false,
-                            "type": "videoOutCombobox",
-                            "default": 0
-                        },
-                        {
-                            "key": "Decodemode",
-                            "name": "Decode mode",
-                            "hide": false,
-                            "type": "decoderCombobox",
-                            "default": 0
                         }
                     ]
                 },

debian/changelog

@@ -1,8 +1,8 @@
 deepin-movie-reborn (5.10.51) unstable; urgency=medium
 
-  * feat: Added new settings for movie
+  * merge release 1070. 
 
- -- xiepengfei <xiepengfei@uniontech.com>  Wed, 02 Jul 2024 15:48:47 +0800
+ -- muyuanakai <muyuanakai@uniontech.com>  Thu, 22 Aug 2024 16:22:22 +0800
 
 deepin-movie-reborn (5.10.50) unstable; urgency=medium
 

debian/control

@@ -19,14 +19,14 @@ Homepage: https://www.deepin.org/
 
 Package: deepin-movie
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, va-driver-all, libavcodec58(>= 7:4.0) | libavcodec60(>= 7:6.0), libavformat58(>= 7:4.1) | libavformat60(>= 7:6.0), libavutil56(>= 7:4.0) | libavutil58(>= 7:6.0), libffmpegthumbnailer4v5, libmpv1(>= 0.29) | libmpv2(>= 0.36), libpulse0(>= 0.99.1), libqt5concurrent5, libmpris-qt5-1, libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0)
-Recommends: libgpuinfo, uos-reporter, deepin-event-log
+Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec58(>= 7:4.0), libavformat58(>= 7:4.1), libavutil56(>= 7:4.0), libffmpegthumbnailer4v5, libmpv1(>= 0.29), libpulse0(>= 0.99.1), libqt5concurrent5, libmpris-qt5-1, libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0)
+Recommends: libgpuinfo, uos-reporter, deepin-event-log, va-driver-all
 Description: movie player
  Movie is a full-featured video player, supporting playing local and streaming media in multiple video formats.
 
 Package: libdmr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec58(>= 7:4.0) | libavcodec60(>= 7:6.0), libavformat58(>= 7:4.1) | libavformat60(>= 7:6.0), libavutil56(>= 7:4.0) | libavutil58(>= 7:6.0), libffmpegthumbnailer4v5, libmpv1(>= 0.29) | libmpv2(>= 0.36), libpulse0(>= 0.99.1), libqt5concurrent5, libmpris-qt5-1, libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libavcodec58(>= 7:4.0), libavformat58(>= 7:4.1), libavutil56(>= 7:4.0), libffmpegthumbnailer4v5, libmpv1(>= 0.29), libpulse0(>= 0.99.1), libqt5concurrent5, libmpris-qt5-1, libgstreamer-plugins-base1.0-0 (>= 1.0.0), libgstreamer1.0-0 (>= 1.4.0)
 Multi-Arch: same
 Description: movie player widget library 
  deepin movie player widget library

src/backends/mpv/mpv_glwidget.cpp

@@ -34,11 +34,6 @@ DWIDGET_USE_NAMESPACE
 #endif
 
 static const char *vs_blend = R"(
-#ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
-precision mediump float;
-#endif
 attribute vec2 position;
 attribute vec2 vTexCoord;
 
@@ -51,11 +46,6 @@ void main() {
 )";
 
 static const char* fs_blend = R"(
-#ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
-precision mediump float;
-#endif
 varying vec2 texCoord;
 
 uniform sampler2D movie;
@@ -67,8 +57,6 @@ void main() {
 
 static const char* fs_blend_wayland = R"(
 #ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
 precision mediump float;
 #endif
 varying vec2 texCoord;
@@ -81,11 +69,6 @@ void main() {
 )";
 
 static const char* vs_blend_corner = R"(
-#ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
-precision mediump float;
-#endif
 attribute vec2 position;
 attribute vec2 maskTexCoord;
 attribute vec2 vTexCoord;
@@ -101,11 +84,6 @@ void main() {
 )";
 
 static const char* fs_blend_corner = R"(
-#ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
-precision mediump float;
-#endif
 varying vec2 maskCoord;
 varying vec2 texCoord;
 
@@ -119,8 +97,6 @@ void main() {
 
 static const char* fs_blend_corner_wayland = R"(
 #ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
 precision mediump float;
 #endif
 varying vec2 maskCoord;
@@ -135,12 +111,6 @@ void main() {
 )";
 
 static const char* vs_code = R"(
-#ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
-precision mediump float;
-#endif
-
 attribute vec2 position;
 attribute vec2 vTexCoord;
 
@@ -153,11 +123,6 @@ void main() {
 )";
 
 static const char* fs_code = R"(
-#ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
-precision mediump float;
-#endif
 varying vec2 texCoord;
 
 uniform sampler2D sampler;
@@ -171,8 +136,6 @@ void main() {
 
 static const char* fs_code_wayland = R"(
 #ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
 precision mediump float;
 #endif
 varying vec2 texCoord;
@@ -187,11 +150,6 @@ void main() {
 )";
 
 static const char* fs_corner_code = R"(
-#ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
-precision mediump float;
-#endif
 varying vec2 texCoord;
 
 uniform sampler2D corner;
@@ -205,8 +163,6 @@ void main() {
 
 static const char* fs_corner_code_wayland = R"(
 #ifdef GL_ES
-// Set default precision to medium
-precision mediump int;
 precision mediump float;
 #endif
 varying vec2 texCoord;
@@ -1072,7 +1028,7 @@ namespace dmr {
     void MpvGLWidget::initMpvFuns()
     {
         qInfo() << "MpvGLWidget开始initMpvFuns";
-        QLibrary mpvLibrary(libPath("libmpv.so"));
+        QLibrary mpvLibrary(libPath("libmpv.so.1"));
         m_callback = reinterpret_cast<mpv_render_contextSet_update_callback>(mpvLibrary.resolve("mpv_render_context_set_update_callback"));
         m_context_report = reinterpret_cast<mpv_render_contextReport_swap>(mpvLibrary.resolve("mpv_render_context_report_swap"));
         m_renderContex = reinterpret_cast<mpv_renderContext_free>(mpvLibrary.resolve("mpv_render_context_free"));

src/backends/mpv/mpv_proxy.cpp

@@ -139,7 +139,7 @@ void MpvProxy::setDecodeModel(const QVariant &value)
 
 void MpvProxy::initMpvFuns()
 {
-    QLibrary mpvLibrary(libPath("libmpv.so"));
+    QLibrary mpvLibrary(libPath("libmpv.so.1"));
 
     m_waitEvent = reinterpret_cast<mpv_waitEvent>(mpvLibrary.resolve("mpv_wait_event"));
     m_setOptionString = reinterpret_cast<mpv_set_optionString>(mpvLibrary.resolve("mpv_set_option_string"));
@@ -422,11 +422,6 @@ mpv_handle *MpvProxy::mpv_init()
             my_set_property(pHandle, "vo", "gpu,xv,x11");
             m_sInitVo = "gpu,xv,x11";
         }
-        if (CompositingManager::get().isSpecialControls()) {
-            my_set_property(pHandle, "hwdec", "vaapi");
-            my_set_property(pHandle, "vo", "vaapi");
-            m_sInitVo = "vaapi";
-        }
 #else
         //去除9200显卡适配
         QFileInfo sjmfi("/dev/jmgpu");
@@ -480,6 +475,12 @@ mpv_handle *MpvProxy::mpv_init()
             my_set_property(pHandle, "vo", "gpu,x11");
             m_sInitVo = "gpu,x11";
         }
+
+        if (CompositingManager::get().isSpecialControls()) {
+            my_set_property(pHandle, "hwdec", "vaapi");
+            my_set_property(pHandle, "vo", "vaapi");
+            m_sInitVo = "vaapi";
+        }
     } else { //3.设置硬解
         QFileInfo fi("/dev/mwv206_0");
         QFileInfo jmfi("/dev/jmgpu");
@@ -653,23 +654,6 @@ mpv_handle *MpvProxy::mpv_init()
 
     //设置hwdec和vo配置
     CompositingManager::get().getMpvConfig(m_pConfig);
-#ifndef _LIBDMR_
-    if (Settings::get().settings()->getOption(QString("base.decode.select")).toInt() == 3) {
-        int decodeIndex = Settings::get().settings()->getOption(QString("base.decode.Decodemode")).toInt();
-        auto decodeModeOpt = Settings::get().settings()->option("base.decode.Decodemode");
-        QString decodeMode = decodeModeOpt.data()->data("items").toStringList()[decodeIndex];
-        decodeMode = decodeMode.isEmpty() ? "auto" : decodeMode;
-        m_pConfig->insert("hwdec", decodeMode);
-
-        if (!CompositingManager::get().composited()) {
-            int voIndex = Settings::get().settings()->getOption(QString("base.decode.Videoout")).toInt();
-            auto voOpt = Settings::get().settings()->option("base.decode.Videoout");
-            QString voMode = voOpt.data()->data("items").toStringList()[voIndex];
-            voMode = voMode.isEmpty() ? "auto" : voMode;
-            m_pConfig->insert("vo", voMode);
-        }
-    }
-#endif
     QMap<QString, QString>::iterator iter = m_pConfig->begin();
     qInfo() << __func__ << "First set mpv propertys!!";
     while (iter != m_pConfig->end()) {
@@ -1291,6 +1275,9 @@ void MpvProxy::refreshDecode()
             if(!isSoftCodec && !CompositingManager::get().isZXIntgraphics() && !jmflag && !x100flag) {
                 isSoftCodec = !isSurportHardWareDecode(codec, currentInfo.mi.width, currentInfo.mi.height);
             }
+            if (CompositingManager::get().isZXIntgraphics() && !jmflag) {
+                isSoftCodec = codec.contains("vp8") && (currentInfo.mi.width > 1920 || currentInfo.mi.height > 1080);
+            }
 #endif
             if(utils::check_wayland_env()){
                 PlaylistModel *playMode = dynamic_cast<PlayerEngine *>(m_pParentWidget)->getplaylist();
@@ -1327,6 +1314,9 @@ void MpvProxy::refreshDecode()
                         my_set_property(m_handle, "hwdec", "auto");
                     }
                 }
+#ifdef _LIBDMR_
+    my_set_property(m_handle, "vo", "libmpv,opengl-cb");
+#endif
             } else if (X100GPU.exists() && X100VPU.exists()) {
                 my_set_property(m_handle, "hwdec", "ftomx-copy");
                 my_set_property(m_handle, "vo", "gpu");
@@ -1395,6 +1385,9 @@ void MpvProxy::refreshDecode()
             }else {
                 my_set_property(m_handle, "hwdec", "auto");
             }
+#ifdef _LIBDMR_
+    my_set_property(m_handle, "vo", "libmpv,opengl-cb");
+#endif
         } else if (X100GPU.exists() && X100VPU.exists()) {
             my_set_property(m_handle, "hwdec", "ftomx-copy");
             my_set_property(m_handle, "vo", "gpu");
@@ -1423,23 +1416,6 @@ void MpvProxy::refreshDecode()
 
         //play.conf
         CompositingManager::get().getMpvConfig(m_pConfig);
-#ifndef _LIBDMR_
-        if (Settings::get().settings()->getOption(QString("base.decode.select")).toInt() == 3) {
-            int decodeIndex = Settings::get().settings()->getOption(QString("base.decode.Decodemode")).toInt();
-            auto decodeModeOpt = Settings::get().settings()->option("base.decode.Decodemode");
-            QString decodeMode = decodeModeOpt.data()->data("items").toStringList()[decodeIndex];
-            decodeMode = decodeMode.isEmpty() ? "auto" : decodeMode;
-            m_pConfig->insert("hwdec", decodeMode);
-
-            if (!CompositingManager::get().composited()) {
-                int voIndex = Settings::get().settings()->getOption(QString("base.decode.Videoout")).toInt();
-                auto voOpt = Settings::get().settings()->option("base.Customize.Videoout");
-                QString voMode = voOpt.data()->data("items").toStringList()[voIndex];
-                voMode = voMode.isEmpty() ? "auto" : voMode;
-                m_pConfig->insert("vo", voMode);
-            }
-        }
-#endif
         QMap<QString, QString>::iterator iter = m_pConfig->begin();
         while (iter != m_pConfig->end()) {
             if (iter.key().contains(QString("hwdec"))) {
@@ -1565,11 +1541,7 @@ void MpvProxy::play()
     }
 
     if (listOpts.size()) {
-        listArgs << "replace";
-        if (MPV_CLIENT_API_VERSION >= MPV_MAKE_VERSION(2,3)) {
-            listArgs << "-1";
-        }
-        listArgs << listOpts.join(',');
+        listArgs << "replace" << listOpts.join(',');
     }
 
     qInfo() << listArgs;

src/backends/mpv/mpv_proxy.h

@@ -61,7 +61,7 @@ class MpvHandle
         explicit container(mpv_handle *pHandle) : m_pHandle(pHandle) {}
         ~container()
         {
-            mpv_terminateDestroy func = (mpv_terminateDestroy)QLibrary::resolve(libPath("libmpv.so"), "mpv_terminate_destroy");
+            mpv_terminateDestroy func = (mpv_terminateDestroy)QLibrary::resolve(libPath("libmpv.so.1"), "mpv_terminate_destroy");
             func(m_pHandle);
         }
         mpv_handle *m_pHandle;