my last try to get mediaplayer2 more stable.

-> protected the videobuffer with mutex, make a deep copy of it so xine may
   destruct its internal buffers as wanted

2 files changed, 97 insertions, 52 deletions

diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index 9e86041..211791b 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -1,66 +1,71 @@
 
 /*
-                            This file is part of the Opie Project
+                            This file is part of the Opie Project
 
-                             Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
+                             Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
+                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
+#include "xinevideowidget.h"
+#include <opie2/odebug.h>
+
 #include <qimage.h>
 #include <qdirectpainter_qws.h>
 #include <qgfx_qws.h>
 #include <qsize.h>
 #include <qapplication.h>
 
 #include <qpe/resource.h>
 
-#include "xinevideowidget.h"
+#include <pthread.h>
+
 
 
 // 0 deg rot: copy a line from src to dst (use libc memcpy)
 
 // 180 deg rot: copy a line from src to dst reversed
 
 /*
  * This code relies the len be a multiply of 16bit
  */
 static inline void memcpy_rev ( void *_dst, void *_src, size_t len )
 {
 
     /*
      * move the source to the end
      */
     char *src_c = static_cast<char*>(_src) + len;
 
     /*
      * as we copy by 16bit and not 8bit
      * devide the length by two
      */
     len >>= 1;
 
     short int* dst = static_cast<short int*>( _dst );
@@ -100,79 +105,103 @@ static inline void memcpy_step_rev ( void *_dst, void *_src, size_t len, size_t
     len >>= 1;
 
     char *src_c = static_cast<char*>( _src ) + (len*step);
     short int* dst = static_cast<short int*>( _dst );
     short int* src = reinterpret_cast<short int*>( src_c );
 
     while ( len-- ) {
         src_c -= step;
         src = reinterpret_cast<short int*>( src_c );
         *dst++ = *src;
     }
 }
 
 
 XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name )
 	: QWidget ( parent, name, WRepaintNoErase | WResizeNoErase )
 {
 	setBackgroundMode ( NoBackground );
 
 	m_logo              = 0;
 	m_buff              = 0;
 	m_bytes_per_line_fb = qt_screen-> linestep ( );
 	m_bytes_per_pixel   = ( qt_screen->depth() + 7 ) / 8;
 	m_rotation          = 0;
+    m_lastsize = 0;
 }
 
 
 XineVideoWidget::~XineVideoWidget ( )
 {
+    ThreadUtil::AutoLock a(m_bufmutex);
+    if (m_buff) {
+        delete[]m_buff;
+        m_lastsize=0;
+        m_buff = 0;
+    }
+    if (m_logo) {
 	delete m_logo;
 }
+}
 
 void XineVideoWidget::clear ( )
 {
+    ThreadUtil::AutoLock a(m_bufmutex);
+    if (m_buff) {
+        delete[]m_buff;
+        m_lastsize=0;
 	m_buff = 0;
+    }
 	repaint ( false );
 }
 
 QSize XineVideoWidget::videoSize() const
 {
     QSize s = size();
     bool fs = ( s == qApp->desktop()->size() );
 
     // if we are in fullscreen mode, do not rotate the video
     // (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!)
     m_rotation = fs ? - qt_screen->transformOrientation() : 0;
 
     if ( fs && qt_screen->isTransformed() )
         s = qt_screen->mapToDevice( s );
 
     return s;
 }
 
 void XineVideoWidget::paintEvent ( QPaintEvent * )
 {
+    ThreadUtil::AutoLock a(m_bufmutex);
+    QPainter p ( this );
+    p. fillRect ( rect (), black );
+    if (m_logo)
+        p. drawImage ( 0, 0, *m_logo );
+}
+
+void XineVideoWidget::paintEvent2 ( QPaintEvent * )
+{
+    ThreadUtil::AutoLock a(m_bufmutex);
 	if ( m_buff == 0 ) {
 		QPainter p ( this );
 		p. fillRect ( rect ( ), black );
 		if ( m_logo )
 			p. drawImage ( 0, 0, *m_logo );
 	}
 	else {
 		// Qt needs to be notified which areas were really updated .. strange
 		QArray <QRect> qt_bug_workaround_clip_rects;
 
 		{
 			QDirectPainter dp ( this );
 
 			int rot = dp. transformOrientation ( ) + m_rotation; // device rotation + custom rotation
 
 			uchar *fb = dp. frameBuffer ( );
 			uchar *frame = m_buff;
 
 			// where is the video frame in fb coordinates
 			QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
 
 			qt_bug_workaround_clip_rects. resize ( dp. numRects ( ));
 
 			for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) {
@@ -251,56 +280,68 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 			QPainter p ( this );
 
 			for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) {
 				p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [ i ]. topLeft ( )), qt_bug_workaround_clip_rects [ i ]. size ( )), QBrush ( NoBrush ));
 			}
 		}
 	}
 }
 
 
 QImage *XineVideoWidget::logo ( ) const
 {
 	return m_logo;
 }
 
 
 void XineVideoWidget::setLogo ( QImage* logo )
 {
 	delete m_logo;
 	m_logo = logo;
 }
 
 void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl )
 {
+    // mutex area for AutoLock
+    {
+        if (m_bufmutex.isLocked()) {
+            // no time to wait - drop frame
+            return;
+        }
+        ThreadUtil::AutoLock a(m_bufmutex);
 	bool rot90 = (( -m_rotation ) & 1 );
+        int l = h*m_bytes_per_pixel*w;
+        if (l>m_lastsize) {
+            if (m_buff) {
+                delete[]m_buff;
+            }
+            m_buff = new uchar[l];
+            m_lastsize=l;
+        }
 
 	if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height
 		int d = w;
 		w = h;
 		h = d;
 	}
 
 	m_lastframe = m_thisframe;
 	m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h );
 
-	m_buff                 = img;
+        memcpy(m_buff,img,m_lastsize);
 	m_bytes_per_line_frame = bpl;
+    } // Release Mutex
 
-	// only repaint the area that *really* needs to be repainted
-
-	repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false );
-	// ensure that we always have a valid frame!
-	m_buff = 0;
+    paintEvent2(0);
 }
 
 void XineVideoWidget::resizeEvent ( QResizeEvent * )
 {
     emit videoResized( videoSize() );
 }
 
 
 void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
 {
 	emit clicked();
 }
 
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h
index 8b3a3ea..7f00aaa 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.h
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.h
@@ -1,76 +1,80 @@
+
 /*
-                            This file is part of the Opie Project
+                            This file is part of the Opie Project
 
-                             Copyright (c)  2002 Robert Griebl <sandman@handhelds.org>
+                             Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
+                             Copyright (c)  2002 L. Potter <ljp@llornkcor.com>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
-           .>+-=
- _;:,     .>    :=|.         This program is free software; you can
-.> <`_,   >  .   <=          redistribute it and/or  modify it under
-:`=1 )Y*s>-.--   :           the terms of the GNU General Public
-.="- .-=="i,     .._         License as published by the Free Software
- - .   .-<_>     .<>         Foundation; either version 2 of the License,
-     ._= =}       :          or (at your option) any later version.
-    .%`+i>       _;_.
-    .i_,=:_.      -<s.       This program is distributed in the hope that
-     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
-    : ..    .:,     . . .    without even the implied warranty of
-    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
-  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
-..}^=.=       =       ;      Library General Public License for more
-++=   -.     .`     .:       details.
- :     =  ...= . :.=-
- -.   .:....=;==+<;          You should have received a copy of the GNU
-  -_. . .   )=.  =           Library General Public License along with
-    --        :-=`           this library; see the file COPYING.LIB.
+           .>+-=
+ _;:,     .>    :=|.         This program is free software; you can
+.> <`_,   >  .   <=          redistribute it and/or  modify it under
+:`=1 )Y*s>-.--   :           the terms of the GNU General Public
+.="- .-=="i,     .._         License as published by the Free Software
+ - .   .-<_>     .<>         Foundation; either version 2 of the License,
+     ._= =}       :          or (at your option) any later version.
+    .%`+i>       _;_.
+    .i_,=:_.      -<s.       This program is distributed in the hope that
+     +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
+    : ..    .:,     . . .    without even the implied warranty of
+    =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
+  _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
+..}^=.=       =       ;      Library General Public License for more
+++=   -.     .`     .:       details.
+ :     =  ...= . :.=-
+ -.   .:....=;==+<;          You should have received a copy of the GNU
+  -_. . .   )=.  =           Library General Public License along with
+    --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 
-
 #include <qwidget.h>
 
 #include "lib.h"
 
 class QImage;
 
 
 class XineVideoWidget : public QWidget {
     Q_OBJECT
     
 public:
     XineVideoWidget ( QWidget* parent,  const char* name );
     ~XineVideoWidget ( );
     QImage *logo ( ) const;
     void setLogo ( QImage *image );
     void setVideoFrame ( uchar *image, int width, int height, int linestep );
     void clear ( );
 
     QSize videoSize() const;
 
 protected:
-    void paintEvent( QPaintEvent *p );
-    void resizeEvent ( QResizeEvent *r );
+    void paintEvent2( QPaintEvent *p );
+    virtual void paintEvent(QPaintEvent*);
+    virtual void resizeEvent ( QResizeEvent *r );
 
     void mouseReleaseEvent ( QMouseEvent *e );
 
 signals:
     void clicked ( );
     void videoResized ( const QSize &s );
 
 private:
     QRect   m_lastframe;
     QRect   m_thisframe;
 
     uchar  *m_buff;
     int     m_bytes_per_line_fb;
     int     m_bytes_per_line_frame;
     int     m_bytes_per_pixel;
+    int     m_lastsize;
     QImage *m_logo;
     mutable int     m_rotation;
+    ThreadUtil::Mutex m_bufmutex;
 };