Changeset b3e689d0e60cffe1d8c4406e2a280d8c0ba83c1a

Timestamp:

26/01/04 17:54:56 (5 years ago)

Author:

Eric Petit <titer@videolan.org>

git-committer:

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

git-parent:

[d47b33f38a60ffe3a781e9b04d25ff9434b1f424]

git-author:

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

Message:

+ All: added Altivec-optimized i420 to yuy2 conversion. It isn't used

yet as Quicktime handles i420 pictures, but it will be when I've
cleaned the OpenGL output I'm working on (to be commited soon).

Files:

• configure.ac (modified) (3 diffs)
• modules/video_chroma/Modules.am (modified) (1 diff)
• modules/video_chroma/i420_yuy2.c (modified) (11 diffs)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-59 2004/01/26 10:35:28 gbazin
+60 2004/01/26 16:54:56 titer
-
-AC_INIT(vlc,0.7.1-cvs)
@@ -914 +914 @@
-THREEDNOW_MODULES="memcpy3dn"
-SSE_MODULES=""
-
+ i420_yuy2_altivec
-#ALTIVEC_MODULES="${ALTIVEC_MODULES} idctaltivec motionaltivec"
-
@@ -996 +996 @@
-if test "${ac_cv_c_altivec}" != "no"; then
-  AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
-
+ i420_yuy2_altivec
-  ACCEL_MODULES="${ACCEL_MODULES} ${ALTIVEC_MODULES}"
-fi

modules/video_chroma/Modules.am

@@ -24 +24 @@
-    $(NULL)
-
+SOURCES_i420_yuy2_altivec = \
+    i420_yuy2.c \
+    i420_yuy2.h \
+    $(NULL)
+
-SOURCES_i422_yuy2 = \
-    i422_yuy2.c \

modules/video_chroma/i420_yuy2.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001 VideoLAN
-5 2004/01/25 17:20:18 kuehne
+6 2004/01/26 16:54:56 titer
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -37 +37 @@
-#if defined (MODULE_NAME_IS_i420_yuy2)
-#    define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,IUYV,cyuv,Y211"
-se
+if defined (MODULE_NAME_IS_i420_yuy2_mmx)
-#    define DEST_FOURCC "YUY2,YUNV,YVYU,UYVY,UYNV,Y422,IUYV,cyuv"
+#elif defined (MODULE_NAME_IS_i420_yuy2_altivec)
+#    define DEST_FOURCC "YUY2,YUNV"
-#endif
-
@@ -47 +49 @@
-
-static void I420_YUY2           ( vout_thread_t *, picture_t *, picture_t * );
+#if !defined (MODULE_NAME_IS_i420_yuy2_altivec)
-static void I420_YVYU           ( vout_thread_t *, picture_t *, picture_t * );
-static void I420_UYVY           ( vout_thread_t *, picture_t *, picture_t * );
-static void I420_IUYV           ( vout_thread_t *, picture_t *, picture_t * );
-static void I420_cyuv           ( vout_thread_t *, picture_t *, picture_t * );
+#endif
-#if defined (MODULE_NAME_IS_i420_yuy2)
-static void I420_Y211           ( vout_thread_t *, picture_t *, picture_t * );
@@ -74 +78 @@
-    i_00ffw = 0x00ff00ff00ff00ffULL;
-    i_80w   = 0x0000000080808080ULL;
+#elif defined (MODULE_NAME_IS_i420_yuy2_altivec)
+    set_description(
+            _("Altivec conversions from " SRC_FOURCC " to " DEST_FOURCC) );
+    set_capability( "chroma", 100 );
+    add_requirement( ALTIVEC );
-#endif
-    set_callbacks( Activate, NULL );
@@ -104 +113 @@
-                    break;
-
+#if !defined (MODULE_NAME_IS_i420_yuy2_altivec)
-                case VLC_FOURCC('Y','V','Y','U'):
-                    p_vout->chroma.pf_convert = I420_YVYU;
@@ -121 +131 @@
-                    p_vout->chroma.pf_convert = I420_cyuv;
-                    break;
+#endif
-
-#if defined (MODULE_NAME_IS_i420_yuy2)
@@ -160 +171 @@
-                               - p_dest->p->i_visible_pitch;
-
+#if defined (MODULE_NAME_IS_i420_yuy2_altivec)
+    vector unsigned char u_vec;
+    vector unsigned char v_vec;
+    vector unsigned char uv_vec;
+    vector unsigned char y_vec;
+    int high = 1;
+#endif
+
-    for( i_y = p_vout->render.i_height / 2 ; i_y-- ; )
-    {
@@ -168 +187 @@
-        p_y2 += p_source->p[Y_PLANE].i_pitch;
-
+#if defined (MODULE_NAME_IS_i420_yuy2_altivec)
+        /* FIXME Thats only works for sizes multiple of 16 */
+        for( i_x = p_vout->render.i_width / 16 ; i_x-- ; )
+        {
+            if( high )
+            {
+                u_vec = vec_ld( 0, p_u ); p_u += 16;
+                v_vec = vec_ld( 0, p_v ); p_v += 16;
+                uv_vec = vec_mergeh( u_vec, v_vec );
+            }
+            else
+            {
+                uv_vec = vec_mergel( u_vec, v_vec );
+            }
+            y_vec = vec_ld( 0, p_y1 ); p_y1 += 16;
+            vec_st( vec_mergeh( y_vec, uv_vec ), 0, p_line1 ); p_line1 += 16;
+            vec_st( vec_mergel( y_vec, uv_vec ), 0, p_line1 ); p_line1 += 16;
+            y_vec = vec_ld( 0, p_y2 ); p_y2 += 16;
+            vec_st( vec_mergeh( y_vec, uv_vec ), 0, p_line2 ); p_line2 += 16;
+            vec_st( vec_mergel( y_vec, uv_vec ), 0, p_line2 ); p_line2 += 16;
+            high = !high;
+        }
+#else
-        for( i_x = p_vout->render.i_width / 8 ; i_x-- ; )
-        {
@@ -179 +221 @@
-#endif
-        }
+#endif
-
-        p_y1 += i_source_margin;
@@ -190 +233 @@
- * I420_YVYU: planar YUV 4:2:0 to packed YVYU 4:2:2
- *****************************************************************************/
+#if !defined (MODULE_NAME_IS_i420_yuy2_altivec)
-static void I420_YVYU( vout_thread_t *p_vout, picture_t *p_source,
-                                              picture_t *p_dest )
@@ -335 +379 @@
-    }
-}
+#endif // !defined (MODULE_NAME_IS_i420_yuy2_altivec)
-
-/*****************************************************************************