January 2009 - MPlayer-cvslog - lists.mplayerhq.hu

r23524 - trunk/etc/codecs.conf
by compn 10 Jun '10

10 Jun '10

Author: compn Date: Sat Jun 9 00:59:04 2007 New Revision: 23524 Log: add mmes fourcc for mpeg2 in avi files Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Sat Jun 9 00:59:04 2007 @@ -58,6 +58,7 @@ videocodec mpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver libmpeg2 ; dll "libmpeg2" out YV12,I420,IYUV @@ -85,6 +86,7 @@ videocodec ffmpeg2 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpeg2video" out YV12,I420,IYUV @@ -104,6 +106,7 @@ videocodec ffmpeg12 fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo" out YV12,I420,IYUV @@ -122,6 +125,7 @@ videocodec ffmpeg12mc fourcc MPEG fourcc hdv3 ; HDV 1080i50 fourcc mx5p ; MPEG IMX 625/50 (50 Mb/s) + fourcc MMES,mmes ; matrox mpeg2 in avi driver ffmpeg dll "mpegvideo_xvmc" out IDCT_MPEG2

4 5

r28039 - trunk/etc/codecs.conf
by diego 04 Sep '09

04 Sep '09

Author: diego Date: Wed Nov 26 14:04:10 2008 New Revision: 28039 Log: Update Tremor comment regarding fixed-point mode. Modified: trunk/etc/codecs.conf Modified: trunk/etc/codecs.conf ============================================================================== --- trunk/etc/codecs.conf (original) +++ trunk/etc/codecs.conf Wed Nov 26 14:04:10 2008 @@ -3494,7 +3494,7 @@ audiocodec vorbis audiocodec tremor info "OggVorbis audio decoder" status working - comment "OggVorbis fixed-point decoder useful for ARM based systems" + comment "fixed-point decoder useful systems without floating-point unit" fourcc vrbs format 0x566F driver tremor

4 3

r26345 - trunk/libao2/ao_sun.c
by reimar 08 Mar '09

08 Mar '09

Author: reimar Date: Mon Apr 7 19:39:41 2008 New Revision: 26345 Log: reset() should not senselessly close and reopen the device but instead just call flush_audio() Modified: trunk/libao2/ao_sun.c Modified: trunk/libao2/ao_sun.c ============================================================================== --- trunk/libao2/ao_sun.c (original) +++ trunk/libao2/ao_sun.c Mon Apr 7 19:39:41 2008 @@ -588,29 +588,7 @@ static void uninit(int immed){ // stop playing and empty buffers (for seeking/pause) static void reset(void){ - audio_info_t info; - - uninit(1); - audio_fd=open(audio_dev, O_WRONLY); - if(audio_fd<0){ - mp_msg(MSGT_AO, MSGL_FATAL, MSGTR_AO_SUN_CantReopenReset, strerror(errno)); - return; - } - - ioctl(audio_fd, AUDIO_DRAIN, 0); - - AUDIO_INITINFO(&info); - info.play.encoding = af2sunfmt(ao_data.format); - info.play.precision = - (ao_data.format==AF_FORMAT_S16_NE - ? AUDIO_PRECISION_16 - : AUDIO_PRECISION_8); - info.play.channels = ao_data.channels; - info.play.sample_rate = ao_data.samplerate; - info.play.samples = 0; - info.play.eof = 0; - info.play.error = 0; - ioctl (audio_fd, AUDIO_SETINFO, &info); + flush_audio(audio_fd); queued_bursts = 0; queued_samples = 0; }

4 4

r28360 - in trunk: Makefile mencoder.c mpcommon.c mpcommon.h mplayer.c version.sh
by diego 22 Feb '09

22 Feb '09

Author: diego Date: Sun Jan 25 21:35:58 2009 New Revision: 28360 Log: Factorize print_version(). Modified: trunk/Makefile trunk/mencoder.c trunk/mpcommon.c trunk/mpcommon.h trunk/mplayer.c trunk/version.sh Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Sun Jan 25 21:10:36 2009 (r28359) +++ trunk/Makefile Sun Jan 25 21:35:58 2009 (r28360) @@ -848,7 +848,7 @@ version.h: ###### dependency declarations / specific CFLAGS ###### codec-cfg.d: codecs.conf.h -mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h +mpcommon.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h $(DEPS): help_mp.h libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS) Modified: trunk/mencoder.c ============================================================================== --- trunk/mencoder.c Sun Jan 25 21:10:36 2009 (r28359) +++ trunk/mencoder.c Sun Jan 25 21:35:58 2009 (r28360) @@ -36,13 +36,9 @@ #include <sys/time.h> - -#include "version.h" #include "mp_msg.h" #include "help_mp.h" -#include "cpudetect.h" - #include "codec-cfg.h" #include "m_option.h" #include "m_config.h" @@ -421,40 +417,7 @@ user_correct_pts = 0; // Preparse the command line m_config_preparse_command_line(mconfig,argc,argv); - mp_msg(MSGT_CPLAYER,MSGL_INFO, "MEncoder " VERSION " (C) 2000-2009 MPlayer Team\n"); - - /* Test for cpu capabilities (and corresponding OS support) for optimizing */ - GetCpuCaps(&gCpuCaps); -#if ARCH_X86 - mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: Type: %d MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", - gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2, - gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, - gCpuCaps.hasSSE, gCpuCaps.hasSSE2); -#ifdef RUNTIME_CPUDETECT - mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection); -#else - mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions); -#if HAVE_MMX - mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX"); -#endif -#if HAVE_MMX2 - mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2"); -#endif -#if HAVE_3DNOW - mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow"); -#endif -#if HAVE_3DNOWEX - mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx"); -#endif -#if HAVE_SSE - mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE"); -#endif -#if HAVE_SSE2 - mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2"); -#endif - mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n"); -#endif -#endif + print_version("MEncoder"); #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) set_path_env(); Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Sun Jan 25 21:10:36 2009 (r28359) +++ trunk/mpcommon.c Sun Jan 25 21:35:58 2009 (r28360) @@ -5,7 +5,11 @@ #include "mplayer.h" #include "libvo/sub.h" #include "libvo/video_out.h" +#include "cpudetect.h" +#include "help_mp.h" +#include "mp_msg.h" #include "spudec.h" +#include "version.h" #include "vobsub.h" #ifdef CONFIG_TV_TELETEXT #include "stream/tv.h" @@ -24,6 +28,47 @@ ass_track_t* ass_track = 0; // current t sub_data* subdata = NULL; subtitle* vo_sub_last = NULL; + +void print_version(const char* name) +{ + mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name); + + /* Test for CPU capabilities (and corresponding OS support) for optimizing */ + GetCpuCaps(&gCpuCaps); +#if ARCH_X86 + mp_msg(MSGT_CPLAYER, MSGL_V, + "CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", + gCpuCaps.hasMMX, gCpuCaps.hasMMX2, + gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, + gCpuCaps.hasSSE, gCpuCaps.hasSSE2); +#ifdef RUNTIME_CPUDETECT + mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithRuntimeDetection); +#else + mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithCPUExtensions); +#if HAVE_MMX + mp_msg(MSGT_CPLAYER,MSGL_V," MMX"); +#endif +#if HAVE_MMX2 + mp_msg(MSGT_CPLAYER,MSGL_V," MMX2"); +#endif +#if HAVE_3DNOW + mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow"); +#endif +#if HAVE_3DNOWEX + mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowEx"); +#endif +#if HAVE_SSE + mp_msg(MSGT_CPLAYER,MSGL_V," SSE"); +#endif +#if HAVE_SSE2 + mp_msg(MSGT_CPLAYER,MSGL_V," SSE2"); +#endif + mp_msg(MSGT_CPLAYER,MSGL_V,"\n"); +#endif /* RUNTIME_CPUDETECT */ +#endif /* ARCH_X86 */ +} + + void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset) { unsigned char *packet=NULL; Modified: trunk/mpcommon.h ============================================================================== --- trunk/mpcommon.h Sun Jan 25 21:10:36 2009 (r28359) +++ trunk/mpcommon.h Sun Jan 25 21:35:58 2009 (r28360) @@ -8,6 +8,8 @@ extern double sub_last_pts; extern struct ass_track_s *ass_track; extern subtitle *vo_sub_last; + +void print_version(const char* name); void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset); void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset); int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang); Modified: trunk/mplayer.c ============================================================================== --- trunk/mplayer.c Sun Jan 25 21:10:36 2009 (r28359) +++ trunk/mplayer.c Sun Jan 25 21:35:58 2009 (r28360) @@ -36,8 +36,6 @@ #include <errno.h> -#include "version.h" - #include "mp_msg.h" #define HELP_MP_DEFINE_STATIC @@ -74,8 +72,6 @@ #include "osdep/getch2.h" #include "osdep/timer.h" -#include "cpudetect.h" - #ifdef CONFIG_GUI #include "gui/interface.h" #endif @@ -2396,43 +2392,6 @@ static void pause_loop(void) #endif } -void print_version(void){ - mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s\n", MP_TITLE); - -/* Test for CPU capabilities (and corresponding OS support) for optimizing */ - GetCpuCaps(&gCpuCaps); -#if ARCH_X86 - mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n", - gCpuCaps.hasMMX,gCpuCaps.hasMMX2, - gCpuCaps.has3DNow, gCpuCaps.has3DNowExt, - gCpuCaps.hasSSE, gCpuCaps.hasSSE2); -#ifdef RUNTIME_CPUDETECT - mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection); -#else - mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions); -#if HAVE_MMX - mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX"); -#endif -#if HAVE_MMX2 - mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2"); -#endif -#if HAVE_3DNOW - mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow"); -#endif -#if HAVE_3DNOWEX - mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx"); -#endif -#if HAVE_SSE - mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE"); -#endif -#if HAVE_SSE2 - mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2"); -#endif - mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n"); -#endif /* RUNTIME_CPUDETECT */ -#endif /* ARCH_X86 */ -} - // Find the right mute status and record position for new file position static void edl_seek_reset(MPContext *mpctx) @@ -2570,7 +2529,7 @@ int gui_no_filename=0; // Preparse the command line m_config_preparse_command_line(mconfig,argc,argv); - print_version(); + print_version("MPlayer"); #if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL) set_path_env(); #endif Modified: trunk/version.sh ============================================================================== --- trunk/version.sh Sun Jan 25 21:10:36 2009 (r28359) +++ trunk/version.sh Sun Jan 25 21:35:58 2009 (r28360) @@ -9,7 +9,7 @@ test $svn_revision || svn_revision=UNKNO NEW_REVISION="#define VERSION \"dev-SVN-r${svn_revision}${extra}\"" OLD_REVISION=`cat version.h 2> /dev/null` -TITLE="#define MP_TITLE \"MPlayer dev-SVN-r${svn_revision}${extra} (C) 2000-2009 MPlayer Team\"" +TITLE="#define MP_TITLE \"%s dev-SVN-r${svn_revision}${extra} (C) 2000-2009 MPlayer Team\\\n\"" # Update version.h only on revision changes to avoid spurious rebuilds if test "$NEW_REVISION" != "$OLD_REVISION"; then

5 9

r28370 - in trunk: Makefile configure cpudetect.c liba52/imdct.c liba52/imdct_3dnow.h liba52/liba52_changes.diff liba52/srfftp_3dnow.h libaf/af.h libmpcodecs/vf_filmdint.c libmpcodecs/vf_tfields.c ...
by diego 09 Feb '09

09 Feb '09

Author: diego Date: Mon Jan 26 10:29:53 2009 New Revision: 28370 Log: HAVE_3DNOW --> HAVE_AMD3DNOW Modified: trunk/Makefile trunk/configure trunk/cpudetect.c trunk/liba52/imdct.c trunk/liba52/imdct_3dnow.h trunk/liba52/liba52_changes.diff trunk/liba52/srfftp_3dnow.h trunk/libaf/af.h trunk/libmpcodecs/vf_filmdint.c trunk/libmpcodecs/vf_tfields.c trunk/libmpeg2/libmpeg2_changes.diff trunk/libmpeg2/motion_comp.c trunk/libvo/aclib.c trunk/libvo/aclib_template.c trunk/libvo/fastmemcpy.h trunk/libvo/osd.c trunk/libvo/osd_template.c trunk/mpcommon.c Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/Makefile Mon Jan 26 10:29:53 2009 (r28370) @@ -387,10 +387,10 @@ SRCS_COMMON-$(MACOSX_FINDER) += SRCS_COMMON-$(MNG) += libmpdemux/demux_mng.c SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c mp3lib/sr1.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32) += mp3lib/decode_i586.c -SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOW) += mp3lib/dct36_3dnow.c \ - mp3lib/dct64_3dnow.c -SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_3DNOWEXT) += mp3lib/dct36_k7.c \ - mp3lib/dct64_k7.c +SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOW) += mp3lib/dct36_3dnow.c \ + mp3lib/dct64_3dnow.c +SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_AMD3DNOWEXT) += mp3lib/dct36_k7.c \ + mp3lib/dct64_k7.c SRCS_COMMON-$(MP3LIB)-$(ARCH_X86_32)-$(HAVE_MMX) += mp3lib/dct64_mmx.c SRCS_COMMON-$(MP3LIB)-$(HAVE_ALTIVEC) += mp3lib/dct64_altivec.c SRCS_COMMON-$(MP3LIB)-$(HAVE_MMX) += mp3lib/decode_mmx.c @@ -1026,13 +1026,13 @@ TOOLS/netstream$(EXESUF) TOOLS/vivodump$ fastmemcpybench: TOOLS/fastmemcpybench.c $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX - $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW - $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 - $(CC) $(CFLAGS) $< -o TOOLS/fastmem-sse$(EXESUF) -DNAME=\"sse\" -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 + $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_AMD3DNOW + $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_AMD3DNOW -DHAVE_MMX2 + $(CC) $(CFLAGS) $< -o TOOLS/fastmem-sse$(EXESUF) -DNAME=\"sse\" -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-mmx$(EXESUF) -DNAME=\"mga-mmx\" -DCONFIG_MGA -DHAVE_MMX - $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW - $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 - $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DCONFIG_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 + $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k6$(EXESUF) -DNAME=\"mga-k6\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_AMD3DNOW + $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-k7$(EXESUF) -DNAME=\"mga-k7\ \" -DCONFIG_MGA -DHAVE_MMX -DHAVE_AMD3DNOW -DHAVE_MMX2 + $(CC) $(CFLAGS) $< -o TOOLS/fastmem2-sse$(EXESUF) -DNAME=\"mga-sse\" -DCONFIG_MGA -DHAVE_MMX -DHAVE_SSE -DHAVE_MMX2 REAL_SRCS = $(wildcard TOOLS/realcodecs/*.c) REAL_TARGETS = $(REAL_SRCS:.c=.so.6.0) Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/configure Mon Jan 26 10:29:53 2009 (r28370) @@ -2611,12 +2611,12 @@ EOF echores "$_iwmmxt" fi -_cpuexts_all='ALTIVEC MMX MMX2 3DNOW 3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI' +_cpuexts_all='ALTIVEC MMX MMX2 AMD3DNOW AMD3DNOWEXT SSE SSE2 SSSE3 FAST_CMOV CMOV PLD ARMV5TE ARMV6 ARMV6T2 ARMVFP IWMMXT MMI VIS MVI' test "$_altivec" = yes && _cpuexts="ALTIVEC $_cpuexts" test "$_mmx" = yes && _cpuexts="MMX $_cpuexts" test "$_mmxext" = yes && _cpuexts="MMX2 $_cpuexts" -test "$_3dnow" = yes && _cpuexts="3DNOW $_cpuexts" -test "$_3dnowext" = yes && _cpuexts="3DNOWEXT $_cpuexts" +test "$_3dnow" = yes && _cpuexts="AMD3DNOW $_cpuexts" +test "$_3dnowext" = yes && _cpuexts="AMD3DNOWEXT $_cpuexts" test "$_sse" = yes && _cpuexts="SSE $_cpuexts" test "$_sse2" = yes && _cpuexts="SSE2 $_cpuexts" test "$_ssse3" = yes && _cpuexts="SSSE3 $_cpuexts" Modified: trunk/cpudetect.c ============================================================================== --- trunk/cpudetect.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/cpudetect.c Mon Jan 26 10:29:53 2009 (r28370) @@ -228,11 +228,11 @@ void GetCpuCaps( CpuCaps *caps) if(caps->hasSSE2) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"SSE2 supported but disabled\n"); caps->hasSSE2=0; #endif -#if !HAVE_3DNOW +#if !HAVE_AMD3DNOW if(caps->has3DNow) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNow supported but disabled\n"); caps->has3DNow=0; #endif -#if !HAVE_3DNOWEXT +#if !HAVE_AMD3DNOWEXT if(caps->has3DNowExt) mp_msg(MSGT_CPUDETECT,MSGL_WARN,"3DNowExt supported but disabled\n"); caps->has3DNowExt=0; #endif Modified: trunk/liba52/imdct.c ============================================================================== --- trunk/liba52/imdct.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/liba52/imdct.c Mon Jan 26 10:29:53 2009 (r28370) @@ -53,8 +53,8 @@ void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias); #ifdef RUNTIME_CPUDETECT -#undef HAVE_3DNOWEXT -#define HAVE_3DNOWEXT 0 +#undef HAVE_AMD3DNOWEXT +#define HAVE_AMD3DNOWEXT 0 #endif typedef struct complex_s { @@ -712,19 +712,19 @@ imdct_do_512_altivec(sample_t data[],sam // Stuff below this line is borrowed from libac3 #include "srfftp.h" #if ARCH_X86 || ARCH_X86_64 -#undef HAVE_3DNOW -#define HAVE_3DNOW 1 +#undef HAVE_AMD3DNOW +#define HAVE_AMD3DNOW 1 #include "srfftp_3dnow.h" const i_cmplx_t x_plus_minus_3dnow __attribute__ ((aligned (8))) = {{ 0x00000000UL, 0x80000000UL }}; const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }}; const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 }; -#undef HAVE_3DNOWEXT -#define HAVE_3DNOWEXT 0 +#undef HAVE_AMD3DNOWEXT +#define HAVE_AMD3DNOWEXT 0 #include "imdct_3dnow.h" -#undef HAVE_3DNOWEXT -#define HAVE_3DNOWEXT 1 +#undef HAVE_AMD3DNOWEXT +#define HAVE_AMD3DNOWEXT 1 #include "imdct_3dnow.h" void Modified: trunk/liba52/imdct_3dnow.h ============================================================================== --- trunk/liba52/imdct_3dnow.h Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/liba52/imdct_3dnow.h Mon Jan 26 10:29:53 2009 (r28370) @@ -26,7 +26,7 @@ #undef FFT_ASMB16_3DNOW #undef FFT_128P_3DNOW -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT #define FFT_4_3DNOW fft_4_3dnowex #define FFT_8_3DNOW fft_8_3dnowex #define FFT_ASMB_3DNOW fft_asmb_3dnowex @@ -52,7 +52,7 @@ static void FFT_4_3DNOW(complex_t *x) "pxor %3, %%mm1\n\t" /* -mm1.re | mm1.im */ "pfadd %%mm1, %%mm3\n\t" /* vi.im = x[3].re - x[1].re; */ "movq %%mm3, %%mm4\n\t" /* vi.re =-x[3].im + x[1].im; mm4 = vi */ -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %%mm4, %%mm4\n\t" #else "punpckldq %%mm4, %%mm5\n\t" @@ -129,7 +129,7 @@ static void FFT_8_3DNOW(complex_t *x) "movq (%1), %%mm1\n\t" "movq 16(%1), %%mm4\n\t" "movq %%mm1, %%mm2\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %%mm3, %%mm3\n\t" #else "punpckldq %%mm3, %%mm6\n\t" @@ -160,7 +160,7 @@ static void FFT_8_3DNOW(complex_t *x) "movq %2, %%mm1\n\t" "movq 56(%3), %%mm3\n\t" "pfsub 40(%3), %%mm0\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %%mm1, %%mm1\n\t" #else "punpckldq %%mm1, %%mm2\n\t" @@ -168,7 +168,7 @@ static void FFT_8_3DNOW(complex_t *x) #endif "pxor %%mm7, %%mm1\n\t" "pfadd %%mm1, %%mm0\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %%mm3, %%mm3\n\t" #else "punpckldq %%mm3, %%mm2\n\t" @@ -182,7 +182,7 @@ static void FFT_8_3DNOW(complex_t *x) "pfmul %4, %%mm0\n\t" "movq 40(%3), %%mm5\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %%mm5, %%mm5\n\t" #else "punpckldq %%mm5, %%mm1\n\t" @@ -205,7 +205,7 @@ static void FFT_8_3DNOW(complex_t *x) /* x[3] x[7] */ __asm__ volatile( "movq %1, %%mm0\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %3, %%mm1\n\t" #else "movq %3, %%mm1\n\t" @@ -218,7 +218,7 @@ static void FFT_8_3DNOW(complex_t *x) "movq 56(%4), %%mm3\n\t" "pxor %%mm7, %%mm3\n\t" "pfadd %%mm3, %%mm2\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %%mm2, %%mm2\n\t" #else "punpckldq %%mm2, %%mm5\n\t" @@ -331,7 +331,7 @@ static void FFT_128P_3DNOW(complex_t *a) } static void -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT imdct_do_512_3dnowex #else imdct_do_512_3dnow @@ -371,14 +371,14 @@ imdct_do_512_3dnow "punpckldq %4, %%mm1\n\t" /* mm1 = xcos[j] | xsin[j] */ "movq %%mm0, %%mm2\n\t" "pfmul %%mm1, %%mm0\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd %%mm1, %%mm1\n\t" #else "punpckldq %%mm1, %%mm5\n\t" "punpckhdq %%mm5, %%mm1\n\t" #endif "pfmul %%mm1, %%mm2\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pfpnacc %%mm2, %%mm0\n\t" #else "pxor %%mm7, %%mm0\n\t" @@ -445,7 +445,7 @@ imdct_do_512_3dnow __asm__ volatile ( "movq %1, %%mm0\n\t" /* ac3_buf[i].re | ac3_buf[i].im */ "movq %%mm0, %%mm1\n\t" /* ac3_buf[i].re | ac3_buf[i].im */ -#if !HAVE_3DNOWEXT +#if !HAVE_AMD3DNOWEXT "punpckldq %%mm1, %%mm2\n\t" "punpckhdq %%mm2, %%mm1\n\t" #else @@ -455,7 +455,7 @@ imdct_do_512_3dnow "punpckldq %2, %%mm3\n\t" /* ac3_xsin[i] | ac3_xcos[i] */ "pfmul %%mm3, %%mm0\n\t" "pfmul %%mm3, %%mm1\n\t" -#if !HAVE_3DNOWEXT +#if !HAVE_AMD3DNOWEXT "pxor %%mm7, %%mm0\n\t" "pfacc %%mm1, %%mm0\n\t" "punpckldq %%mm0, %%mm1\n\t" @@ -543,7 +543,7 @@ imdct_do_512_3dnow "movd (%1), %%mm1\n\t" "punpckldq (%2), %%mm0\n\t" "punpckldq 508(%2), %%mm1\n\t" -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT "pswapd (%3), %%mm3\n\t" "pswapd -512(%3), %%mm4\n\t" #else Modified: trunk/liba52/liba52_changes.diff ============================================================================== --- trunk/liba52/liba52_changes.diff Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/liba52/liba52_changes.diff Mon Jan 26 10:29:53 2009 (r28370) @@ -1412,7 +1412,7 @@ +void (*a52_imdct_512) (sample_t * data, sample_t * delay, sample_t bias); + +#ifdef RUNTIME_CPUDETECT -+#undef HAVE_3DNOWEXT ++#undef HAVE_AMD3DNOWEXT +#endif typedef struct complex_s { @@ -1853,8 +1853,8 @@ +// Stuff below this line is borrowed from libac3 +#include "srfftp.h" +#if defined(ARCH_X86) || defined(ARCH_X86_64) -+#ifndef HAVE_3DNOW -+#define HAVE_3DNOW 1 ++#ifndef HAVE_AMD3DNOW ++#define HAVE_AMD3DNOW 1 +#endif +#include "srfftp_3dnow.h" + @@ -1862,9 +1862,9 @@ +const i_cmplx_t x_minus_plus_3dnow __attribute__ ((aligned (8))) = {{ 0x80000000UL, 0x00000000UL }}; +const complex_t HSQRT2_3DNOW __attribute__ ((aligned (8))) = { 0.707106781188, 0.707106781188 }; + -+#undef HAVE_3DNOWEXT ++#undef HAVE_AMD3DNOWEXT +#include "imdct_3dnow.h" -+#define HAVE_3DNOWEXT ++#define HAVE_AMD3DNOWEXT +#include "imdct_3dnow.h" + +void Modified: trunk/liba52/srfftp_3dnow.h ============================================================================== --- trunk/liba52/srfftp_3dnow.h Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/liba52/srfftp_3dnow.h Mon Jan 26 10:29:53 2009 (r28370) @@ -46,7 +46,7 @@ typedef struct "m"(x_minus_plus_3dnow)\ :"memory"); -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT #define PSWAP_MM(mm_base,mm_hlp) "pswapd "mm_base","mm_base"\n\t" #else #define PSWAP_MM(mm_base,mm_hlp)\ @@ -54,7 +54,7 @@ typedef struct "psrlq $32, "mm_base"\n\t"\ "punpckldq "mm_hlp","mm_base"\n\t" #endif -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT #define PFNACC_MM(mm_base,mm_hlp) "pfnacc "mm_base","mm_base"\n\t" #else #define PFNACC_MM(mm_base,mm_hlp)\ Modified: trunk/libaf/af.h ============================================================================== --- trunk/libaf/af.h Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libaf/af.h Mon Jan 26 10:29:53 2009 (r28370) @@ -93,7 +93,7 @@ extern int* af_cpu_speed; // Default init type #ifndef AF_INIT_TYPE -#if HAVE_SSE || HAVE_3DNOW +#if HAVE_SSE || HAVE_AMD3DNOW #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_FAST) #else #define AF_INIT_TYPE (af_cpu_speed?*af_cpu_speed:AF_INIT_SLOW) Modified: trunk/libmpcodecs/vf_filmdint.c ============================================================================== --- trunk/libmpcodecs/vf_filmdint.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libmpcodecs/vf_filmdint.c Mon Jan 26 10:29:53 2009 (r28370) @@ -433,7 +433,7 @@ block_metrics_3dnow(unsigned char *a, un int lines, struct vf_priv_s *p, struct frame_stats *s) { struct metrics tm; -#if !HAVE_3DNOW +#if !HAVE_AMD3DNOW mp_msg(MSGT_VFILTER, MSGL_FATAL, "block_metrics_3dnow: internal error\n"); #else static const unsigned long long ones = 0x0101010101010101ull; @@ -1425,7 +1425,7 @@ static int open(vf_instance_t *vf, char* #if !HAVE_MMX p->mmx2 = 0; #endif -#if !HAVE_3DNOW +#if !HAVE_AMD3DNOW p->mmx2 &= 1; #endif p->thres.odd = p->thres.even; Modified: trunk/libmpcodecs/vf_tfields.c ============================================================================== --- trunk/libmpcodecs/vf_tfields.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libmpcodecs/vf_tfields.c Mon Jan 26 10:29:53 2009 (r28370) @@ -46,7 +46,7 @@ static void deint(unsigned char *dest, i } } -#if HAVE_3DNOW +#if HAVE_AMD3DNOW static void qpel_li_3DNOW(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up) { int i, j, ssd=ss; @@ -485,7 +485,7 @@ static int open(vf_instance_t *vf, char* #if HAVE_MMX2 if(gCpuCaps.hasMMX2) qpel_li = qpel_li_MMX2; #endif -#if HAVE_3DNOW +#if HAVE_AMD3DNOW if(gCpuCaps.has3DNow) qpel_li = qpel_li_3DNOW; #endif return 1; Modified: trunk/libmpeg2/libmpeg2_changes.diff ============================================================================== --- trunk/libmpeg2/libmpeg2_changes.diff Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libmpeg2/libmpeg2_changes.diff Mon Jan 26 10:29:53 2009 (r28370) @@ -136,7 +136,7 @@ - else if (accel & MPEG2_ACCEL_X86_3DNOW) + else +#endif -+#ifdef HAVE_3DNOW ++#ifdef HAVE_AMD3DNOW + if (accel & MPEG2_ACCEL_X86_3DNOW) mpeg2_mc = mpeg2_mc_3dnow; - else if (accel & MPEG2_ACCEL_X86_MMX) Modified: trunk/libmpeg2/motion_comp.c ============================================================================== --- trunk/libmpeg2/motion_comp.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libmpeg2/motion_comp.c Mon Jan 26 10:29:53 2009 (r28370) @@ -42,7 +42,7 @@ void mpeg2_mc_init (uint32_t accel) mpeg2_mc = mpeg2_mc_mmxext; else #endif -#if HAVE_3DNOW +#if HAVE_AMD3DNOW if (accel & MPEG2_ACCEL_X86_3DNOW) mpeg2_mc = mpeg2_mc_3dnow; else Modified: trunk/libvo/aclib.c ============================================================================== --- trunk/libvo/aclib.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libvo/aclib.c Mon Jan 26 10:29:53 2009 (r28370) @@ -30,7 +30,7 @@ #ifdef CAN_COMPILE_X86_ASM -#if (HAVE_MMX && !HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) +#if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) #define COMPILE_MMX #endif @@ -38,7 +38,7 @@ #define COMPILE_MMX2 #endif -#if (HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) +#if (HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) #define COMPILE_3DNOW #endif @@ -48,24 +48,24 @@ #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #undef HAVE_SSE #undef HAVE_SSE2 #define HAVE_MMX 0 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define HAVE_SSE 0 #define HAVE_SSE2 0 /* #ifdef COMPILE_C #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #undef HAVE_SSE #undef HAVE_SSE2 #define HAVE_MMX 0 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define HAVE_SSE 0 #define HAVE_SSE2 0 #define RENAME(a) a ## _C @@ -77,12 +77,12 @@ #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #undef HAVE_SSE #undef HAVE_SSE2 #define HAVE_MMX 1 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define HAVE_SSE 0 #define HAVE_SSE2 0 #define RENAME(a) a ## _MMX @@ -94,12 +94,12 @@ #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #undef HAVE_SSE #undef HAVE_SSE2 #define HAVE_MMX 1 #define HAVE_MMX2 1 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define HAVE_SSE 0 #define HAVE_SSE2 0 #define RENAME(a) a ## _MMX2 @@ -111,12 +111,12 @@ #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #undef HAVE_SSE #undef HAVE_SSE2 #define HAVE_MMX 1 #define HAVE_MMX2 0 -#define HAVE_3DNOW 1 +#define HAVE_AMD3DNOW 1 #define HAVE_SSE 0 #define HAVE_SSE2 0 #define RENAME(a) a ## _3DNow @@ -128,12 +128,12 @@ #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #undef HAVE_SSE #undef HAVE_SSE2 #define HAVE_MMX 1 #define HAVE_MMX2 1 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define HAVE_SSE 1 #define HAVE_SSE2 1 #define RENAME(a) a ## _SSE @@ -165,7 +165,7 @@ void * fast_memcpy(void * to, const void fast_memcpy_SSE(to, from, len); #elif HAVE_MMX2 fast_memcpy_MMX2(to, from, len); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW fast_memcpy_3DNow(to, from, len); #elif HAVE_MMX fast_memcpy_MMX(to, from, len); @@ -199,7 +199,7 @@ void * mem2agpcpy(void * to, const void mem2agpcpy_SSE(to, from, len); #elif HAVE_MMX2 mem2agpcpy_MMX2(to, from, len); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW mem2agpcpy_3DNow(to, from, len); #elif HAVE_MMX mem2agpcpy_MMX(to, from, len); Modified: trunk/libvo/aclib_template.c ============================================================================== --- trunk/libvo/aclib_template.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libvo/aclib_template.c Mon Jan 26 10:29:53 2009 (r28370) @@ -66,7 +66,7 @@ If you have questions please contact wit #undef HAVE_ONLY_MMX1 -#if HAVE_MMX && !HAVE_MMX2 && !HAVE_3DNOW && !HAVE_SSE +#if HAVE_MMX && !HAVE_MMX2 && !HAVE_AMD3DNOW && !HAVE_SSE /* means: mmx v.1. Note: Since we added alignment of destinition it speedups of memory copying on PentMMX, Celeron-1 and P2 upto 12% versus standard (non MMX-optimized) version. @@ -77,7 +77,7 @@ If you have questions please contact wit #undef HAVE_K6_2PLUS -#if !HAVE_MMX2 && HAVE_3DNOW +#if !HAVE_MMX2 && HAVE_AMD3DNOW #define HAVE_K6_2PLUS #endif @@ -107,14 +107,14 @@ __asm__ volatile(\ #if HAVE_MMX2 #define PREFETCH "prefetchnta" -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW #define PREFETCH "prefetch" #else #define PREFETCH " # nop" #endif /* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */ -#if HAVE_3DNOW +#if HAVE_AMD3DNOW #define EMMS "femms" #else #define EMMS "emms" Modified: trunk/libvo/fastmemcpy.h ============================================================================== --- trunk/libvo/fastmemcpy.h Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libvo/fastmemcpy.h Mon Jan 26 10:29:53 2009 (r28370) @@ -24,7 +24,7 @@ #include <string.h> #ifdef CONFIG_FASTMEMCPY -#if HAVE_MMX || HAVE_MMX2 || HAVE_3DNOW \ +#if HAVE_MMX || HAVE_MMX2 || HAVE_AMD3DNOW \ /* || HAVE_SSE || HAVE_SSE2 */ #include <stddef.h> Modified: trunk/libvo/osd.c ============================================================================== --- trunk/libvo/osd.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libvo/osd.c Mon Jan 26 10:29:53 2009 (r28370) @@ -29,7 +29,7 @@ static const unsigned long long mask24hl #ifdef CAN_COMPILE_X86_ASM -#if (HAVE_MMX && !HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) +#if (HAVE_MMX && !HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) #define COMPILE_MMX #endif @@ -37,27 +37,27 @@ static const unsigned long long mask24hl #define COMPILE_MMX2 #endif -#if (HAVE_3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) +#if (HAVE_AMD3DNOW && !HAVE_MMX2) || defined (RUNTIME_CPUDETECT) #define COMPILE_3DNOW #endif #endif //CAN_COMPILE_X86_ASM #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #define HAVE_MMX 0 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #ifndef CAN_COMPILE_X86_ASM #ifdef COMPILE_C #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #define HAVE_MMX 0 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define RENAME(a) a ## _C #include "osd_template.c" #endif @@ -69,10 +69,10 @@ static const unsigned long long mask24hl #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #define HAVE_MMX 0 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define RENAME(a) a ## _X86 #include "osd_template.c" #endif @@ -82,10 +82,10 @@ static const unsigned long long mask24hl #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #define HAVE_MMX 1 #define HAVE_MMX2 0 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define RENAME(a) a ## _MMX #include "osd_template.c" #endif @@ -95,10 +95,10 @@ static const unsigned long long mask24hl #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #define HAVE_MMX 1 #define HAVE_MMX2 1 -#define HAVE_3DNOW 0 +#define HAVE_AMD3DNOW 0 #define RENAME(a) a ## _MMX2 #include "osd_template.c" #endif @@ -108,10 +108,10 @@ static const unsigned long long mask24hl #undef RENAME #undef HAVE_MMX #undef HAVE_MMX2 -#undef HAVE_3DNOW +#undef HAVE_AMD3DNOW #define HAVE_MMX 1 #define HAVE_MMX2 0 -#define HAVE_3DNOW 1 +#define HAVE_AMD3DNOW 1 #define RENAME(a) a ## _3DNow #include "osd_template.c" #endif @@ -136,7 +136,7 @@ void vo_draw_alpha_yv12(int w,int h, uns #else //RUNTIME_CPUDETECT #if HAVE_MMX2 vo_draw_alpha_yv12_MMX2(w, h, src, srca, srcstride, dstbase, dststride); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW vo_draw_alpha_yv12_3DNow(w, h, src, srca, srcstride, dstbase, dststride); #elif HAVE_MMX vo_draw_alpha_yv12_MMX(w, h, src, srca, srcstride, dstbase, dststride); @@ -166,7 +166,7 @@ void vo_draw_alpha_yuy2(int w,int h, uns #else //RUNTIME_CPUDETECT #if HAVE_MMX2 vo_draw_alpha_yuy2_MMX2(w, h, src, srca, srcstride, dstbase, dststride); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW vo_draw_alpha_yuy2_3DNow(w, h, src, srca, srcstride, dstbase, dststride); #elif HAVE_MMX vo_draw_alpha_yuy2_MMX(w, h, src, srca, srcstride, dstbase, dststride); @@ -196,7 +196,7 @@ void vo_draw_alpha_uyvy(int w,int h, uns #else //RUNTIME_CPUDETECT #if HAVE_MMX2 vo_draw_alpha_uyvy_MMX2(w, h, src, srca, srcstride, dstbase, dststride); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW vo_draw_alpha_uyvy_3DNow(w, h, src, srca, srcstride, dstbase, dststride); #elif HAVE_MMX vo_draw_alpha_uyvy_MMX(w, h, src, srca, srcstride, dstbase, dststride); @@ -226,7 +226,7 @@ void vo_draw_alpha_rgb24(int w,int h, un #else //RUNTIME_CPUDETECT #if HAVE_MMX2 vo_draw_alpha_rgb24_MMX2(w, h, src, srca, srcstride, dstbase, dststride); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW vo_draw_alpha_rgb24_3DNow(w, h, src, srca, srcstride, dstbase, dststride); #elif HAVE_MMX vo_draw_alpha_rgb24_MMX(w, h, src, srca, srcstride, dstbase, dststride); @@ -256,7 +256,7 @@ void vo_draw_alpha_rgb32(int w,int h, un #else //RUNTIME_CPUDETECT #if HAVE_MMX2 vo_draw_alpha_rgb32_MMX2(w, h, src, srca, srcstride, dstbase, dststride); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW vo_draw_alpha_rgb32_3DNow(w, h, src, srca, srcstride, dstbase, dststride); #elif HAVE_MMX vo_draw_alpha_rgb32_MMX(w, h, src, srca, srcstride, dstbase, dststride); @@ -301,7 +301,7 @@ void vo_draw_alpha_init(void){ #else //RUNTIME_CPUDETECT #if HAVE_MMX2 mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit MMX2) Optimized OnScreenDisplay\n"); -#elif HAVE_3DNOW +#elif HAVE_AMD3DNOW mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX (with tiny bit 3DNow) Optimized OnScreenDisplay\n"); #elif HAVE_MMX mp_msg(MSGT_OSD,MSGL_INFO,"Using MMX Optimized OnScreenDisplay\n"); Modified: trunk/libvo/osd_template.c ============================================================================== --- trunk/libvo/osd_template.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/libvo/osd_template.c Mon Jan 26 10:29:53 2009 (r28370) @@ -7,7 +7,7 @@ #undef PREFETCHW #undef PAVGB -#if HAVE_3DNOW +#if HAVE_AMD3DNOW #define PREFETCH "prefetch" #define PREFETCHW "prefetchw" #define PAVGB "pavgusb" @@ -20,7 +20,7 @@ #define PREFETCHW " # nop" #endif -#if HAVE_3DNOW +#if HAVE_AMD3DNOW /* On K6 femms is faster of emms. On K7 femms is directly mapped on emms. */ #define EMMS "femms" #else @@ -307,12 +307,12 @@ static inline void RENAME(vo_draw_alpha_ dstbase++; #endif #if HAVE_MMX -#if HAVE_3DNOW +#if HAVE_AMD3DNOW __asm__ volatile( "pxor %%mm7, %%mm7\n\t" "pcmpeqb %%mm6, %%mm6\n\t" // F..F ::); -#else /* HAVE_3DNOW */ +#else /* HAVE_AMD3DNOW */ __asm__ volatile( "pxor %%mm7, %%mm7\n\t" "pcmpeqb %%mm5, %%mm5\n\t" // F..F @@ -320,13 +320,13 @@ static inline void RENAME(vo_draw_alpha_ "psllw $8, %%mm5\n\t" //FF00FF00FF00 "psrlw $8, %%mm4\n\t" //00FF00FF00FF ::); -#endif /* HAVE_3DNOW */ +#endif /* HAVE_AMD3DNOW */ #endif /* HAVE_MMX */ for(y=0;y<h;y++){ register int x; #if ARCH_X86 && (!ARCH_X86_64 || HAVE_MMX) #if HAVE_MMX -#if HAVE_3DNOW +#if HAVE_AMD3DNOW __asm__ volatile( PREFETCHW" %0\n\t" PREFETCH" %1\n\t" Modified: trunk/mpcommon.c ============================================================================== --- trunk/mpcommon.c Mon Jan 26 10:11:23 2009 (r28369) +++ trunk/mpcommon.c Mon Jan 26 10:29:53 2009 (r28370) @@ -51,10 +51,10 @@ void print_version(const char* name) #if HAVE_MMX2 mp_msg(MSGT_CPLAYER,MSGL_V," MMX2"); #endif -#if HAVE_3DNOW +#if HAVE_AMD3DNOW mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow"); #endif -#if HAVE_3DNOWEXT +#if HAVE_AMD3DNOWEXT mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowExt"); #endif #if HAVE_SSE

4 6

r23335 - in trunk: configure vidix/Makefile
by diego 04 Feb '09

04 Feb '09

Author: diego Date: Thu May 17 23:48:56 2007 New Revision: 23335 Log: Remove awk test. awk is a basic Unix tool, any implementation is sufficient. Modified: trunk/configure trunk/vidix/Makefile Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Thu May 17 23:48:56 2007 @@ -7179,28 +7179,7 @@ if test "$_vidix_internal" = auto ; then beos && _vidix_internal=no darwin && _vidix_internal=no fi - -# checking for a working awk, I'm using mawk first, because it's fastest - atmos -_awk=awk if test "$_vidix_internal" = yes ; then -_awk_verc_fail=yes -echocheck "awk" -for _awk in mawk gawk nawk; do - if ( $_awk 'BEGIN{testme();}function testme(){print"";}' ) >> "$TMPLOG" 2>&1; then - _awk_verc_fail=no - break - fi -done -test "$_awk_verc_fail" = yes && _awk=no -echores "$_awk" -if test "$_awk_verc_fail" = yes; then -echo "VIDIX needs awk, but no working implementation was found!" -echo "Try the GNU version, which can be downloaded from:" -echo "ftp://ftp.gnu.org/gnu/gawk/" -echo "If you don't need VIDIX, you can use configure --disable-vidix instead." -die "no awk" -fi -fi if test "$_vidix_internal" = yes; then _res_comment="internal" @@ -7544,7 +7523,6 @@ libdir = \$(LIBDIR) #AR = ar CC = $_cc HOST_CC = $_host_cc -AWK = $_awk RANLIB = $_ranlib LDCONFIG = $_ldconfig INSTALL = $_install Modified: trunk/vidix/Makefile ============================================================================== --- trunk/vidix/Makefile (original) +++ trunk/vidix/Makefile Thu May 17 23:48:56 2007 @@ -47,7 +47,7 @@ rage128_vid.o: radeon_vid.c $(CC) -c $(CFLAGS) -DRAGE128 -o $@ $< pci_names.c pci_dev_ids.c: pci.db - LC_ALL=C $(AWK) -f pci_db2c.awk $< + LC_ALL=C awk -f pci_db2c.awk $< clean:: rm -f pci_*.c pci_*.h

5 8

[propchange]: r28397 - svn:log
by diego 31 Jan '09

31 Jan '09

Author: diego Revision: 28397 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,2 +1,3 @@ -HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1, -not defined/undefined, use them accordingly. +1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1, + not defined/undefined, use them accordingly. +2) Add ESD definitions to avoid undefined preprocessor directives warnings.

3 2

[propchange]: r28397 - svn:log
by diego 31 Jan '09

31 Jan '09

Author: diego Revision: 28397 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1,3 +1,3 @@ -1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined to 0/1, - not defined/undefined, use them accordingly. +1) HAVE_SYS_ASOUNDLIB_H/HAVE_ALSA_ASOUNDLIB_H are defined/undefined, + not defined to 0/1, use them accordingly. 2) Add ESD definitions to avoid undefined preprocessor directives warnings.

1 0

r28412 - trunk/configure
by diego 31 Jan '09

31 Jan '09

Author: diego Date: Sun Feb 1 00:19:16 2009 New Revision: 28412 Log: Set a sane default path on Solaris. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Feb 1 00:12:27 2009 (r28411) +++ trunk/configure Sun Feb 1 00:19:16 2009 (r28412) @@ -190,6 +190,9 @@ echores() { } ############################################################################# +# Solaris has broken stone-age tools in the standard locations +sunos && test -d /usr/xpg4/bin && PATH=/usr/xpg4/bin:$PATH + # Check how echo works in this /bin/sh case `echo -n` in -n) _echo_n= _echo_c='\c' ;; # SysV echo

1 0

r28411 - trunk/configure
by diego 31 Jan '09

31 Jan '09

Author: diego Date: Sun Feb 1 00:12:27 2009 New Revision: 28411 Log: cosmetics: Move memalign_hack define next to other FFmpeg defines in config.h. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sat Jan 31 23:46:12 2009 (r28410) +++ trunk/configure Sun Feb 1 00:12:27 2009 (r28411) @@ -8297,7 +8297,6 @@ $_def_lrint $_def_lrintf $_def_map_memalign $_def_memalign -$_def_memalign_hack $_def_nanosleep $_def_posix_select $_def_round @@ -8589,6 +8588,7 @@ $def_bswap $_def_dcbzl $def_fast_64bit $_def_fast_unaligned +$_def_memalign_hack $def_mlib $_def_mkstemp $_def_pthreads

1 0