Ticket #368: osdsurface.diff

libs/libmythtv/osdsurface.cpp

@@ -86 +86 @@
     memset(u, 127, size / 4);
     memset(v, 127, size / 4);
     memset(alpha, 0, size);
+    usedRegionsLock.lock();
     usedRegions = QRegion();
+    usedRegionsLock.unlock();
 }
 
 void OSDSurface::ClearUsed(void)
 {
+    usedRegionsLock.lock();
     QMemArray<QRect> rects = usedRegions.rects();
     QMemArray<QRect>::Iterator it = rects.begin();
     QRect drawRect;
@@ -129 +132 @@
     }
 
     usedRegions = QRegion();
+    usedRegionsLock.unlock();
 }
 
 bool OSDSurface::IntersectsDrawn(QRect &newrect)
 {
+    QMutexLocker lock(&usedRegionsLock);
     QMemArray<QRect> rects = usedRegions.rects();
     QMemArray<QRect>::Iterator it = rects.begin();
     for (; it != rects.end(); ++it)
@@ -143 +148 @@
 
 void OSDSurface::AddRect(QRect &newrect)
 {
+    usedRegionsLock.lock();
     usedRegions = usedRegions.unite(newrect);
+    usedRegionsLock.unlock();
 }
 
 ///////////////////////////////////////////////////////////////////////////
@@ -551 +558 @@
  */
 void OSDSurface::BlendToYV12(unsigned char *yuvptr) const
 {
+    usedRegionsLock.lock();
     const OSDSurface *surface = this;
     blendtoyv12_8_fun blender = blendtoyv12_8_init(surface);
 
@@ -649 +657 @@
             }
         }
     }
+    usedRegionsLock.unlock();
 }
 
 static void BlendToBlack(unsigned char *argbptr, uint width, uint outheight)
@@ -686 +695 @@
                              uint outheight, bool blend_to_black,
                              uint threshold) const
 {
+    usedRegionsLock.lock();
     const OSDSurface *surface = this;
     blendtoargb_8_fun blender = blendtoargb_8_init(surface);
     const unsigned char *cm = surface->cm;
@@ -756 +766 @@
     }
     if (blend_to_black)
         BlendToBlack(argbptr, stride>>2, outheight);
+
+    usedRegionsLock.unlock();
 }
 
 /** \fn OSDSurface::DitherToI44(unsigned char*,bool,uint,uint) const
@@ -772 +784 @@
 void OSDSurface::DitherToI44(unsigned char *outbuf, bool ifirst,
                              uint stride, uint outheight) const
 {
+    usedRegionsLock.lock();
     const OSDSurface *surface = this;
     int ashift = ifirst ? 0 : 4;
     int amask = ifirst ? 0x0f : 0xf0;
@@ -855 +868 @@
     }
 
     delete_dithertoia44_8_context(dcontext);
+    usedRegionsLock.unlock();
 }
 
 /** \fn OSDSurface::DitherToIA44(unsigned char*,uint,uint) const

libs/libmythtv/osdsurface.h

@@ -2 +2 @@
 #define OSDSURFACE_H_
 
 #include <qregion.h>
+#include <qmutex.h>
 #include "blend.h"
 
 #define MAX_NEG_CROP 1024
@@ -61 +62 @@
     int size;
 
     QRegion usedRegions;
-
+    mutable QMutex usedRegionsLock;
 #ifdef MMX
     short int rec_lut[256];
 #else