From 54eb82d90a4ee254c0abb6d33937e76aeb32ddf1 Mon Sep 17 00:00:00 2001
From: sandman <sandman>
Date: Thu, 01 Aug 2002 21:18:11 +0000
Subject: video in qvfb works now with 0/90/180/270° rotation

---
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
@@ -187,16 +187,16 @@ 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 ) {
     if (!m_video ) {
         qWarning("not showing video now");
         return;
     }
-    qWarning("called draw frame %d %d",  width,  height);
+//    qWarning("called draw frame %d %d",  width,  height);
 
     QSize size = m_wid->size();
     int xoffset  = (size.width() - width) / 2;
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
@@ -14,6 +14,8 @@
 #include "alphablend.h"
 #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,
 				      int  width, int height,int bytes );
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
@@ -55,6 +55,10 @@ 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;
 	}
@@ -69,6 +73,10 @@ 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;
 	}
 }
 
@@ -101,7 +109,7 @@ void XineVideoWidget::clear ( )
 
 void XineVideoWidget::paintEvent ( QPaintEvent * )
 {
-	qWarning( "painting" );
+	qWarning( "painting <<<" );
 	if ( m_buff == 0 ) {
 		QPainter p ( this );
 		p. fillRect ( rect ( ), black );
@@ -109,13 +117,15 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 		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;
 			
@@ -128,8 +138,6 @@ 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 ); 
 					uchar *src = frame + (( clip. x ( ) - framerect. x ( )) * m_bytes_per_pixel ) + (( clip. y ( ) - framerect. y ( )) * m_bytes_per_line_frame );
@@ -176,7 +184,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 					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;
@@ -200,16 +208,16 @@ 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 )
 								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 );
 					}					
 				}
 			}
@@ -223,6 +231,7 @@ void XineVideoWidget::paintEvent ( QPaintEvent * )
 			}
 		}
 	}
+	qWarning( "painting >>>" );
 }
 
 int XineVideoWidget::height ( ) const
--
cgit v0.9.0.2