Packman Build Service PMBS

Changes of Revision 260

_service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/modules/gui/qt/util/textureproviderobserver.cpp -> _service:obs_scm:vlc-beta-20260208.496227102.obscpio/modules/gui/qt/util/textureproviderobserver.cpp Changed

@@ -157,6 +157,11 @@
     return m_comparisonKey.load(std::memory_order_acquire);
 }
 
+QRectF TextureProviderObserver::normalizedTextureSubRect() const
+{
+    return m_normalizedTextureSubRect.load(std::memory_order_acquire);
+}
+
 void TextureProviderObserver::updateProperties()
 {
     // This is likely called in the rendering thread.
@@ -168,6 +173,8 @@
 
     if (m_provider)
     {
+        const bool notifyAllChanges = m_notifyAllChanges.load(memoryOrder);
+
         if (const auto texture = m_provider->texture())
         {
             {
@@ -175,24 +182,54 @@
 
                 // SG texture size:
                 const auto textureSize = texture->textureSize();
-                m_textureSize.store(textureSize, memoryOrder);
+                if (notifyAllChanges)
+                {
+                    if (m_textureSize.exchange(textureSize, memoryOrder) != textureSize)
+                        emit textureSizeChanged(textureSize);
+                }
+                else
+                {
+                    m_textureSize.store(textureSize, memoryOrder);
+                }
 
                 {
                     // Native texture size
 
                     const auto legacyUpdateNativeTextureSize = &() {
                         const auto ntsr = texture->normalizedTextureSubRect();
-                        m_nativeTextureSize.store({static_cast<int>(textureSize.width() / ntsr.width()),
-                                                   static_cast<int>(textureSize.height() / ntsr.height())},
-                                                  memoryOrder);
+                        const QSize size = {static_cast<int>(textureSize.width() / ntsr.width()),
+                                            static_cast<int>(textureSize.height() / ntsr.height())};
+
+                        if (notifyAllChanges)
+                        {
+                            if (m_nativeTextureSize.exchange(size, memoryOrder) != size)
+                                emit nativeTextureSizeChanged(size);
+                        }
+                        else
+                        {
+                            m_nativeTextureSize.store(size, memoryOrder);
+                        }
                     };
 
 #ifdef RHI_HEADER_AVAILABLE
                     const QRhiTexture* const rhiTexture = texture->rhiTexture();
                     if (Q_LIKELY(rhiTexture))
-                        m_nativeTextureSize.store(rhiTexture->pixelSize(), memoryOrder);
+                    {
+                        const QSize size = rhiTexture->pixelSize();
+                        if (notifyAllChanges)
+                        {
+                            if (m_nativeTextureSize.exchange(size, memoryOrder) != size)
+                                emit nativeTextureSizeChanged(size);
+                        }
+                        else
+                        {
+                            m_nativeTextureSize.store(size, memoryOrder);
+                        }
+                    }
                     else
+                    {
                         legacyUpdateNativeTextureSize();
+                    }
 #else
                     legacyUpdateNativeTextureSize();
 #endif
@@ -200,6 +237,21 @@
             }
 
             {
+                // Normal rect
+                const QRectF& normalizedTextureSubRect = texture->normalizedTextureSubRect();
+
+                if (notifyAllChanges)
+                {
+                    if (m_normalizedTextureSubRect.exchange(normalizedTextureSubRect, memoryOrder) != normalizedTextureSubRect)
+                        emit normalizedTextureSubRectChanged(normalizedTextureSubRect);
+                }
+                else
+                {
+                    m_normalizedTextureSubRect.store(normalizedTextureSubRect, memoryOrder);
+                }
+            }
+
+            {
                 // Alpha channel
                 const bool hasAlphaChannel = texture->hasAlphaChannel();
 
@@ -230,8 +282,16 @@
                 // Comparison key
                 const qint64 comparisonKey = texture->comparisonKey();
 
-                if (m_comparisonKey.exchange(comparisonKey, memoryOrder) != comparisonKey)
-                    emit comparisonKeyChanged(comparisonKey);
+                if (notifyAllChanges)
+                {
+                    if (m_comparisonKey.exchange(comparisonKey, memoryOrder) != comparisonKey) {
+                        emit comparisonKeyChanged(comparisonKey);
+                    }
+                }
+                else
+                {
+                    m_comparisonKey.store(comparisonKey, memoryOrder);
+                }
             }
 
             return;
@@ -243,8 +303,14 @@
 
 void TextureProviderObserver::resetProperties(std::memory_order memoryOrder)
 {
-    m_textureSize.store({}, memoryOrder);
-    m_nativeTextureSize.store({}, memoryOrder);
+    if (m_textureSize.exchange({}, memoryOrder) != QSize())
+        emit textureSizeChanged({});
+
+    if (m_nativeTextureSize.exchange({}, memoryOrder) != QSize())
+        emit nativeTextureSizeChanged({});
+
+    if (m_normalizedTextureSubRect.exchange({}, memoryOrder) != QRectF())
+        emit normalizedTextureSubRectChanged({});
 
     if (m_hasAlphaChannel.exchange(false, memoryOrder))
         emit hasAlphaChannelChanged(false);

_service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/modules/gui/qt/util/textureproviderobserver.hpp -> _service:obs_scm:vlc-beta-20260208.496227102.obscpio/modules/gui/qt/util/textureproviderobserver.hpp Changed

@@ -47,13 +47,16 @@
     //          to not conflict with the updates, if the properties must reflect the immediately up-to-date
     //          texture and the properties change each frame, as otherwise it might end up in a
     //          "forever chase"), so by the time the sampling is done the properties should be consistent.
-    // NOTE: These properties do not provide notify signal, dynamic textures such as layer may
+    // NOTE: By default these properties are not notified, as dynamic textures such as layer may
     //       change rapidly (even though throttled by v-sync in the rendering thread), and if
     //       such signal is connected to a receiver that lives in the GUI thread, the queued
     //       invocations can easily backlog. Similar to the high precision timer, we moved
     //       away from event based approach in favor of sampling based approach here.
-    Q_PROPERTY(QSize textureSize READ textureSize FINAL) // Scene graph texture size
-    Q_PROPERTY(QSize nativeTextureSize READ nativeTextureSize FINAL) // Native texture size (e.g. for atlas textures, the atlas size)
+    Q_PROPERTY(bool notifyAllChanges MEMBER m_notifyAllChanges NOTIFY notifyAllChangesChanged FINAL)
+    Q_PROPERTY(QSize textureSize READ textureSize NOTIFY textureSizeChanged FINAL) // Scene graph texture size
+    Q_PROPERTY(QSize nativeTextureSize READ nativeTextureSize NOTIFY nativeTextureSizeChanged FINAL) // Native texture size (e.g. for atlas textures, the atlas size)
+    Q_PROPERTY(QRectF normalizedTextureSubRect READ normalizedTextureSubRect NOTIFY normalizedTextureSubRectChanged FINAL)
+    Q_PROPERTY(qint64 comparisonKey READ comparisonKey NOTIFY comparisonKeyChanged FINAL)
 
     // NOTE: Since it is not expected that these properties change rapidly, they have notify signals.
     //       These signals may be emitted in the rendering thread, thus if the connection is auto
@@ -62,7 +65,6 @@
     Q_PROPERTY(bool hasMipmaps READ hasMipmaps NOTIFY hasMipmapsChanged FINAL)
     Q_PROPERTY(bool isAtlasTexture READ isAtlasTexture NOTIFY isAtlasTextureChanged FINAL)
     Q_PROPERTY(bool isValid READ isValid NOTIFY isValidChanged FINAL) // whether a texture is provided or not
-    Q_PROPERTY(qint64 comparisonKey READ comparisonKey NOTIFY comparisonKeyChanged FINAL)
 
 public:
     explicit TextureProviderObserver(QObject *parent = nullptr);
@@ -75,13 +77,18 @@
     QSize textureSize() const;
     QSize nativeTextureSize() const;
     qint64 comparisonKey() const;
+    QRectF normalizedTextureSubRect() const;
     bool hasAlphaChannel() const;
     bool hasMipmaps() const;
     bool isAtlasTexture() const;
     bool isValid() const;
 
 signals:
+    void notifyAllChangesChanged();
     void sourceChanged();
+    void textureSizeChanged(const QSize&);
+    void nativeTextureSizeChanged(const QSize&);
+    void normalizedTextureSubRectChanged(const QRectF&);
     void hasAlphaChannelChanged(bool);
     void hasMipmapsChanged(bool);
     void isAtlasTextureChanged(bool);
@@ -105,9 +112,11 @@
     // where the SG synchronization would not be blocking the (GUI) thread where this
     // observer lives.
 
+    std::atomic<bool> m_notifyAllChanges = false;
     std::atomic<QSize> m_textureSize {{}}; // invalid by default
     std::atomic<QSize> m_nativeTextureSize {{}}; // invalid by default
     std::atomic<qint64> m_comparisonKey {-1};
+    std::atomic<QRectF> m_normalizedTextureSubRect {{}}; // invalid by default
 
     std::atomic<bool> m_hasAlphaChannel = false;
     std::atomic<bool> m_hasMipmaps = false;

_service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/modules/gui/qt/widgets/qml/DualKawaseBlur.qml -> _service:obs_scm:vlc-beta-20260208.496227102.obscpio/modules/gui/qt/widgets/qml/DualKawaseBlur.qml Changed

@@ -108,6 +108,7 @@
                                                                                                      : Qt.rect(0, 0, 0, 0)
 
     property alias sourceTextureProviderObserver: ds1.tpObserver // for accessory
+    sourceTextureProviderObserver.notifyAllChanges: !live
 
     readonly property bool sourceTextureIsValid: sourceTextureProviderObserver.isValid
 
@@ -124,14 +125,15 @@
 
     property bool _queuedScheduledUpdate: false
 
-    // WARNING: The QML property type is not `int` because the target property type is `qint64`.
-    readonly property var _comparisonKey: sourceTextureProviderObserver.comparisonKey
-    property var _oldComparisonKey
+    readonly property var _comparisonVar: ({key: sourceTextureProviderObserver.comparisonKey,
+                                            subRect: sourceTextureProviderObserver.normalizedTextureSubRect})
+    property var _oldComparisonVar
+
+    on_ComparisonVarChanged: {
+        if (_comparisonVar.key >= 0) {
+            if (_oldComparisonVar !== undefined && _oldComparisonVar !== _comparisonVar) {
+                _oldComparisonVar = undefined
 
-    on_ComparisonKeyChanged: {
-        if (_comparisonKey >= 0) {
-            if (_oldComparisonKey !== undefined && _oldComparisonKey !== _comparisonKey) {
-                _oldComparisonKey = undefined
                 // If source texture is not valid, update will be requeued in `scheduleUpdate()`.
                 // That being said, a non-valid source texture should have (-1) as comparison key,
                 // which we already checked here.
@@ -140,7 +142,10 @@
         }
     }
 
-    function scheduleUpdate(onNextTextureChange /* : bool */ = false) {
+    // When `onNextEffectiveTextureChange` is set, the update is scheduled automatically when the effective
+    // texture changes, which is when the texture itself changes or the texture remains the same but
+    // the sub-rect changes (such as, the new texture is a different part of the same atlas texture).
+    function scheduleUpdate(onNextEffectiveTextureChange /* : bool */ = false) {
         if (live)
             return // no-op
 
@@ -152,8 +157,8 @@
             return
         }
 
-        if (onNextTextureChange) {
-            root._oldComparisonKey = root._comparisonKey
+        if (onNextEffectiveTextureChange) {
+            root._oldComparisonVar = root._comparisonVar
             return
         }

_service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/src/win32/dirs-uap.c -> _service:obs_scm:vlc-beta-20260208.496227102.obscpio/src/win32/dirs-uap.c Changed

_service:obs_scm:vlc-beta-20260208.37e0097a4.obscpio/src/win32/dirs.c -> _service:obs_scm:vlc-beta-20260208.496227102.obscpio/src/win32/dirs.c Changed

_service:obs_scm:vlc-beta.obsinfo Changed