author | sandman <sandman> | 2002-08-01 21:18:11 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-08-01 21:18:11 (UTC) |
commit | 54eb82d90a4ee254c0abb6d33937e76aeb32ddf1 (patch) (side-by-side diff) | |
tree | e9628916c721262232efc3314a8ccd29613a7189 /noncore/multimedia/opieplayer2/xinevideowidget.cpp | |
parent | c80b2060a6f051f16690db4b8f0ccbc7dde84ec5 (diff) | |
download | opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.zip opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.tar.gz opie-54eb82d90a4ee254c0abb6d33937e76aeb32ddf1.tar.bz2 |
video in qvfb works now with 0/90/180/270° rotation
Diffstat (limited to 'noncore/multimedia/opieplayer2/xinevideowidget.cpp') (more/less context) (show whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/xinevideowidget.cpp | 25 |
1 files changed, 17 insertions, 8 deletions
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 @@ -54,8 +54,12 @@ static inline void memcpy_rev ( void *dst, void *src, size_t len ) static inline void memcpy_step ( void *dst, void *src, size_t len, size_t step ) { len >>= 1; while ( len-- ) { +// *((char *) dst ) = *((char *) src + 1); +// *((char *) dst + 1) = *((char *) src ); +// ((char *) dst ) += 2; + *((short int *) dst )++ = *((short int *) src ); ((char *) src ) += step; } } @@ -68,8 +72,12 @@ static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t st while ( len-- ) { ((char *) src ) -= step; *((short int *) dst )++ = *((short int *) src ); + +// *((char *) dst ) = *((char *) src + 1); +// *((char *) dst + 1) = *((char *) src ); +// ((char *) dst ) += 2; } } @@ -100,23 +108,25 @@ void XineVideoWidget::clear ( ) } void XineVideoWidget::paintEvent ( QPaintEvent * ) { - qWarning( "painting" ); + qWarning( "painting <<<" ); if ( m_buff == 0 ) { QPainter p ( this ); p. fillRect ( rect ( ), black ); p. drawImage ( 0, 0, *m_image ); qWarning ( "logo\n" ); } else { - qWarning ( "paintevent\n" ); +// qWarning ( "paintevent\n" ); QArray <QRect> qt_bug_workaround_clip_rects; { QDirectPainter dp ( this ); + int rot = dp. transformOrientation ( ); + 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 ( )); @@ -127,10 +137,8 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) 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 ); @@ -175,9 +183,9 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) 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 ); + src += (( framerect. height ( ) - 1 ) * m_bytes_per_pixel ); uint leftfill = 0; uint framefill = 0; uint rightfill = 0; @@ -199,18 +207,18 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) memset ( dst, 0, leftfill ); 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 ); + else + memcpy_step ( 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 ); + src += ( rot == 270 ? -m_bytes_per_pixel : m_bytes_per_pixel ); } } } } @@ -222,8 +230,9 @@ void XineVideoWidget::paintEvent ( QPaintEvent * ) p. fillRect ( QRect ( mapFromGlobal ( qt_bug_workaround_clip_rects [i]. topLeft ( )), qt_bug_workaround_clip_rects [i]. size ( )), QBrush ( NoBrush ) ); } } } + qWarning( "painting >>>" ); } int XineVideoWidget::height ( ) const { |