Replace implicit use of fast_memcpy via macro by explicit use to allow

for future optimization.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23475 b3059339-0415-0410-9bf9-f77b7e298cf2

4 files changed, 12 insertions, 12 deletions

diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c
index 79f70b1b76..5f6bc8daea 100644
--- a/libao2/ao_dsound.c
+++ b/libao2/ao_dsound.c
@@ -199,7 +199,7 @@ static BOOL CALLBACK DirectSoundEnum(LPGUID guid,LPCSTR desc,LPCSTR module,LPVOI
     if(device_num==*device_index){
         mp_msg(MSGT_AO, MSGL_V,"<--");
         if(guid){
-            memcpy(&device,guid,sizeof(GUID));
+            fast_memcpy(&device,guid,sizeof(GUID));
         }
     }
     mp_msg(MSGT_AO, MSGL_V,"\n");
@@ -337,14 +337,14 @@ static int write_buffer(unsigned char *data, int len)
   	    numsamp = dwBytes1 / (ao_data.channels * sampsize);  // number of samples for each channel in this buffer
 
   	    for( i = 0; i < numsamp; i++ ) for( j = 0; j < ao_data.channels; j++ ) {
-  	        memcpy(lpvPtr1+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
+  	        fast_memcpy(lpvPtr1+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
   	    }
 
   	    if (NULL != lpvPtr2 )
   	    {
   	        numsamp = dwBytes2 / (ao_data.channels * sampsize);
   	        for( i = 0; i < numsamp; i++ ) for( j = 0; j < ao_data.channels; j++ ) {
-  	            memcpy(lpvPtr2+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+dwBytes1+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
+  	            fast_memcpy(lpvPtr2+(i*ao_data.channels*sampsize)+(chantable[j]*sampsize),data+dwBytes1+(i*ao_data.channels*sampsize)+(j*sampsize),sampsize);
   	        }
   	    }
 
@@ -352,8 +352,8 @@ static int write_buffer(unsigned char *data, int len)
   	    if(write_offset>=buffer_size)write_offset=dwBytes2;
   	} else {
   	    // Write to pointers without reordering. 
-	memcpy(lpvPtr1,data,dwBytes1);
-    if (NULL != lpvPtr2 )memcpy(lpvPtr2,data+dwBytes1,dwBytes2);
+	fast_memcpy(lpvPtr1,data,dwBytes1);
+    if (NULL != lpvPtr2 )fast_memcpy(lpvPtr2,data+dwBytes1,dwBytes2);
 	write_offset+=dwBytes1+dwBytes2;
     if(write_offset>=buffer_size)write_offset=dwBytes2;
   	}
diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c
index 556a887a4b..1e9dbff8c8 100644
--- a/libao2/ao_jack.c
+++ b/libao2/ao_jack.c
@@ -111,10 +111,10 @@ static int write_buffer(unsigned char* data, int len) {
   if (len > free) len = free;
   if (first_len > len) first_len = len;
   // till end of buffer
-  memcpy (&buffer[write_pos], data, first_len);
+  fast_memcpy (&buffer[write_pos], data, first_len);
   if (len > first_len) { // we have to wrap around
     // remaining part from beginning of buffer
-    memcpy (buffer, &data[first_len], len - first_len);
+    fast_memcpy (buffer, &data[first_len], len - first_len);
   }
   write_pos = (write_pos + len) % BUFFSIZE;
   return len;
diff --git a/libao2/ao_sdl.c b/libao2/ao_sdl.c
index 6ec56d1665..0da9bb338f 100644
--- a/libao2/ao_sdl.c
+++ b/libao2/ao_sdl.c
@@ -88,10 +88,10 @@ static int write_buffer(unsigned char* data,int len){
   if (len > free) len = free;
   if (first_len > len) first_len = len;
   // till end of buffer
-  memcpy (&buffer[write_pos], data, first_len);
+  fast_memcpy (&buffer[write_pos], data, first_len);
   if (len > first_len) { // we have to wrap around
     // remaining part from beginning of buffer
-    memcpy (buffer, &data[first_len], len - first_len);
+    fast_memcpy (buffer, &data[first_len], len - first_len);
   }
   write_pos = (write_pos + len) % BUFFSIZE;
   return len;
@@ -106,14 +106,14 @@ static int read_buffer(unsigned char* data,int len){
 #ifdef USE_SDL_INTERNAL_MIXER
   SDL_MixAudio (data, &buffer[read_pos], first_len, volume);
 #else
-  memcpy (data, &buffer[read_pos], first_len);
+  fast_memcpy (data, &buffer[read_pos], first_len);
 #endif
   if (len > first_len) { // we have to wrap around
     // remaining part from beginning of buffer
 #ifdef USE_SDL_INTERNAL_MIXER
     SDL_MixAudio (&data[first_len], buffer, len - first_len, volume);
 #else
-    memcpy (&data[first_len], buffer, len - first_len);
+    fast_memcpy (&data[first_len], buffer, len - first_len);
 #endif
   }
   read_pos = (read_pos + len) % BUFFSIZE;
diff --git a/libao2/ao_win32.c b/libao2/ao_win32.c
index 0f39b51767..71146b43a2 100644
--- a/libao2/ao_win32.c
+++ b/libao2/ao_win32.c
@@ -299,7 +299,7 @@ static int write_waveOutBuffer(unsigned char* data,int len){
            waveOutUnprepareHeader(hWaveOut, current, sizeof(WAVEHDR));
 	x=BUFFER_SIZE-buf_write_pos;          
     if(x>len) x=len;                   
-    memcpy(current->lpData+buf_write_pos,data+len2,x); 
+    fast_memcpy(current->lpData+buf_write_pos,data+len2,x); 
     if(buf_write_pos==0)full_buffers++;
     len2+=x; len-=x;                 
 	buffered_bytes+=x; buf_write_pos+=x;