Changeset c2633d59c55c65107505aef43331ca0caed76b83

Timestamp:

04/01/04 14:30:07 (4 years ago)

Author:

Eric Petit <titer@videolan.org>

git-committer:

Eric Petit <titer@videolan.org> 1080822607 +0000

git-parent:

[bc138de9f090772a5bf99d93914684e3db151fa6]

git-author:

Eric Petit <titer@videolan.org> 1080822607 +0000

Message:

i420_yuy2.c: fixed AltiVec? conversion for unusual image sizes

Files:

• modules/video_chroma/i420_yuy2.c (modified) (5 diffs)

modules/video_chroma/i420_yuy2.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
-: i420_yuy2.c,v 1.7 2004/01/27 03:22:03 titer Exp 
+
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -166 +166 @@
-    int i_x, i_y;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-#define VEC_NEXT_LINES( ) \
-    p_line1  = p_line2; \
@@ -222 +191 @@
-    vector unsigned char y_vec;
-
-
+
+
-    {
-        /* Width is a multiple of 32, we take 2 lines at a time */
@@ -236 +206 @@
-        }
-    }
-
+
+
-    {
-        /* Width is only a multiple of 16, we take 4 lines at a time */
@@ -267 +238 @@
-        }
-    }
+    else
+    {
+        /* Crap, use the C version */
-#undef VEC_NEXT_LINES
-#undef VEC_LOAD_UV
-#undef VEC_MERGE
+#endif
+
+    const int i_source_margin = p_source->p->i_pitch
+                                 - p_source->p->i_visible_pitch;
+    const int i_dest_margin = p_dest->p->i_pitch
+                               - p_dest->p->i_visible_pitch;
+
+    for( i_y = p_vout->render.i_height / 2 ; i_y-- ; )
+    {
+        p_line1 = p_line2;
+        p_line2 += p_dest->p->i_pitch;
+
+        p_y1 = p_y2;
+        p_y2 += p_source->p[Y_PLANE].i_pitch;
+
+        for( i_x = p_vout->render.i_width / 8 ; i_x-- ; )
+        {
+#if !defined (MODULE_NAME_IS_i420_yuy2_mmx)
+            C_YUV420_YUYV( );
+            C_YUV420_YUYV( );
+            C_YUV420_YUYV( );
+            C_YUV420_YUYV( );
+#else
+            MMX_CALL( MMX_YUV420_YUYV );
+#endif
+        }
+
+        p_y1 += i_source_margin;
+        p_y2 += i_source_margin;
+        p_line1 += i_dest_margin;
+        p_line2 += i_dest_margin;
+    }
+
+#if defined (MODULE_NAME_IS_i420_yuy2_altivec)
+    }
-#endif
-}