| -rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 6 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/nullvideo.c | 2 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 25 |
3 files changed, 22 insertions, 11 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp index ac5cdd5..5ae6c21 100644 --- a/noncore/multimedia/opieplayer2/lib.cpp +++ b/noncore/multimedia/opieplayer2/lib.cpp @@ -189,5 +189,5 @@ void Lib::xine_display_frame( void* user_data, uint8_t *frame, int width, int height, int bytes ) { - printf("display x frame"); +// printf("display x frame"); ((Lib*)user_data)->drawFrame( frame, width, height, bytes ); - printf("displayed x frame\n"); +// printf("displayed x frame\n"); } @@ -198,3 +198,3 @@ void Lib::drawFrame( uint8_t* frame, int width, int height, int bytes ) { } - qWarning("called draw frame %d %d", width, height); +// qWarning("called draw frame %d %d", width, height); diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c index 63d5752..3a18a40 100644 --- a/noncore/multimedia/opieplayer2/nullvideo.c +++ b/noncore/multimedia/opieplayer2/nullvideo.c @@ -16,2 +16,4 @@ +#define printf(x,...) + /* the caller for our event draw handler */ diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp index e46c4df..8e8f139 100644 --- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp +++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp @@ -57,2 +57,6 @@ static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step ) while ( len-- ) { +// *((char *) dst ) = *((char *) src + 1); +// *((char *) dst + 1) = *((char *) src ); +// ((char *) dst ) += 2; + *((short int *) dst )++ = *((short int *) src ); @@ -71,2 +75,6 @@ static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t st *((short int *) dst )++ = *((short int *) src ); + +// *((char *) dst ) = *((char *) src + 1); +// *((char *) dst + 1) = *((char *) src ); +// ((char *) dst ) += 2; } @@ -103,3 +111,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) { - qWarning( "painting" ); + qWarning( "painting <<<" ); if ( m_buff == 0 ) { @@ -111,3 +119,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) else { - qWarning ( "paintevent\n" ); +// qWarning ( "paintevent\n" ); @@ -118,2 +126,4 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) + int rot = dp. transformOrientation ( ); + uchar *fb = dp. frameBuffer ( ); @@ -130,4 +140,2 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) - int rot = dp. transformOrientation ( ); - if ( rot == 0 || rot == 180 ) { @@ -178,3 +186,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) if ( rot == 270 ) - src += (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame ); + src += (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ); @@ -202,5 +210,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) 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 ); + else + memcpy_step ( dst + leftfill, src, framefill, m_bytes_per_line_frame ); } @@ -211,3 +219,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) dst += m_bytes_per_line_fb; - src += ( rot == 90 ? +1 : -1 ); // m_bytes_per_line_frame : -m_bytes_per_line_frame ); + src += ( rot == 270 ? -m_bytes_per_pixel : m_bytes_per_pixel ); } @@ -225,2 +233,3 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) } + qWarning( "painting >>>" ); } |