Changeset 8b09b55dd76c038d1363ff4827f49f131bd42429

Timestamp:

11/06/02 19:07:57 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1036606077 +0000

git-parent:

[2401b66298e2d714223c9d5f32aa23376a0afc4c]

git-author:

Sam Hocevar <sam@videolan.org> 1036606077 +0000

Message:

• ./modules/access/dvdplay/access.c: activated button highlighting.
  
• ./modules/codec/spudec/parse.c: implemented subtitle cropping and
  temporarily disabled subtitle cropping.
  
• ./modules/codec/spudec/render.c: split RenderSPU into chroma-specific
  functions.
  

Files:

• include/video.h (modified) (4 diffs)
• include/video_output.h (modified) (2 diffs)
• modules/access/dvdplay/access.c (modified) (8 diffs)
• modules/access/dvdplay/dvd.h (modified) (2 diffs)
• modules/access/dvdplay/intf.c (modified) (4 diffs)
• modules/codec/spudec/parse.c (modified) (20 diffs)
• modules/codec/spudec/render.c (modified) (21 diffs)
• modules/codec/spudec/spudec.c (modified) (5 diffs)
• modules/codec/spudec/spudec.h (modified) (5 diffs)
• src/video_output/vout_subpictures.c (modified) (5 diffs)

include/video.h

@@ -5 +5 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-6 2002/07/23 00:39:16
+7 2002/11/06 18:07:57
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -167 +167 @@
-    int             i_type;                                          /* type */
-    int             i_status;                                       /* flags */
-    int             i_size;                                     /* data size */
-    subpicture_t *  p_next;                 /* next subtitle to be displayed */
-
@@ -200 +199 @@
-#endif
-
-
-
+
+
+
-
-    /* Private data - the subtitle plugin might want to put stuff here to
-     * keep track of the subpicture */
-    subpicture_sys_t *p_sys;                              /* subpicture data */
-    void             *p_sys_orig;                 /* pointer before memalign */
-};
-
@@ -217 +216 @@
-#define RESERVED_SUBPICTURE    1                   /* allocated and reserved */
-#define READY_SUBPICTURE       2                        /* ready for display */
-
-
+

include/video_output.h

@@ -6 +6 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-4 2002/10/17 16:03:18
+5 2002/11/06 18:07:57
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -159 +159 @@
-                                                       subpicture_t * );
-
-, int
+
-VLC_EXPORT( void,            vout_DestroySubPicture,  ( vout_thread_t *, subpicture_t * ) );
-VLC_EXPORT( void,            vout_DisplaySubPicture,  ( vout_thread_t *, subpicture_t * ) );

modules/access/dvdplay/access.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-4 2002/10/26 15:24:19 gbazin
+5 2002/11/06 18:07:57 sam
- *
- * Author: St�ane Borel <stef@via.ecp.fr>
@@ -88 +88 @@
-    if( p_dvd == NULL )
-    {
-dvdplay error: 
+
-        return -1;
-    }
@@ -115 +115 @@
-    if( p_dvd->vmg == NULL )
-    {
-dvdplay error: can't open source"
+cannot open %s", psz_source
-        free( p_dvd );
-        return -1;
@@ -185 +185 @@
-    p_input->psz_demux = "dvdplay";
-
+    /* FIXME: we might lose variables here */
+    var_Create( p_input, "x-start", VLC_VAR_INTEGER );
+    var_Create( p_input, "y-start", VLC_VAR_INTEGER );
+    var_Create( p_input, "x-end", VLC_VAR_INTEGER );
+    var_Create( p_input, "y-end", VLC_VAR_INTEGER );
+
+    var_Create( p_input, "color", VLC_VAR_ADDRESS );
+    var_Create( p_input, "contrast", VLC_VAR_ADDRESS );
+
+    var_Create( p_input, "highlight", VLC_VAR_BOOL );
+    var_Create( p_input, "highlight-mutex", VLC_VAR_MUTEX );
+
-    return 0;
-}
@@ -195 +207 @@
-    input_thread_t * p_input = (input_thread_t *)p_this;
-    dvd_data_t *     p_dvd = (dvd_data_t *)p_input->p_access_data;
+
+    var_Destroy( p_input, "highlight-mutex" );
+    var_Destroy( p_input, "highlight" );
+
+    var_Destroy( p_input, "x-start" );
+    var_Destroy( p_input, "x-end" );
+    var_Destroy( p_input, "y-start" );
+    var_Destroy( p_input, "y-end" );
+
+    var_Destroy( p_input, "color" );
+    var_Destroy( p_input, "contrast" );
-
-    /* close libdvdplay */
@@ -351 +374 @@
-    input_thread_t *    p_input;
-    dvd_data_t *        p_dvd;
+    vlc_value_t         val;
-    int                 i;
-
@@ -408 +432 @@
-        break;
-    case NEW_HIGHLIGHT:
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        break;
-    default:
-
-
+
-    }
-
@@ -495 +546 @@
-    return 0;
-}
+

modules/access/dvdplay/dvd.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-1 2002/08/04 17:23:42
+2 2002/11/06 18:07:57
- *
- * Author: St�ane Borel <stef@via.ecp.fr>
@@ -57 +57 @@
-    dvdplay_event_t         event;
-    dvdplay_ctrl_t          control;   
+    dvdplay_highlight_t     hli;
-
-} dvd_data_t;

modules/access/dvdplay/intf.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/10/17 16:03:18
+3 2002/11/06 18:07:57
- *
- * Authors: St�ane Borel <stef@via.ecp.fr>
@@ -34 +34 @@
-#include "stream_control.h"
-#include "input_ext-intf.h"
+#include "input_ext-dec.h"
-
-#include "dvd.h"
@@ -191 +192 @@
-            }
-
-            msg_Dbg( p_intf, "send button coordinates: %dx%d",
-                             p_intf->p_sys->control.mouse.i_x,
-                             p_intf->p_sys->control.mouse.i_y );
-
-            /* we can safely interact with libdvdplay
-             * with the stream lock */
@@ -344 +341 @@
-    vlc_mutex_unlock( &p_intf->change_lock );
-
-
-
-
-
+
+
+

modules/codec/spudec/parse.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-3 2002/10/31 09:40:26 gbazin
+4 2002/11/06 18:07:57 sam
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -45 +45 @@
- * Local prototypes.
- *****************************************************************************/
-
-
+
+
+
+
+
+
+
+
-
-/*****************************************************************************
@@ -52 +58 @@
- *****************************************************************************/
-static inline unsigned int AddNibble( unsigned int i_code,
-8
+int8_t
-{
-    if( *pi_index & 0x1 )
@@ -102 +108 @@
-{
-    subpicture_t * p_spu;
-8     
+int8_t
-    unsigned int   i_offset;
-    mtime_t        i_pts;
@@ -118 +124 @@
-
-    /* Allocate the subpicture internal data. */
-
-
-
+
+
+
+
+
+
+
-    /* Rationale for the "p_spudec->i_rle_size * 4": we are going to
-     * expand the RLE stuff so that we won't need to read nibbles later
-     * on. This will speed things up a lot. Plus, we'll only need to do
-     * this stupid interlacing stuff once. */
-
-
-
+
+
+
+
+
+
-        return;
-    }
-
-    /* Fill the p_spu structure */
+    vlc_mutex_init( p_spudec->p_fifo, &p_spu->p_sys->lock );
+
-    p_spu->pf_render = E_(RenderSPU);
-
+
+
-    p_spu->p_sys->b_palette = VLC_FALSE;
-
@@ -141 +157 @@
-    p_spu->p_sys->pi_alpha[3] = 0x0f;
-
+    p_spu->p_sys->b_crop = VLC_FALSE;
+
-    /* Get display time now. If we do it later, we may miss the PTS. */
-    p_spu->p_sys->i_pts = i_pts;
+
+    /* Attach to our input thread */
+    p_spu->p_sys->p_input = vlc_object_find( p_spudec->p_fifo,
+                                             VLC_OBJECT_INPUT, FIND_PARENT );
+    if( p_spu->p_sys->p_input )
+    {
+        vlc_value_t val;
+
+        if( !var_Get( p_spu->p_sys->p_input, "highlight-mutex", &val ) )
+        {
+            vlc_mutex_t *p_mutex = val.p_address;
+
+            vlc_mutex_lock( p_mutex );
+            UpdateSPU( p_spu, VLC_OBJECT(p_spu->p_sys->p_input) );
+            var_AddCallback( p_spu->p_sys->p_input,
+                             "highlight", CropCallback, p_spu );
+            vlc_mutex_unlock( p_mutex );
+        }
+    }
-
-    /* Allocate the temporary buffer we will parse */
@@ -177 +214 @@
-
-    /* Getting the control part */
-uences
+
-    {
-        /* There was a parse error, delete the subpicture */
@@ -204 +241 @@
-    vout_DisplaySubPicture( p_spudec->p_vout, p_spu );
-
+    /* TODO: do stuff! */
+
-    /* Clean up */
-    free( p_src );
@@ -209 +248 @@
-
-/*****************************************************************************
-uences
+
- *****************************************************************************
- * This is the most important part in SPU decoding. We get dates, palette
@@ -215 +254 @@
- * subtitles format, see http://sam.zoy.org/doc/dvd/subtitles/index.html
- *****************************************************************************/
-uences
+
-                                  subpicture_t * p_spu )
-{
@@ -225 +264 @@
-
-    /* Command and date */
-8
+int8_t
-    mtime_t date = 0;
-
@@ -276 +315 @@
-                 && *(int*)p_spudec->p_fifo->p_demux_data == 0xBeeF )
-            {
-32
+int32_t
-
-                p_spu->p_sys->b_palette = VLC_TRUE;
-                for( i = 0; i < 4 ; i++ )
-                {
-32
+int32_t
-                                p_demux_data + sizeof(int)))[
-                                  GetBits(&p_spudec->bit_stream, 4) ];
@@ -432 +471 @@
- *****************************************************************************/
-static int ParseRLE( spudec_thread_t *p_spudec,
-8
+int8_t
-{
-    unsigned int i_code;
@@ -440 +479 @@
-    unsigned int i_x, i_y;
-
-16 *p_dest = (u16
+int16_t *p_dest = (uint16_t
-
-    /* The subtitles are interlaced, we need two offsets */
@@ -447 +486 @@
-    unsigned int *pi_offset;
-
+#if 0 /* cropping */
-    vlc_bool_t b_empty_top = VLC_TRUE,
-               b_empty_bottom = VLC_FALSE;
-    unsigned int i_skipped_top = 0,
-                 i_skipped_bottom = 0;
+#endif
-
-    /* Colormap statistics */
@@ -514 +555 @@
-            }
-
+#if 0 /* cropping */
-            if( (i_code >> 2) == i_width
-                 && p_spu->p_sys->pi_alpha[ i_code & 0x3 ] == 0x00 )
@@ -542 +584 @@
-                i_skipped_bottom = 0;
-            }
+#else
+            *p_dest++ = i_code;
+#endif
-        }
-
@@ -582 +627 @@
-             p_spu->i_width, p_spu->i_height, p_spu->i_x, p_spu->i_y );
-
+#if 0 /* cropping */
-    /* Crop if necessary */
-    if( i_skipped_top || i_skipped_bottom )
@@ -591 +637 @@
-                 p_spu->i_width, p_spu->i_height, p_spu->i_x, p_spu->i_y );
-    }
+#endif
-
-    /* Handle color if no palette was found */
@@ -652 +699 @@
-}
-
+/*****************************************************************************
+ * DestroySPU: subpicture destructor
+ *****************************************************************************/
+static void DestroySPU( subpicture_t *p_spu )
+{
+    if( p_spu->p_sys->p_input )
+    {
+        /* Detach from our input thread */
+        var_DelCallback( p_spu->p_sys->p_input, "highlight",
+                         CropCallback, p_spu );
+        vlc_object_release( p_spu->p_sys->p_input );
+    }
+
+    vlc_mutex_destroy( &p_spu->p_sys->lock );
+    free( p_spu->p_sys );
+}
+
+/*****************************************************************************
+ * UpdateSPU: update subpicture settings
+ *****************************************************************************
+ * This function is called from CropCallback and at initialization time, to
+ * retrieve crop information from the input.
+ *****************************************************************************/
+static void UpdateSPU( subpicture_t *p_spu, vlc_object_t *p_object )
+{
+    vlc_value_t val;
+
+    if( var_Get( p_object, "highlight", &val ) )
+    {
+        return;
+    }
+
+    p_spu->p_sys->b_crop = val.b_bool;
+    if( !p_spu->p_sys->b_crop )
+    {
+        return;
+    }
+
+    var_Get( p_object, "x-start", &val );
+    p_spu->p_sys->i_x_start = val.i_int;
+    var_Get( p_object, "y-start", &val );
+    p_spu->p_sys->i_y_start = val.i_int;
+    var_Get( p_object, "x-end", &val );
+    p_spu->p_sys->i_x_end = val.i_int;
+    var_Get( p_object, "y-end", &val );
+    p_spu->p_sys->i_y_end = val.i_int;
+
+#if 0
+    if( var_Get( p_object, "color", &val ) == VLC_SUCCESS )
+    {
+        p_spu->p_sys->pi_color[0] = ((uint8_t *)val.p_address)[0];
+        p_spu->p_sys->pi_color[1] = ((uint8_t *)val.p_address)[1];
+        p_spu->p_sys->pi_color[2] = ((uint8_t *)val.p_address)[2];
+        p_spu->p_sys->pi_color[3] = ((uint8_t *)val.p_address)[3];
+    }
+#endif
+
+    if( var_Get( p_object, "contrast", &val ) == VLC_SUCCESS )
+    {
+        p_spu->p_sys->pi_alpha[0] = ((uint8_t *)val.p_address)[0];
+        p_spu->p_sys->pi_alpha[1] = ((uint8_t *)val.p_address)[1];
+        p_spu->p_sys->pi_alpha[2] = ((uint8_t *)val.p_address)[2];
+        p_spu->p_sys->pi_alpha[3] = ((uint8_t *)val.p_address)[3];
+    }
+}
+
+/*****************************************************************************
+ * CropCallback: called when the highlight properties are changed
+ *****************************************************************************
+ * This callback is called from the input thread when we need cropping
+ *****************************************************************************/
+static int CropCallback( vlc_object_t *p_object, char const *psz_var,
+                         vlc_value_t oldval, vlc_value_t newval, void *p_data )
+{
+    UpdateSPU( (subpicture_t *)p_data, p_object );
+
+    return VLC_SUCCESS;
+}
+

modules/codec/spudec/render.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2001 VideoLAN
-2 2002/09/30 18:30:26 titer
+3 2002/11/06 18:07:57 sam
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -45 +45 @@
-
-/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static void RenderI420( vout_thread_t *, picture_t *, const subpicture_t *,
+                        vlc_bool_t );
+static void RenderRV16( vout_thread_t *, picture_t *, const subpicture_t *,
+                        vlc_bool_t );
+static void RenderRV32( vout_thread_t *, picture_t *, const subpicture_t *,
+                        vlc_bool_t );
+static void RenderYUY2( vout_thread_t *, picture_t *, const subpicture_t *,
+                        vlc_bool_t );
+
+/*****************************************************************************
- * RenderSPU: draw an SPU on a picture
- *****************************************************************************
@@ -55 +67 @@
-                    const subpicture_t *p_spu )
-{
+    switch( p_vout->output.i_chroma )
+    {
+        /* I420 target, no scaling */
+        case VLC_FOURCC('I','4','2','0'):
+        case VLC_FOURCC('I','Y','U','V'):
+        case VLC_FOURCC('Y','V','1','2'):
+            RenderI420( p_vout, p_pic, p_spu, p_spu->p_sys->b_crop );
+            break;
+
+        /* RV16 target, scaling */
+        case VLC_FOURCC('R','V','1','6'):
+            RenderRV16( p_vout, p_pic, p_spu, p_spu->p_sys->b_crop );
+            break;
+
+        /* RV32 target, scaling */
+        case VLC_FOURCC('R','V','2','4'):
+        case VLC_FOURCC('R','V','3','2'):
+            RenderRV32( p_vout, p_pic, p_spu, p_spu->p_sys->b_crop );
+            break;
+
+        /* NVidia overlay, no scaling */
+        case VLC_FOURCC('Y','U','Y','2'):
+            RenderYUY2( p_vout, p_pic, p_spu, p_spu->p_sys->b_crop );
+            break;
+
+        default:
+            msg_Err( p_vout, "unknown chroma, can't render SPU" );
+            break;
+    }
+}
+
+/* Following functions are local */
+
+static void RenderI420( vout_thread_t *p_vout, picture_t *p_pic,
+                        const subpicture_t *p_spu, vlc_bool_t b_crop )
+{
-    /* Common variables */
-    u16  p_clut16[4];
-    u32  p_clut32[4];
-    u8  *p_dest;
-    u8  *p_destptr;
@@ -65 +111 @@
-    int i_len, i_color;
-    u16 i_colprecomp, i_destalpha;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-    p_dest = p_pic->Y_PIXELS + p_spu->i_x + p_spu->i_width
-              + p_pic->Y_PITCH * ( p_spu->i_y + p_spu->i_height );
+
+    i_x_start = p_spu->i_width - p_spu->p_sys->i_x_end;
+    i_y_start = p_pic->Y_PITCH * (p_spu->i_height - p_spu->p_sys->i_y_end );
+    i_x_end = p_spu->i_width - p_spu->p_sys->i_x_start;
+    i_y_end = p_pic->Y_PITCH * (p_spu->i_height - p_spu->p_sys->i_y_start );
-
-    /* Draw until we reach the bottom of the subtitle */
@@ -86 +129 @@
-    {
-        /* Draw until we reach the end of the line */
-
+i_x -= i_len 
-        {
-            /* Get the RLE part, then draw the line */
-            i_color = *p_source & 0x3;
-            i_len = *p_source++ >> 2;
+
+            if( b_crop
+                 && ( i_x < i_x_start || i_x > i_x_end
+                       || i_y < i_y_start || i_y > i_y_end ) )
+            {
+                continue;
+            }
-
-            switch( p_spu->p_sys->pi_alpha[i_color] )
@@ -118 +168 @@
-                    }
-                    break;
-
-
-
+
-        }
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* XXX: this is a COMPLETE HACK, memcpy is unable to do u16s anyway */
@@ -147 +208 @@
-              + ( (p_spu->i_x * i_xscale) >> 6 ) * 2
-              + ( (p_spu->i_y * i_yscale) >> 6 ) * p_pic->p->i_pitch;
+
+    i_x_start = i_width - i_xscale * p_spu->p_sys->i_x_end;
+    i_y_start = i_yscale * p_spu->p_sys->i_y_start;
+    i_x_end = i_width - i_xscale * p_spu->p_sys->i_x_start;
+    i_y_end = i_yscale * p_spu->p_sys->i_y_end;
-
-    /* Draw until we reach the bottom of the subtitle */
@@ -161 +227 @@
-
-            /* Draw until we reach the end of the line */
-
+i_x -= i_len 
-            {
-                /* Get the RLE part, then draw the line */
-                i_color = *p_source & 0x3;
+                i_len = i_xscale * ( *p_source++ >> 2 );
+
+                if( b_crop
+                     && ( i_x < i_x_start || i_x > i_x_end
+                           || i_y < i_y_start || i_y > i_y_end ) )
+                {
+                    continue;
+                }
-
-                switch( p_spu->p_sys->pi_alpha[ i_color ] )
-                {
-                case 0x00:
-                    i_x -= i_xscale * ( *p_source++ >> 2 );
-                    break;
-
-                case 0x0f:
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    memset( p_dest - 2 * ( i_x >> 6 ) + i_yreal,
-                            p_clut16[ i_color ],
-                            2 * ( ( i_len >> 6 ) + 1 ) );
-                    i_x -= i_len;
-                    break;
-
-                default:
-                    /* FIXME: we should do transparency */
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    memset( p_dest - 2 * ( i_x >> 6 ) + i_yreal,
-                            p_clut16[ i_color ],
-                            2 * ( ( i_len >> 6 ) + 1 ) );
-
-
-
-
+
+
-            }
-        }
@@ -198 +266 @@
-
-            /* Draw until we reach the end of the line */
-
+i_x -= i_len 
-            {
-                /* Get the RLE part, then draw as many lines as needed */
-                i_color = *p_source & 0x3;
+                i_len = i_xscale * ( *p_source++ >> 2 );
+
+                if( b_crop
+                     && ( i_x < i_x_start || i_x > i_x_end
+                           || i_y < i_y_start || i_y > i_y_end ) )
+                {
+                    continue;
+                }
-
-                switch( p_spu->p_sys->pi_alpha[ i_color ] )
-                {
-                case 0x00:
-                    i_x -= i_xscale * ( *p_source++ >> 2 );
-                    break;
-
-                case 0x0f:
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
-                         i_ytmp += p_pic->p->i_pitch )
@@ -218 +292 @@
-                                2 * ( ( i_len >> 6 ) + 1 ) );
-                    }
-                    i_x -= i_len;
-                    break;
-
-                default:
-                    /* FIXME: we should do transparency */
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
-                         i_ytmp += p_pic->p->i_pitch )
@@ -231 +303 @@
-                                2 * ( ( i_len >> 6 ) + 1 ) );
-                    }
-                    i_x -= i_len;
-                    break;
-                }
@@ -237 +308 @@
-        }
-    }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    /* XXX: this is a COMPLETE HACK, memcpy is unable to do u32s anyway */
@@ -257 +340 @@
-    i_width  = p_spu->i_width  * i_xscale;
-    i_height = p_spu->i_height * i_yscale;
+
+    i_x_start = i_width - i_xscale * p_spu->p_sys->i_x_end;
+    i_y_start = i_yscale * p_spu->p_sys->i_y_start;
+    i_x_end = i_width - i_xscale * p_spu->p_sys->i_x_start;
+    i_y_end = i_yscale * p_spu->p_sys->i_y_end;
-
-    p_dest = p_pic->p->p_pixels + ( i_width >> 6 ) * 4
@@ -276 +364 @@
-
-            /* Draw until we reach the end of the line */
-
+i_x -= i_len 
-            {
-                /* Get the RLE part, then draw the line */
-                i_color = *p_source & 0x3;
+                i_len = i_xscale * ( *p_source++ >> 2 );
+
+                if( b_crop
+                     && ( i_x < i_x_start || i_x > i_x_end
+                           || i_y < i_y_start || i_y > i_y_end ) )
+                {
+                    continue;
+                }
-
-                switch( p_spu->p_sys->pi_alpha[ i_color ] )
-                {
-                case 0x00:
-                    i_x -= i_xscale * ( *p_source++ >> 2 );
-                    break;
-
-                case 0x0f:
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    memset( p_dest - 4 * ( i_x >> 6 ) + i_yreal,
-                            p_clut32[ i_color ], 4 * ( ( i_len >> 6 ) + 1 ) );
-                    i_x -= i_len;
-                    break;
-
-                default:
-                    /* FIXME: we should do transparency */
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    memset( p_dest - 4 * ( i_x >> 6 ) + i_yreal,
-                            p_clut32[ i_color ], 4 * ( ( i_len >> 6 ) + 1 ) );
-
-
-
-
+
+
-            }
-        }
@@ -311 +401 @@
-
-            /* Draw until we reach the end of the line */
-
+i_x -= i_len 
-            {
-                /* Get the RLE part, then draw as many lines as needed */
-                i_color = *p_source & 0x3;
+                i_len = i_xscale * ( *p_source++ >> 2 );
+
+                if( b_crop
+                     && ( i_x < i_x_start || i_x > i_x_end
+                           || i_y < i_y_start || i_y > i_y_end ) )
+                {
+                    continue;
+                }
-
-                switch( p_spu->p_sys->pi_alpha[ i_color ] )
-                {
-                case 0x00:
-                    i_x -= i_xscale * ( *p_source++ >> 2 );
-                    break;
-
-                case 0x0f:
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
-                         i_ytmp += p_pic->p->i_pitch )
@@ -331 +427 @@
-                                4 * ( ( i_len >> 6 ) + 1 ) );
-                    }
-                    i_x -= i_len;
-                    break;
-
-                default:
-                    /* FIXME: we should do transparency */
-                    i_len = i_xscale * ( *p_source++ >> 2 );
-                    for( i_ytmp = i_yreal ; i_ytmp < i_ynext ;
-                         i_ytmp += p_pic->p->i_pitch )
@@ -344 +438 @@
-                                4 * ( ( i_len >> 6 ) + 1 ) );
-                    }
-                    i_x -= i_len;
-                    break;
-                }
@@ -350 +443 @@
-        }
-    }
-
-
-
-
-