-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 60 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 43 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 166 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.h | 1 |
4 files changed, 138 insertions, 132 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index e3289bc..9f7a9c5 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp | |||
@@ -1,29 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 LJP <> | 5 | Copyright (c) 2002 LJP <> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
@@ -190,4 +190,15 @@ int Lib::subVersion() { | |||
190 | } | 190 | } |
191 | 191 | ||
192 | int Lib::setfile(const QString& fileName) | ||
193 | { | ||
194 | QString str = fileName.stripWhiteSpace(); | ||
195 | |||
196 | |||
197 | if ( !xine_open( m_stream, str.utf8().data() ) ) { | ||
198 | return 0; | ||
199 | } | ||
200 | return 1; | ||
201 | } | ||
202 | |||
192 | int Lib::play( const QString& fileName, int startPos, int start_time ) { | 203 | int Lib::play( const QString& fileName, int startPos, int start_time ) { |
193 | assert( m_initialized ); | 204 | assert( m_initialized ); |
@@ -332,7 +343,8 @@ void Lib::setWidget( XineVideoWidget *widget ) | |||
332 | { | 343 | { |
333 | m_wid = widget; | 344 | m_wid = widget; |
345 | if (m_wid) { | ||
334 | resize ( m_wid-> size ( ) ); | 346 | resize ( m_wid-> size ( ) ); |
335 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); | 347 | ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); |
336 | m_wid->repaint(); | 348 | } |
337 | } | 349 | } |
338 | 350 | ||
@@ -432,6 +444,6 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { | |||
432 | } | 444 | } |
433 | 445 | ||
434 | assert( m_wid ); | 446 | // assert( m_wid ); |
435 | 447 | ||
436 | m_wid-> setVideoFrame ( frame, width, height, bytes ); | 448 | if (m_wid) m_wid-> setVideoFrame ( frame, width, height, bytes ); |
437 | } | 449 | } |
diff --git a/noncore/multimedia/opieplayer2/lib.h b/noncore/multimedia/opieplayer2/lib.h index ab432a0..2f5bf86 100644 --- a/noncore/multimedia/opieplayer2/lib.h +++ b/noncore/multimedia/opieplayer2/lib.h | |||
@@ -1,29 +1,29 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> | 4 | Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> |
5 | Copyright (c) 2002 LJP <> | 5 | Copyright (c) 2002 LJP <> |
6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> | 6 | Copyright (c) 2002 Holger Freyther <zecke@handhelds.org> |
7 | =. | 7 | =. |
8 | .=l. | 8 | .=l. |
9 | .>+-= | 9 | .>+-= |
10 | _;:, .> :=|. This program is free software; you can | 10 | _;:, .> :=|. This program is free software; you can |
11 | .> <`_, > . <= redistribute it and/or modify it under | 11 | .> <`_, > . <= redistribute it and/or modify it under |
12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public | 12 | :`=1 )Y*s>-.-- : the terms of the GNU General Public |
13 | .="- .-=="i, .._ License as published by the Free Software | 13 | .="- .-=="i, .._ License as published by the Free Software |
14 | - . .-<_> .<> Foundation; either version 2 of the License, | 14 | - . .-<_> .<> Foundation; either version 2 of the License, |
15 | ._= =} : or (at your option) any later version. | 15 | ._= =} : or (at your option) any later version. |
16 | .%`+i> _;_. | 16 | .%`+i> _;_. |
17 | .i_,=:_. -<s. This program is distributed in the hope that | 17 | .i_,=:_. -<s. This program is distributed in the hope that |
18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 18 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
19 | : .. .:, . . . without even the implied warranty of | 19 | : .. .:, . . . without even the implied warranty of |
20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 20 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 21 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
22 | ..}^=.= = ; Library General Public License for more | 22 | ..}^=.= = ; Library General Public License for more |
23 | ++= -. .` .: details. | 23 | ++= -. .` .: details. |
24 | : = ...= . :.=- | 24 | : = ...= . :.=- |
25 | -. .:....=;==+<; You should have received a copy of the GNU | 25 | -. .:....=;==+<; You should have received a copy of the GNU |
26 | -_. . . )=. = Library General Public License along with | 26 | -_. . . )=. = Library General Public License along with |
27 | -- :-=` this library; see the file COPYING.LIB. | 27 | -- :-=` this library; see the file COPYING.LIB. |
28 | If not, write to the Free Software Foundation, | 28 | If not, write to the Free Software Foundation, |
29 | Inc., 59 Temple Place - Suite 330, | 29 | Inc., 59 Temple Place - Suite 330, |
@@ -66,4 +66,5 @@ namespace XINE { | |||
66 | void resize ( const QSize &s ); | 66 | void resize ( const QSize &s ); |
67 | 67 | ||
68 | int setfile(const QString& fileName); | ||
68 | int play( const QString& fileName, | 69 | int play( const QString& fileName, |
69 | int startPos = 0, | 70 | int startPos = 0, |
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index 211791b..7f59085 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp | |||
@@ -172,4 +172,7 @@ QSize XineVideoWidget::videoSize() const | |||
172 | void XineVideoWidget::paintEvent ( QPaintEvent * ) | 172 | void XineVideoWidget::paintEvent ( QPaintEvent * ) |
173 | { | 173 | { |
174 | if (m_bufmutex.isLocked()) { | ||
175 | return; | ||
176 | } | ||
174 | ThreadUtil::AutoLock a(m_bufmutex); | 177 | ThreadUtil::AutoLock a(m_bufmutex); |
175 | QPainter p ( this ); | 178 | QPainter p ( this ); |
@@ -182,11 +185,10 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) | |||
182 | { | 185 | { |
183 | ThreadUtil::AutoLock a(m_bufmutex); | 186 | ThreadUtil::AutoLock a(m_bufmutex); |
184 | if ( m_buff == 0 ) { | ||
185 | QPainter p ( this ); | 187 | QPainter p ( this ); |
188 | if ( m_buff == 0 ) { | ||
186 | p. fillRect ( rect ( ), black ); | 189 | p. fillRect ( rect ( ), black ); |
187 | if ( m_logo ) | 190 | if ( m_logo ) |
188 | p. drawImage ( 0, 0, *m_logo ); | 191 | p. drawImage ( 0, 0, *m_logo ); |
189 | } | 192 | } else if (m_lastsize){ |
190 | else { | ||
191 | // Qt needs to be notified which areas were really updated .. strange | 193 | // Qt needs to be notified which areas were really updated .. strange |
192 | QArray <QRect> qt_bug_workaround_clip_rects; | 194 | QArray <QRect> qt_bug_workaround_clip_rects; |
@@ -197,95 +199,83 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) | |||
197 | int rot = dp. transformOrientation ( ) + m_rotation; // device rotation + custom rotation | 199 | int rot = dp. transformOrientation ( ) + m_rotation; // device rotation + custom rotation |
198 | 200 | ||
201 | bool rot90 = (( -m_rotation ) & 1 ); | ||
202 | |||
203 | int _vw,_vh; | ||
204 | switch (rot90) { | ||
205 | case true: | ||
206 | _vh = m_framesize.width(); | ||
207 | _vw = m_framesize.height(); | ||
208 | break; | ||
209 | default: | ||
210 | _vw = m_framesize.width(); | ||
211 | _vh = m_framesize.height(); | ||
212 | break; | ||
213 | break; | ||
214 | } | ||
215 | int middle_w = _vw/2; | ||
216 | int middle_h = _vh/2; | ||
217 | m_thisframe.setRect(width()/2-middle_w,height()/2-middle_h,_vw,_vh); | ||
218 | QRect topFill,rightFill,leftFill,downFill; | ||
219 | topFill. setRect(0,0 ,width(),m_thisframe.top()); | ||
220 | downFill.setCoords(0,m_thisframe.bottom(),width(),height()); | ||
221 | rightFill.setCoords(m_thisframe.right(),0,width(),height()); | ||
222 | leftFill.setCoords(0,0,m_thisframe.left(),height()); | ||
223 | |||
224 | if (topFill.isValid()) { | ||
225 | p.fillRect(topFill,black); | ||
226 | } | ||
227 | if (downFill.isValid()) { | ||
228 | p.fillRect(downFill,black); | ||
229 | } | ||
230 | if (rightFill.isValid()) { | ||
231 | p.fillRect(rightFill,black); | ||
232 | } | ||
233 | if (leftFill.isValid()) { | ||
234 | p.fillRect(leftFill,black); | ||
235 | } | ||
199 | uchar *fb = dp. frameBuffer ( ); | 236 | uchar *fb = dp. frameBuffer ( ); |
200 | uchar *frame = m_buff; | 237 | uchar *frame = m_buff; |
201 | 238 | ||
202 | // where is the video frame in fb coordinates | 239 | // where is the video frame in fb coordinates |
203 | QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); | 240 | QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), |
204 | 241 | qt_screen-> height ( ))); | |
205 | qt_bug_workaround_clip_rects. resize ( dp. numRects ( )); | ||
206 | |||
207 | for ( int i = dp. numRects ( ) - 1; i >= 0; i-- ) { | ||
208 | const QRect &clip = dp. rect ( i ); | ||
209 | 242 | ||
210 | qt_bug_workaround_clip_rects [ i ] = qt_screen-> mapFromDevice ( clip, QSize ( qt_screen-> width ( ), qt_screen-> height ( ))); | ||
211 | |||
212 | uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb ); // clip x/y in the fb | ||
213 | uchar *src = frame; | 243 | uchar *src = frame; |
244 | uchar * dst = fb+framerect.y()*m_bytes_per_line_fb+framerect.x()*m_bytes_per_pixel; | ||
214 | 245 | ||
215 | // Adjust the start the source data based on the rotation (xine frame) | 246 | for (int y=framerect.top();y<=framerect.bottom();++y) { |
216 | switch ( rot ) { | 247 | switch ( rot ) { |
217 | case 0: src += ((( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame )); break; | 248 | case 0: |
218 | 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; | 249 | memcpy(dst,src,m_bytes_per_line_frame); |
219 | 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; | 250 | src+=m_bytes_per_line_frame; |
220 | case 3: src += ((( clip. y ( ) - framerect. y ( )) * m_bytes_per_pixel ) + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_line_frame )); break; | 251 | break; |
221 | default: break; | 252 | case 1: |
253 | memcpy_step ( dst, src, m_thisframe.size().width(), m_bytes_per_line_frame ); | ||
254 | src -= m_bytes_per_pixel; | ||
255 | break; | ||
256 | case 2: | ||
257 | memcpy_rev ( dst, src, m_thisframe.size().width()); | ||
258 | src-=m_bytes_per_line_frame; | ||
259 | break; | ||
260 | case 3: | ||
261 | memcpy_step_rev ( dst, src, m_thisframe.size().width(), m_bytes_per_line_frame ); | ||
262 | src += m_bytes_per_pixel; | ||
263 | break; | ||
264 | default: | ||
265 | break; | ||
266 | } | ||
267 | dst += m_bytes_per_line_fb; | ||
222 | } | 268 | } |
223 | |||
224 | // all of the following widths/heights are fb relative (0deg rotation) | ||
225 | |||
226 | uint leftfill = 0; // black border on the "left" side of the video frame | ||
227 | uint framefill = 0; // "width" of the video frame | ||
228 | uint rightfill = 0; // black border on the "right" side of the video frame | ||
229 | uint clipwidth = clip. width ( ) * m_bytes_per_pixel; // "width" of the current clip rect | ||
230 | |||
231 | if ( clip. left ( ) < framerect. left ( )) | ||
232 | leftfill = (( framerect. left ( ) - clip. left ( )) * m_bytes_per_pixel ) <? clipwidth; | ||
233 | if ( clip. right ( ) > framerect. right ( )) | ||
234 | rightfill = (( clip. right ( ) - framerect. right ( )) * m_bytes_per_pixel ) <? clipwidth; | ||
235 | |||
236 | framefill = clipwidth - ( leftfill + rightfill ); | ||
237 | |||
238 | for ( int y = clip. top ( ); y <= clip. bottom ( ); y++ ) { | ||
239 | if (( y < framerect. top ( )) || ( y > framerect. bottom ( ))) { | ||
240 | // "above" or "below" the video -> black | ||
241 | memset ( dst, 0, clipwidth ); | ||
242 | } | 269 | } |
243 | else { | ||
244 | if ( leftfill ) | ||
245 | memset ( dst, 0, leftfill ); // "left" border -> black | ||
246 | 270 | ||
247 | if ( framefill ) { // blit in the video frame | ||
248 | // see above for an explanation of the different memcpys | ||
249 | |||
250 | switch ( rot ) { | ||
251 | case 0: memcpy ( dst + leftfill, src, framefill & ~1 ); break; | ||
252 | case 1: memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; | ||
253 | case 2: memcpy_rev ( dst + leftfill, src, framefill ); break; | ||
254 | case 3: memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); break; | ||
255 | default: break; | ||
256 | } | ||
257 | } | ||
258 | if ( rightfill ) | ||
259 | memset ( dst + leftfill + framefill, 0, rightfill ); // "right" border -> black | ||
260 | } | ||
261 | |||
262 | dst += m_bytes_per_line_fb; // advance one line in the framebuffer | ||
263 | |||
264 | // advance one "line" in the xine frame data | ||
265 | switch ( rot ) { | ||
266 | case 0: src += m_bytes_per_line_frame; break; | ||
267 | case 1: src -= m_bytes_per_pixel; break; | ||
268 | case 2: src -= m_bytes_per_line_frame; break; | ||
269 | case 3: src += m_bytes_per_pixel; break; | ||
270 | default: break; | ||
271 | } | ||
272 | } | ||
273 | } | ||
274 | } | ||
275 | 271 | ||
276 | { | 272 | { |
277 | // QVFB hack by Martin Jones | 273 | // QVFB hack by Martin Jones |
278 | // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter | 274 | // We need to "touch" all affected clip rects with a normal QPainter in addition to the QDirectPainter |
279 | 275 | p.fillRect(QRect(mapFromGlobal (m_thisframe. topLeft ( )), m_thisframe.size ()),QBrush(NoBrush)); | |
280 | QPainter p ( this ); | ||
281 | |||
282 | for ( int i = qt_bug_workaround_clip_rects. size ( ) - 1; i >= 0; i-- ) { | ||
283 | p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [ i ]. topLeft ( )), qt_bug_workaround_clip_rects [ i ]. size ( )), QBrush ( NoBrush )); | ||
284 | } | ||
285 | } | 276 | } |
286 | } | 277 | } |
287 | } | 278 | } |
288 | 279 | ||
289 | |||
290 | QImage *XineVideoWidget::logo ( ) const | 280 | QImage *XineVideoWidget::logo ( ) const |
291 | { | 281 | { |
@@ -304,5 +294,5 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | |||
304 | // mutex area for AutoLock | 294 | // mutex area for AutoLock |
305 | { | 295 | { |
306 | if (m_bufmutex.isLocked()) { | 296 | if (m_bufmutex.isLocked()||w>width()||h>height()) { |
307 | // no time to wait - drop frame | 297 | // no time to wait - drop frame |
308 | return; | 298 | return; |
@@ -310,23 +300,25 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) | |||
310 | ThreadUtil::AutoLock a(m_bufmutex); | 300 | ThreadUtil::AutoLock a(m_bufmutex); |
311 | bool rot90 = (( -m_rotation ) & 1 ); | 301 | bool rot90 = (( -m_rotation ) & 1 ); |
312 | int l = h*m_bytes_per_pixel*w; | 302 | int l = h*bpl; |
313 | if (l>m_lastsize) { | 303 | if (l!=m_lastsize) { |
314 | if (m_buff) { | 304 | if (m_buff) { |
315 | delete[]m_buff; | 305 | delete[]m_buff; |
316 | } | 306 | } |
307 | if (l>0) { | ||
317 | m_buff = new uchar[l]; | 308 | m_buff = new uchar[l]; |
309 | odebug << "Point to: " << (unsigned long)m_buff << oendl; | ||
318 | m_lastsize=l; | 310 | m_lastsize=l; |
311 | } else { | ||
312 | m_buff = 0; | ||
319 | } | 313 | } |
320 | 314 | } else if (l==0){ | |
321 | if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height | 315 | delete[] m_buff; |
322 | int d = w; | 316 | m_buff = 0; |
323 | w = h; | ||
324 | h = d; | ||
325 | } | 317 | } |
326 | 318 | m_lastsize = l; | |
327 | m_lastframe = m_thisframe; | 319 | m_framesize = QSize(w,h); |
328 | m_thisframe. setRect (( width ( ) - w ) / 2, ( height ( ) - h ) / 2, w , h ); | 320 | if (m_buff && m_lastsize) { |
329 | |||
330 | memcpy(m_buff,img,m_lastsize); | 321 | memcpy(m_buff,img,m_lastsize); |
322 | } | ||
331 | m_bytes_per_line_frame = bpl; | 323 | m_bytes_per_line_frame = bpl; |
332 | } // Release Mutex | 324 | } // Release Mutex |
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h index 7f00aaa..eccff1a 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.h +++ b/noncore/multimedia/opieplayer2/xinevideowidget.h | |||
@@ -74,4 +74,5 @@ private: | |||
74 | int m_bytes_per_pixel; | 74 | int m_bytes_per_pixel; |
75 | int m_lastsize; | 75 | int m_lastsize; |
76 | QSize m_framesize; | ||
76 | QImage *m_logo; | 77 | QImage *m_logo; |
77 | mutable int m_rotation; | 78 | mutable int m_rotation; |