Changeset 9c08885d924c68f7cd8a84d9cd5ef32f25ba7de1

Timestamp:

02/03/04 13:49:53 (5 years ago)

Author:

Sigmund Augdal Helberg <sigmunau@videolan.org>

git-committer:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1075812593 +0000

git-parent:

[a1fc3b9fcf187db72eb1c43dd418e2b0abe18d2e]

git-author:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1075812593 +0000

Message:

configure.ac:

• define CAN_COMPILE_MMX and CAN_COMPILE_MMXEXT if availabe
  

modules/video_filter/deinterlace/deinterlace.c:

• changed how accelerated code is handled.
  

Files:

• configure.ac (modified) (3 diffs)
• modules/video_filter/deinterlace/deinterlace.c (modified) (9 diffs)

configure.ac

@@ -1 +1 @@
-dnl Autoconf settings for vlc
-8 2004/01/31 16:44:58 rocky
+9 2004/02/03 12:49:53 sigmunau
-
-AC_INIT(vlc,0.7.1-cvs)
@@ -932 +932 @@
-                    ac_cv_mmx_inline=yes, ac_cv_mmx_inline=no)])
-if test "${ac_cv_mmx_inline}" != "no"; then
+  AC_DEFINE(CAN_COMPILE_MMX, 1, Define if \$CC groks MMX inline assembly.)
-  ACCEL_MODULES="${ACCEL_MODULES} ${MMX_MODULES}"
-fi
@@ -941 +942 @@
-                    ac_cv_mmxext_inline=yes, ac_cv_mmxext_inline=no)])
-if test "${ac_cv_mmxext_inline}" != "no"; then
+  AC_DEFINE(CAN_COMPILE_MMXEXT, 1, Define if \$CC groks MMX EXT inline assembly.)
-  ACCEL_MODULES="${ACCEL_MODULES} ${MMXEXT_MODULES}"
-fi

modules/video_filter/deinterlace/deinterlace.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000, 2001, 2002, 2003 VideoLAN
-1 2004/02/01 16:53:11
+2 2004/02/03 12:49:53
- *
- * Author: Sam Hocevar <sam@zoy.org>
@@ -57 +57 @@
-
-static void MergeGeneric ( void *, const void *, const void *, size_t );
+#if defined(CAN_COMPILE_C_ALTIVEC)
-static void MergeAltivec ( void *, const void *, const void *, size_t );
+#endif
+#if defined(CAN_COMPILE_MMX)
-static void MergeMMX     ( void *, const void *, const void *, size_t );
+#endif
+#if defined(CAN_COMPILE_SSE)
-static void MergeSSE2    ( void *, const void *, const void *, size_t );
+#endif
+#if defined(CAN_COMPILE_MMX) || defined(CAN_COMPILE_SSE)
-static void EndMMX       ( void );
+#endif
-
-static int  SendEvents   ( vlc_object_t *, char const *,
@@ -147 +155 @@
-    vlc_mutex_init( p_vout, &p_vout->p_sys->filter_lock );
-
+#if defined(CAN_COMPILE_C_ALTIVEC)
-    if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_ALTIVEC )
-    {
@@ -152 +161 @@
-        p_vout->p_sys->pf_end_merge = NULL;
-    }
+#endif
+#if defined(CAN_COMPILE_SSE)
+    if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2 )
+    {
+        p_vout->p_sys->pf_merge = MergeSSE2;
+        p_vout->p_sys->pf_end_merge = EndMMX;
+    }
+    else
+#endif
+#if defined(CAN_COMPILE_MMX)
-    if( p_vout->p_libvlc->i_cpu & CPU_CAPABILITY_MMX )
-    {
@@ -157 +176 @@
-        p_vout->p_sys->pf_end_merge = EndMMX;
-    }
-
-
-
-
-
+
-    else
-    {
@@ -840 +855 @@
-}
-
+#if defined(CAN_COMPILE_MMX)
-static void MergeMMX( void *_p_dest, const void *_p_s1, const void *_p_s2,
-                      size_t i_bytes )
@@ -866 +882 @@
-    }
-}
-
+
+
+
-static void MergeSSE2( void *_p_dest, const void *_p_s1, const void *_p_s2,
-                       size_t i_bytes )
@@ -893 +911 @@
-    }
-}
-
+
+
+
-static void EndMMX( void )
-{
-    __asm__ __volatile__( "emms" :: );
-}
-
+
+
+
-static void MergeAltivec( void *_p_dest, const void *_p_s1,
-                          const void *_p_s2, size_t i_bytes )
-{
-#ifdef CAN_COMPILE_C_ALTIVEC
-    uint8_t *p_dest = (uint8_t*)_p_dest;
-    const uint8_t *p_s1 = (const uint8_t *)_p_s1;
@@ -931 +952 @@
-        *p_dest++ = ( (uint16_t)(*p_s1++) + (uint16_t)(*p_s2++) ) >> 1;
-    }
+}
-#endif
-}
-
-/*****************************************************************************