[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[120] mplayerxp

[<nic...@us...>]

Revision: 120
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=120&view=rev
Author:   nickols_k
Date:     2010-01-23 13:25:30 +0000 (Sat, 23 Jan 2010)

Log Message:
-----------
cleanups

Modified Paths:
--------------
    NEWS
    functions
    mplayerxp/configure
    mplayerxp/pvector/pvector_f32_x86.h
    mplayerxp/sig_hand.c

Modified: NEWS
===================================================================
--- NEWS	2010-01-22 16:43:32 UTC (rev 119)
+++ NEWS	2010-01-23 13:25:30 UTC (rev 120)
@@ -2,8 +2,9 @@
 
 Version 0.8
 
-* significand acceleration of playback. Now it can scale 640x480->2000x1500 at 25 FPS in real-time without
-  framedropping with using of non-accelerated '-vo x11' driver on Quad-Core AMD Phenom-9550 running at 2.2GHz
+* significand acceleration of playback. Now 64-bit version can scale 640x480 up to 2000x1500+ at 25 FPS
+  in real-time without framedropping with using of non-accelerated '-vo x11' driver
+  on Quad-Core AMD Phenom-9550 running at 2.2GHz
 * project migrated from CVS on SVN
 * Redesigned internal architecture of the player (now it being building statically with all internal libs)
 * new configure script

Modified: functions
===================================================================
--- functions	2010-01-22 16:43:32 UTC (rev 119)
+++ functions	2010-01-23 13:25:30 UTC (rev 120)
@@ -1149,45 +1149,26 @@
 #check_cflags "-fno-tree-vectorize"
 
 disable mmx_test
-x86_32 && enable mmx_test
-def_mmx=
-def_mmx2=
-def_3dnow=
-def_3dnow2=
-def_sse=
-def_sse2=
-def_sse3=
-def_ssse3=
-def_sse3=
-def_avx=
+x86 && enable mmx_test
+
 if enabled mmx_test ; then
-check_cflags -mmmx	&& def_mmx='#define CAN_COMPILE_MMX 1'
-check_cflags -m3dnow	&& def_3dnow='#define CAN_COMPILE_3DNOW 1'
-check_cflags -msse	&& def_sse='#define CAN_COMPILE_SSE 1'
-check_cflags -msse2	&& def_sse2='#define CAN_COMPILE_SSE2 1'
-check_cflags -msse3	&& def_sse3='#define CAN_COMPILE_SSE3 1'
-check_cflags -mssse3	&& def_ssse3='#define CAN_COMPILE_SSSE3 1'
-check_cflags -msse4	&& def_sse4='#define CAN_COMPILE_SSE4 1'
-check_cflags -mavx	&& def_avx='#define CAN_COMPILE_AVX 1'
+check_cflags -mmmx
+check_cflags -m3dnow
+check_cflags -msse
+check_cflags -msse2
+check_cflags -msse3
+check_cflags -mssse3
+check_cflags -msse4
+check_cflags -mpclmul
+check_cflags -maes
+check_cflags -mavx
 fpu_clob='#define FPU_CLOBBERED "st","st(1)","st(2)","st(3)","st(4)","st(5)","st(6)","st(7)"'
 mmx_clob='#define MMX_CLOBBERED "mm0","mm1","mm2","mm3","mm4","mm5","mm6","mm7"'
 sse_clob='#define SSE_CLOBBERED "xmm0","xmm1","xmm2","xmm3","xmm4","xmm5","xmm6","xmm7"'
 fi
-if test -n "$def_3dnow" || test -n "$def_sse" ; then
-def_mmx2='#define CAN_COMPILE_MMX2 1'
-fi
 
 cat >> $config_h << EOF
 /* Extension defines */
-$def_mmx
-$def_mmx2
-$def_3dnow
-$def_sse
-$def_sse2
-$def_sse3
-$def_ssse3
-$def_sse4
-$def_avx
 $fpu_clob
 $mmx_clob
 $sse_clob

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2010-01-22 16:43:32 UTC (rev 119)
+++ mplayerxp/configure	2010-01-23 13:25:30 UTC (rev 120)
@@ -358,7 +358,7 @@
 ffmpeg_args="--enable-static --disable-shared --disable-doc --disable-ffmpeg --disable-ffplay --disable-ffserver --enable-postproc --enable-gpl --enable-pthreads"
 if test -n $host ; then
 _arch=$host_arch
-x86_32 && _arch="x86_32"
+x86_32 && _arch="i686"
 x86_64 && _arch="x86_64"
 ffmpeg_args="--arch=$_arch $ffmpeg_args"
 fi

Modified: mplayerxp/pvector/pvector_f32_x86.h
===================================================================
--- mplayerxp/pvector/pvector_f32_x86.h	2010-01-22 16:43:32 UTC (rev 119)
+++ mplayerxp/pvector/pvector_f32_x86.h	2010-01-23 13:25:30 UTC (rev 120)
@@ -174,9 +174,9 @@
 PVECTOR_RENAME(f32_to_s32u)(void *dst,__f32vec src)
 {
 #ifdef OPTIMIZE_AVX
-    return _mm256_storeu_si256(dst,_mm256_cvtps_epi32(src));
+    _mm256_storeu_si256(dst,_mm256_cvtps_epi32(src));
 #elif defined( OPTIMIZE_SSE2 )
-    return _mm_storeu_si128(dst,_mm_cvtps_epi32(src));
+    _mm_storeu_si128(dst,_mm_cvtps_epi32(src));
 #elif defined( OPTIMIZE_SSE )
     __m128 tmp;
     *(__m64 *)dst = _mm_cvtps_pi32(src);
@@ -194,7 +194,7 @@
 PVECTOR_RENAME(f32_to_s32a)(void *dst,__f32vec src)
 {
 #ifdef OPTIMIZE_AVX
-    return _mm256_store_si256(dst,_mm256_cvtps_epi32(src));
+    _mm256_store_si256(dst,_mm256_cvtps_epi32(src));
 #elif defined( OPTIMIZE_SSE2 )
     _mm_store_si128(dst,_mm_cvtps_epi32(src));
 #elif defined( OPTIMIZE_SSE )
@@ -213,7 +213,7 @@
 PVECTOR_RENAME(f32_to_s32_stream)(void *dst,__f32vec src)
 {
 #ifdef OPTIMIZE_AVX
-    return _mm256_stream_si256(dst,_mm256_cvtps_epi32(src));
+    _mm256_stream_si256(dst,_mm256_cvtps_epi32(src));
 #elif defined( OPTIMIZE_SSE2 )
     _mm_stream_si128(dst,_mm_cvtps_epi32(src));
 #elif defined( OPTIMIZE_SSE )

Modified: mplayerxp/sig_hand.c
===================================================================
--- mplayerxp/sig_hand.c	2010-01-22 16:43:32 UTC (rev 119)
+++ mplayerxp/sig_hand.c	2010-01-23 13:25:30 UTC (rev 120)
@@ -1,8 +1,9 @@
 /*
   MplayerXP's Signal handling
 */
-
+#ifndef _GNU_SOURCE
 #define _GNU_SOURCE   /* to get definition of strsignal */
+#endif
 #include <string.h>
 #include <stdio.h>
 #include <signal.h>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.