1
0
mirror of https://github.com/mpv-player/mpv synced 2025-02-17 04:58:06 +00:00

Fixing compilation on non-MMX but x86 systems

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4322 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nick 2002-01-23 17:09:58 +00:00
parent b3b5c37c83
commit 58d3b8ec23
2 changed files with 11 additions and 4 deletions

View File

@ -13,6 +13,13 @@
#include "../config.h"
#ifndef CAN_COMPILE_X86
#ifdef ARCH_X86
#define CAN_COMPILE_X86
#endif
#endif
#if 0
/* old WRITE_SAMPLE */
/* is portable */
@ -149,7 +156,7 @@ static int synth_1to1_r(real *bandPtr,int channel,unsigned char *out,int *pnt)
synth_func_t synth_func;
#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(HAVE_MMX)
#if defined(CAN_COMPILE_X86_ASM)
int synth_1to1_MMX( real *bandPtr,int channel,short * samples)
{
static short buffs[2][2][0x110];
@ -169,7 +176,7 @@ static int synth_1to1(real *bandPtr,int channel,unsigned char *out,int *pnt)
int clip = 0;
int bo1;
/* optimized for x86 */
#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86)
#if defined(CAN_COMPILE_X86_ASM)
if ( synth_func )
{
int ret;

View File

@ -129,7 +129,7 @@ LOCAL unsigned int getbits_fast(short number_of_bits)
// if(MP3_frames>=7741) printf("getbits_fast: bits=%d bitsleft=%d wordptr=%x\n",number_of_bits,bitsleft,wordpointer);
if((bitsleft-=number_of_bits)<0) return 0;
if(!number_of_bits) return 0;
#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86)
#if defined(CAN_COMPILE_X86_ASM)
rval = bswap_16(*((unsigned short *)wordpointer));
#else
/*
@ -172,7 +172,7 @@ LOCAL void set_pointer(long backstep)
LOCAL int stream_head_read(unsigned char *hbuf,unsigned long *newhead){
if(mp3_read(hbuf,4) != 4) return FALSE;
#if (defined(RUNTIME_CPUDETECT) && defined(CAN_COMPILE_X86_ASM)) || defined(ARCH_X86)
#if defined(CAN_COMPILE_X86_ASM)
*newhead = bswap_32(*((unsigned long *)hbuf));
#else
/*