summaryrefslogtreecommitdiff
path: root/noncore/multimedia/opieplayer2
authoralwin <alwin>2005-04-02 21:55:07 (UTC)
committer alwin <alwin>2005-04-02 21:55:07 (UTC)
commita5020219d43b9dd788cc090ae565c28f27dd6a58 (patch) (side-by-side diff)
treec60f0ae6554817db54e45ea2eb6b1c9896193b3e /noncore/multimedia/opieplayer2
parentb92357d5566b9ee220ff5f4e8eb612b2db32e20b (diff)
downloadopie-a5020219d43b9dd788cc090ae565c28f27dd6a58.zip
opie-a5020219d43b9dd788cc090ae565c28f27dd6a58.tar.gz
opie-a5020219d43b9dd788cc090ae565c28f27dd6a58.tar.bz2
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
Diffstat (limited to 'noncore/multimedia/opieplayer2') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp359
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.h54
2 files changed, 229 insertions, 184 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,36 +1,40 @@
/*
-                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>
@@ -39,7 +43,8 @@
#include <qpe/resource.h>
-#include "xinevideowidget.h"
+#include <pthread.h>
+
// 0 deg rot: copy a line from src to dst (use libc memcpy)
@@ -112,27 +117,41 @@ static inline void memcpy_step_rev ( void *_dst, void *_src, size_t len, size_t
XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name )
- : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase )
+ : 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;
+ 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 ( )
{
- delete m_logo;
+ 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 ( )
{
- m_buff = 0;
- repaint ( false );
+ ThreadUtil::AutoLock a(m_bufmutex);
+ if (m_buff) {
+ delete[]m_buff;
+ m_lastsize=0;
+ m_buff = 0;
+ }
+ repaint ( false );
}
QSize XineVideoWidget::videoSize() const
@@ -152,145 +171,167 @@ QSize XineVideoWidget::videoSize() const
void XineVideoWidget::paintEvent ( QPaintEvent * )
{
- 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-- ) {
- const QRect &clip = dp. rect ( i );
-
- qt_bug_workaround_clip_rects [ i ] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
-
- uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); // clip x/y in the fb
- uchar *src = frame;
-
- // Adjust the start the source data based on the rotation (xine frame)
- switch ( rot ) {
- case 0: src += ((( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame )); break;
- case 1: src += ((( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel )); break;
- case 2: src += ((( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame )); break;
- case 3: src += ((( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame )); break;
- default: break;
- }
-
- // all of the following widths/heights are fb relative (0deg rotation)
-
- uint leftfill = 0; // black border on the "left" side of the video frame
- uint framefill = 0; // "width" of the video frame
- uint rightfill = 0; // black border on the "right" side of the video frame
- uint clipwidth = clip. width ( ) * m_bytes_per_pixel; // "width" of the current clip rect
-
- if ( clip. left ( ) < framerect. left ( ))
- leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth;
- if ( clip. right ( ) > framerect. right ( ))
- rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth;
-
- framefill = clipwidth - ( leftfill + rightfill );
-
- for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) {
- if (( y < framerect. top ( )) || ( y > framerect. bottom ( ))) {
- // "above" or "below" the video -> black
- memset ( dst, 0, clipwidth );
- }
- else {
- if ( leftfill )
- memset ( dst, 0, leftfill ); // "left" border -> black
-
- if ( framefill ) { // blit in the video frame
- // see above for an explanation of the different memcpys
-
- switch ( rot ) {
- case 0: memcpy ( dst + leftfill, src, framefill & ~1 ); break;
- case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
- case 2: memcpy_rev ( dst + leftfill, src, framefill ); break;
- case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
- default: break;
- }
- }
- if ( rightfill )
- memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black
- }
-
- dst += m_bytes_per_line_fb; // advance one line in the framebuffer
-
- // advance one "line" in the xine frame data
- switch ( rot ) {
- case 0: src += m_bytes_per_line_frame; break;
- case 1: src -= m_bytes_per_pixel; break;
- case 2: src -= m_bytes_per_line_frame; break;
- case 3: src += m_bytes_per_pixel; break;
- default: break;
- }
- }
- }
- }
-
- {
- // QVFB hack by Martin Jones
- // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter
-
- 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 ));
- }
- }
- }
+ 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-- ) {
+ const QRect &clip = dp. rect ( i );
+
+ qt_bug_workaround_clip_rects [ i ] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( )));
+
+ uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); // clip x/y in the fb
+ uchar *src = frame;
+
+ // Adjust the start the source data based on the rotation (xine frame)
+ switch ( rot ) {
+ case 0: src += ((( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame )); break;
+ case 1: src += ((( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_pixel )); break;
+ case 2: src += ((( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame ) + (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame )); break;
+ case 3: src += ((( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame )); break;
+ default: break;
+ }
+
+ // all of the following widths/heights are fb relative (0deg rotation)
+
+ uint leftfill = 0; // black border on the "left" side of the video frame
+ uint framefill = 0; // "width" of the video frame
+ uint rightfill = 0; // black border on the "right" side of the video frame
+ uint clipwidth = clip. width ( ) * m_bytes_per_pixel; // "width" of the current clip rect
+
+ if ( clip. left ( ) < framerect. left ( ))
+ leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth;
+ if ( clip. right ( ) > framerect. right ( ))
+ rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth;
+
+ framefill = clipwidth - ( leftfill + rightfill );
+
+ for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) {
+ if (( y < framerect. top ( )) || ( y > framerect. bottom ( ))) {
+ // "above" or "below" the video -> black
+ memset ( dst, 0, clipwidth );
+ }
+ else {
+ if ( leftfill )
+ memset ( dst, 0, leftfill ); // "left" border -> black
+
+ if ( framefill ) { // blit in the video frame
+ // see above for an explanation of the different memcpys
+
+ switch ( rot ) {
+ case 0: memcpy ( dst + leftfill, src, framefill & ~1 ); break;
+ case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
+ case 2: memcpy_rev ( dst + leftfill, src, framefill ); break;
+ case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break;
+ default: break;
+ }
+ }
+ if ( rightfill )
+ memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black
+ }
+
+ dst += m_bytes_per_line_fb; // advance one line in the framebuffer
+
+ // advance one "line" in the xine frame data
+ switch ( rot ) {
+ case 0: src += m_bytes_per_line_frame; break;
+ case 1: src -= m_bytes_per_pixel; break;
+ case 2: src -= m_bytes_per_line_frame; break;
+ case 3: src += m_bytes_per_pixel; break;
+ default: break;
+ }
+ }
+ }
+ }
+
+ {
+ // QVFB hack by Martin Jones
+ // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter
+
+ 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;
+ return m_logo;
}
void XineVideoWidget::setLogo ( QImage* logo )
{
- delete m_logo;
- m_logo = logo;
+ delete m_logo;
+ m_logo = logo;
}
void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl )
{
- bool rot90 = (( -m_rotation ) & 1 );
-
- 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;
- m_bytes_per_line_frame = bpl;
-
- // 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;
+ // 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 );
+
+ memcpy(m_buff,img,m_lastsize);
+ m_bytes_per_line_frame = bpl;
+ } // Release Mutex
+
+ paintEvent2(0);
}
void XineVideoWidget::resizeEvent ( QResizeEvent * )
@@ -301,6 +342,6 @@ void XineVideoWidget::resizeEvent ( QResizeEvent * )
void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ )
{
- emit clicked();
+ 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,29 +1,31 @@
+
/*
-                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.
@@ -31,7 +33,6 @@
*/
-
#include <qwidget.h>
#include "lib.h"
@@ -41,7 +42,7 @@ class QImage;
class XineVideoWidget : public QWidget {
Q_OBJECT
-
+
public:
XineVideoWidget ( QWidget* parent, const char* name );
~XineVideoWidget ( );
@@ -53,8 +54,9 @@ public:
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 );
@@ -70,7 +72,9 @@ private:
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;
};