author | alwin <alwin> | 2005-04-02 21:55:07 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-04-02 21:55:07 (UTC) |
commit | a5020219d43b9dd788cc090ae565c28f27dd6a58 (patch) (unidiff) | |
tree | c60f0ae6554817db54e45ea2eb6b1c9896193b3e | |
parent | b92357d5566b9ee220ff5f4e8eb612b2db32e20b (diff) | |
download | opie-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
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 97 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.h | 52 |
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,54 +1,59 @@ | |||
1 | 1 | ||
2 | /* | 2 | /* |
3 | This file is part of the Opie Project | 3 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
4 | 4 | ||
5 | Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 5 | Â Â Â Â Â Â Â Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
6 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | ||
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 7 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 8 | =. |
8 | .=l. | 9 | .=l. |
9 | .>+-= | 10 | Â Â Â Â Â Â .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 11 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 12 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 13 | :`=1 )Y*s>-.-- Â : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 14 | .="- .-=="i, Â Â .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 15 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 16 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
16 | .%`+i> _;_. | 17 | Â Â .%`+i> Â Â Â _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 18 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 19 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 20 | Â Â : .. Â Â .:, Â Â . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 21 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 22 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 23 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
23 | ++= -. .` .: details. | 24 | ++= Â -. Â Â .` Â Â .: details. |
24 | : = ...= . :.=- | 25 | Â : Â Â = Â ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 26 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 27 | Â -_. . . Â )=. Â = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 28 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 29 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 30 | Inc., 59 Temple Place - Suite 330, |
30 | Boston, MA 02111-1307, USA. | 31 | Boston, MA 02111-1307, USA. |
31 | 32 | ||
32 | */ | 33 | */ |
33 | 34 | ||
35 | #include "xinevideowidget.h" | ||
36 | #include <opie2/odebug.h> | ||
37 | |||
34 | #include <qimage.h> | 38 | #include <qimage.h> |
35 | #include <qdirectpainter_qws.h> | 39 | #include <qdirectpainter_qws.h> |
36 | #include <qgfx_qws.h> | 40 | #include <qgfx_qws.h> |
37 | #include <qsize.h> | 41 | #include <qsize.h> |
38 | #include <qapplication.h> | 42 | #include <qapplication.h> |
39 | 43 | ||
40 | #include <qpe/resource.h> | 44 | #include <qpe/resource.h> |
41 | 45 | ||
42 | #include "xinevideowidget.h" | 46 | #include <pthread.h> |
47 | |||
43 | 48 | ||
44 | 49 | ||
45 | // 0 deg rot: copy a line from src to dst (use libc memcpy) | 50 | // 0 deg rot: copy a line from src to dst (use libc memcpy) |
46 | 51 | ||
47 | // 180 deg rot: copy a line from src to dst reversed | 52 | // 180 deg rot: copy a line from src to dst reversed |
48 | 53 | ||
49 | /* | 54 | /* |
50 | * This code relies the len be a multiply of 16bit | 55 | * This code relies the len be a multiply of 16bit |
51 | */ | 56 | */ |
52 | static inline void memcpy_rev ( void *_dst, void *_src, size_t len ) | 57 | static inline void memcpy_rev ( void *_dst, void *_src, size_t len ) |
53 | { | 58 | { |
54 | 59 | ||
@@ -112,55 +117,79 @@ static inline void memcpy_step_rev ( void *_dst, void *_src, size_t len, size_t | |||
112 | 117 | ||
113 | 118 | ||
114 | XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) | 119 | XineVideoWidget::XineVideoWidget ( QWidget* parent, const char* name ) |
115 | : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase ) | 120 | : QWidget ( parent, name, WRepaintNoErase | WResizeNoErase ) |
116 | { | 121 | { |
117 | setBackgroundMode ( NoBackground ); | 122 | setBackgroundMode ( NoBackground ); |
118 | 123 | ||
119 | m_logo = 0; | 124 | m_logo = 0; |
120 | m_buff = 0; | 125 | m_buff = 0; |
121 | m_bytes_per_line_fb = qt_screen-> linestep ( ); | 126 | m_bytes_per_line_fb = qt_screen-> linestep ( ); |
122 | m_bytes_per_pixel = ( qt_screen->depth() + 7 ) / 8; | 127 | m_bytes_per_pixel = ( qt_screen->depth() + 7 ) / 8; |
123 | m_rotation = 0; | 128 | m_rotation = 0; |
129 | m_lastsize = 0; | ||
124 | } | 130 | } |
125 | 131 | ||
126 | 132 | ||
127 | XineVideoWidget::~XineVideoWidget ( ) | 133 | XineVideoWidget::~XineVideoWidget ( ) |
128 | { | 134 | { |
135 | ThreadUtil::AutoLock a(m_bufmutex); | ||
136 | if (m_buff) { | ||
137 | delete[]m_buff; | ||
138 | m_lastsize=0; | ||
139 | m_buff = 0; | ||
140 | } | ||
141 | if (m_logo) { | ||
129 | delete m_logo; | 142 | delete m_logo; |
130 | } | 143 | } |
144 | } | ||
131 | 145 | ||
132 | void XineVideoWidget::clear ( ) | 146 | void XineVideoWidget::clear ( ) |
133 | { | 147 | { |
148 | ThreadUtil::AutoLock a(m_bufmutex); | ||
149 | if (m_buff) { | ||
150 | delete[]m_buff; | ||
151 | m_lastsize=0; | ||
134 | m_buff = 0; | 152 | m_buff = 0; |
153 | } | ||
135 | repaint ( false ); | 154 | repaint ( false ); |
136 | } | 155 | } |
137 | 156 | ||
138 | QSize XineVideoWidget::videoSize() const | 157 | QSize XineVideoWidget::videoSize() const |
139 | { | 158 | { |
140 | QSize s = size(); | 159 | QSize s = size(); |
141 | bool fs = ( s == qApp->desktop()->size() ); | 160 | bool fs = ( s == qApp->desktop()->size() ); |
142 | 161 | ||
143 | // if we are in fullscreen mode, do not rotate the video | 162 | // if we are in fullscreen mode, do not rotate the video |
144 | // (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!) | 163 | // (!! the paint routine uses m_rotation + qt_screen-> transformOrientation() !!) |
145 | m_rotation = fs ? - qt_screen->transformOrientation() : 0; | 164 | m_rotation = fs ? - qt_screen->transformOrientation() : 0; |
146 | 165 | ||
147 | if ( fs && qt_screen->isTransformed() ) | 166 | if ( fs && qt_screen->isTransformed() ) |
148 | s = qt_screen->mapToDevice( s ); | 167 | s = qt_screen->mapToDevice( s ); |
149 | 168 | ||
150 | return s; | 169 | return s; |
151 | } | 170 | } |
152 | 171 | ||
153 | void XineVideoWidget::paintEvent ( QPaintEvent * ) | 172 | void XineVideoWidget::paintEvent ( QPaintEvent * ) |
154 | { | 173 | { |
174 | ThreadUtil::AutoLock a(m_bufmutex); | ||
175 | QPainter p ( this ); | ||
176 | p. fillRect ( rect (), black ); | ||
177 | if (m_logo) | ||
178 | p. drawImage ( 0, 0, *m_logo ); | ||
179 | } | ||
180 | |||
181 | void XineVideoWidget::paintEvent2 ( QPaintEvent * ) | ||
182 | { | ||
183 | ThreadUtil::AutoLock a(m_bufmutex); | ||
155 | if ( m_buff == 0 ) { | 184 | if ( m_buff == 0 ) { |
156 | QPainter p ( this ); | 185 | QPainter p ( this ); |
157 | p. fillRect ( rect ( ), black ); | 186 | p. fillRect ( rect ( ), black ); |
158 | if ( m_logo ) | 187 | if ( m_logo ) |
159 | p. drawImage ( 0, 0, *m_logo ); | 188 | p. drawImage ( 0, 0, *m_logo ); |
160 | } | 189 | } |
161 | else { | 190 | else { |
162 | // Qt needs to be notified which areas were really updated .. strange | 191 | // Qt needs to be notified which areas were really updated .. strange |
163 | QArray <QRect> qt_bug_workaround_clip_rects; | 192 | QArray <QRect> qt_bug_workaround_clip_rects; |
164 | 193 | ||
165 | { | 194 | { |
166 | QDirectPainter dp ( this ); | 195 | QDirectPainter dp ( this ); |
@@ -263,43 +292,55 @@ QImage *XineVideoWidget::logo ( ) const | |||
263 | return m_logo; | 292 | return m_logo; |
264 | } | 293 | } |
265 | 294 | ||
266 | 295 | ||
267 | void XineVideoWidget::setLogo ( QImage* logo ) | 296 | void XineVideoWidget::setLogo ( QImage* logo ) |
268 | { | 297 | { |
269 | delete m_logo; | 298 | delete m_logo; |
270 | m_logo = logo; | 299 | m_logo = logo; |
271 | } | 300 | } |
272 | 301 | ||
273 | void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | 302 | void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) |
274 | { | 303 | { |
304 | // mutex area for AutoLock | ||
305 | { | ||
306 | if (m_bufmutex.isLocked()) { | ||
307 | // no time to wait - drop frame | ||
308 | return; | ||
309 | } | ||
310 | ThreadUtil::AutoLock a(m_bufmutex); | ||
275 | bool rot90 = (( -m_rotation ) & 1 ); | 311 | bool rot90 = (( -m_rotation ) & 1 ); |
312 | int l = h*m_bytes_per_pixel*w; | ||
313 | if (l>m_lastsize) { | ||
314 | if (m_buff) { | ||
315 | delete[]m_buff; | ||
316 | } | ||
317 | m_buff = new uchar[l]; | ||
318 | m_lastsize=l; | ||
319 | } | ||
276 | 320 | ||
277 | if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height | 321 | if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height |
278 | int d = w; | 322 | int d = w; |
279 | w = h; | 323 | w = h; |
280 | h = d; | 324 | h = d; |
281 | } | 325 | } |
282 | 326 | ||
283 | m_lastframe = m_thisframe; | 327 | m_lastframe = m_thisframe; |
284 | m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h ); | 328 | m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h ); |
285 | 329 | ||
286 | m_buff = img; | 330 | memcpy(m_buff,img,m_lastsize); |
287 | m_bytes_per_line_frame = bpl; | 331 | m_bytes_per_line_frame = bpl; |
332 | } // Release Mutex | ||
288 | 333 | ||
289 | // only repaint the area that *really* needs to be repainted | 334 | paintEvent2(0); |
290 | |||
291 | repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false ); | ||
292 | // ensure that we always have a valid frame! | ||
293 | m_buff = 0; | ||
294 | } | 335 | } |
295 | 336 | ||
296 | void XineVideoWidget::resizeEvent ( QResizeEvent * ) | 337 | void XineVideoWidget::resizeEvent ( QResizeEvent * ) |
297 | { | 338 | { |
298 | emit videoResized( videoSize() ); | 339 | emit videoResized( videoSize() ); |
299 | } | 340 | } |
300 | 341 | ||
301 | 342 | ||
302 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) | 343 | void XineVideoWidget::mouseReleaseEvent ( QMouseEvent * /*me*/ ) |
303 | { | 344 | { |
304 | emit clicked(); | 345 | emit clicked(); |
305 | } | 346 | } |
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 @@ | |||
1 | |||
1 | /* | 2 | /* |
2 | This file is part of the Opie Project | 3 | Â Â Â Â Â Â Â Â This file is part of the Opie Project |
3 | 4 | ||
4 | Copyright (c) 2002 Robert Griebl <sandman@handhelds.org> | 5 | Â Â Â Â Â Â Â Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
6 | Copyright (c) 2002 L. Potter <ljp@llornkcor.com> | ||
5 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 7 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
6 | =. | 8 | =. |
7 | .=l. | 9 | .=l. |
8 | .>+-= | 10 | Â Â Â Â Â Â .>+-= |
9 | _;:, .> :=|. This program is free software; you can | 11 | Â _;:, Â Â .> Â Â :=|. This program is free software; you can |
10 | .> <`_, > . <= redistribute it and/or modify it under | 12 | .> <`_, Â > Â . Â <= redistribute it and/or modify it under |
11 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 13 | :`=1 )Y*s>-.-- Â : the terms of the GNU General Public |
12 | .="- .-=="i, .._ License as published by the Free Software | 14 | .="- .-=="i, Â Â .._ License as published by the Free Software |
13 | - . .-<_> .<> Foundation; either version 2 of the License, | 15 | Â - . Â .-<_> Â Â .<> Foundation; either version 2 of the License, |
14 | ._= =} : or (at your option) any later version. | 16 | Â Â Â ._= =} Â Â Â : or (at your option) any later version. |
15 | .%`+i> _;_. | 17 | Â Â .%`+i> Â Â Â _;_. |
16 | .i_,=:_. -<s. This program is distributed in the hope that | 18 | Â Â .i_,=:_. Â Â Â -<s. This program is distributed in the hope that |
17 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 19 | Â Â Â + Â . Â -:. Â Â Â = it will be useful, but WITHOUT ANY WARRANTY; |
18 | : .. .:, . . . without even the implied warranty of | 20 | Â Â : .. Â Â .:, Â Â . . . without even the implied warranty of |
19 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 21 | Â Â =_ Â Â Â Â + Â Â =;=|` MERCHANTABILITY or FITNESS FOR A |
20 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 22 | Â _.=:. Â Â Â : Â Â :=>`: PARTICULAR PURPOSE. See the GNU |
21 | ..}^=.= = ; Library General Public License for more | 23 | ..}^=.= Â Â Â = Â Â Â ; Library General Public License for more |
22 | ++= -. .` .: details. | 24 | ++= Â -. Â Â .` Â Â .: details. |
23 | : = ...= . :.=- | 25 | Â : Â Â = Â ...= . :.=- |
24 | -. .:....=;==+<; You should have received a copy of the GNU | 26 | Â -. Â .:....=;==+<; You should have received a copy of the GNU |
25 | -_. . . )=. = Library General Public License along with | 27 | Â -_. . . Â )=. Â = Library General Public License along with |
26 | -- :-=` this library; see the file COPYING.LIB. | 28 | Â Â -- Â Â Â Â :-=` this library; see the file COPYING.LIB. |
27 | If not, write to the Free Software Foundation, | 29 | If not, write to the Free Software Foundation, |
28 | Inc., 59 Temple Place - Suite 330, | 30 | Inc., 59 Temple Place - Suite 330, |
29 | Boston, MA 02111-1307, USA. | 31 | Boston, MA 02111-1307, USA. |
30 | 32 | ||
31 | */ | 33 | */ |
32 | 34 | ||
33 | 35 | ||
34 | |||
35 | #include <qwidget.h> | 36 | #include <qwidget.h> |
36 | 37 | ||
37 | #include "lib.h" | 38 | #include "lib.h" |
38 | 39 | ||
39 | class QImage; | 40 | class QImage; |
40 | 41 | ||
41 | 42 | ||
42 | class XineVideoWidget : public QWidget { | 43 | class XineVideoWidget : public QWidget { |
43 | Q_OBJECT | 44 | Q_OBJECT |
44 | 45 | ||
45 | public: | 46 | public: |
46 | XineVideoWidget ( QWidget* parent, const char* name ); | 47 | XineVideoWidget ( QWidget* parent, const char* name ); |
47 | ~XineVideoWidget ( ); | 48 | ~XineVideoWidget ( ); |
48 | QImage *logo ( ) const; | 49 | QImage *logo ( ) const; |
49 | void setLogo ( QImage *image ); | 50 | void setLogo ( QImage *image ); |
50 | void setVideoFrame ( uchar *image, int width, int height, int linestep ); | 51 | void setVideoFrame ( uchar *image, int width, int height, int linestep ); |
51 | void clear ( ); | 52 | void clear ( ); |
52 | 53 | ||
53 | QSize videoSize() const; | 54 | QSize videoSize() const; |
54 | 55 | ||
55 | protected: | 56 | protected: |
56 | void paintEvent( QPaintEvent *p ); | 57 | void paintEvent2( QPaintEvent *p ); |
57 | void resizeEvent ( QResizeEvent *r ); | 58 | virtual void paintEvent(QPaintEvent*); |
59 | virtual void resizeEvent ( QResizeEvent *r ); | ||
58 | 60 | ||
59 | void mouseReleaseEvent ( QMouseEvent *e ); | 61 | void mouseReleaseEvent ( QMouseEvent *e ); |
60 | 62 | ||
61 | signals: | 63 | signals: |
62 | void clicked ( ); | 64 | void clicked ( ); |
63 | void videoResized ( const QSize &s ); | 65 | void videoResized ( const QSize &s ); |
64 | 66 | ||
65 | private: | 67 | private: |
66 | QRect m_lastframe; | 68 | QRect m_lastframe; |
67 | QRect m_thisframe; | 69 | QRect m_thisframe; |
68 | 70 | ||
69 | uchar *m_buff; | 71 | uchar *m_buff; |
70 | int m_bytes_per_line_fb; | 72 | int m_bytes_per_line_fb; |
71 | int m_bytes_per_line_frame; | 73 | int m_bytes_per_line_frame; |
72 | int m_bytes_per_pixel; | 74 | int m_bytes_per_pixel; |
75 | int m_lastsize; | ||
73 | QImage *m_logo; | 76 | QImage *m_logo; |
74 | mutable int m_rotation; | 77 | mutable int m_rotation; |
78 | ThreadUtil::Mutex m_bufmutex; | ||
75 | }; | 79 | }; |
76 | 80 | ||