summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.cpp181
-rw-r--r--noncore/multimedia/opieplayer2/xinevideowidget.h7
2 files changed, 159 insertions, 29 deletions
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index b5a714e..e46c4df 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -42,6 +42,37 @@
#include "xinevideowidget.h"
+static inline void memcpy_rev ( void *dst, void *src, size_t len )
+{
+ ((char *) src ) += len;
+
+ len >>= 1;
+ while ( len-- )
+ *((short int *) dst )++ = *--((short int *) src );
+}
+
+static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step )
+{
+ len >>= 1;
+ while ( len-- ) {
+ *((short int *) dst )++ = *((short int *) src );
+ ((char *) src ) += step;
+ }
+}
+
+static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t step )
+{
+ len >>= 1;
+
+ ((char *) src ) += ( len * step );
+
+ while ( len-- ) {
+ ((char *) src ) -= step;
+ *((short int *) dst )++ = *((short int *) src );
+ }
+}
+
+
XineVideoWidget::XineVideoWidget( int width,
int height,
QWidget* parent,
@@ -56,14 +87,20 @@ XineVideoWidget::XineVideoWidget( int width,
m_image = new QImage( image );*/
}
-XineVideoWidget::~XineVideoWidget() {
+
+XineVideoWidget::~XineVideoWidget ( )
+{
delete m_image;
}
-void XineVideoWidget::clear() {
+
+void XineVideoWidget::clear ( )
+{
m_buff = 0;
repaint(false);
}
-void XineVideoWidget::paintEvent( QPaintEvent* e ) {
+
+void XineVideoWidget::paintEvent ( QPaintEvent * )
+{
qWarning("painting");
if (m_buff == 0 ) {
QPainter p(this );
@@ -72,54 +109,150 @@ void XineVideoWidget::paintEvent( QPaintEvent* e ) {
qWarning ( "logo\n" );
}
else {
- qWarning("paitnevent\n");
+ qWarning ( "paintevent\n" );
+
+ QArray <QRect> qt_bug_workaround_clip_rects;
+
{
+ QDirectPainter dp ( this );
- if (( m_thisframe & m_lastframe ) != m_lastframe ) {
- QPainter p ( this );
- p. fillRect ( m_lastframe, black );
+ uchar *fb = dp. frameBuffer ( );
+ uchar *frame = m_buff; // rot == 0 ? m_buff : m_buff + ( m_thisframe. height ( ) - 1 ) * m_bytes_per_line_frame;
+
+ QRect framerect = QRect ( mapToGlobal ( m_thisframe. topLeft ( )), m_thisframe. size ( ));
+
+ 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] = clip;
+
+ int rot = dp. transformOrientation ( );
+
+ if ( rot == 0 || rot == 180 ) {
+ uchar *dst = fb + ( clip. x ( ) * m_bytes_per_pixel ) + ( clip. y ( ) * m_bytes_per_line_fb );
+ uchar *src = frame + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame );
+
+ if ( rot == 180 )
+ src += (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame );
+
+ uint leftfill = 0;
+ uint framefill = 0;
+ uint rightfill = 0;
+ uint clipwidth = clip. width ( ) * m_bytes_per_pixel;
+
+ 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 ( ))) {
+ memset ( dst, 0, clipwidth );
}
+ else {
+ if ( leftfill )
+ memset ( dst, 0, leftfill );
+
+ if ( framefill ) {
+ if ( rot == 0 )
+ memcpy ( dst + leftfill, src, framefill );
+ else
+ memcpy_rev ( dst + leftfill, src, framefill );
}
- {
- QDirectPainter dp ( this );
+ if ( rightfill )
+ memset ( dst + leftfill + framefill, 0, rightfill );
+ }
+
+ dst += m_bytes_per_line_fb;
+ src += ( rot == 0 ? m_bytes_per_line_frame : -m_bytes_per_line_frame );
+ }
+ }
+ else { // rot == 90 || rot == 270
+ uchar *dst = fb + ( clip. y ( ) * m_bytes_per_pixel ) + ( clip. x ( ) * m_bytes_per_line_fb );
+ uchar *src = frame + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame );
+
+ if ( rot == 270 )
+ src += (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame );
+
+ uint leftfill = 0;
+ uint framefill = 0;
+ uint rightfill = 0;
+ uint clipwidth = clip. height ( ) * m_bytes_per_pixel;
+
+ if ( clip. bottom ( ) > framerect. bottom ( ))
+ leftfill = (( clip. bottom ( ) - framerect. bottom ( )) * m_bytes_per_pixel ) <? clipwidth;
+ if ( clip. top ( ) < framerect. top ( ))
+ rightfill = (( framerect. top ( ) - framerect. top ( )) * m_bytes_per_pixel ) <? clipwidth;
+
+ framefill = clipwidth - ( leftfill + rightfill );
+
+ for ( int y = clip. left ( ); y <= clip. right ( ); y++ ) {
+ if (( y < framerect. left ( )) || ( y > framerect. right ( ))) {
+ memset ( dst, 0, clipwidth );
+ }
+ else {
+ if ( leftfill )
+ memset ( dst, 0, leftfill );
- uchar* dst = dp.frameBuffer() + (m_thisframe. y ( ) + dp.yOffset() ) * linestep +
- (m_thisframe. x ( ) + dp.xOffset() ) * m_bytes_per_pixel;
- uchar* frame = m_buff;
- for(int y = 0; y < m_thisframe. height ( ); y++ ) {
- memcpy( dst, frame, m_bytes );
- frame += m_bytes;
- dst += linestep;
+ if ( framefill ) {
+ if ( rot == 90 )
+ memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame );
+ else
+ memcpy_step_rev ( dst + leftfill, src, framefill, m_bytes_per_line_frame );
+ }
+ if ( rightfill )
+ memset ( dst + leftfill + framefill, 0, rightfill );
+ }
+
+ dst += m_bytes_per_line_fb;
+ src += ( rot == 90 ? +1 : -1 ); // m_bytes_per_line_frame : -m_bytes_per_line_frame );
+ }
+ }
}
}
{
// QVFB hack by MArtin Jones
QPainter p ( this );
- p. fillRect ( m_thisframe, QBrush ( NoBrush ));
+
+ 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 ) );
}
}
}
-int XineVideoWidget::height() const{
+}
+
+int XineVideoWidget::height ( ) const
+{
return m_image->height();
}
-int XineVideoWidget::width() const{
+
+int XineVideoWidget::width ( ) const
+{
return m_image->width();
}
-void XineVideoWidget::setImage( QImage* image ) {
+
+void XineVideoWidget::setImage ( QImage* image )
+{
delete m_image;
m_image = image;
}
+
void XineVideoWidget::setImage( uchar* image, int yoffsetXLine,
int xoffsetXBytes, int width,
- int height, int linestep, int bytes, int bpp ) {
+ int height, int linestep, int bytes, int bpp )
+{
m_lastframe = m_thisframe;
m_thisframe. setRect ( xoffsetXBytes, yoffsetXLine, width, height );
m_buff = image;
- this->linestep = linestep;
- m_bytes = bytes;
+ m_bytes_per_line_fb = linestep;
+ m_bytes_per_line_frame = bytes;
m_bytes_per_pixel = bpp;
- repaint ( false );
+ repaint ((( m_thisframe & m_lastframe ) != m_lastframe ) ? m_lastframe : m_thisframe, false );
}
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h
index 5656194..7d9a6d2 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.h
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.h
@@ -54,12 +54,9 @@ private:
QRect m_lastframe;
QRect m_thisframe;
- int m_wid;
- int m_height;
- int m_yOff, m_xOff;
uchar* m_buff;
- int m_Width, m_Height, linestep;
- int m_bytes;
+ int m_bytes_per_line_fb;
+ int m_bytes_per_line_frame;
int m_bytes_per_pixel;
QImage* m_image;