Merge ../mlt

[melted] / src / modules / gtk2 / pixops.c

diff --git a/src/modules/gtk2/pixops.c b/src/modules/gtk2/pixops.c
index 5956b6e..05b8292 100644 (file)
--- a/src/modules/gtk2/pixops.c
+++ b/src/modules/gtk2/pixops.c
@@ -1,9 +1,12 @@
 /* GdkPixbuf library - Scaling and compositing functions
  *
- * Copyright (C) 1999 The Free Software Foundation
- *
+ * Original:
+ * Copyright (C) 2000 Red Hat, Inc
  * Author: Owen Taylor <otaylor@redhat.com>
- * Modified for YUV422 by Dan Dennedy <dan@dennedy.org>
+ *
+ * Modification for MLT:
+ * Copyright (C) 2003-2004 Ushodaya Enterprises Limited
+ * Author: Dan Dennedy <dan@dennedy.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,7 +23,7 @@
  * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
  * Boston, MA 02111-1307, USA.
  */
- 
+
 #include <math.h>
 #include <glib.h>
 #include <stdio.h>
@@ -58,8 +61,8 @@ typedef void ( *PixopsPixelFunc ) ( guchar *dest, guint y1, guint cr, guint y2,
 
 
 /* mmx function declarations */
-#ifdef USE_MMX
-guchar *pixops_scale_line_22_33_mmx ( guint32 weights[ 16 ][ 8 ], guchar *p, guchar *q1, guchar *q2, int x_step, guchar *p_stop, int x_init );
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
+guchar *pixops_scale_line_22_yuv_mmx ( guint32 weights[ 16 ][ 8 ], guchar *p, guchar *q1, guchar *q2, int x_step, guchar *p_stop, int x_init, int destx );
 int pixops_have_mmx ( void );
 #endif
 
@@ -102,7 +105,7 @@ pixops_scale_nearest ( guchar *dest_buf,
                const guchar *src = src_buf + ( ( ( i + render_y0 ) * y_step + ( y_step >> 1 ) ) >> SCALE_SHIFT ) * src_rowstride;
                guchar *dest = dest_buf + i * dest_rowstride;
                x = render_x0 * x_step + ( x_step >> 1 );
-               
+
                for ( j = 0; j < ( render_x1 - render_x0 ); j++ )
                {
                        x_scaled = x >> SCALE_SHIFT;
@@ -131,7 +134,7 @@ scale_line ( int *weights, int n_x, int n_y,
                x_scaled = x >> SCALE_SHIFT;
                y_index = x_scaled << 1;
                uv_index = ( ( x_scaled >> 1 ) << 2 ) + ( ( dest_x & 1 ) << 1 ) + 1;
-               
+
                for ( i = 0; i < n_y; i++ )
                {
                        int *line_weights = pixel_weights + n_x * i;
@@ -156,9 +159,9 @@ scale_line ( int *weights, int n_x, int n_y,
        return dest;
 }
 
-#ifdef USE_MMX
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
 static inline guchar *
-scale_line_22_33_mmx_stub ( int *weights, int n_x, int n_y,
+scale_line_22_yuv_mmx_stub ( int *weights, int n_x, int n_y,
                             guchar *dest, int dest_x, guchar *dest_end,
                             guchar **src,
                             int x_init, int x_step, int src_width )
@@ -178,12 +181,12 @@ scale_line_22_33_mmx_stub ( int *weights, int n_x, int n_y,
                mmx_weights[ j ][ 7 ] = 0x00010001 * ( weights[ 4 * j + 3 ] >> 8 );
        }
 
-       return pixops_scale_line_22_33_mmx ( mmx_weights, dest, src[ 0 ], src[ 1 ], x_step, dest_end, x_init );
+       return pixops_scale_line_22_yuv_mmx ( mmx_weights, dest, src[ 0 ], src[ 1 ], x_step, dest_end, x_init, dest_x );
 }
 #endif /* USE_MMX */
 
 static inline guchar *
-scale_line_22_33 ( int *weights, int n_x, int n_y,
+scale_line_22_yuv ( int *weights, int n_x, int n_y,
                    guchar *dest, int dest_x, guchar *dest_end,
                    guchar **src,
                    int x_init, int x_step, int src_width )
@@ -199,7 +202,7 @@ scale_line_22_33 ( int *weights, int n_x, int n_y,
        while ( dest < dest_end )
        {
                int *pixel_weights = weights + ( ( x >> ( SCALE_SHIFT - SUBSAMPLE_BITS ) ) & SUBSAMPLE_MASK ) * 4;
-               
+
                x_scaled = x >> SCALE_SHIFT;
 
                w1 = pixel_weights[ 0 ];
@@ -218,17 +221,19 @@ scale_line_22_33 ( int *weights, int n_x, int n_y,
 
                /* process U/V */
                x_aligned = ( ( x_scaled >> 1 ) << 2 );
+               uv_index = ( ( dest_x & 1 ) << 1 ) + 1;
+
                q0 = src0 + x_aligned;
                q1 = src1 + x_aligned;
-               uv_index = ( ( dest_x & 1 ) << 1 ) + 1;
                p  = w1 * q0[ uv_index ];
-               p += w2 * q0[ uv_index ];
                p += w3 * q1[ uv_index ];
+               p += w2 * q0[ uv_index ];
                p += w4 * q1[ uv_index ];
-               *dest++ = ( p + 0x8000 ) >> SCALE_SHIFT;
 
                x += x_step;
-               dest_x++;
+               dest_x ++;
+
+               *dest++ = ( p + 0x8000 ) >> SCALE_SHIFT;
        }
 
        return dest;
@@ -710,10 +715,10 @@ yuv422_scale ( guchar *dest_buf,
                double scale_y,
                PixopsInterpType interp_type )
 {
-       PixopsFilter filter;
+       PixopsFilter filter = { { 0, 0, 0}, { 0, 0, 0 }, 0 };
        PixopsLineFunc line_func;
 
-#ifdef USE_MMX
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
        gboolean found_mmx = pixops_have_mmx();
 #endif
 
@@ -738,13 +743,16 @@ yuv422_scale ( guchar *dest_buf,
 
        if ( filter.x.n == 2 && filter.y.n == 2 )
        {
-#ifdef USE_MMX
-               if ( 0 && found_mmx )
-                       line_func = scale_line_22_33_mmx_stub;
+#if defined(USE_MMX) && !defined(ARCH_X86_64)
+               if ( found_mmx )
+               {
+                       //fprintf( stderr, "rescale: using mmx\n" );
+                       line_func = scale_line_22_yuv_mmx_stub;
+               }
                else
 #endif
 
-                       line_func = scale_line_22_33;
+                       line_func = scale_line_22_yuv;
        }
        else
                line_func = scale_line;