summaryrefslogtreecommitdiff
authoralwin <alwin>2005-04-10 11:03:22 (UTC)
committer alwin <alwin>2005-04-10 11:03:22 (UTC)
commit713db174943e9184bfa68fa430123c52ad3c3b2b (patch) (side-by-side diff)
tree6f19a3127d0b0d142db2520611fa66245124b862
parent8729cfb1a96057fb2d46188aa091c4086ae6ae61 (diff)
downloadopie-713db174943e9184bfa68fa430123c52ad3c3b2b.zip
opie-713db174943e9184bfa68fa430123c52ad3c3b2b.tar.gz
opie-713db174943e9184bfa68fa430123c52ad3c3b2b.tar.bz2
- replaced the origin videopaint with a more simple one (this high-sophisticated stuff
isn't needed) in xinevideo - replaced an assert in lib.cpp with a "if" construct - may set a file without start playing it (for getting information and so on)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp90
-rw-r--r--noncore/multimedia/opieplayer2/lib.h49
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp180
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.h1
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,30 +1,30 @@
/*
-                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 <>
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.
@@ -48,7 +48,7 @@
#include <unistd.h>
typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
- int width, int height,int bytes );
+ int width, int height,int bytes );
extern "C" {
xine_vo_driver_t* init_video_out_plugin( xine_t *xine, void* video, display_xine_frame_t, void * );
@@ -189,6 +189,17 @@ int Lib::subVersion() {
return sub;
}
+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 ) {
assert( m_initialized );
@@ -214,7 +225,7 @@ void Lib::pause( bool toggle ) {
xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
xine_set_param( m_stream, XINE_PARAM_AUDIO_CLOSE_DEVICE, 1);
}
-
+
else {
xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL );
}
@@ -266,16 +277,16 @@ int Lib::length() const {
int iRetVal=0, iTestLoop=0;
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
valid stream, then return -1 (this value could be used to make the stream
unseekable, but it should never occur!! Mr. Murphy ? :) ) */
@@ -302,7 +313,7 @@ void Lib::seekTo( int time ) {
xine_play( m_stream, 0, time*1000 );
xine_set_param( m_stream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE );
}
-
+
}
@@ -331,9 +342,10 @@ void Lib::ensureInitialized()
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() );
+ }
}
void Lib::receiveMessage( ThreadUtil::ChannelMessage *msg, SendType sendType )
@@ -431,7 +443,7 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) {
return;
}
- 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,30 +1,30 @@
/*
-                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 <>
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.
@@ -65,6 +65,7 @@ namespace XINE {
void resize ( const QSize &s );
+ int setfile(const QString& fileName);
int play( const QString& fileName,
int startPos = 0,
int start_time = 0 );
@@ -190,14 +191,14 @@ namespace XINE {
bool m_video:1;
XineVideoWidget *m_wid;
xine_t *m_xine;
- xine_stream_t *m_stream;
+ xine_stream_t *m_stream;
xine_cfg_entry_t *m_config;
xine_vo_driver_t *m_videoOutput;
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 );
// C -> C++ bridge for the event system
static void xine_event_handler( void* user_data, const xine_event_t* t);
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
@@ -171,6 +171,9 @@ QSize XineVideoWidget::videoSize() const
void XineVideoWidget::paintEvent ( QPaintEvent * )
{
+ if (m_bufmutex.isLocked()) {
+ return;
+ }
ThreadUtil::AutoLock a(m_bufmutex);
QPainter p ( this );
p. fillRect ( rect (), black );
@@ -181,13 +184,12 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
void XineVideoWidget::paintEvent2 ( QPaintEvent * )
{
ThreadUtil::AutoLock a(m_bufmutex);
+ QPainter p (this);
if ( m_buff == 0 ) {
- QPainter p ( this );
p. fillRect ( rect ( ), black );
if ( m_logo )
p. drawImage ( 0, 0, *m_logo );
- }
- else {
+ } else if (m_lastsize){
// Qt needs to be notified which areas were really updated .. strange
QArray <QRect> qt_bug_workaround_clip_rects;
@@ -196,97 +198,85 @@ void XineVideoWidget::paintEvent2 ( QPaintEvent * )
int rot = dp. transformOrientation ( ) + m_rotation; // device rotation + custom rotation
+ 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 ( );
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;
- }
+ 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;
}
}
+
{
// 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 ));
- }
+ p.fillRect(QRect(mapFromGlobal (m_thisframe. topLeft ( )), m_thisframe.size ()),QBrush(NoBrush));
}
}
}
-
QImage *XineVideoWidget::logo ( ) const
{
return m_logo;
@@ -303,31 +293,33 @@ void XineVideoWidget::setVideoFrame ( uchar* img, int w, int h, int bpl )
{
// mutex area for AutoLock
{
- if (m_bufmutex.isLocked()) {
+ if (m_bufmutex.isLocked()||w>width()||h>height()) {
// 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) {
+ int l = h*bpl;
+ if (l!=m_lastsize) {
if (m_buff) {
delete[]m_buff;
}
- 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;
} // 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
@@ -73,6 +73,7 @@ private:
int m_bytes_per_line_frame;
int m_bytes_per_pixel;
int m_lastsize;
+ QSize m_framesize;
QImage *m_logo;
mutable int m_rotation;
ThreadUtil::Mutex m_bufmutex;