diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-05 14:27:54 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-06-05 14:27:54 +0000 |
commit | 6a09e8e2ed913cb44d74cac9c9e7a4cf7f4a18c1 (patch) | |
tree | ef08af22a70727d8ee9a902f622cf1d5042f5344 /libmpdemux | |
parent | ac87b4a173d2aee564e7cdca3037f101d946fbad (diff) | |
download | mpv-6a09e8e2ed913cb44d74cac9c9e7a4cf7f4a18c1.tar.bz2 mpv-6a09e8e2ed913cb44d74cac9c9e7a4cf7f4a18c1.tar.xz |
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
Diffstat (limited to 'libmpdemux')
-rw-r--r-- | libmpdemux/demux_asf.c | 8 | ||||
-rw-r--r-- | libmpdemux/demux_gif.c | 4 | ||||
-rw-r--r-- | libmpdemux/demuxer.c | 4 |
3 files changed, 8 insertions, 8 deletions
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;x<asf->scrambling_w;x++) for(y=0;y<asf->scrambling_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(i<len) memcpy(dst+i,src+i,len-i); + //if(i<len) fast_memcpy(dst+i,src+i,len-i); free(*src); *src = dst; } @@ -154,7 +154,7 @@ static void demux_asf_append_to_packet(demux_packet_t* dp,unsigned char *data,in { if(dp->len!=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) } |