Fixed video output (frames allocated before video was enabled via

show_video flag have never been displayes thereafter)
Also optimized the video widget

4 files changed, 49 insertions, 52 deletions

diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index aa37cd7..ac5cdd5 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -201,9 +201,9 @@ void Lib::drawFrame( uint8_t* frame,  int width,  int height,  int bytes ) {
     QSize size = m_wid->size();
     int xoffset  = (size.width() - width) / 2;
     int yoffset  = (size.height() - height) / 2;
     int linestep = qt_screen->linestep();
 
     m_wid->setImage( frame, yoffset, xoffset, width, height, linestep, bytes, m_bytes_per_pixel );
-    m_wid->repaint();
+//    m_wid->repaint(false);
 
 }
diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index f356e76..63d5752 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -69,35 +69,34 @@ struct opie_frame_s {
     int yuv_stride;
     int stripe_height, stripe_inc;
   
     int bytes_per_line;
     uint8_t *data;
 
-    int show_video;
+//    int show_video;
     null_driver_t *output;
 };
 
 static uint32_t null_get_capabilities(vo_driver_t *self ){   
     null_driver_t* this = (null_driver_t*)self;
     printf("capabilities\n");
     return this->m_capabilities;
 }
 
 static void null_frame_copy (vo_frame_t *vo_img, uint8_t **src) {
   opie_frame_t  *frame = (opie_frame_t *) vo_img ;
   printf("frame copy\n");
-  if(!frame->show_video ){ printf("no video\n"); return; } // no video
+  if(!frame->output->m_show_video ){ printf("no video\n"); return; } // no video
 
   if (frame->format == IMGFMT_YV12) {
       frame->yuv2rgb->yuv2rgb_fun (frame->yuv2rgb, frame->rgb_dst,
 				   src[0], src[1], src[2]);
   } else {
 
       frame->yuv2rgb->yuy22rgb_fun (frame->yuv2rgb, frame->rgb_dst,
 				    src[0]);
-      
   }	
   
   frame->rgb_dst += frame->stripe_inc; 
   printf("returning\n");
 }
 
@@ -142,13 +141,13 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
     pthread_mutex_init (&frame->frame.mutex, NULL);
 
     printf("alloc_frame\n");
     frame->name = "opie\0";
     frame->version = 1;
     frame->output = this;
-    frame->show_video = this->m_show_video;
+//    frame->show_video = this->m_show_video;
     /* initialize the frame*/
     frame->frame.driver = self;
     /*frame.frame.free = null_frame_free;*/
     frame->frame.copy = null_frame_copy;
     frame->frame.field = null_frame_field;
     frame->frame.dispose = null_frame_dispose;
@@ -162,13 +161,13 @@ static vo_frame_t* null_alloc_frame( vo_driver_t* self ){
     return (vo_frame_t*) frame;
 }
 
 // size specific
 static void null_compute_ideal_size (null_driver_t *this, opie_frame_t *frame) {
 
-    if (!this->m_is_scaling || !this->m_show_video) {
+    if (!this->m_is_scaling /*|| !this->m_show_video*/) {
         printf("Not scaling\n");
 	frame->ideal_width   = frame->width;
 	frame->ideal_height  = frame->height;
 	frame->ratio_factor  = 1.0;
 
   } else {
@@ -298,13 +297,13 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
 	frame->height     = height;
 	frame->ratio_code = ratio_code;
 	frame->flags      = flags;
 	frame->format     = format;
 	frame->user_ratio = this->user_ratio;
 	this->gui_changed = 0;
-	frame->show_video = this->m_show_video;
+//	frame->show_video = this->m_show_video;
 
         
 	    null_compute_ideal_size (this, frame);
 	    null_compute_rgb_size (this, frame);
 	
 	/*
@@ -352,13 +351,13 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
 	frame->stripe_height = 16 * frame->output_height / frame->height;
 	frame->bytes_per_line = frame->output_width * this->bytes_per_pixel;
   
 	/* 
 	 * set up colorspace converter
 	 */
-	if(this->m_show_video ){
+	if(1 /*this->m_show_video*/ ){
 	    printf("showing video\n");	    	
 
 	switch (flags) {
 	    case VO_TOP_FIELD:
 	    case VO_BOTTOM_FIELD:
 		frame->yuv2rgb->configure (frame->yuv2rgb,
@@ -411,21 +410,21 @@ static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
 static void null_display_frame( vo_driver_t* self, vo_frame_t *frame_gen ){   
     null_driver_t* this = (null_driver_t*) self;
     opie_frame_t* frame = (opie_frame_t*)frame_gen;
     display_xine_frame_t display = this->frameDis;
 
     printf("display frame\n");
-    //    if( this->m_show_video ) { // return if not displaying	
+//       if( this->m_show_video ) { // return if not displaying	
 	printf("calling home aye\n" );
 	if( display != NULL ) {
 	(*display)(this->caller, frame->data,
 		   frame->output_width, frame->output_height,
 		   frame->bytes_per_line );
 	printf("display done hope you enyoyed the frame");
 	}
-	//    }
+//    }
     
     frame->frame.displayed (&frame->frame);
 }
 
 
 // blending related
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.cpp b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
index d665f16..b5a714e 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.cpp
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.cpp
@@ -43,13 +43,13 @@
 #include "xinevideowidget.h"
 
 XineVideoWidget::XineVideoWidget( int width,
                                   int height,
                                   QWidget* parent,
                                   const char* name )
-    : QWidget( parent, name )
+    : QWidget( parent, name, WRepaintNoErase | WResizeNoErase )
 {
     m_image = new QImage( width, height,  qt_screen->depth() );
     m_buff = 0;
     setBackgroundMode( NoBackground);
 /*    QImage image = Resource::loadImage("SoundPlayer");
     image = image.smoothScale( width, height );
@@ -58,38 +58,49 @@ XineVideoWidget::XineVideoWidget( int width,
 }
 XineVideoWidget::~XineVideoWidget() {
     delete m_image;
 }
 void XineVideoWidget::clear() {
     m_buff = 0;
-    repaint();
+    repaint(false);
 }
 void XineVideoWidget::paintEvent( QPaintEvent* e ) {
     qWarning("painting");
-    QPainter p(this );
-    p.setBrush( QBrush( Qt::black ) );
-    p.drawRect( rect() );
-    if (m_buff == 0 )
+    if (m_buff == 0 ) {
+	    QPainter p(this );
+	    p.fillRect( rect(), black );
         p.drawImage( 0, 0, *m_image );
-    else {
+        qWarning ( "logo\n" );
+    }
+    else { 
         qWarning("paitnevent\n");
-
-        QDirectPainter dp( this );
-        uchar* dst =  dp.frameBuffer() + (m_yOff + dp.yOffset()  ) * linestep +
-                        (m_xOff + dp.xOffset() )  * m_bytes_per_pixel;
-        uchar* frame = m_buff;
-        for(int  y = 0; y < m_Height; y++ ) {
-            memcpy( dst, frame, m_bytes );
-            frame += m_bytes;
-            dst += linestep;
+        {
+        	
+        	if (( m_thisframe & m_lastframe ) != m_lastframe ) {
+        		QPainter p ( this );
+				p. fillRect ( m_lastframe, black );				
+			}
+		}
+		{
+			QDirectPainter dp ( this );
+			
+			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;
+			}
         }
-        // QVFB hack by MArtin Jones
-//        QPainter dp2(this);
-        //      dp2.fillRect( rect(), QBrush( NoBrush ) );
+        {
+	 		// QVFB hack by MArtin Jones
+			QPainter p ( this );
+			p. fillRect ( m_thisframe, QBrush ( NoBrush ));		
+		}
     }
-//    QWidget::paintEvent( e );
 }
 int XineVideoWidget::height() const{
     return m_image->height();
 }
 int XineVideoWidget::width() const{
     return m_image->width();
@@ -98,33 +109,17 @@ 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 ) {
-/*    if (m_buff != 0 )
-        free(m_buff );
-*/
+                                
+	m_lastframe = m_thisframe;
+	m_thisframe. setRect ( xoffsetXBytes, yoffsetXLine, width, height );
+
     m_buff = image;
-    m_yOff = yoffsetXLine;
-    m_xOff = xoffsetXBytes;
-    m_Width = width;
-    m_Height = height;
     this->linestep = linestep;
     m_bytes = bytes;
     m_bytes_per_pixel = bpp;
-    ////
-    qWarning("width %d  %d", width, height );
-/*    QDirectPainter dp( this );
-    uchar* dst =  dp.frameBuffer() + (m_yOff + dp.yOffset()  ) * linestep +
-                  (m_xOff + dp.xOffset() )  * m_bytes_per_pixel;
-    uchar* frame = m_buff;
-    for(int  y = 0; y < m_Height; y++ ) {
-        memcpy( dst, frame, m_bytes );
-        frame += m_bytes;
-        dst += linestep;
-    }
-    // QVFB hack
-    QPainter dp2(this);
-    dp2.fillRect( rect(), QBrush( NoBrush ) );
-*/
+
+    repaint ( false );
 }
diff --git a/noncore/multimedia/opieplayer2/xinevideowidget.h b/noncore/multimedia/opieplayer2/xinevideowidget.h
index b670fa0..5656194 100644
--- a/noncore/multimedia/opieplayer2/xinevideowidget.h
+++ b/noncore/multimedia/opieplayer2/xinevideowidget.h
@@ -48,12 +48,15 @@ public:
     int width() const;
     int height() const;
     void clear() ;
 protected:
     void paintEvent( QPaintEvent* p );
 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;