From 6a09e8e2ed913cb44d74cac9c9e7a4cf7f4a18c1 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 5 Jun 2007 14:27:54 +0000 Subject: [PATCH] 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 --- gui/mplayer/mw.c | 2 +- gui/mplayer/pb.c | 2 +- libaf/af_format.c | 2 +- libao2/ao_dsound.c | 10 +++++----- libao2/ao_jack.c | 4 ++-- libao2/ao_sdl.c | 8 ++++---- libao2/ao_win32.c | 2 +- libmenu/vf_menu.c | 4 ++-- libmpcodecs/ad_mpc.c | 2 +- libmpcodecs/native/nuppelvideo.c | 6 +++--- libmpcodecs/vd_mpng.c | 2 +- libmpcodecs/vd_mtga.c | 10 +++++----- libmpcodecs/vf_bmovl.c | 6 +++--- libmpcodecs/vf_detc.c | 2 +- libmpcodecs/vf_down3dright.c | 2 +- libmpcodecs/vf_filmdint.c | 12 ++++++------ libmpcodecs/vf_fspp.c | 12 ++++++------ libmpcodecs/vf_il.c | 12 ++++++------ libmpcodecs/vf_ivtc.c | 2 +- libmpcodecs/vf_kerndeint.c | 12 ++++++------ libmpcodecs/vf_noise.c | 4 ++-- libmpcodecs/vf_phase.c | 4 ++-- libmpcodecs/vf_pp7.c | 6 +++--- libmpcodecs/vf_pullup.c | 10 +++++----- libmpcodecs/vf_softpulldown.c | 2 +- libmpcodecs/vf_spp.c | 8 ++++---- libmpcodecs/vf_telecine.c | 2 +- libmpcodecs/vf_tfields.c | 26 +++++++++++++------------- libmpcodecs/vf_tinterlace.c | 2 +- libmpcodecs/vf_unsharp.c | 4 ++-- libmpcodecs/vf_uspp.c | 6 +++--- libmpcodecs/vf_yadif.c | 4 ++-- libmpcodecs/vf_yvu9.c | 2 +- libmpdemux/demux_asf.c | 8 ++++---- libmpdemux/demux_gif.c | 4 ++-- libmpdemux/demuxer.c | 4 ++-- libvo/fastmemcpy.h | 7 ++++--- libvo/vesa_lvo.c | 10 +++++----- libvo/vo_3dfx.c | 8 ++++---- libvo/vo_bl.c | 6 +++--- libvo/vo_directfb2.c | 20 ++++++++++---------- libvo/vo_directx.c | 4 ++-- libvo/vo_dxr2.c | 4 ++-- libvo/vo_dxr3.c | 4 ++-- libvo/vo_fbdev.c | 2 +- libvo/vo_fbdev2.c | 4 ++-- libvo/vo_macosx.m | 2 +- libvo/vo_quartz.c | 2 +- libvo/vo_sdl.c | 12 ++++++------ libvo/vo_svga.c | 2 +- libvo/vo_syncfb.c | 10 +++++----- libvo/vo_vesa.c | 8 ++++---- libvo/vo_yuv4mpeg.c | 22 +++++++++++----------- libvo/vo_zr.c | 8 ++++---- libvo/vo_zr2.c | 6 +++--- mencoder.c | 16 ++++++++-------- mp3lib/sr1.c | 2 +- stream/tvi_v4l.c | 14 +++++++------- 58 files changed, 192 insertions(+), 191 deletions(-) diff --git a/gui/mplayer/mw.c b/gui/mplayer/mw.c index 142eca3185..1762eea45d 100644 --- a/gui/mplayer/mw.c +++ b/gui/mplayer/mw.c @@ -65,7 +65,7 @@ void mplMainDraw( void ) btnModify( evSetMoviePosition,guiIntfStruct.Position ); btnModify( evSetVolume,guiIntfStruct.Volume ); - memcpy( mplDrawBuffer,appMPlayer.main.Bitmap.Image,appMPlayer.main.Bitmap.ImageSize ); + fast_memcpy( mplDrawBuffer,appMPlayer.main.Bitmap.Image,appMPlayer.main.Bitmap.ImageSize ); Render( &appMPlayer.mainWindow,appMPlayer.Items,appMPlayer.NumberOfItems,mplDrawBuffer,appMPlayer.main.Bitmap.ImageSize ); mplMainRender=0; } diff --git a/gui/mplayer/pb.c b/gui/mplayer/pb.c index 3fad991c28..0a06abf9b0 100644 --- a/gui/mplayer/pb.c +++ b/gui/mplayer/pb.c @@ -88,7 +88,7 @@ void mplPBDraw( void ) vo_mouse_autohide=0; - memcpy( mplPBDrawBuffer,appMPlayer.bar.Bitmap.Image,appMPlayer.bar.Bitmap.ImageSize ); + fast_memcpy( mplPBDrawBuffer,appMPlayer.bar.Bitmap.Image,appMPlayer.bar.Bitmap.ImageSize ); Render( &appMPlayer.barWindow,appMPlayer.barItems,appMPlayer.NumberOfBarItems,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize ); wsConvert( &appMPlayer.barWindow,mplPBDrawBuffer,appMPlayer.bar.Bitmap.ImageSize ); } diff --git a/libaf/af_format.c b/libaf/af_format.c index 193a4e7f9b..df95a03aeb 100644 --- a/libaf/af_format.c +++ b/libaf/af_format.c @@ -287,7 +287,7 @@ static af_data_t* play(struct af_instance_s* af, af_data_t* data) if(c->bps != l->bps) change_bps(c->audio,l->audio,len,c->bps,l->bps); else - memcpy(l->audio,c->audio,len*c->bps); + fast_memcpy(l->audio,c->audio,len*c->bps); break; } } 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; diff --git a/libmenu/vf_menu.c b/libmenu/vf_menu.c index 7996c24adc..3b1e1cc2a1 100644 --- a/libmenu/vf_menu.c +++ b/libmenu/vf_menu.c @@ -146,8 +146,8 @@ static void get_image(struct vf_instance_s* vf, mp_image_t *mpi){ if(mpi->type == MP_IMGTYPE_TEMP && (!(mpi->flags&MP_IMGFLAG_PRESERVE)) ) { dmpi = vf_get_image(vf->next,mpi->imgfmt,mpi->type, mpi->flags, mpi->w, mpi->h); - memcpy(mpi->planes,dmpi->planes,MP_MAX_PLANES*sizeof(unsigned char*)); - memcpy(mpi->stride,dmpi->stride,MP_MAX_PLANES*sizeof(unsigned int)); + fast_memcpy(mpi->planes,dmpi->planes,MP_MAX_PLANES*sizeof(unsigned char*)); + fast_memcpy(mpi->stride,dmpi->stride,MP_MAX_PLANES*sizeof(unsigned int)); mpi->flags|=MP_IMGFLAG_DIRECT; mpi->priv=(void*)dmpi; return; diff --git a/libmpcodecs/ad_mpc.c b/libmpcodecs/ad_mpc.c index e91998df7b..435a6cb0e5 100644 --- a/libmpcodecs/ad_mpc.c +++ b/libmpcodecs/ad_mpc.c @@ -54,7 +54,7 @@ static mpc_int32_t cb_read(void *data, void *buf, mpc_int32_t size) { if (d->pos < d->header_len) { if (s > d->header_len - d->pos) s = d->header_len - d->pos; - memcpy(p, &d->header[d->pos], s); + fast_memcpy(p, &d->header[d->pos], s); } else s = 0; memset(&p[s], 0, size - s); diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index c7d88eca66..cac116f3eb 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -67,7 +67,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, switch(encodedh->comptype) { case '0': /* raw YUV420 */ - memcpy(decoded, encoded + 12, out_len); + fast_memcpy(decoded, encoded + 12, out_len); break; case '1': /* RTJpeg */ RTjpeg_decompressYUV420 ( ( __s8 * ) encoded + 12, decoded ); @@ -102,13 +102,13 @@ void decode_nuv( unsigned char *encoded, int encoded_size, break; case 'L': /* copy last frame */ #ifdef KEEP_BUFFER - memcpy ( decoded, previous_buffer, width*height*3/2); + fast_memcpy ( decoded, previous_buffer, width*height*3/2); #endif break; } #ifdef KEEP_BUFFER - memcpy(previous_buffer, decoded, width*height*3/2); + fast_memcpy(previous_buffer, decoded, width*height*3/2); #endif break; } diff --git a/libmpcodecs/vd_mpng.c b/libmpcodecs/vd_mpng.c index d8725f7c08..f4af973e8d 100644 --- a/libmpcodecs/vd_mpng.c +++ b/libmpcodecs/vd_mpng.c @@ -58,7 +58,7 @@ static void pngReadFN( png_structp pngstr,png_bytep buffer,png_size_t size ) { char * p = pngstr->io_ptr; if(size>pngLength-pngPointer && pngLength>=pngPointer) size=pngLength-pngPointer; - memcpy( buffer,(char *)&p[pngPointer],size ); + fast_memcpy( buffer,(char *)&p[pngPointer],size ); pngPointer+=size; } diff --git a/libmpcodecs/vd_mtga.c b/libmpcodecs/vd_mtga.c index a328ab037c..f9f2301da2 100644 --- a/libmpcodecs/vd_mtga.c +++ b/libmpcodecs/vd_mtga.c @@ -110,20 +110,20 @@ static void decode_rle_tga(TGAInfo *info, unsigned char *data, mp_image_t *mpi) if (packet_header & 0x80) /* runlength encoded packet */ { - memcpy(final, data, num_bytes); + fast_memcpy(final, data, num_bytes); // Note: this will be slow when DR to vram! i=num_bytes; while(2*i<=replen){ - memcpy(final+i,final,i); + fast_memcpy(final+i,final,i); i*=2; } - memcpy(final+i,final,replen-i); + fast_memcpy(final+i,final,replen-i); data += num_bytes; } else /* raw packet */ { - memcpy(final, data, replen); + fast_memcpy(final, data, replen); data += replen; } @@ -144,7 +144,7 @@ static void decode_uncompressed_tga(TGAInfo *info, unsigned char *data, mp_image for (row = info->start_row; (!info->origin && row) || (info->origin && row < info->height); row += info->increment) { final = mpi->planes[0] + mpi->stride[0] * row; - memcpy(final, data, info->width * num_bytes); + fast_memcpy(final, data, info->width * num_bytes); data += info->width * num_bytes; } diff --git a/libmpcodecs/vf_bmovl.c b/libmpcodecs/vf_bmovl.c index 90b6ccd15e..ef7ce19ce9 100644 --- a/libmpcodecs/vf_bmovl.c +++ b/libmpcodecs/vf_bmovl.c @@ -388,14 +388,14 @@ put_image(struct vf_instance_s* vf, mp_image_t* mpi, double pts){ if(vf->priv->opaque) { // Just copy buffer memory to screen for( ypos=vf->priv->y1 ; ypos < vf->priv->y2 ; ypos++ ) { - memcpy( dmpi->planes[0] + (ypos*dmpi->stride[0]) + vf->priv->x1, + fast_memcpy( dmpi->planes[0] + (ypos*dmpi->stride[0]) + vf->priv->x1, vf->priv->bitmap.y + (ypos*vf->priv->w) + vf->priv->x1, vf->priv->x2 - vf->priv->x1 ); if(ypos%2) { - memcpy( dmpi->planes[1] + ((ypos/2)*dmpi->stride[1]) + (vf->priv->x1/2), + fast_memcpy( dmpi->planes[1] + ((ypos/2)*dmpi->stride[1]) + (vf->priv->x1/2), vf->priv->bitmap.u + (((ypos/2)*(vf->priv->w)/2)) + (vf->priv->x1/2), (vf->priv->x2 - vf->priv->x1)/2 ); - memcpy( dmpi->planes[2] + ((ypos/2)*dmpi->stride[2]) + (vf->priv->x1/2), + fast_memcpy( dmpi->planes[2] + ((ypos/2)*dmpi->stride[2]) + (vf->priv->x1/2), vf->priv->bitmap.v + (((ypos/2)*(vf->priv->w)/2)) + (vf->priv->x1/2), (vf->priv->x2 - vf->priv->x1)/2 ); } diff --git a/libmpcodecs/vf_detc.c b/libmpcodecs/vf_detc.c index 52932d8d6b..27be5d393c 100644 --- a/libmpcodecs/vf_detc.c +++ b/libmpcodecs/vf_detc.c @@ -60,7 +60,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int for(i=0; iscaleh == 1) { - memcpy(to + dst, to, dst); + fast_memcpy(to + dst, to, dst); to += dst; } to += dst; diff --git a/libmpcodecs/vf_filmdint.c b/libmpcodecs/vf_filmdint.c index 26896626e2..0fb8ea69d1 100644 --- a/libmpcodecs/vf_filmdint.c +++ b/libmpcodecs/vf_filmdint.c @@ -97,7 +97,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int for(i=0; i 2) { if (threshold >= 128) { - memcpy(d, a, w); - memcpy(d+ds, a+bos, w); + fast_memcpy(d, a, w); + fast_memcpy(d+ds, a+bos, w); } else if (mmx2 == 1) { ret += dint_copy_line_mmx2(d, a, bos, cos, ds, ss, w, threshold); } else @@ -730,9 +730,9 @@ dint_copy_plane(unsigned char *d, unsigned char *a, unsigned char *b, d += 2*ds; a += 2*ss; } - memcpy(d, a, w); + fast_memcpy(d, a, w); if (h == 2) - memcpy(d+ds, a+bos, w); + fast_memcpy(d+ds, a+bos, w); return ret; } diff --git a/libmpcodecs/vf_fspp.c b/libmpcodecs/vf_fspp.c index 541dfb6564..acb39f5c56 100644 --- a/libmpcodecs/vf_fspp.c +++ b/libmpcodecs/vf_fspp.c @@ -421,15 +421,15 @@ static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, if (!src || !dst) return; // HACK avoid crash for Y8 colourspace for(y=0; ysrc + index, src + y*src_stride, width);//this line can be avoided by using DR & user fr.buffers + fast_memcpy(p->src + index, src + y*src_stride, width);//this line can be avoided by using DR & user fr.buffers for(x=0; x<8; x++){ p->src[index - x - 1]= p->src[index + x ]; p->src[index + width + x ]= p->src[index + width - x - 1]; } } for(y=0; y<8; y++){ - memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride); - memcpy(p->src + (height+8+y)*stride, p->src + (height-y+7)*stride, stride); + fast_memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride); + fast_memcpy(p->src + (height+8+y)*stride, p->src + (height-y+7)*stride, stride); } //FIXME (try edge emu) @@ -456,8 +456,8 @@ static void filter(struct vf_priv_s *p, uint8_t *dst, uint8_t *src, column_fidct_s((int16_t*)(&p->threshold_mtx[0]), block+x*8, block3+x*8, 8); //yes, this is a HOTSPOT } row_idct_s(block3+0*8, p->temp + (y&15)*stride+x0+2-(y&1), stride, 2*(BLOCKSZ-1)); - memcpy(block, block+(BLOCKSZ-1)*64, 8*8*sizeof(DCTELEM)); //cycling - memcpy(block3, block3+(BLOCKSZ-1)*64, 6*8*sizeof(DCTELEM)); + fast_memcpy(block, block+(BLOCKSZ-1)*64, 8*8*sizeof(DCTELEM)); //cycling + fast_memcpy(block3, block3+(BLOCKSZ-1)*64, 6*8*sizeof(DCTELEM)); } // es=width+8-x0; // 8, ... @@ -532,7 +532,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) if(mpi->pict_type != 3 && mpi->qscale && !vf->priv->qp){ if(!vf->priv->non_b_qp) vf->priv->non_b_qp= malloc(mpi->qstride * ((mpi->h + 15) >> 4)); - memcpy(vf->priv->non_b_qp, mpi->qscale, mpi->qstride * ((mpi->h + 15) >> 4)); + fast_memcpy(vf->priv->non_b_qp, mpi->qscale, mpi->qstride * ((mpi->h + 15) >> 4)); } if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){ char *qp_tab= vf->priv->non_b_qp; diff --git a/libmpcodecs/vf_il.c b/libmpcodecs/vf_il.c index edc847ccff..a5af511c6e 100644 --- a/libmpcodecs/vf_il.c +++ b/libmpcodecs/vf_il.c @@ -58,20 +58,20 @@ static void interleave(uint8_t *dst, uint8_t *src, int w, int h, int dstStride, switch(interleave){ case -1: for(y=0; y < m; y++){ - memcpy(dst + dstStride* y , src + srcStride*(y*2 + a), w); - memcpy(dst + dstStride*(y + m), src + srcStride*(y*2 + b), w); + fast_memcpy(dst + dstStride* y , src + srcStride*(y*2 + a), w); + fast_memcpy(dst + dstStride*(y + m), src + srcStride*(y*2 + b), w); } break; case 0: for(y=0; y < m; y++){ - memcpy(dst + dstStride* y*2 , src + srcStride*(y*2 + a), w); - memcpy(dst + dstStride*(y*2+1), src + srcStride*(y*2 + b), w); + fast_memcpy(dst + dstStride* y*2 , src + srcStride*(y*2 + a), w); + fast_memcpy(dst + dstStride*(y*2+1), src + srcStride*(y*2 + b), w); } break; case 1: for(y=0; y < m; y++){ - memcpy(dst + dstStride*(y*2+a), src + srcStride* y , w); - memcpy(dst + dstStride*(y*2+b), src + srcStride*(y + m), w); + fast_memcpy(dst + dstStride*(y*2+a), src + srcStride* y , w); + fast_memcpy(dst + dstStride*(y*2+b), src + srcStride*(y + m), w); } break; } diff --git a/libmpcodecs/vf_ivtc.c b/libmpcodecs/vf_ivtc.c index 9c30a02477..4f9ca36d7c 100644 --- a/libmpcodecs/vf_ivtc.c +++ b/libmpcodecs/vf_ivtc.c @@ -47,7 +47,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int for(i=0; iplanes[z]; dstp = pmpi->planes[z]; for (y=0; y>1; i; i--) { - memcpy(dst, src0, w); + fast_memcpy(dst, src0, w); src0 += ss; dst += ds; - memcpy(dst, src1, w); + fast_memcpy(dst, src1, w); src1 += ss; dst += ds; } @@ -153,8 +153,8 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts) } } if (mpi->qscale) { - memcpy(b->planes[3], mpi->qscale, c->w[3]); - memcpy(b->planes[3]+c->w[3], mpi->qscale, c->w[3]); + fast_memcpy(b->planes[3], mpi->qscale, c->w[3]); + fast_memcpy(b->planes[3]+c->w[3], mpi->qscale, c->w[3]); } p = mpi->fields & MP_IMGFIELD_TOP_FIRST ? 0 : diff --git a/libmpcodecs/vf_softpulldown.c b/libmpcodecs/vf_softpulldown.c index b261d906f0..493d3502cb 100644 --- a/libmpcodecs/vf_softpulldown.c +++ b/libmpcodecs/vf_softpulldown.c @@ -24,7 +24,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int for(i=0; isrc + index, src + y*src_stride, width); + fast_memcpy(p->src + index, src + y*src_stride, width); for(x=0; x<8; x++){ p->src[index - x - 1]= p->src[index + x ]; p->src[index + width + x ]= p->src[index + width - x - 1]; } } for(y=0; y<8; y++){ - memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride); - memcpy(p->src + (height+8+y)*stride, p->src + (height-y+7)*stride, stride); + fast_memcpy(p->src + ( 7-y)*stride, p->src + ( y+8)*stride, stride); + fast_memcpy(p->src + (height+8+y)*stride, p->src + (height-y+7)*stride, stride); } //FIXME (try edge emu) @@ -478,7 +478,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ if(mpi->pict_type != 3 && mpi->qscale && !vf->priv->qp){ if(!vf->priv->non_b_qp) vf->priv->non_b_qp= malloc(mpi->qstride * ((mpi->h + 15) >> 4)); - memcpy(vf->priv->non_b_qp, mpi->qscale, mpi->qstride * ((mpi->h + 15) >> 4)); + fast_memcpy(vf->priv->non_b_qp, mpi->qscale, mpi->qstride * ((mpi->h + 15) >> 4)); } if(vf->priv->log2_count || !(mpi->flags&MP_IMGFLAG_DIRECT)){ char *qp_tab= vf->priv->non_b_qp; diff --git a/libmpcodecs/vf_telecine.c b/libmpcodecs/vf_telecine.c index f75ccfa40f..e16c9fab20 100644 --- a/libmpcodecs/vf_telecine.c +++ b/libmpcodecs/vf_telecine.c @@ -22,7 +22,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int for(i=0; i>2; d += ds; s += ss; - if (!up) memcpy(d, s, w); + if (!up) fast_memcpy(d, s, w); asm volatile("emms \n\t" : : : "memory"); } #endif @@ -276,7 +276,7 @@ static void qpel_li_C(unsigned char *d, unsigned char *s, int w, int h, int ds, int i, j, ssd=ss; if (up) { ssd = -ss; - memcpy(d, s, w); + fast_memcpy(d, s, w); d += ds; s += ss; } @@ -286,7 +286,7 @@ static void qpel_li_C(unsigned char *d, unsigned char *s, int w, int h, int ds, d += ds; s += ss; } - if (!up) memcpy(d, s, w); + if (!up) fast_memcpy(d, s, w); } static void qpel_4tap_C(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up) @@ -294,7 +294,7 @@ static void qpel_4tap_C(unsigned char *d, unsigned char *s, int w, int h, int ds int i, j, ssd=ss; if (up) { ssd = -ss; - memcpy(d, s, w); + fast_memcpy(d, s, w); d += ds; s += ss; } for (j=0; j>2; d += ds; s += ss; - if (!up) memcpy(d, s, w); + if (!up) fast_memcpy(d, s, w); } static void (*qpel_li)(unsigned char *d, unsigned char *s, int w, int h, int ds, int ss, int up); diff --git a/libmpcodecs/vf_tinterlace.c b/libmpcodecs/vf_tinterlace.c index eb02872b0e..351cde3a47 100644 --- a/libmpcodecs/vf_tinterlace.c +++ b/libmpcodecs/vf_tinterlace.c @@ -43,7 +43,7 @@ static inline void *my_memcpy_pic(void * dst, void * src, int bytesPerLine, int for(i=0; isrc[i] + index, src[i] + y*src_stride[i], w); + fast_memcpy(p->src[i] + index, src[i] + y*src_stride[i], w); for(x=0; xsrc[i][index - x - 1]= p->src[i][index + x ]; p->src[i][index + w + x ]= p->src[i][index + w - x - 1]; } } for(y=0; ysrc[i] + ( block-1-y)*stride, p->src[i] + ( y+block )*stride, stride); - memcpy(p->src[i] + (h+block +y)*stride, p->src[i] + (h-y+block-1)*stride, stride); + fast_memcpy(p->src[i] + ( block-1-y)*stride, p->src[i] + ( y+block )*stride, stride); + fast_memcpy(p->src[i] + (h+block +y)*stride, p->src[i] + (h-y+block-1)*stride, stride); } p->frame->linesize[i]= stride; diff --git a/libmpcodecs/vf_yadif.c b/libmpcodecs/vf_yadif.c index 0b37731464..89c1a8b6bd 100644 --- a/libmpcodecs/vf_yadif.c +++ b/libmpcodecs/vf_yadif.c @@ -62,7 +62,7 @@ static void (*filter_line)(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uin static void store_ref(struct vf_priv_s *p, uint8_t *src[3], int src_stride[3], int width, int height){ int i; - memcpy (p->ref[3], p->ref[0], sizeof(uint8_t *)*3); + fast_memcpy (p->ref[3], p->ref[0], sizeof(uint8_t *)*3); memmove(p->ref[0], p->ref[1], sizeof(uint8_t *)*3*3); for(i=0; i<3; i++){ @@ -363,7 +363,7 @@ static void filter(struct vf_priv_s *p, uint8_t *dst[3], int dst_stride[3], int uint8_t *dst2= &dst[i][y*dst_stride[i]]; filter_line(p, dst2, prev, cur, next, w, refs, parity ^ tff); }else{ - memcpy(&dst[i][y*dst_stride[i]], &p->ref[1][i][y*refs], w); + fast_memcpy(&dst[i][y*dst_stride[i]], &p->ref[1][i][y*refs], w); } } } diff --git a/libmpcodecs/vf_yvu9.c b/libmpcodecs/vf_yvu9.c index f22053934c..03bf9a135d 100644 --- a/libmpcodecs/vf_yvu9.c +++ b/libmpcodecs/vf_yvu9.c @@ -37,7 +37,7 @@ static int put_image(struct vf_instance_s* vf, mp_image_t *mpi, double pts){ mpi->w, mpi->h); for(y=0;yh;y++) - memcpy(dmpi->planes[0]+dmpi->stride[0]*y, + fast_memcpy(dmpi->planes[0]+dmpi->stride[0]*y, mpi->planes[0]+mpi->stride[0]*y, mpi->w); diff --git a/libmpdemux/demux_asf.c b/libmpdemux/demux_asf.c index c932e1031b..983f1eefa5 100644 --- a/libmpdemux/demux_asf.c +++ b/libmpdemux/demux_asf.c @@ -56,12 +56,12 @@ static void asf_descrambling(unsigned char **src,unsigned len, struct asf_priv* //i+=asf_scrambling_h*asf_scrambling_w; for(x=0;xscrambling_w;x++) for(y=0;yscrambling_h;y++){ - memcpy(dst+i,s2+(y*asf->scrambling_w+x)*asf->scrambling_b,asf->scrambling_b); + fast_memcpy(dst+i,s2+(y*asf->scrambling_w+x)*asf->scrambling_b,asf->scrambling_b); i+=asf->scrambling_b; } s2+=asf->scrambling_h*asf->scrambling_w*asf->scrambling_b; } - //if(ilen!=offs && offs!=-1) mp_msg(MSGT_DEMUX,MSGL_V,"warning! fragment.len=%d BUT next fragment offset=%d \n",dp->len,offs); dp->buffer=realloc(dp->buffer,dp->len+len+FF_INPUT_BUFFER_PADDING_SIZE); - memcpy(dp->buffer+dp->len,data,len); + fast_memcpy(dp->buffer+dp->len,data,len); memset(dp->buffer+dp->len+len, 0, FF_INPUT_BUFFER_PADDING_SIZE); mp_dbg(MSGT_DEMUX,MSGL_DBG4,"data appended! %d+%d\n",dp->len,len); dp->len+=len; @@ -224,7 +224,7 @@ static int demux_asf_read_packet(demuxer_t *demux,unsigned char *data,int len,in return 0; } dp=new_demux_packet(len); - memcpy(dp->buffer,data,len); + fast_memcpy(dp->buffer,data,len); if (asf->asf_is_dvr_ms) dp->pts=time*0.0000001f; else diff --git a/libmpdemux/demux_gif.c b/libmpdemux/demux_gif.c index 3d8b3ff3f8..13dbfb5365 100644 --- a/libmpdemux/demux_gif.c +++ b/libmpdemux/demux_gif.c @@ -145,7 +145,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) dp = new_demux_packet(priv->w * priv->h); buf = calloc(gif->Image.Width, gif->Image.Height); if (priv->useref) - memcpy(dp->buffer, priv->refimg, priv->w * priv->h); + fast_memcpy(dp->buffer, priv->refimg, priv->w * priv->h); else memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h); @@ -199,7 +199,7 @@ static int demux_gif_fill_buffer(demuxer_t *demuxer, demux_stream_t *ds) memcpy_transp_pic(dest, buf, w, h, priv->w, gif->Image.Width, transparency, transparent_col); - if (refmode == 1) memcpy(priv->refimg, dp->buffer, priv->w * priv->h); + if (refmode == 1) fast_memcpy(priv->refimg, dp->buffer, priv->w * priv->h); if (refmode == 2 && priv->useref) { dest = priv->refimg + priv->w * t + l; memset(buf, gif->SBackGroundColor, len); diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 96c4f12bb3..758d203299 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -429,7 +429,7 @@ while(len>0){ if(!ds_fill_buffer(ds)) return bytes; } else { if(x>len) x=len; - if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); + if(mem) fast_memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); bytes+=x;len-=x;ds->buffer_pos+=x; } } @@ -445,7 +445,7 @@ while(len>0){ if(!ds_fill_buffer(ds)) return bytes; } else { if(x>len) x=len; - if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); + if(mem) fast_memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); bytes+=x;len-=x;ds->buffer_pos+=x; return bytes; // stop at end of package! (for correct timestamping) } diff --git a/libvo/fastmemcpy.h b/libvo/fastmemcpy.h index d0316f44db..295efd8077 100644 --- a/libvo/fastmemcpy.h +++ b/libvo/fastmemcpy.h @@ -29,14 +29,15 @@ extern void * fast_memcpy(void * to, const void * from, size_t len); extern void * mem2agpcpy(void * to, const void * from, size_t len); -#define memcpy(a,b,c) fast_memcpy(a,b,c) #else /* HAVE_MMX/MMX2/3DNOW/SSE/SSE2 */ #define mem2agpcpy(a,b,c) memcpy(a,b,c) +#define fast_memcpy(a,b,c) memcpy(a,b,c) #endif #else /* USE_FASTMEMCPY */ #define mem2agpcpy(a,b,c) memcpy(a,b,c) +#define fast_memcpy(a,b,c) memcpy(a,b,c) #endif static inline void * mem2agpcpy_pic(void * dst, const void * src, int bytesPerLine, int height, int dstStride, int srcStride) @@ -80,13 +81,13 @@ static inline void * memcpy_pic(void * dst, const void * src, int bytesPerLine, srcStride = -srcStride; } - memcpy(dst, src, srcStride*height); + fast_memcpy(dst, src, srcStride*height); } else { for(i=0; iU + (uint32_t) VOODOO_YUV_STRIDE* j ,((uint8_t*) u) + uv_imax* j , uv_imax); - memcpy(fb_YUV->V + (uint32_t) VOODOO_YUV_STRIDE* j ,((uint8_t*) v) + uv_imax* j , uv_imax); - memcpy(fb_YUV->Y + (uint32_t) VOODOO_YUV_STRIDE* (j<<1) ,((uint8_t*) y) + y_imax * (j<<1) , y_imax); - memcpy(fb_YUV->Y + (uint32_t) VOODOO_YUV_STRIDE*((j<<1)+1),((uint8_t*) y) + y_imax *((j<<1)+1), y_imax); + fast_memcpy(fb_YUV->U + (uint32_t) VOODOO_YUV_STRIDE* j ,((uint8_t*) u) + uv_imax* j , uv_imax); + fast_memcpy(fb_YUV->V + (uint32_t) VOODOO_YUV_STRIDE* j ,((uint8_t*) v) + uv_imax* j , uv_imax); + fast_memcpy(fb_YUV->Y + (uint32_t) VOODOO_YUV_STRIDE* (j<<1) ,((uint8_t*) y) + y_imax * (j<<1) , y_imax); + fast_memcpy(fb_YUV->Y + (uint32_t) VOODOO_YUV_STRIDE*((j<<1)+1),((uint8_t*) y) + y_imax *((j<<1)+1), y_imax); } LOG("video_out_3dfx: done planar dump\n"); } diff --git a/libvo/vo_bl.c b/libvo/vo_bl.c index b227eb88f0..7036c3c4f3 100644 --- a/libvo/vo_bl.c +++ b/libvo/vo_bl.c @@ -174,7 +174,7 @@ static int udp_init(bl_host_t *h) { addr.sin_family = AF_INET; addr.sin_port = htons(h->port); - memcpy(&addr.sin_addr.s_addr, dest->h_addr_list[0], dest->h_length); + fast_memcpy(&addr.sin_addr.s_addr, dest->h_addr_list[0], dest->h_length); h->fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP); if (h->fd < 0) { @@ -283,7 +283,7 @@ static void flip_page (void) { if (prevpts >= 0) for (i = 0; i < no_bl_files; i++) bl->write_frame(&bl_files[i], tmp, (vo_pts - prevpts)/90); - memcpy(tmp, image, bl->width*bl->height*bl->channels); + fast_memcpy(tmp, image, bl->width*bl->height*bl->channels); prevpts = vo_pts; for (i = 0; i < no_bl_hosts; i++) bl->send_frame(&bl_hosts[i]); @@ -331,7 +331,7 @@ static int draw_slice(uint8_t *srcimg[], int stride[], dst=image; /* + zr->off_y + zr->image_width*(y/zr->vdec)+x;*/ // copy Y: for (i = 0; i < h; i++) { - memcpy(dst,src,w); + fast_memcpy(dst,src,w); dst+=bl->width; src+=stride[0]; diff --git a/libvo/vo_directfb2.c b/libvo/vo_directfb2.c index 15e56a886a..3a27d9bfaa 100644 --- a/libvo/vo_directfb2.c +++ b/libvo/vo_directfb2.c @@ -1233,7 +1233,7 @@ static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) srcp = src[0]; for (i=0;iplanes[0]+mpi->y*mpi->stride[0]+mpi->x; for (i=0;ih;i++) { - memcpy(dst+i*pitch,src+i*mpi->stride[0],p); + fast_memcpy(dst+i*pitch,src+i*mpi->stride[0],p); } @@ -1338,14 +1338,14 @@ static uint32_t put_image(mp_image_t *mpi){ src = mpi->planes[2]+mpi->y*mpi->stride[2]+mpi->x/2; for (i=0;ih/2;i++) { - memcpy(dst+i*pitch/2,src+i*mpi->stride[2],p); + fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[2],p); } dst += pitch*height/4; src = mpi->planes[1]+mpi->y*mpi->stride[1]+mpi->x/2; for (i=0;ih/2;i++) { - memcpy(dst+i*pitch/2,src+i*mpi->stride[1],p); + fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[1],p); } } else { @@ -1355,14 +1355,14 @@ static uint32_t put_image(mp_image_t *mpi){ src = mpi->planes[1]+mpi->y*mpi->stride[1]+mpi->x/2; for (i=0;ih/2;i++) { - memcpy(dst+i*pitch/2,src+i*mpi->stride[1],p); + fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[1],p); } dst += pitch*height/4; src = mpi->planes[2]+mpi->y*mpi->stride[2]+mpi->x/2; for (i=0;ih/2;i++) { - memcpy(dst+i*pitch/2,src+i*mpi->stride[2],p); + fast_memcpy(dst+i*pitch/2,src+i*mpi->stride[2],p); } } diff --git a/libvo/vo_directx.c b/libvo/vo_directx.c index 3521f9dfeb..cb36a2ba2b 100644 --- a/libvo/vo_directx.c +++ b/libvo/vo_directx.c @@ -1179,7 +1179,7 @@ static void flip_page(void) static int draw_frame(uint8_t *src[]) { - memcpy( image, *src, dstride * image_height ); + fast_memcpy( image, *src, dstride * image_height ); return 0; } @@ -1262,7 +1262,7 @@ static uint32_t put_image(mp_image_t *mpi){ } else //packed { - memcpy( image, mpi->planes[0], image_height * dstride); + fast_memcpy( image, mpi->planes[0], image_height * dstride); } return VO_TRUE; } diff --git a/libvo/vo_dxr2.c b/libvo/vo_dxr2.c index f43ed25f6c..87a5d3fdb3 100644 --- a/libvo/vo_dxr2.c +++ b/libvo/vo_dxr2.c @@ -165,13 +165,13 @@ int write_dxr2(unsigned char *data, int len) } while (len>0) if ((dxr2bufpos+len) <= BUF_SIZE) { - memcpy(dxr2buf+dxr2bufpos, data, len); + fast_memcpy(dxr2buf+dxr2bufpos, data, len); dxr2bufpos+=len; len=0; } else { int copylen=BUF_SIZE-dxr2bufpos; if(copylen > 0) { - memcpy(dxr2buf+dxr2bufpos, data, copylen); + fast_memcpy(dxr2buf+dxr2bufpos, data, copylen); dxr2bufpos += copylen; data+=copylen; len-=copylen; diff --git a/libvo/vo_dxr3.c b/libvo/vo_dxr3.c index f08a706127..8d86b61a83 100644 --- a/libvo/vo_dxr3.c +++ b/libvo/vo_dxr3.c @@ -727,7 +727,7 @@ static void draw_osd(void) if ( !cleared ) { spued->count=spubuf->count; - memcpy( spued->data,spubuf->data,DATASIZE ); + fast_memcpy( spued->data,spubuf->data,DATASIZE ); cleared=1; } } @@ -1106,7 +1106,7 @@ static struct lut_entry *new_lookuptable(overlay_t *o) },*p; p = malloc(sizeof(m)); - memcpy(p,m,sizeof(m)); + fast_memcpy(p,m,sizeof(m)); return p; } diff --git a/libvo/vo_fbdev.c b/libvo/vo_fbdev.c index f59aa024b6..a8675ee95b 100644 --- a/libvo/vo_fbdev.c +++ b/libvo/vo_fbdev.c @@ -1075,7 +1075,7 @@ static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, s = src[0]; while (h) { - memcpy(d, s, w * fb_pixel_size); + fast_memcpy(d, s, w * fb_pixel_size); d += fb_line_len; s += stride[0]; h--; diff --git a/libvo/vo_fbdev2.c b/libvo/vo_fbdev2.c index 053c193526..f303832e59 100644 --- a/libvo/vo_fbdev2.c +++ b/libvo/vo_fbdev2.c @@ -354,7 +354,7 @@ static int draw_slice(uint8_t *src[], int stride[], int w, int h, int x, int y) int i; for (i = 0; i < h; i++) { - memcpy(dest, in, w * fb_pixel_size); + fast_memcpy(dest, in, w * fb_pixel_size); dest += next; in += stride[0]; } @@ -371,7 +371,7 @@ static void flip_page(void) int i, out_offset = 0, in_offset = 0; for (i = 0; i < in_height; i++) { - memcpy(center + out_offset, next_frame + in_offset, + fast_memcpy(center + out_offset, next_frame + in_offset, in_width * fb_pixel_size); out_offset += fb_line_len; in_offset += in_width * fb_pixel_size; diff --git a/libvo/vo_macosx.m b/libvo/vo_macosx.m index fdbff85a14..1b72f602b6 100644 --- a/libvo/vo_macosx.m +++ b/libvo/vo_macosx.m @@ -202,7 +202,7 @@ static int draw_frame(uint8_t *src[]) { case IMGFMT_BGR32: case IMGFMT_RGB32: - memcpy(image_data, src[0], image_width*image_height*image_bytes); + fast_memcpy(image_data, src[0], image_width*image_height*image_bytes); break; case IMGFMT_YUY2: diff --git a/libvo/vo_quartz.c b/libvo/vo_quartz.c index a47f58c942..32b0b80c10 100644 --- a/libvo/vo_quartz.c +++ b/libvo/vo_quartz.c @@ -1021,7 +1021,7 @@ static int draw_frame(uint8_t *src[]) switch (image_format) { case IMGFMT_RGB32: - memcpy(image_data,src[0],image_size); + fast_memcpy(image_data,src[0],image_size); return 0; case IMGFMT_UYVY: diff --git a/libvo/vo_sdl.c b/libvo/vo_sdl.c index 415c43de17..177003e0e7 100644 --- a/libvo/vo_sdl.c +++ b/libvo/vo_sdl.c @@ -1052,11 +1052,11 @@ static int draw_frame(uint8_t *src[]) mysrc+=priv->framePlaneYUY; for(i = 0; i < priv->height; i++) { mysrc-=priv->stridePlaneYUY; - memcpy (dst, mysrc, priv->stridePlaneYUY); + fast_memcpy (dst, mysrc, priv->stridePlaneYUY); dst+=priv->overlay->pitches[0]; } } - else memcpy (dst, src[0], priv->framePlaneYUY); + else fast_memcpy (dst, src[0], priv->framePlaneYUY); SDL_OVR_UNLOCK break; @@ -1075,11 +1075,11 @@ static int draw_frame(uint8_t *src[]) mysrc+=priv->framePlaneRGB; for(i = 0; i < priv->height; i++) { mysrc-=priv->stridePlaneRGB; - memcpy (dst, mysrc, priv->stridePlaneRGB); + fast_memcpy (dst, mysrc, priv->stridePlaneRGB); dst += priv->surface->pitch; } } - else memcpy (dst, src[0], priv->framePlaneRGB); + else fast_memcpy (dst, src[0], priv->framePlaneRGB); SDL_SRF_UNLOCK(priv->surface) } else { SDL_SRF_LOCK(priv->rgbsurface, -1) @@ -1088,11 +1088,11 @@ static int draw_frame(uint8_t *src[]) mysrc+=priv->framePlaneRGB; for(i = 0; i < priv->height; i++) { mysrc-=priv->stridePlaneRGB; - memcpy (dst, mysrc, priv->stridePlaneRGB); + fast_memcpy (dst, mysrc, priv->stridePlaneRGB); dst += priv->rgbsurface->pitch; } } - else memcpy (dst, src[0], priv->framePlaneRGB); + else fast_memcpy (dst, src[0], priv->framePlaneRGB); SDL_SRF_UNLOCK(priv->rgbsurface) } break; diff --git a/libvo/vo_svga.c b/libvo/vo_svga.c index acd2a104f6..182880a2a9 100644 --- a/libvo/vo_svga.c +++ b/libvo/vo_svga.c @@ -206,7 +206,7 @@ int i; rgbplane=PageStore[0].vbase + (y*mode_stride) + (x*modeinfo->bytesperpixel); for(i=0;ibytesperpixel); + fast_memcpy(rgbplane,zerobuf,w*modeinfo->bytesperpixel); // memset(rgbplane,0,w*modeinfo->bytesperpixel); rgbplane+=mode_stride; } diff --git a/libvo/vo_syncfb.c b/libvo/vo_syncfb.c index a6b965e264..472f89c617 100644 --- a/libvo/vo_syncfb.c +++ b/libvo/vo_syncfb.c @@ -127,7 +127,7 @@ write_frame_YUV420P2(uint_8 *y,uint_8 *cr, uint_8 *cb) for(h=0; h < _config.src_height; h++) { - memcpy(dest, y, _config.src_width); + fast_memcpy(dest, y, _config.src_width); y += _config.src_width; dest += bespitch; } @@ -161,7 +161,7 @@ write_slice_YUV420P2(uint_8 *y,uint_8 *cr, uint_8 *cb,uint_32 slice_num) for(h=0; h < 16; h++) { - memcpy(dest, y, _config.src_width); + fast_memcpy(dest, y, _config.src_width); y += _config.src_width; dest += bespitch; } @@ -190,7 +190,7 @@ write_slice_YUV420P3(uint_8 *y,uint_8 *cr, uint_8 *cb,int stride[],uint_32 ypos, dest = frame_mem + bufinfo.offset + (bespitch * ypos); for(h=0; h < ysize; h++) { - memcpy(dest, y, xsize); + fast_memcpy(dest, y, xsize); y += stride[0]; dest += bespitch; } @@ -201,7 +201,7 @@ write_slice_YUV420P3(uint_8 *y,uint_8 *cr, uint_8 *cb,int stride[],uint_32 ypos, dest = frame_mem + bufinfo.offset_p2 + (bespitch * ypos)/4; for(h=0; h < ysize; h++) { - memcpy(dest, cr, xsize); + fast_memcpy(dest, cr, xsize); cr += stride[1]; dest += bespitch/2; } @@ -209,7 +209,7 @@ write_slice_YUV420P3(uint_8 *y,uint_8 *cr, uint_8 *cb,int stride[],uint_32 ypos, dest = frame_mem + bufinfo.offset_p3 + (bespitch * ypos)/4; for(h=0; h < ysize; h++) { - memcpy(dest, cb, xsize); + fast_memcpy(dest, cb, xsize); cb += stride[2]; dest += bespitch/2; } diff --git a/libvo/vo_vesa.c b/libvo/vo_vesa.c index 50df7f26be..a7c51197a0 100644 --- a/libvo/vo_vesa.c +++ b/libvo/vo_vesa.c @@ -217,7 +217,7 @@ static void __vbeSetPixel(int x, int y, int r, int g, int b) color = (r << shift_r) | (g << shift_g) | (b << shift_b); offset = y * bpl + (x * pixel_size); if(!VALID_WIN_FRAME(offset)) __vbeSwitchBank(offset); - memcpy(VIDEO_PTR(offset), &color, pixel_size); + fast_memcpy(VIDEO_PTR(offset), &color, pixel_size); } /* @@ -226,7 +226,7 @@ static void __vbeSetPixel(int x, int y, int r, int g, int b) */ static void __vbeCopyBlockFast(unsigned long offset,uint8_t *image,unsigned long size) { - memcpy(&win.ptr[offset],image,size); + fast_memcpy(&win.ptr[offset],image,size); } static void __vbeCopyBlock(unsigned long offset,uint8_t *image,unsigned long size) @@ -236,7 +236,7 @@ static void __vbeCopyBlock(unsigned long offset,uint8_t *image,unsigned long siz { if(!VALID_WIN_FRAME(offset)) __vbeSwitchBank(offset); delta = min(size,win.high - offset); - memcpy(VIDEO_PTR(offset),&image[src_idx],delta); + fast_memcpy(VIDEO_PTR(offset),&image[src_idx],delta); src_idx += delta; offset += delta; size -= delta; @@ -649,7 +649,7 @@ config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uin else fs_mode = 1; } if((err=vbeInit()) != VBE_OK) { PRINT_VBE_ERR("vbeInit",err); return -1; } - memcpy(vib.VESASignature,"VBE2",4); + fast_memcpy(vib.VESASignature,"VBE2",4); if(!vib_set && (err=vbeGetControllerInfo(&vib)) != VBE_OK) { PRINT_VBE_ERR("vbeGetControllerInfo",err); diff --git a/libvo/vo_yuv4mpeg.c b/libvo/vo_yuv4mpeg.c index 1b5b5696e9..c06cf28e8f 100644 --- a/libvo/vo_yuv4mpeg.c +++ b/libvo/vo_yuv4mpeg.c @@ -175,9 +175,9 @@ static void swap_fields(uint8_t *ptr, const int h, const int stride) for (i=0; i> 1) + (x >> 1); for (i = 0; i < h / 2; i++) { - memcpy(dstu, src1 , w >> 1); - memcpy(dstv, src2, w >> 1); + fast_memcpy(dstu, src1 , w >> 1); + fast_memcpy(dstv, src2, w >> 1); src1 += stride[1]; src2 += stride[2]; dstu += imgstride; @@ -405,7 +405,7 @@ static int draw_slice(uint8_t *srcimg[], int stride[], int w,int h,int x,int y) dst = rgb_buffer + (image_width * y + x) * 3; for (i = 0; i < h; i++) { - memcpy(dst, src, w * 3); + fast_memcpy(dst, src, w * 3); src += stride[0]; dst += image_width * 3; } @@ -424,7 +424,7 @@ static int draw_frame(uint8_t * src[]) case IMGFMT_BGR24: case IMGFMT_RGB24: - memcpy(rgb_buffer, src[0], image_width * image_height * 3); + fast_memcpy(rgb_buffer, src[0], image_width * image_height * 3); break; } return 0; diff --git a/libvo/vo_zr.c b/libvo/vo_zr.c index f64bf419d2..f919ee9227 100644 --- a/libvo/vo_zr.c +++ b/libvo/vo_zr.c @@ -546,7 +546,7 @@ static int draw_frame(uint8_t * src[]) { source = src[0] + 2*g->yoff*zr->vdec*zr->stride + 2*g->xoff; dest = zr->image + 2*zr->off_y; for (i = 0; i < g->height/zr->vdec; i++) { - memcpy(dest, source, zr->image_width*2); + fast_memcpy(dest, source, zr->image_width*2); dest += 2*zr->image_width; source += zr->vdec*zr->stride; } @@ -619,7 +619,7 @@ static int draw_slice(uint8_t *srcimg[], int stride[], // copy Y: for (i = 0; i < h; i++) { if ((i + x)%zr->vdec == 0) { - memcpy(dst,src,w); + fast_memcpy(dst,src,w); dst+=zr->image_width; } src+=stride[0]; @@ -633,8 +633,8 @@ static int draw_slice(uint8_t *srcimg[], int stride[], zr->image_width/2+(x/2); for (i = 0; i< h/2; i++) { if ((i+x/2)%zr->vdec == 0) { - memcpy(dst1,src1,w/2); - memcpy(dst2,src2,w/2); + fast_memcpy(dst1,src1,w/2); + fast_memcpy(dst2,src2,w/2); dst1+=zr->image_width/2; dst2+=zr->image_width/2; } diff --git a/libvo/vo_zr2.c b/libvo/vo_zr2.c index 760294d87f..613496d48c 100644 --- a/libvo/vo_zr2.c +++ b/libvo/vo_zr2.c @@ -151,7 +151,7 @@ static uint32_t draw_image(mp_image_t *mpi) { } /* copy the jpeg image to the buffer which we acquired */ - memcpy(p->buf + p->zrq.size*p->frame, mpi->planes[0], size); + fast_memcpy(p->buf + p->zrq.size*p->frame, mpi->planes[0], size); return VO_TRUE; } @@ -394,7 +394,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, * We make configuration changes to a temporary params structure, * compare it with the old params structure and only apply the new * config if it is different from the old one. */ - memcpy(&zptmp, &p->zp, sizeof(zptmp)); + fast_memcpy(&zptmp, &p->zp, sizeof(zptmp)); /* translate the configuration to zoran understandable format */ zptmp.decimation = 0; @@ -423,7 +423,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, if (memcmp(&zptmp, &p->zp, sizeof(zptmp))) { /* config differs, we must update */ - memcpy(&p->zp, &zptmp, sizeof(zptmp)); + fast_memcpy(&p->zp, &zptmp, sizeof(zptmp)); stop_playing(p); if (ioctl(p->vdes, MJPIOC_S_PARAMS, &p->zp) < 0) { ERROR("error writing display params to card\n"); diff --git a/mencoder.c b/mencoder.c index 6a427b5432..efec45eb14 100644 --- a/mencoder.c +++ b/mencoder.c @@ -338,10 +338,10 @@ static int dec_audio(sh_audio_t *sh_audio,unsigned char* buffer,int total){ if(ret>0) sh_audio->a_out_buffer_len+=ret; else at_eof=1; } if(len>sh_audio->a_out_buffer_len) len=sh_audio->a_out_buffer_len; - memcpy(buffer+size,sh_audio->a_out_buffer,len); + fast_memcpy(buffer+size,sh_audio->a_out_buffer,len); sh_audio->a_out_buffer_len-=len; size+=len; if(sh_audio->a_out_buffer_len>0) - memcpy(sh_audio->a_out_buffer,&sh_audio->a_out_buffer[len],sh_audio->a_out_buffer_len); + fast_memcpy(sh_audio->a_out_buffer,&sh_audio->a_out_buffer[len],sh_audio->a_out_buffer_len); } return size; } @@ -771,7 +771,7 @@ case VCODEC_COPY: if (!curfile) { if (sh_video->bih) { mux_v->bih=malloc(sh_video->bih->biSize); - memcpy(mux_v->bih, sh_video->bih, sh_video->bih->biSize); + fast_memcpy(mux_v->bih, sh_video->bih, sh_video->bih->biSize); } else { @@ -941,7 +941,7 @@ case ACODEC_COPY: } if (sh_audio->wf){ mux_a->wf=malloc(sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); - memcpy(mux_a->wf, sh_audio->wf, sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); + fast_memcpy(mux_a->wf, sh_audio->wf, sizeof(WAVEFORMATEX) + sh_audio->wf->cbSize); if(!sh_audio->i_bps) sh_audio->i_bps=mux_a->wf->nAvgBytesPerSec; } else { mux_a->wf = malloc(sizeof(WAVEFORMATEX)); @@ -1222,7 +1222,7 @@ if(sh_audio){ mux_a->wf->nAvgBytesPerSec=0.5f+(double)mux_a->size/mux_a->timer; // avg bps (VBR) if(mux_a->buffer_len>=len){ mux_a->buffer_len-=len; - memcpy(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len); + fast_memcpy(mux_a->buffer,mux_a->buffer+len,mux_a->buffer_len); } @@ -1573,9 +1573,9 @@ static uint8_t* flip_upside_down(uint8_t* dst, const uint8_t* src, int width, int i; for(i = 0; i < height/2; i++) { - memcpy(tmp, &src[i*width], width); - memcpy(&dst[i * width], &src[(height - i) * width], width); - memcpy(&dst[(height - i) * width], tmp, width); + fast_memcpy(tmp, &src[i*width], width); + fast_memcpy(&dst[i * width], &src[(height - i) * width], width); + fast_memcpy(&dst[(height - i) * width], tmp, width); } free(tmp); diff --git a/mp3lib/sr1.c b/mp3lib/sr1.c index 25ee594ba8..9b607d0bfd 100644 --- a/mp3lib/sr1.c +++ b/mp3lib/sr1.c @@ -172,7 +172,7 @@ LOCAL void set_pointer(int backstep) // if(backstep!=512 && backstep>fsizeold) // printf("\rWarning! backstep (%d>%d) \n",backstep,fsizeold); wordpointer = bsbuf + ssize - backstep; - if (backstep) memcpy(wordpointer,bsbufold+fsizeold-backstep,backstep); + if (backstep) fast_memcpy(wordpointer,bsbufold+fsizeold-backstep,backstep); bitindex = 0; bitsleft+=8*backstep; // printf("Backstep %d (bitsleft=%d)\n",backstep,bitsleft); diff --git a/stream/tvi_v4l.c b/stream/tvi_v4l.c index 3d19122868..63c4fac471 100644 --- a/stream/tvi_v4l.c +++ b/stream/tvi_v4l.c @@ -1416,9 +1416,9 @@ static inline void copy_frame(priv_t *priv, unsigned char *dest, unsigned char * } // YV12 uses VIDEO_PALETTE_YUV420P, but the planes are swapped if (priv->format == IMGFMT_YV12) { - memcpy(dest, source, priv->width * priv->height); - memcpy(dest+priv->width * priv->height*5/4, source+priv->width * priv->height, priv->width * priv->height/4); - memcpy(dest+priv->width * priv->height, source+priv->width * priv->height*5/4, priv->width * priv->height/4); + fast_memcpy(dest, source, priv->width * priv->height); + fast_memcpy(dest+priv->width * priv->height*5/4, source+priv->width * priv->height, priv->width * priv->height/4); + fast_memcpy(dest+priv->width * priv->height, source+priv->width * priv->height*5/4, priv->width * priv->height/4); return; } @@ -1429,7 +1429,7 @@ static inline void copy_frame(priv_t *priv, unsigned char *dest, unsigned char * case VIDEO_PALETTE_RGB565: sptr = source + (priv->height-1)*priv->bytesperline; for (i = 0; i < priv->height; i++) { - memcpy(dest, sptr, priv->bytesperline); + fast_memcpy(dest, sptr, priv->bytesperline); dest += priv->bytesperline; sptr -= priv->bytesperline; } @@ -1437,7 +1437,7 @@ static inline void copy_frame(priv_t *priv, unsigned char *dest, unsigned char * case VIDEO_PALETTE_UYVY: case VIDEO_PALETTE_YUV420P: default: - memcpy(dest, source, priv->bytesperline * priv->height); + fast_memcpy(dest, source, priv->bytesperline * priv->height); } } @@ -1665,7 +1665,7 @@ static double grab_video_frame(priv_t *priv, char *buffer, int len) pthread_mutex_lock(&priv->video_buffer_mutex); interval = (double)priv->video_timebuffer[priv->video_head]*1e-6; - memcpy(buffer, priv->video_ringbuffer[priv->video_head], len); + fast_memcpy(buffer, priv->video_ringbuffer[priv->video_head], len); priv->video_cnt--; priv->video_head = (priv->video_head+1)%priv->video_buffer_size_current; pthread_mutex_unlock(&priv->video_buffer_mutex); @@ -1766,7 +1766,7 @@ static double grab_audio_frame(priv_t *priv, char *buffer, int len) while (priv->audio_head == priv->audio_tail) { usleep(10000); } - memcpy(buffer, priv->audio_ringbuffer+priv->audio_head*priv->audio_in.blocksize, len); + fast_memcpy(buffer, priv->audio_ringbuffer+priv->audio_head*priv->audio_in.blocksize, len); priv->audio_head = (priv->audio_head+1) % priv->audio_buffer_size; priv->audio_cnt--; priv->audio_sent_blocks_total++;