adapted to todays xine cvs

2 files changed, 4 insertions, 2 deletions

diff --git a/noncore/multimedia/opieplayer2/nullvideo.c b/noncore/multimedia/opieplayer2/nullvideo.c
index a49f9d3..095f206 100644
--- a/noncore/multimedia/opieplayer2/nullvideo.c
+++ b/noncore/multimedia/opieplayer2/nullvideo.c
@@ -1,246 +1,248 @@
  /*
                             This file is part of the Opie Project
 
                              Copyright (c)  2002 Max Reiss <harlekin@handhelds.org>
                              Copyright (c)  2002 LJP <>
                              Copyright (c)  2002 Holger Freyther <zecke@handhelds.org>
               =.
             .=l.
            .>+-=
  _;:,     .>    :=|.         This program is free software; you can
 .> <`_,   >  .   <=          redistribute it and/or  modify it under
 :`=1 )Y*s>-.--   :           the terms of the GNU General Public
 .="- .-=="i,     .._         License as published by the Free Software
  - .   .-<_>     .<>         Foundation; either version 2 of the License,
      ._= =}       :          or (at your option) any later version.
     .%`+i>       _;_.
     .i_,=:_.      -<s.       This program is distributed in the hope that
      +  .  -:.       =       it will be useful,  but WITHOUT ANY WARRANTY;
     : ..    .:,     . . .    without even the implied warranty of
     =_        +     =;=|`    MERCHANTABILITY or FITNESS FOR A
   _.=:.       :    :=>`:     PARTICULAR PURPOSE. See the GNU
 ..}^=.=       =       ;      Library General Public License for more
 ++=   -.     .`     .:       details.
  :     =  ...= . :.=-
  -.   .:....=;==+<;          You should have received a copy of the GNU
   -_. . .   )=.  =           Library General Public License along with
     --        :-=`           this library; see the file COPYING.LIB.
                              If not, write to the Free Software Foundation,
                              Inc., 59 Temple Place - Suite 330,
                              Boston, MA 02111-1307, USA.
 
 */
 
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <math.h>
 
 #include <xine.h>
 #include <xine/video_out.h>
 #include <xine/xine_internal.h>
 #include <xine/xineutils.h>
 #include <xine/vo_scale.h>
 #include <xine/buffer.h>
 
 #include <pthread.h>
 #include "alphablend.h"
 #include "yuv2rgb.h"
 
 #define printf(x,...)
 
 /*
 #define LOG
 */
 
 /* 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 );
 
 typedef struct null_driver_s null_driver_t;
 
 struct null_driver_s {
   vo_driver_t     vo_driver;
 
   uint32_t             m_capabilities;
   int                  m_show_video;
   int                  m_video_fullscreen;
   int                  m_is_scaling;
 
   int                  depth, bpp, bytes_per_pixel;
   int                  yuv2rgb_mode;
   int                  yuv2rgb_swap;
   int                  yuv2rgb_gamma;
   uint8_t             *yuv2rgb_cmap;
   yuv2rgb_factory_t   *yuv2rgb_factory;
 
   vo_overlay_t        *overlay;
   vo_scale_t           sc;  
 
   int                  gui_width;
   int                  gui_height;
   int                  gui_changed;
 
   double               display_ratio;
   void*                caller;
   display_xine_frame_t frameDis;
 };
 
 typedef struct opie_frame_s opie_frame_t;
 struct opie_frame_s {
   vo_frame_t         frame;
 
   int                format;
   int                flags;
 
   vo_scale_t         sc;
 
   uint8_t           *chunk[3];
 
   uint8_t           *data; /* rgb */
   int                bytes_per_line;
 
   yuv2rgb_t         *yuv2rgb;
   uint8_t           *rgb_dst;
   int                yuv_stride;
   int                stripe_height, stripe_inc;
   
   null_driver_t     *output;
 };
 
 static uint32_t null_get_capabilities( vo_driver_t *self ){   
   null_driver_t* this = (null_driver_t*)self;
   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 ;
 
+  vo_img->copy_called = 1;
+
   if (!frame->output->m_show_video) { 
     /* printf("nullvideo: no video\n");  */
     return; 
   } 
 
   if (frame->format == XINE_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; 
 }
 
 static void null_frame_field (vo_frame_t *vo_img, int which_field) {
 
   opie_frame_t  *frame = (opie_frame_t *) vo_img ;
 
   switch (which_field) {
   case VO_TOP_FIELD:
     frame->rgb_dst    = (uint8_t *)frame->data;
     frame->stripe_inc = 2*frame->stripe_height * frame->bytes_per_line;
     break;
   case VO_BOTTOM_FIELD:
     frame->rgb_dst    = (uint8_t *)frame->data + frame->bytes_per_line ;
     frame->stripe_inc = 2*frame->stripe_height * frame->bytes_per_line;
     break;
   case VO_BOTH_FIELDS:
     frame->rgb_dst    = (uint8_t *)frame->data;
     break;
   }
 }
 
 
 /* take care of the frame*/
 static void null_frame_dispose( vo_frame_t* vo_img){    
   opie_frame_t* frame = (opie_frame_t*)vo_img;
 
   if (frame->data)
     free( frame->data );
   free (frame);
 }
 
 /* end take care of frames*/
 
 static vo_frame_t* null_alloc_frame( vo_driver_t* self ){    
 
   null_driver_t* this = (null_driver_t*)self;
   opie_frame_t* frame;
 
 #ifdef LOG  
   fprintf (stderr, "nullvideo: alloc_frame\n");
 #endif  
 
   frame = (opie_frame_t*)malloc ( sizeof(opie_frame_t) );
   
   memset( frame, 0, sizeof( opie_frame_t) );
   memcpy (&frame->sc, &this->sc, sizeof(vo_scale_t));
   
   pthread_mutex_init (&frame->frame.mutex, NULL);
   
   frame->output = this;
   
   /* initialize the frame*/
   frame->frame.driver = self;
   frame->frame.copy = null_frame_copy;
   frame->frame.field = null_frame_field;
   frame->frame.dispose = null_frame_dispose;
   
   /*
    *    colorspace converter for this frame
    */   
   frame->yuv2rgb = this->yuv2rgb_factory->create_converter (this->yuv2rgb_factory);
   
   return (vo_frame_t*) frame;
 }
 
 static void null_update_frame_format( vo_driver_t* self, vo_frame_t* img,
               uint32_t width, uint32_t height,
               int ratio_code,  int format, int flags ){
   null_driver_t* this = (null_driver_t*) self;
   opie_frame_t*  frame = (opie_frame_t*)img;
   /* not needed now */
 
 #ifdef LOG
   fprintf (stderr, "nullvideo: update_frame_format\n");
 #endif
 
   flags &= VO_BOTH_FIELDS;
 
   /* find out if we need to adapt this frame */
 
   if ((width != frame->sc.delivered_width)
       || (height != frame->sc.delivered_height)
       || (ratio_code != frame->sc.delivered_ratio_code)
       || (flags != frame->flags)
       || (format != frame->format)
       || (this->sc.user_ratio != frame->sc.user_ratio)
       || (this->gui_width != frame->sc.gui_width)
       || (this->gui_height != frame->sc.gui_height)) {
 
     frame->sc.delivered_width      = width;
     frame->sc.delivered_height     = height;
     frame->sc.delivered_ratio_code = ratio_code;
     frame->flags                   = flags;
     frame->format                  = format;
     frame->sc.user_ratio           = this->sc.user_ratio;
     frame->sc.gui_width            = this->gui_width;
     frame->sc.gui_height           = this->gui_height;
     frame->sc.gui_pixel_aspect     = 1.0;
 
     vo_scale_compute_ideal_size ( &frame->sc );
     vo_scale_compute_output_size( &frame->sc );
 
 #ifdef LOG  
     fprintf (stderr, "nullvideo: gui %dx%d delivered %dx%d output %dx%d\n",
        frame->sc.gui_width, frame->sc.gui_height,
        frame->sc.delivered_width, frame->sc.delivered_height,
        frame->sc.output_width, frame->sc.output_height);
 #endif
 
     /*
      * (re-) allocate 
      */
     if( frame->data ) {
diff --git a/noncore/multimedia/opieplayer2/yuv2rgb.c b/noncore/multimedia/opieplayer2/yuv2rgb.c
index e8e86e6..8e34052 100644
--- a/noncore/multimedia/opieplayer2/yuv2rgb.c
+++ b/noncore/multimedia/opieplayer2/yuv2rgb.c
@@ -1082,261 +1082,261 @@ static void scale_line_5_8 (uint8_t *source, uint8_t *dest,
     dest[6] = (1*p2 + 3*p1) >> 2;
     p2 = source[5];
     dest[7] = (5*p1 + 3*p2) >> 3;
     source += 5;
     dest += 8;
   }
 
   if ((width += 8) <= 0) goto done;
   *dest++ = source[0];
   if (--width <= 0) goto done;
   *dest++ = (3*source[0] + 5*source[1]) >> 3;
   if (--width <= 0) goto done;
   *dest++ = (3*source[1] + 1*source[2]) >> 2;
   if (--width <= 0) goto done;
   *dest++ = (1*source[1] + 7*source[2]) >> 3;
   if (--width <= 0) goto done;
   *dest++ = (1*source[2] + 1*source[3]) >> 1;
   if (--width <= 0) goto done;
   *dest++ = (7*source[3] + 1*source[4]) >> 3;
   if (--width <= 0) goto done;
   *dest++ = (1*source[3] + 3*source[4]) >> 2;
 done:
 
   xine_profiler_stop_count(prof_scale_line);
 }
 
 
 /*
  * Interpolates 4 output pixels from 3 source pixels using shifts.
  * Useful for scaling a NTSC svcd input source to 4:3 display format.
  */
 static void scale_line_3_4 (uint8_t *source, uint8_t *dest,
 			    int width, int step) {
 
   int p1, p2;
 
   xine_profiler_start_count(prof_scale_line);
 
   while ((width -= 4) >= 0) {
     p1 = source[0];
     p2 = source[1];
     dest[0] = p1;
     dest[1] = (1*p1 + 3*p2) >> 2;
     p1 = source[2];
     dest[2] = (1*p2 + 1*p1) >> 1;
     p2 = source[3];
     dest[3] = (3*p1 + 1*p2) >> 2;
     source += 3;
     dest += 4;
   }
 
   if ((width += 4) <= 0) goto done;
   *dest++ = source[0];
   if (--width <= 0) goto done;
   *dest++ = (1*source[0] + 3*source[1]) >> 2;
   if (--width <= 0) goto done;
   *dest++ = (1*source[1] + 1*source[2]) >> 1;
 done:
 
   xine_profiler_stop_count(prof_scale_line);
 }
 
 
 /* Interpolate 2 output pixels from one source pixel. */
 
 static void scale_line_1_2 (uint8_t *source, uint8_t *dest,
 			    int width, int step) {
   int p1, p2;
 
   xine_profiler_start_count(prof_scale_line);
 
   p1 = *source;
   while ((width -= 4) >= 0) {
     *dest++ = p1;
     p2 = *++source;
     *dest++ = (p1 + p2) >> 1;
     *dest++ = p2;
     p1 = *++source;
     *dest++ = (p2 + p1) >> 1;
   }
 
   if ((width += 4) <= 0) goto done;
   *dest++ = source[0];
   if (--width <= 0) goto done;
   *dest++ = (source[0] + source[1]) >> 1;
   if (--width <= 0) goto done;
   *dest++ = source[1];
  done:
 
   xine_profiler_stop_count(prof_scale_line);
 }
 
 			
 /*
  * Scale line with no horizontal scaling. For NTSC mpeg2 dvd input in
  * 4:3 output format (720x480 -> 720x540)
  */
 static void scale_line_1_1 (uint8_t *source, uint8_t *dest,
 			    int width, int step) {
 
   xine_profiler_start_count(prof_scale_line);
   xine_fast_memcpy(dest, source, width);
   xine_profiler_stop_count(prof_scale_line);
 }
 
 			
 static scale_line_func_t find_scale_line_func(int step) {
   static struct {
     int			src_step;
     int			dest_step;
     scale_line_func_t	func;
     char	       *desc;
   } scale_line[] = {
     { 15, 16, scale_line_15_16, "dvd 4:3(pal)" },
     { 45, 64, scale_line_45_64, "dvd 16:9(pal), fullscreen(1024x768)" },
     {  9, 16, scale_line_9_16,  "dvd fullscreen(1280x1024)" },
     { 45, 53, scale_line_45_53, "dvd 16:9(ntsc)" },
     { 11, 12, scale_line_11_12, "vcd 4:3(pal)" },
     { 11, 24, scale_line_11_24, "vcd 4:3(pal) 2*zoom" },
     {  5,  8, scale_line_5_8,   "svcd 4:3(pal)" },
     {  3,  4, scale_line_3_4,   "svcd 4:3(ntsc)" },
     {  1,  2, scale_line_1_2,   "2*zoom" },
     {  1,  1, scale_line_1_1,   "non-scaled" },
   };
   int i;
 
   for (i = 0; i < sizeof(scale_line)/sizeof(scale_line[0]); i++) {
     if (step == scale_line[i].src_step*32768/scale_line[i].dest_step) {
-      printf("yuv2rgb: using %s optimized scale_line\n", scale_line[i].desc);
+	//printf("yuv2rgb: using %s optimized scale_line\n", scale_line[i].desc);
       return scale_line[i].func;
     }
   }
-  printf("yuv2rgb: using generic scale_line with interpolation\n");
+  //printf("yuv2rgb: using generic scale_line with interpolation\n");
   return scale_line_gen;
 
 }
 
 
 static void scale_line_2 (uint8_t *source, uint8_t *dest,
 			  int width, int step) {
   int p1;
   int p2;
   int dx;
 
   p1 = *source; source+=2;
   p2 = *source; source+=2;
   dx = 0;
 
   while (width) {
 
     *dest = (p1 * (32768 - dx) + p2 * dx) / 32768;
 
     dx += step;
     while (dx > 32768) {
       dx -= 32768;
       p1 = p2;
       p2 = *source;
       source+=2;
     }
 
     dest ++;
     width --;
   }
 }
 
 static void scale_line_4 (uint8_t *source, uint8_t *dest,
 			  int width, int step) {
   int p1;
   int p2;
   int dx;
 
   p1 = *source; source+=4;
   p2 = *source; source+=4;
   dx = 0;
 
   while (width) {
 
     *dest = (p1 * (32768 - dx) + p2 * dx) / 32768;
 
     dx += step;
     while (dx > 32768) {
       dx -= 32768;
       p1 = p2;
       p2 = *source;
       source+=4;
     }
 
     dest ++;
     width --;
   }
 }
 
 
 #define RGB(i)							\
 	U = pu[i];						\
 	V = pv[i];						\
 	r = this->table_rV[V];					\
 	g = (void *) (((uint8_t *)this->table_gU[U]) + this->table_gV[V]);	\
 	b = this->table_bU[U];
 
 #define DST1(i)					\
 	Y = py_1[2*i];                          \
 	dst_1[2*i] = r[Y] + g[Y] + b[Y];	\
 	Y = py_1[2*i+1];			\
 	dst_1[2*i+1] = r[Y] + g[Y] + b[Y];
 
 #define DST2(i)					\
 	Y = py_2[2*i];				\
 	dst_2[2*i] = r[Y] + g[Y] + b[Y];	\
 	Y = py_2[2*i+1];			\
 	dst_2[2*i+1] = r[Y] + g[Y] + b[Y];
 
 #define DST1RGB(i)							\
 	Y = py_1[2*i];							\
 	dst_1[6*i] = r[Y]; dst_1[6*i+1] = g[Y]; dst_1[6*i+2] = b[Y];	\
 	Y = py_1[2*i+1];						\
 	dst_1[6*i+3] = r[Y]; dst_1[6*i+4] = g[Y]; dst_1[6*i+5] = b[Y];
 
 #define DST2RGB(i)							\
 	Y = py_2[2*i];							\
 	dst_2[6*i] = r[Y]; dst_2[6*i+1] = g[Y]; dst_2[6*i+2] = b[Y];	\
 	Y = py_2[2*i+1];						\
 	dst_2[6*i+3] = r[Y]; dst_2[6*i+4] = g[Y]; dst_2[6*i+5] = b[Y];
 
 #define DST1BGR(i)							\
 	Y = py_1[2*i];							\
 	dst_1[6*i] = b[Y]; dst_1[6*i+1] = g[Y]; dst_1[6*i+2] = r[Y];	\
 	Y = py_1[2*i+1];						\
 	dst_1[6*i+3] = b[Y]; dst_1[6*i+4] = g[Y]; dst_1[6*i+5] = r[Y];
 
 #define DST2BGR(i)							\
 	Y = py_2[2*i];							\
 	dst_2[6*i] = b[Y]; dst_2[6*i+1] = g[Y]; dst_2[6*i+2] = r[Y];	\
 	Y = py_2[2*i+1];						\
 	dst_2[6*i+3] = b[Y]; dst_2[6*i+4] = g[Y]; dst_2[6*i+5] = r[Y];
 
 #define DST1CMAP(i)							\
 	Y = py_1[2*i];                          			\
 	dst_1[2*i] = this->cmap[r[Y] + g[Y] + b[Y]];		\
 	Y = py_1[2*i+1];						\
 	dst_1[2*i+1] = this->cmap[r[Y] + g[Y] + b[Y]];
 
 #define DST2CMAP(i)							\
 	Y = py_2[2*i];							\
 	dst_2[2*i] = this->cmap[r[Y] + g[Y] + b[Y]];		\
 	Y = py_2[2*i+1];						\
 	dst_2[2*i+1] = this->cmap[r[Y] + g[Y] + b[Y]];
 
 static void yuv2rgb_c_32 (yuv2rgb_t *this, uint8_t * _dst,
 			  uint8_t * _py, uint8_t * _pu, uint8_t * _pv)
 {
   int U, V, Y;
   uint8_t  * py_1, * py_2, * pu, * pv;
   uint32_t * r, * g, * b;
   uint32_t * dst_1, * dst_2;
   int width, height, dst_height;
   int dy;
 
   if (this->do_scale) {
     scale_line_func_t scale_line = this->scale_line;