Ticket #7525: mythui_pulse_optimize.patch

libs/libmythui/mythuitype.h

@@ -115 +115 @@
 
     bool ContainsPoint(const QPoint &point) const;
 
+    enum AnimationType {
+        animMovement=0,
+        animAlpha,
+        animPulse,
+        animNUMTYPES
+    };
+    void SetNextPulse(AnimationType type, bool flag); // true=asap, false=never
+    void SetNextPulse(bool flag); // true=asap, false=never
+    void FixupNextChildPulse(bool recomputeChildren=true);
+
   protected:
     virtual void customEvent(QEvent *);
 
@@ -181 +191 @@
     QPoint m_XYDestination;
     QPoint m_XYSpeed;
 
+    unsigned m_NextPulse;
+    unsigned m_NextChildPulse;
+
     FontMap *m_Fonts;
 
     MythUIType *m_Parent;

libs/libmythui/mythuitype.cpp

@@ -44 +44 @@
     m_XYSpeed = QPoint(0, 0);
     m_deferload = false;
 
+    m_NextPulse = (1 << animNUMTYPES) - 1; // all bits set
+    m_NextChildPulse = 0;
+
     m_Parent = NULL;
     if (parent)
     {
@@ -69 +72 @@
  */
 void MythUIType::Reset()
 {
+    SetNextPulse(true);
     // Reset all children
     QMutableListIterator<MythUIType *> it(m_ChildrenList);
     while (it.hasNext())
@@ -88 +92 @@
         return;
 
     m_ChildrenList.push_back(child);
+    FixupNextChildPulse();
 }
 
 static QObject *qChildHelper(const char *objName, const char *inheritsClass,
@@ -149 +154 @@
         {
             type->deleteLater();
             it.remove();
+            FixupNextChildPulse();
             return;
         }
     }
@@ -171 +177 @@
         {
             type->deleteLater();
             it.remove();
+            FixupNextChildPulse();
             child = NULL;
             return;
         }
@@ -191 +198 @@
     }
 
     m_ChildrenList.clear();
+    FixupNextChildPulse();
 }
 
 /** \brief Return the first MythUIType which accepts focus found at the given
@@ -307 +315 @@
 void MythUIType::HandleMovementPulse(void)
 {
     if (!GetMythPainter()->SupportsAnimation())
+    {
+        SetNextPulse(animMovement, false);
         return;
+    }
 
     if (!m_Moving)
+    {
+        SetNextPulse(animMovement, false);
         return;
+    }
 
     QPoint curXY = m_Area.topLeft().toQPoint();
     m_DirtyRegion = m_Area.toQRect();
@@ -344 +358 @@
     }
 
     m_Area.moveTopLeft(curXY);
+    SetNextPulse(animMovement, m_Moving);
 }
 
 void MythUIType::HandleAlphaPulse(void)
 {
     if (!GetMythPainter()->SupportsAlpha() ||
         !GetMythPainter()->SupportsAnimation())
+    {
+        SetNextPulse(animAlpha, false);
         return;
+    }
 
     if (m_AlphaChangeMode == 0)
+    {
+        SetNextPulse(animAlpha, false);
         return;
+    }
 
     m_Alpha += m_AlphaChange;
 
@@ -377 +398 @@
     }
 
     SetRedraw();
+    SetNextPulse(animAlpha, (m_AlphaChangeMode != 0));
 }
 
 void MythUIType::Pulse(void)
@@ -384 +406 @@
     if (!m_Visible)
         return;
 
-    HandleMovementPulse();
-    HandleAlphaPulse();
+    if (m_NextPulse & (1 << animMovement))
+        HandleMovementPulse();
+    if (m_NextPulse & (1 << animAlpha))
+        HandleAlphaPulse();
 
-    QList<MythUIType *>::Iterator it;
-    for (it = m_ChildrenList.begin(); it != m_ChildrenList.end(); ++it)
-        (*it)->Pulse();
+    if (m_NextChildPulse & (1 << animPulse))
+    {
+        QList<MythUIType *>::Iterator it;
+        for (it = m_ChildrenList.begin(); it != m_ChildrenList.end(); ++it)
+            (*it)->Pulse();
+    }
+    SetNextPulse(animPulse, false);
 }
 
 int MythUIType::CalcAlpha(int alphamod)
@@ -532 +560 @@
                              int maxalpha)
 {
     if (!GetMythPainter()->SupportsAlpha())
+    {
+        SetNextPulse(animAlpha, false);
         return;
+    }
 
     m_AlphaChangeMode = mode;
     m_AlphaChange = alphachange;
@@ -543 +574 @@
         m_Alpha = m_AlphaMax;
     if (m_Alpha < m_AlphaMin)
         m_Alpha = m_AlphaMin;
+    SetNextPulse(animAlpha, (m_AlphaChangeMode != 0));
 }
 
 void MythUIType::SetAlpha(int newalpha)
@@ -615 +647 @@
         emit Showing();
     else
         emit Hiding();
+    FixupNextChildPulse();
 }
 
 void MythUIType::SetEnabled(bool enable)
@@ -677 +710 @@
     m_XYSpeed = base->m_XYSpeed;
     m_deferload = base->m_deferload;
 
+    m_NextPulse = m_Visible ? (1 << animNUMTYPES) - 1 : 0;
+    FixupNextChildPulse();
+
     QList<MythUIType *>::Iterator it;
     for (it = base->m_ChildrenList.begin(); it != base->m_ChildrenList.end();
          ++it)
@@ -840 +876 @@
     return false;
 }
 
+// Recompute m_NextChildPulse, and if anything has changed, continue
+// up the tree.
+void MythUIType::FixupNextChildPulse(bool recomputeChildren)
+{
+    for (MythUIType *current=this; current; current=current->m_Parent)
+    {
+        unsigned oldNextPulse = current->m_NextPulse;
+        unsigned oldNextChildPulse = current->m_NextChildPulse;
+
+        if (current->m_Visible)
+        {
+            // If necessary, recompute m_NextChildPulse as the min of
+            // m_NextPulse and m_NextChildPulse across all children.
+            if (recomputeChildren)
+            {
+                current->m_NextChildPulse = 0;
+                QList<MythUIType*>::iterator it;
+                for (it = current->m_ChildrenList.begin(); it != current->m_ChildrenList.end(); ++it)
+                {
+                    current->m_NextChildPulse |= (*it)->m_NextPulse;
+                    current->m_NextChildPulse |= (*it)->m_NextChildPulse;
+                }
+            }
+
+        } else {
+            current->m_NextPulse = 0;
+            current->m_NextChildPulse = 0;
+        }
+
+        // If anything changed, continue up the tree.  Also continue
+        // if current=this, since the method might have been called as
+        // a result of m_NextPulse changing.
+        unsigned oldmin = oldNextPulse | oldNextChildPulse;
+        unsigned newmin = current->m_NextPulse | current->m_NextChildPulse;
+        if (oldmin == newmin && current != this)
+            break;
+        recomputeChildren = true;
+    }
+}
+
+void MythUIType::SetNextPulse(AnimationType type, bool flag)
+{
+    unsigned oldMask = m_NextPulse;
+    if (flag)
+        m_NextPulse |= (1 << type);
+    else
+        m_NextPulse &= ~(1 << type);
+    if (m_NextPulse != oldMask)
+        FixupNextChildPulse(false);
+}
+
+void MythUIType::SetNextPulse(bool flag)
+{
+    for (unsigned i=0; i<animNUMTYPES; i++)
+        SetNextPulse((AnimationType)i, flag);
+}

libs/libmythui/mythuiimage.cpp

@@ -280 +280 @@
     m_Delay = delayms;
     m_LastDisplay = QTime::currentTime();
     m_CurPos = 0;
+    SetNextPulse(animPulse, (m_Delay > 0));
 }
 
 /**
@@ -298 +299 @@
     m_Filename = img->GetFileName();
     Clear();
     m_Delay = -1;
+    SetNextPulse(animPulse, false);
 
     img->UpRef();
 
@@ -839 +841 @@
     }
 
     MythUIType::Pulse();
+    SetNextPulse(animPulse, (m_Delay > 0));
 }
 
 /**
@@ -982 +985 @@
     else if (element.tagName() == "crop")
         m_cropRect = parseRect(element);
     else if (element.tagName() == "delay")
+    {
         m_Delay = getFirstText(element).toInt();
+        SetNextPulse(animPulse, (m_Delay > 0));
+    }
     else if (element.tagName() == "reflection")
     {
         m_isReflected = true;

libs/libmythui/mythuitext.cpp

@@ -315 +315 @@
     //
 
     MythUIType::Pulse();
+    SetNextPulse(animPulse, (m_colorCycling || m_scrolling));
 
     if (m_colorCycling)
     {

libs/libmythui/mythuiwebbrowser.cpp

@@ -534 +534 @@
     }
 
     MythUIType::Pulse();
+    SetNextPulse(animPulse, (m_updateInterval != 0));
 }
 
 void MythUIWebBrowser::DrawSelf(MythPainter *p, int xoffset, int yoffset,

libs/libmythui/mythuitextedit.cpp

@@ -73 +73 @@
 void MythUITextEdit::Pulse(void)
 {
     if (!m_cursorImage)
+    {
+        SetNextPulse(animPulse, false);
         return;
+    }
 
     if (m_HasFocus)
     {
@@ -92 +95 @@
         m_cursorImage->SetVisible(false);
 
     MythUIType::Pulse();
+    SetNextPulse(animPulse, true);
 }
 
 bool MythUITextEdit::ParseElement(QDomElement &element)

libs/libmythui/mythuiclock.cpp

@@ -64 +64 @@
     }
 
     MythUIText::Pulse();
+    SetNextPulse(animPulse, true);
 }
 
 bool MythUIClock::ParseElement(QDomElement &element)