video in qvfb works now with 0/90/180/270° rotation

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
@@ -188,7 +188,7 @@ void Lib::xine_event_handler( void* user_data, xine_event_t* t ) {
 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");
 }
 void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
@@ -197,5 +197,5 @@ void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
         return;
     }
-    qWarning("called draw frame %d %d",  width,  height);
+//    qWarning("called draw frame %d %d",  width,  height);
 
     QSize size = m_wid->size();
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
@@ -15,4 +15,6 @@
 #include "yuv2rgb.h"
 
+#define printf(x,...)
+
 /* the caller for our event draw handler */
 typedef void (*display_xine_frame_t) (void *user_data, uint8_t* frame,
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
@@ -56,4 +56,8 @@ 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;
@@ -70,4 +74,8 @@ static inline void memcpy_step_rev ( void *dst, void *src, size_t len, size_t st
 		((char *) src ) -= step;
 		*((short int *) dst )++ = *((short int *) src );
+
+//		*((char *) dst ) = *((char *) src + 1);
+//		*((char *) dst + 1) = *((char *) src );
+//		((char *) dst ) += 2;
 	}
 }
@@ -102,5 +110,5 @@ void XineVideoWidget::clear ( )
 void XineVideoWidget::paintEvent ( QPaintEvent * )
 {
-	qWarning( "painting" );
+	qWarning( "painting <<<" );
 	if ( m_buff == 0 ) {
 		QPainter p ( this );
@@ -110,5 +118,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 	}
 	else {
-		qWarning ( "paintevent\n" );
+//		qWarning ( "paintevent\n" );
 		
 		QArray <QRect> qt_bug_workaround_clip_rects;
@@ -117,4 +125,6 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 			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;
@@ -129,6 +139,4 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 				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 ); 
@@ -177,5 +185,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 					
 					if ( rot == 270 )
-						src += (( framerect. height ( ) - 1 ) * m_bytes_per_line_frame );
+						src += (( framerect. height ( ) - 1 ) * m_bytes_per_pixel );
 										
 					uint leftfill = 0;
@@ -201,7 +209,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 							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 )
@@ -210,5 +218,5 @@ 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 );
 					}					
 				}
@@ -224,4 +232,5 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 		}
 	}
+	qWarning( "painting >>>" );
 }