Packman Build Service PMBS

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/meson.build -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/meson.build Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/meson_options.txt -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/meson_options.txt Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/codec/dav1d.c -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/codec/dav1d.c Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/Makefile.am -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/Makefile.am Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/dialogs/help/help.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/dialogs/help/help.cpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/dialogs/sout/convert.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/dialogs/sout/convert.cpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/maininterface/compositor.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/maininterface/compositor.cpp Changed

@@ -272,7 +272,16 @@
     }
     if (!backendIsOpenVg && (flags & CompositorVideo::HAS_ACRYLIC))
     {
-        setBlurBehind(window, true);
+        if (Q_LIKELY(!window->isActive()))
+        {
+            connect(window, &QWindow::activeChanged, this, this, window = QPointer(window)() {
+               setBlurBehind(window, true);
+            }, Qt::SingleShotConnection);
+        }
+        else
+        {
+            setBlurBehind(window, true);
+        }
     }
     m_videoWindowHandler = std::make_unique<VideoWindowHandler>(m_intf);
     m_videoWindowHandler->setWindow( window );
@@ -282,7 +291,6 @@
 #else
     m_interfaceWindowHandler = std::make_unique<InterfaceWindowHandler>(m_intf, m_mainCtx, window);
 #endif
-    m_mainCtx->setHasAcrylicSurface(m_blurBehind);
     m_mainCtx->setWindowSuportExtendedFrame(flags & CompositorVideo::HAS_EXTENDED_FRAME);
 
 #ifdef _WIN32
@@ -325,6 +333,7 @@
     m_taskbarWidget.reset();
 #endif
     m_interfaceWindowHandler.reset();
+    m_mainCtx = nullptr;
 }
 
 void CompositorVideo::commonIntfDestroy()
@@ -376,6 +385,6 @@
         return false;
 
     m_windowEffectsModule->setBlurBehind(window, enable);
-    m_blurBehind = enable;
+    m_mainCtx->setHasAcrylicSurface(enable);
     return true;
 }

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/maininterface/compositor.hpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/maininterface/compositor.hpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/maininterface/compositor_dcomp.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/maininterface/compositor_dcomp.cpp Changed

@@ -106,6 +106,8 @@
 
 CompositorDirectComposition::~CompositorDirectComposition()
 {
+    //m_acrylicSurface should be released before the RHI context is destroyed
+    assert(!m_acrylicSurface);
     destroyMainInterface();
 }
 
@@ -213,19 +215,18 @@
 
     m_dcompDevice->Commit();
 
-    if (!m_blurBehind)
+    if (!m_mainCtx->hasAcrylicSurface())
     {
         if (var_InheritBool(m_intf, "qt-backdrop-blur"))
         {
             try
             {
-                m_acrylicSurface = new CompositorDCompositionAcrylicSurface(m_intf, this, m_mainCtx, m_dcompDevice);
+                m_acrylicSurface = std::make_unique<CompositorDCompositionAcrylicSurface>(m_intf, this, m_mainCtx, m_dcompDevice);
             }
             catch (const std::exception& exception)
             {
                 if (const auto what = exception.what())
                     msg_Warn(m_intf, "%s", what);
-                delete m_acrylicSurface.data();
             }
         }
     }
@@ -303,6 +304,7 @@
 
 void CompositorDirectComposition::unloadGUI()
 {
+    m_acrylicSurface.reset();
     m_interfaceWindowHandler.reset();
     m_quickView.reset();
     commonGUIDestroy();
@@ -393,7 +395,7 @@
             static_cast<QPlatformSurfaceEvent *>(event)->surfaceEventType() == QPlatformSurfaceEvent::SurfaceAboutToBeDestroyed)
         {
             m_videoVisual.Reset();
-            delete m_acrylicSurface.data();
+            m_acrylicSurface.reset();
             // Just in case root visual deletes its children
             // when it is deleted: (Qt's UI visual should be
             // deleted by Qt itself)

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/maininterface/compositor_dcomp.hpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/maininterface/compositor_dcomp.hpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/maininterface/compositor_x11.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/maininterface/compositor_x11.cpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/maininterface/mainctx.hpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/maininterface/mainctx.hpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/maininterface/qml/MainInterface.qml -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/maininterface/qml/MainInterface.qml Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/meson.build -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/meson.build Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/playlist/qml/PlaylistDelegate.qml Changed

@@ -64,7 +64,7 @@
 
     hoverEnabled: true
 
-    verticalPadding: VLCStyle.playlistDelegate_verticalPadding
+    verticalPadding: VLCStyle.margin_xxxsmall
 
     leftPadding: VLCStyle.margin_normal
 
@@ -200,29 +200,25 @@
             Layout.fillWidth: true
             Layout.fillHeight: true
             Layout.leftMargin: VLCStyle.margin_large
-            spacing: VLCStyle.margin_xsmall
+            spacing: VLCStyle.margin_xxxsmall
 
             Widgets.ListLabel {
                 id: textInfo
 
-                Layout.fillHeight: true
                 Layout.fillWidth: true
 
                 font.weight: model.isCurrent ? Font.Bold : Font.DemiBold
                 text: model.title
                 color: theme.fg.primary
-                verticalAlignment: Text.AlignTop
             }
 
             Widgets.ListSubtitleLabel {
                 id: textArtist
 
-                Layout.fillHeight: true
                 Layout.fillWidth: true
 
                 text: model.artist || qsTr("Unknown Artist")
                 color: theme.fg.primary
-                verticalAlignment: Text.AlignBottom
             }
         }

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/qt.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/qt.cpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/style/VLCStyle.qml -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/style/VLCStyle.qml Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/gui/qt/widgets/native/roundimage.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/gui/qt/widgets/native/roundimage.cpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/video_chroma/meson.build -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/video_chroma/meson.build Changed

@@ -129,24 +129,24 @@
 
 ## Tests
 
-if host_system != 'windows' # can't use alarm
 # Chroma copy SSE test
-chroma_copy_sse_test = executable(
-    'chroma_copy_sse_test',
-    chroma_copy_lib_srcs,
-    c_args: '-DCOPY_TEST',
-    dependencies: libvlccore_dep,
-    include_directories: vlc_include_dirs
-)
-test('chroma_copy_sse', chroma_copy_sse_test, suite: 'video_chroma')
+vlc_tests += {
+    'name': 'chroma_copy_sse_test',
+    'sources': chroma_copy_lib_srcs,
+    'suite' : 'video_chroma',
+    'c_args': '-DCOPY_TEST',
+    'link_with': vlc_libcompat,
+    'dependencies': libvlccore_dep,
+    'include_directories': vlc_include_dirs
+}
 
 # Chroma copy test
-chroma_copy_test = executable(
-    'chroma_copy_test',
-    chroma_copy_lib_srcs,
-    c_args: '-DCOPY_TEST', '-DCOPY_TEST_NOOPTIM',
-    dependencies: libvlccore_dep,
-    include_directories: vlc_include_dirs
-)
-test('chroma_copy', chroma_copy_test, suite: 'video_chroma')
-endif
+vlc_tests += {
+    'name': 'chroma_copy_test',
+    'sources': chroma_copy_lib_srcs,
+    'suite' : 'video_chroma',
+    'c_args': '-DCOPY_TEST', '-DCOPY_TEST_NOOPTIM',
+    'link_with': vlc_libcompat,
+    'dependencies': libvlccore_dep,
+    'include_directories': vlc_include_dirs
+}

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/modules/video_output/win32/direct3d11.cpp -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/modules/video_output/win32/direct3d11.cpp Changed

_service:obs_scm:vlc-beta-20241021.e009cc4da6.obscpio/src/preparser/fetcher.c -> _service:obs_scm:vlc-beta-20241028.0450706563.obscpio/src/preparser/fetcher.c Changed

@@ -94,10 +94,7 @@
     else if (executor == fetcher->executor_network)
         task->runnable.run = RunSearchNetwork;
     else
-    {
-        assert(executor == fetcher->executor_downloader);
         task->runnable.run = RunDownloader;
-    }
 
     task->runnable.userdata = task;
 
@@ -460,21 +457,19 @@
             return NULL;
         }
 
-        fetcher->executor_downloader = vlc_executor_New(max_threads);
-        if (!fetcher->executor_downloader)
-        {
-            if (fetcher->executor_network)
-                vlc_executor_Delete(fetcher->executor_network);
-            if (fetcher->executor_local)
-                vlc_executor_Delete(fetcher->executor_local);
-            free(fetcher);
-            return NULL;
-        }
     }
     else
-    {
         fetcher->executor_network = NULL;
-        fetcher->executor_downloader = NULL;
+
+    fetcher->executor_downloader = vlc_executor_New(max_threads);
+    if (!fetcher->executor_downloader)
+    {
+        if (fetcher->executor_network)
+            vlc_executor_Delete(fetcher->executor_network);
+        if (fetcher->executor_local)
+            vlc_executor_Delete(fetcher->executor_local);
+        free(fetcher);
+        return NULL;
     }
 
     fetcher->owner = owner;
@@ -533,8 +528,8 @@
         vlc_executor_Delete(fetcher->executor_local);
     if (fetcher->executor_network)
         vlc_executor_Delete(fetcher->executor_network);
-    if (fetcher->executor_downloader)
-        vlc_executor_Delete(fetcher->executor_downloader);
+    assert(fetcher->executor_downloader);
+    vlc_executor_Delete(fetcher->executor_downloader);
 
     vlc_dictionary_clear( &fetcher->album_cache, FreeCacheEntry, NULL );
     free( fetcher );

_service:obs_scm:vlc-beta.obsinfo Changed

Changes of Revision 405