| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 90 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.h | 49 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 180 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.h | 1 |
4 files changed, 163 insertions, 157 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,5 +1,5 @@ /* - This file is part of the Opie Project + This file is part of the Opie Project - Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> + Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> Copyright (c) 2002 LJP <> @@ -8,21 +8,21 @@ .=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, @@ -50,3 +50,3 @@ typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame, - int width, int height,int bytes ); + int width, int height,int bytes ); @@ -191,2 +191,13 @@ int Lib::subVersion() { +int Lib::setfile(const QString& fileName) +{ + QString str = fileName.stripWhiteSpace(); + + + if ( !xine_open( m_stream, str.utf8().data() ) ) { + return 0; + } + return 1; +} + int Lib::play( const QString& fileName, int startPos, int start_time ) { @@ -216,3 +227,3 @@ void Lib::pause( bool toggle ) { } - + else { @@ -268,12 +279,12 @@ int Lib::length() const { do - { - iRetVal = xine_get_pos_length( m_stream, &pos, &time, &length ); - if (iRetVal) - {/* if the function didn't return 0, then pos, time and length are valid.*/ - return length/1000; - } - /*don't poll too much*/ - usleep(100000); - iTestLoop++; - } + { + iRetVal = xine_get_pos_length( m_stream, &pos, &time, &length ); + if (iRetVal) + {/* if the function didn't return 0, then pos, time and length are valid.*/ + return length/1000; + } + /*don't poll too much*/ + usleep(100000); + iTestLoop++; + } while ( iTestLoop < 10 ); /* if after 1s, we still don't have any @@ -304,3 +315,3 @@ void Lib::seekTo( int time ) { } - + } @@ -333,5 +344,6 @@ void Lib::setWidget( XineVideoWidget *widget ) m_wid = widget; - resize ( m_wid-> size ( ) ); - ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); - m_wid->repaint(); + if (m_wid) { + resize ( m_wid-> size ( ) ); + ::null_set_mode( m_videoOutput, qt_screen->depth(), qt_screen->pixelType() ); + } } @@ -433,5 +445,5 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { - assert( m_wid ); +// assert( m_wid ); - m_wid-> setVideoFrame ( frame, width, height, bytes ); + if (m_wid) m_wid-> setVideoFrame ( frame, width, height, bytes ); } 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,5 +1,5 @@ /* - This file is part of the Opie Project + This file is part of the Opie Project - Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> + Copyright (c) 2002 Max Reiss <harlekin@handhelds.org> Copyright (c) 2002 LJP <> @@ -8,21 +8,21 @@ .=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, @@ -67,2 +67,3 @@ namespace XINE { + int setfile(const QString& fileName); int play( const QString& fileName, @@ -192,3 +193,3 @@ namespace XINE { xine_t *m_xine; - xine_stream_t *m_stream; + xine_stream_t *m_stream; xine_cfg_entry_t *m_config; @@ -196,6 +197,6 @@ namespace XINE { xine_ao_driver_t* m_audioOutput; - xine_event_queue_t *m_queue; + xine_event_queue_t *m_queue; void handleXineEvent( const xine_event_t* t ); - void handleXineEvent( int type, int data, const char* name ); + void handleXineEvent( int type, int data, const char* name ); void drawFrame( uint8_t* frame, int width, int height, int bytes ); 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 @@ -173,2 +173,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) { + if (m_bufmutex.isLocked()) { + return; + } ThreadUtil::AutoLock a(m_bufmutex); @@ -183,4 +186,4 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) ThreadUtil::AutoLock a(m_bufmutex); + QPainter p (this); if ( m_buff == 0 ) { - QPainter p ( this ); p. fillRect ( rect ( ), black ); @@ -188,4 +191,3 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) p. drawImage ( 0, 0, *m_logo ); - } - else { + } else if (m_lastsize){ // Qt needs to be notified which areas were really updated .. strange @@ -198,2 +200,37 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) + bool rot90 = (( -m_rotation ) & 1 ); + + int _vw,_vh; + switch (rot90) { + case true: + _vh = m_framesize.width(); + _vw = m_framesize.height(); + break; + default: + _vw = m_framesize.width(); + _vh = m_framesize.height(); + break; + break; + } + int middle_w = _vw/2; + int middle_h = _vh/2; + m_thisframe.setRect(width()/2-middle_w,height()/2-middle_h,_vw,_vh); + QRect topFill,rightFill,leftFill,downFill; + topFill. setRect(0,0 ,width(),m_thisframe.top()); + downFill.setCoords(0,m_thisframe.bottom(),width(),height()); + rightFill.setCoords(m_thisframe.right(),0,width(),height()); + leftFill.setCoords(0,0,m_thisframe.left(),height()); + + if (topFill.isValid()) { + p.fillRect(topFill,black); + } + if (downFill.isValid()) { + p.fillRect(downFill,black); + } + if (rightFill.isValid()) { + p.fillRect(rightFill,black); + } + if (leftFill.isValid()) { + p.fillRect(leftFill,black); + } uchar *fb = dp. frameBuffer ( ); @@ -202,72 +239,30 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) // 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; - } + QRect framerect = qt_screen-> mapToDevice ( QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( )), QSize ( qt_screen-> width ( ), + qt_screen-> height ( ))); + + uchar * src = frame; + uchar * dst = fb+framerect.y()*m_bytes_per_line_fb+framerect.x()*m_bytes_per_pixel; + + for (int y=framerect.top();y<=framerect.bottom();++y) { + switch (rot) { + case 0: + memcpy(dst,src,m_bytes_per_line_frame); + src+=m_bytes_per_line_frame; + break; + case 1: + memcpy_step ( dst, src, m_thisframe.size().width(), m_bytes_per_line_frame ); + src -= m_bytes_per_pixel; + break; + case 2: + memcpy_rev ( dst, src, m_thisframe.size().width()); + src-=m_bytes_per_line_frame; + break; + case 3: + memcpy_step_rev ( dst, src, m_thisframe.size().width(), m_bytes_per_line_frame ); + src += m_bytes_per_pixel; + break; + default: + break; } + dst += m_bytes_per_line_fb; } @@ -275,2 +270,3 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) + { @@ -278,8 +274,3 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) // 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 )); - } + p.fillRect(QRect(mapFromGlobal (m_thisframe. topLeft ( )), m_thisframe.size ()),QBrush(NoBrush)); } @@ -288,3 +279,2 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * ) - QImage *XineVideoWidget::logo ( ) const @@ -305,3 +295,3 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) { - if (m_bufmutex.isLocked()) { + if (m_bufmutex.isLocked()||w>width()||h>height()) { // no time to wait - drop frame @@ -311,4 +301,4 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) bool rot90 = (( -m_rotation ) & 1 ); - int l = h*m_bytes_per_pixel*w; - if (l>m_lastsize) { + int l = h*bpl; + if (l!=m_lastsize) { if (m_buff) { @@ -316,16 +306,18 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl ) } - m_buff = new uchar[l]; - m_lastsize=l; + if (l>0) { + m_buff = new uchar[l]; + odebug << "Point to: " << (unsigned long)m_buff << oendl; + m_lastsize=l; + } else { + m_buff = 0; + } + } else if (l==0){ + delete[] m_buff; + m_buff = 0; } - - if ( rot90 ) { // if the rotation is 90 or 270 we have to swap width / height - int d = w; - w = h; - h = d; + m_lastsize = l; + m_framesize = QSize(w,h); + if (m_buff && m_lastsize) { + memcpy(m_buff,img,m_lastsize); } - - 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; 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 @@ -75,2 +75,3 @@ private: int m_lastsize; + QSize m_framesize; QImage *m_logo; |