videolan
/
vlc
mirror of https://gitea.goldendeliverer.com/videolan/vlc.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

s/vlc_memcpy/memcpy/ 

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
pull/2/head
Rafaël Carré 14 years ago
committed by Rémi Denis-Courmont
parent
102f976a62
commit
31c8cef1ba
42 changed files with 99 additions and 99 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      modules/access/dshow/dshow.cpp
  2. 6
      modules/access/linsys/linsys_sdi.c
  3. 2
      modules/access/pulse.c
  4. 2
      modules/access/shm.c
  5. 6
      modules/audio_filter/converter/a52tospdif.c
  6. 8
      modules/audio_filter/converter/dtstospdif.c
  7. 2
      modules/audio_filter/converter/mpgatofixed32.c
  8. 2
      modules/audio_output/audioqueue.c
  9. 8
      modules/audio_output/auhal.c
  10. 2
      modules/audio_output/directx.c
  11. 2
      modules/audio_output/kai.c
  12. 4
      modules/audio_output/packet.c
  13. 2
      modules/audio_output/waveout.c
  14. 2
      modules/codec/avcodec/video.c
  15. 2
      modules/codec/crystalhd.c
  16. 2
      modules/codec/dirac.c
  17. 4
      modules/codec/dmo/dmo.c
  18. 2
      modules/codec/faad.c
  19. 6
      modules/codec/mash.cpp
  20. 4
      modules/codec/omxil/utils.c
  21. 10
      modules/codec/rawvideo.c
  22. 2
      modules/codec/sdl_image.c
  23. 8
      modules/codec/shine/shine_mod.c
  24. 2
      modules/codec/theora.c
  25. 2
      modules/codec/twolame.c
  26. 2
      modules/mux/mpeg/pes.c
  27. 4
      modules/mux/mpeg/ts.c
  28. 6
      modules/stream_out/smem.c
  29. 10
      modules/stream_out/switcher.c
  30. 2
      modules/video_chroma/i420_rgb.h
  31. 16
      modules/video_chroma/i422_i420.c
  32. 6
      modules/video_filter/ball.c
  33. 2
      modules/video_filter/crop.c
  34. 2
      modules/video_filter/croppadd.c
  35. 22
      modules/video_filter/deinterlace/algo_basic.c
  36. 6
      modules/video_filter/deinterlace/algo_yadif.c
  37. 2
      modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
  38. 2
      modules/video_filter/invert.c
  39. 2
      modules/video_filter/panoramix.c
  40. 8
      modules/video_filter/ripple.c
  41. 6
      modules/video_filter/wave.c
  42. 4
      src/misc/picture.c

4
modules/access/dshow/dshow.cpp
View File

@ -1832,7 +1832,7 @@ static block_t *ReadCompressed( access_t *p_access )
}
sample.p_sample->GetPointer( &p_data );
vlc_memcpy( p_block->p_buffer, p_data, i_data_size );
memcpy( p_block->p_buffer, p_data, i_data_size );
sample.p_sample->Release();
/* The caller got what he wanted */
@ -1921,7 +1921,7 @@ static int Demux( demux_t *p_demux )
#endif
p_block = block_New( p_demux, i_data_size );
vlc_memcpy( p_block->p_buffer, p_data, i_data_size );
memcpy( p_block->p_buffer, p_data, i_data_size );
p_block->i_pts = p_block->i_dts = i_pts;
sample.p_sample->Release();

6
modules/access/linsys/linsys_sdi.c
View File

@ -948,7 +948,7 @@ static int DecodeAudio( demux_t *p_demux, sdi_audio_t *p_audio )
if ( p_audio->i_left_samples == p_audio->i_nb_samples &&
p_audio->i_right_samples == p_audio->i_nb_samples )
vlc_memcpy( p_output, p_audio->p_buffer,
memcpy( p_output, p_audio->p_buffer,
p_audio->i_nb_samples * sizeof(int16_t) * 2 );
else
{
@ -1054,7 +1054,7 @@ static const uint8_t *GetLine( demux_t *p_demux, const uint8_t **pp_parser,
if ( p_sys->i_line_buffer )
{
unsigned int i_remaining = i_total_size - p_sys->i_line_buffer;
vlc_memcpy( p_sys->p_line_buffer + p_sys->i_line_buffer,
memcpy( p_sys->p_line_buffer + p_sys->i_line_buffer,
*pp_parser, i_remaining );
*pp_parser += i_remaining;
p_sys->i_line_buffer = 0;
@ -1064,7 +1064,7 @@ static const uint8_t *GetLine( demux_t *p_demux, const uint8_t **pp_parser,
if ( p_end - *pp_parser < (int)i_total_size )
{
vlc_memcpy( p_sys->p_line_buffer, *pp_parser,
memcpy( p_sys->p_line_buffer, *pp_parser,
p_end - *pp_parser );
p_sys->i_line_buffer = p_end - *pp_parser;
return NULL;

2
modules/access/pulse.c
View File

@ -181,7 +181,7 @@ static void stream_read_cb(pa_stream *s, size_t length, void *userdata)
block_t *block = block_Alloc(length);
if (likely(block != NULL)) {
vlc_memcpy(block->p_buffer, ptr, length);
memcpy(block->p_buffer, ptr, length);
block->i_nb_samples = samples;
block->i_dts = block->i_pts = pts;
if (sys->discontinuity) {

2
modules/access/shm.c
View File

@ -367,7 +367,7 @@ static void Demux (void *data)
if (block == NULL)
return;
vlc_memcpy (block->p_buffer, sys->addr, sys->length);
memcpy (block->p_buffer, sys->addr, sys->length);
/* Send block */
vlc_mutex_lock (&sys->lock);

6
modules/audio_filter/converter/a52tospdif.c
View File

@ -94,14 +94,14 @@ static block_t *DoWork( filter_t * p_filter, block_t *p_in_buf )
/* Copy the S/PDIF headers. */
if( p_filter->fmt_out.audio.i_format == VLC_CODEC_SPDIFB )
{
vlc_memcpy( p_out, p_sync_be, 6 );
memcpy( p_out, p_sync_be, 6 );
p_out[4] = p_in[5] & 0x7; /* bsmod */
SetWBE( p_out + 6, i_frame_size << 4 );
vlc_memcpy( &p_out[8], p_in, i_frame_size * 2 );
memcpy( &p_out[8], p_in, i_frame_size * 2 );
}
else
{
vlc_memcpy( p_out, p_sync_le, 6 );
memcpy( p_out, p_sync_le, 6 );
p_out[5] = p_in[5] & 0x7; /* bsmod */
SetWLE( p_out + 6, i_frame_size << 4 );
swab( p_in, &p_out[8], i_frame_size * 2 );

8
modules/audio_filter/converter/dtstospdif.c
View File

@ -132,7 +132,7 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
/* Backup frame */
/* TODO: keeping the blocks in a list would save one memcpy */
vlc_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_buffer *
memcpy( p_filter->p_sys->p_buf + p_in_buf->i_buffer *
p_filter->p_sys->i_frames,
p_in_buf->p_buffer, p_in_buf->i_buffer );
@ -171,13 +171,13 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
/* Copy the S/PDIF headers. */
if( p_filter->fmt_out.audio.i_format == VLC_CODEC_SPDIFB )
{
vlc_memcpy( p_out, p_sync_be, 6 );
memcpy( p_out, p_sync_be, 6 );
p_out[5] = i_ac5_spdif_type;
SetWBE( p_out + 6, i_length << 3 );
}
else
{
vlc_memcpy( p_out, p_sync_le, 6 );
memcpy( p_out, p_sync_le, 6 );
p_out[4] = i_ac5_spdif_type;
SetWLE( p_out + 6, i_length << 3 );
}
@ -200,7 +200,7 @@ static block_t *DoWork( filter_t * p_filter, block_t * p_in_buf )
}
else
{
vlc_memcpy( p_out + 8, p_in, i_length );
memcpy( p_out + 8, p_in, i_length );
}
if( i_fz > i_length + 8 )

2
modules/audio_filter/converter/mpgatofixed32.c
View File

@ -140,7 +140,7 @@ static void DoWork( filter_t * p_filter,
else
{
assert( p_pcm->channels == 1 );
vlc_memcpy( p_samples, p_left, i_samples * sizeof(mad_fixed_t) );
memcpy( p_samples, p_left, i_samples * sizeof(mad_fixed_t) );
}
}
else

2
modules/audio_output/audioqueue.c
View File

@ -182,7 +182,7 @@ void AudioQueueCallback(void * inUserData, AudioQueueRef inAQ, AudioQueueBufferR
}
if ( p_buffer != NULL ) {
vlc_memcpy( inBuffer->mAudioData, p_buffer->p_buffer, p_buffer->i_buffer );
memcpy( inBuffer->mAudioData, p_buffer->p_buffer, p_buffer->i_buffer );
inBuffer->mAudioDataByteSize = p_buffer->i_buffer;
block_Release( p_buffer );
} else {

8
modules/audio_output/auhal.c
View File

@ -1291,7 +1291,7 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
if( p_sys->i_total_bytes > 0 )
{
i_mData_bytes = __MIN( p_sys->i_total_bytes - p_sys->i_read_bytes, ioData->mBuffers[0].mDataByteSize );
vlc_memcpy( ioData->mBuffers[0].mData,
memcpy( ioData->mBuffers[0].mData,
&p_sys->p_remainder_buffer[p_sys->i_read_bytes],
i_mData_bytes );
p_sys->i_read_bytes += i_mData_bytes;
@ -1312,14 +1312,14 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout,
{
uint32_t i_second_mData_bytes = __MIN( p_buffer->i_buffer, ioData->mBuffers[0].mDataByteSize - i_mData_bytes );
vlc_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes,
memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes,
p_buffer->p_buffer, i_second_mData_bytes );
i_mData_bytes += i_second_mData_bytes;
if( i_mData_bytes >= ioData->mBuffers[0].mDataByteSize )
{
p_sys->i_total_bytes = p_buffer->i_buffer - i_second_mData_bytes;
vlc_memcpy( p_sys->p_remainder_buffer,
memcpy( p_sys->p_remainder_buffer,
&p_buffer->p_buffer[i_second_mData_bytes],
p_sys->i_total_bytes );
block_Release( p_buffer );
@ -1382,7 +1382,7 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice,
msg_Warn( p_aout, "bytesize: %d nb_bytes: %d", (int)BUFFER.mDataByteSize, (int)p_buffer->i_buffer );
/* move data into output data buffer */
vlc_memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer );
memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_buffer );
block_Release( p_buffer );
}
else

2
modules/audio_output/directx.c
View File

@ -1033,7 +1033,7 @@ static int FillBuffer( audio_output_t *p_aout, int i_frame, block_t *p_buffer )
p_sys->i_bits_per_sample );
}
vlc_memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 );
memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 );
block_Release( p_buffer );
}

2
modules/audio_output/kai.c
View File

@ -316,7 +316,7 @@ static ULONG APIENTRY KaiCallback( PVOID p_cb_data,
if ( p_aout_buffer != NULL )
{
vlc_memcpy( ( uint8_t * ) p_buffer + i_len,
memcpy( ( uint8_t * ) p_buffer + i_len,
p_aout_buffer->p_buffer,
p_aout_buffer->i_buffer );

4
modules/audio_output/packet.c
View File

@ -278,7 +278,7 @@ static block_t *aout_OutputSlice (audio_output_t *p_aout)
size_t avail = p_inbuf->i_nb_samples * framesize;
if( avail > needed )
{
vlc_memcpy( p_out, p_in, needed );
memcpy( p_out, p_in, needed );
p_fifo->p_first->p_buffer += needed;
p_fifo->p_first->i_buffer -= needed;
needed /= framesize;
@ -290,7 +290,7 @@ static block_t *aout_OutputSlice (audio_output_t *p_aout)
break;
}
vlc_memcpy( p_out, p_in, avail );
memcpy( p_out, p_in, avail );
needed -= avail;
p_out += avail;
/* Next buffer */

2
modules/audio_output/waveout.c
View File

@ -763,7 +763,7 @@ static int PlayWaveOut( audio_output_t *p_aout, HWAVEOUT h_waveout,
*/
if(b_spdif)
{
vlc_memcpy( p_aout->sys->p_silence_buffer,
memcpy( p_aout->sys->p_silence_buffer,
p_buffer->p_buffer,
p_aout->sys->i_buffer_size );
p_aout->sys->i_repeat_counter = 2;

2
modules/codec/avcodec/video.c
View File

@ -949,7 +949,7 @@ static void ffmpeg_CopyPicture( decoder_t *p_dec,
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
i_line++ )
{
vlc_memcpy( p_dst, p_src, i_size );
memcpy( p_dst, p_src, i_size );
p_src += i_src_stride;
p_dst += i_dst_stride;
}

2
modules/codec/crystalhd.c
View File

@ -599,7 +599,7 @@ static void crystal_CopyPicture ( picture_t *p_pic, BC_DTS_PROC_OUT* p_out )
p_dst_end = p_dst + (i_dst_stride * p_out->PicInfo.height);
for( ; p_dst < p_dst_end; p_dst += i_dst_stride, p_src += (p_out->PicInfo.width * 2))
vlc_memcpy( p_dst, p_src, p_out->PicInfo.width * 2); // Copy in bytes
memcpy( p_dst, p_src, p_out->PicInfo.width * 2); // Copy in bytes
}
#endif

2
modules/codec/dirac.c
View File

@ -834,7 +834,7 @@ static block_t *Encode( encoder_t *p_enc, picture_t *p_pic )
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
vlc_memcpy( p_dst, p_src, i_width );
memcpy( p_dst, p_src, i_width );
p_dst += i_width;
p_src += i_src_stride;
}

4
modules/codec/dmo/dmo.c
View File

@ -1018,7 +1018,7 @@ static void CopyPicture( picture_t *p_pic, uint8_t *p_in )
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
vlc_memcpy( p_dst, p_src, i_width );
memcpy( p_dst, p_src, i_width );
p_src += i_width;
p_dst += i_dst_stride;
}
@ -1531,7 +1531,7 @@ static block_t *EncodeBlock( encoder_t *p_enc, void *p_data )
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
i_line++ )
{
vlc_memcpy( p_dst, p_src, i_width );
memcpy( p_dst, p_src, i_width );
p_dst += i_width;
p_src += i_src_stride;
}

2
modules/codec/faad.c
View File

@ -249,7 +249,7 @@ static block_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
if( p_block->i_buffer > 0 )
{
vlc_memcpy( &p_sys->p_buffer[p_sys->i_buffer],
memcpy( &p_sys->p_buffer[p_sys->i_buffer],
p_block->p_buffer, p_block->i_buffer );
p_sys->i_buffer += p_block->i_buffer;
p_block->i_buffer = 0;

6
modules/codec/mash.cpp
View File

@ -209,11 +209,11 @@ static void *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
p_sys->p_decoder->sync();
p_sys->i_counter = 0;
p_frame = p_sys->p_decoder->frame();
vlc_memcpy( p_dec, p_pic->p[0].p_pixels, p_frame, i_width*i_height );
memcpy( p_dec, p_pic->p[0].p_pixels, p_frame, i_width*i_height );
p_frame += i_width * i_height;
vlc_memcpy( p_dec, p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
memcpy( p_dec, p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 );
p_frame += i_width * i_height/4;
vlc_memcpy( p_dec, p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
memcpy( p_dec, p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 );
p_pic->date = p_sys->i_pts;
}
block_Release( p_block);

4
modules/codec/omxil/utils.c
View File

@ -145,7 +145,7 @@ void CopyOmxPicture( decoder_t *p_dec, picture_t *p_pic,
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
vlc_memcpy( p_dst, p_src, i_width );
memcpy( p_dst, p_src, i_width );
p_src += i_src_stride;
p_dst += i_dst_stride;
}
@ -179,7 +179,7 @@ void CopyVlcPicture( decoder_t *p_dec, OMX_BUFFERHEADERTYPE *p_header,
for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ )
{
vlc_memcpy( p_dst, p_src, i_width );
memcpy( p_dst, p_src, i_width );
p_src += i_src_stride;
p_dst += i_dst_stride;
}

10
modules/codec/rawvideo.c
View File

@ -289,11 +289,11 @@ static void FillPicture( decoder_t *p_dec, block_t *p_block, picture_t *p_pic )
if( p_sys->b_invert )
for( p_dst_end -= i_pitch; p_dst <= p_dst_end;
p_dst_end -= i_pitch, p_src += i_visible_pitch )
vlc_memcpy( p_dst_end, p_src, i_visible_pitch );
memcpy( p_dst_end, p_src, i_visible_pitch );
else
for( ; p_dst < p_dst_end;
p_dst += i_pitch, p_src += i_visible_pitch )
vlc_memcpy( p_dst, p_src, i_visible_pitch );
memcpy( p_dst, p_src, i_visible_pitch );
}
}
@ -371,9 +371,9 @@ static block_t *SendFrame( decoder_t *p_dec, block_t *p_block )
for( j = 0; j < pic.p[i].i_visible_lines / 2; j++ )
{
vlc_memcpy( p_tmp, p_bottom, pic.p[i].i_visible_pitch );
vlc_memcpy( p_bottom, p_top, pic.p[i].i_visible_pitch );
vlc_memcpy( p_top, p_tmp, pic.p[i].i_visible_pitch );
memcpy( p_tmp, p_bottom, pic.p[i].i_visible_pitch );
memcpy( p_bottom, p_top, pic.p[i].i_visible_pitch );
memcpy( p_top, p_tmp, pic.p[i].i_visible_pitch );
p_top += i_pitch;
p_bottom -= i_pitch;
}

2
modules/codec/sdl_image.c
View File

@ -212,7 +212,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block )
for ( i = 0; i < p_surface->h; i++ )
{
vlc_memcpy( p_dst, p_src, i_pitch );
memcpy( p_dst, p_src, i_pitch );
p_src += p_surface->pitch;
p_dst += p_pic->p[0].i_pitch;
}

8
modules/codec/shine/shine_mod.c
View File

@ -154,14 +154,14 @@ static block_t *GetPCM( encoder_t *p_enc, block_t *p_block )
if( p_sys->i_buffer )
{
vlc_memcpy( p_pcm_block->p_buffer, p_sys->p_buffer, p_sys->i_buffer );
memcpy( p_pcm_block->p_buffer, p_sys->p_buffer, p_sys->i_buffer );
i_buffer = p_sys->i_buffer;
p_sys->i_buffer = 0;
free( p_sys->p_buffer );
}
vlc_memcpy( p_pcm_block->p_buffer + i_buffer,
memcpy( p_pcm_block->p_buffer + i_buffer,
p_block->p_buffer, pcm_chunk_size - i_buffer );
p_block->p_buffer += pcm_chunk_size - i_buffer;
@ -188,7 +188,7 @@ static block_t *GetPCM( encoder_t *p_enc, block_t *p_block )
return NULL;
}
p_sys->p_buffer = p_tmp;
vlc_memcpy( p_sys->p_buffer + p_sys->i_buffer,
memcpy( p_sys->p_buffer + p_sys->i_buffer,
p_block->p_buffer, p_block->i_buffer );
p_sys->i_buffer += p_block->i_buffer;
@ -228,7 +228,7 @@ static block_t *EncodeFrame( encoder_t *p_enc, block_t *p_block )
if( !p_mp3_block )
break;
vlc_memcpy( p_mp3_block->p_buffer, chunk->enc_data, chunk->enc_size );
memcpy( p_mp3_block->p_buffer, chunk->enc_data, chunk->enc_size );
/* date management */
p_mp3_block->i_length = SAMP_PER_FRAME1 * 1000000 /

2
modules/codec/theora.c
View File

@ -589,7 +589,7 @@ static void theora_CopyPicture( picture_t *p_pic,
i_line < __MIN(p_pic->p[i_plane].i_lines, ycbcr[i_plane].height);
i_line++ )
{
vlc_memcpy( p_dst, p_src, ycbcr[i_plane].width );
memcpy( p_dst, p_src, ycbcr[i_plane].width );
p_src += i_src_stride;
p_dst += i_dst_stride;
}

2
modules/codec/twolame.c
View File

@ -283,7 +283,7 @@ static block_t *Encode( encoder_t *p_enc, block_t *p_aout_buf )
p_sys->p_out_buffer, MAX_CODED_FRAME_SIZE );
p_sys->i_nb_samples = 0;
p_block = block_New( p_enc, i_used );
vlc_memcpy( p_block->p_buffer, p_sys->p_out_buffer, i_used );
memcpy( p_block->p_buffer, p_sys->p_out_buffer, i_used );
p_block->i_length = (mtime_t)1000000 *
(mtime_t)MPEG_FRAME_SIZE / (mtime_t)p_enc->fmt_out.audio.i_rate;
p_block->i_dts = p_block->i_pts = p_sys->i_pts;

2
modules/mux/mpeg/pes.c
View File

@ -415,7 +415,7 @@ int EStoPES ( sout_instance_t *p_sout, block_t **pp_pes, block_t *p_es,
p_pes->i_length = 0;
if( i_pes_payload > 0 )
{
vlc_memcpy( p_pes->p_buffer + i_pes_header, p_data,
memcpy( p_pes->p_buffer + i_pes_header, p_data,
i_pes_payload );
}
i_pes_count++;

4
modules/mux/mpeg/ts.c
View File

@ -1538,7 +1538,7 @@ static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo )
else if( i_size > STD_PES_PAYLOAD )
{
block_t *p_new = block_New( p_mux, STD_PES_PAYLOAD );
vlc_memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD );
memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD );
p_new->i_pts = p_data->i_pts;
p_new->i_dts = p_data->i_dts;
p_new->i_length = p_data->i_length * STD_PES_PAYLOAD
@ -1567,7 +1567,7 @@ static block_t *FixPES( sout_mux_t *p_mux, block_fifo_t *p_fifo )
}
i_copy = __MIN( STD_PES_PAYLOAD - i_size, p_next->i_buffer );
vlc_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, i_copy );
memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, i_copy );
p_next->i_pts += p_next->i_length * i_copy / p_next->i_buffer;
p_next->i_dts += p_next->i_length * i_copy / p_next->i_buffer;
p_next->i_length -= p_next->i_length * i_copy / p_next->i_buffer;

6
modules/stream_out/smem.c
View File

@ -369,11 +369,11 @@ static int SendVideo( sout_stream_t *p_stream, sout_stream_id_t *id,
if( id->format->video.i_bits_per_pixel > 0 )
{
for ( int line = 0; line < i_line; line++, p_pixels += i_line_size )
vlc_memcpy( p_pixels, p_buffer->p_buffer + i_line_size * line , i_line_size );
memcpy( p_pixels, p_buffer->p_buffer + i_line_size * line , i_line_size );
}
else
{
vlc_memcpy( p_pixels, p_buffer->p_buffer, i_size );
memcpy( p_pixels, p_buffer->p_buffer, i_size );
}
/* Calling the postrender callback to tell the user his buffer is ready */
p_sys->pf_video_postrender_callback( id->p_data, p_pixels,
@ -410,7 +410,7 @@ static int SendAudio( sout_stream_t *p_stream, sout_stream_id_t *id,
}
/* Copying data into user buffer */
vlc_memcpy( p_pcm_buffer, p_buffer->p_buffer, i_size );
memcpy( p_pcm_buffer, p_buffer->p_buffer, i_size );
/* Calling the postrender callback to tell the user his buffer is ready */
p_sys->pf_audio_postrender_callback( id->p_data, p_pcm_buffer,
id->format->audio.i_channels, id->format->audio.i_rate, i_samples,

10
modules/stream_out/switcher.c
View File

@ -942,7 +942,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
= id->ff_enc_c->coded_frame->motion_subsample_log2;
id->p_frame->mb_type = malloc( ((mb_width + 1) * (mb_height + 1) + 1)
* sizeof(uint32_t) );
vlc_memcpy( id->p_frame->mb_type, id->ff_enc_c->coded_frame->mb_type,
memcpy( id->p_frame->mb_type, id->ff_enc_c->coded_frame->mb_type,
(mb_width + 1) * mb_height * sizeof(id->p_frame->mb_type[0]));
for ( i = 0; i < 2; i++ )
@ -957,7 +957,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
{
id->p_frame->motion_val[i] = malloc( 2 * stride * height
* sizeof(int16_t) );
vlc_memcpy( id->p_frame->motion_val[i],
memcpy( id->p_frame->motion_val[i],
id->ff_enc_c->coded_frame->motion_val[i],
2 * stride * height * sizeof(int16_t) );
}
@ -965,7 +965,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
{
id->p_frame->ref_index[i] = malloc( b8_stride * 2 * mb_height
* sizeof(int8_t) );
vlc_memcpy( id->p_frame->ref_index[i],
memcpy( id->p_frame->ref_index[i],
id->ff_enc_c->coded_frame->ref_index[i],
b8_stride * 2 * mb_height * sizeof(int8_t));
}
@ -974,7 +974,7 @@ static block_t *VideoGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
#endif
p_out = block_New( p_stream, i_out );
vlc_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
p_out->i_length = p_buffer->i_length;
p_out->i_pts = p_buffer->i_dts;
p_out->i_dts = p_buffer->i_dts;
@ -1017,7 +1017,7 @@ static block_t *AudioGetBuffer( sout_stream_t *p_stream, sout_stream_id_t *id,
return NULL;
p_out = block_New( p_stream, i_out );
vlc_memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
memcpy( p_out->p_buffer, id->p_buffer_out, i_out );
p_out->i_length = p_buffer->i_length;
p_out->i_pts = p_buffer->i_dts;
p_out->i_dts = p_buffer->i_dts;

2
modules/video_chroma/i420_rgb.h
View File

@ -283,7 +283,7 @@ void I420_A8B8G8R8 ( filter_t *, picture_t *, picture_t * );
while( (i_scale_count -= p_filter->fmt_in.video.i_height) > 0 ) \
{ \
/* Height increment: copy previous picture line */ \
vlc_memcpy( p_pic, p_pic_start, p_filter->fmt_out.video.i_width * BPP ); \
memcpy( p_pic, p_pic_start, p_filter->fmt_out.video.i_width * BPP ); \
p_pic = (void*)((uint8_t*)p_pic + p_dest->p->i_pitch ); \
} \
i_scale_count += p_filter->fmt_out.video.i_height; \

16
modules/video_chroma/i422_i420.c
View File

@ -134,10 +134,10 @@ static void I422_I420( filter_t *p_filter, picture_t *p_source,
for ( ; i_y--; )
{
vlc_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
vlc_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
vlc_memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv;
vlc_memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv;
memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv;
memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv;
}
}
@ -163,10 +163,10 @@ static void I422_YV12( filter_t *p_filter, picture_t *p_source,
for ( ; i_y--; )
{
vlc_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
vlc_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
vlc_memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv;
vlc_memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv;
memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy;
memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv;
memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv;
}
}

6
modules/video_filter/ball.c
View File

@ -595,11 +595,11 @@ static void FilterBall( filter_t *p_filter, picture_t *p_inpic,
if( !p_smooth || !p_grad_x || !p_grad_y ) return;
vlc_memcpy( p_outpic->p[0].p_pixels, p_inpic->p[0].p_pixels,
memcpy( p_outpic->p[0].p_pixels, p_inpic->p[0].p_pixels,
p_outpic->p[0].i_lines * p_outpic->p[0].i_pitch );
vlc_memcpy( p_outpic->p[1].p_pixels, p_inpic->p[1].p_pixels,
memcpy( p_outpic->p[1].p_pixels, p_inpic->p[1].p_pixels,
p_outpic->p[1].i_lines * p_outpic->p[1].i_pitch );
vlc_memcpy( p_outpic->p[2].p_pixels, p_inpic->p[2].p_pixels,
memcpy( p_outpic->p[2].p_pixels, p_inpic->p[2].p_pixels,
p_outpic->p[2].i_lines * p_outpic->p[2].i_pitch );
GaussianConvolution( p_converted, p_smooth );

2
modules/video_filter/crop.c
View File

@ -531,7 +531,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic )
while( p_out < p_out_end )
{
vlc_memcpy( p_out, p_in, i_copy_pitch );
memcpy( p_out, p_in, i_copy_pitch );
p_in += i_in_pitch;
p_out += i_out_pitch;
}

2
modules/video_filter/croppadd.c
View File

@ -283,7 +283,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
p_out += i_xpadd * i_pixel_pitch;
/* Copy the image and crop on the right */
vlc_memcpy( p_out, p_in, i_width * i_pixel_pitch );
memcpy( p_out, p_in, i_width * i_pixel_pitch );
p_out += i_width * i_pixel_pitch;
p_in += i_width * i_pixel_pitch;

22
modules/video_filter/deinterlace/algo_basic.c
View File

@ -60,7 +60,7 @@ void RenderDiscard( picture_t *p_outpic, picture_t *p_pic, int i_field )
for( ; p_out < p_out_end ; )
{
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
p_in += 2 * p_pic->p[i_plane].i_pitch;
@ -89,7 +89,7 @@ void RenderBob( picture_t *p_outpic, picture_t *p_pic, int i_field )
/* For BOTTOM field we need to add the first line */
if( i_field == 1 )
{
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
}
@ -98,24 +98,24 @@ void RenderBob( picture_t *p_outpic, picture_t *p_pic, int i_field )
for( ; p_out < p_out_end ; )
{
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
p_in += 2 * p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
}
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
/* For TOP field we need to add the last line */
if( i_field == 0 )
{
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
}
}
}
@ -142,7 +142,7 @@ void RenderLinear( filter_t *p_filter,
/* For BOTTOM field we need to add the first line */
if( i_field == 1 )
{
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
}
@ -151,7 +151,7 @@ void RenderLinear( filter_t *p_filter,
for( ; p_out < p_out_end ; )
{
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
@ -162,14 +162,14 @@ void RenderLinear( filter_t *p_filter,
p_out += p_outpic->p[i_plane].i_pitch;
}
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
/* For TOP field we need to add the last line */
if( i_field == 0 )
{
p_in += p_pic->p[i_plane].i_pitch;
p_out += p_outpic->p[i_plane].i_pitch;
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
}
}
EndMerge();
@ -229,7 +229,7 @@ void RenderBlend( filter_t *p_filter,
* p_outpic->p[i_plane].i_visible_lines;
/* First line: simple copy */
vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch );
p_out += p_outpic->p[i_plane].i_pitch;
/* Remaining lines: mean value */

6
modules/video_filter/deinterlace/algo_yadif.c
View File

@ -133,7 +133,7 @@ int RenderYadif( filter_t *p_filter, picture_t *p_dst, picture_t *p_src,
{
if( (y % 2) == i_field || yadif_parity == 2 )
{
vlc_memcpy( &dstp->p_pixels[y * dstp->i_pitch],
memcpy( &dstp->p_pixels[y * dstp->i_pitch],
&curp->p_pixels[y * curp->i_pitch], dstp->i_visible_pitch );
}
else
@ -156,11 +156,11 @@ int RenderYadif( filter_t *p_filter, picture_t *p_dst, picture_t *p_src,
/* We duplicate the first and last lines */
if( y == 1 )
vlc_memcpy(&dstp->p_pixels[(y-1) * dstp->i_pitch],
memcpy(&dstp->p_pixels[(y-1) * dstp->i_pitch],
&dstp->p_pixels[ y * dstp->i_pitch],
dstp->i_pitch);
else if( y == dstp->i_visible_lines - 2 )
vlc_memcpy(&dstp->p_pixels[(y+1) * dstp->i_pitch],
memcpy(&dstp->p_pixels[(y+1) * dstp->i_pitch],
&dstp->p_pixels[ y * dstp->i_pitch],
dstp->i_pitch);
}

2
modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
View File

@ -526,7 +526,7 @@ static int exec_DataSharedMem( filter_t *p_filter,
i_line < (size_t)p_ovl->data.p_pic->p[i_plane].i_visible_lines;
++i_line )
{
vlc_memcpy( p_out, p_in,
memcpy( p_out, p_in,
p_ovl->data.p_pic->p[i_plane].i_visible_pitch );
p_out += p_ovl->data.p_pic->p[i_plane].i_pitch;
p_in += p_ovl->data.p_pic->p[i_plane].i_visible_pitch;

2
modules/video_filter/invert.c
View File

@ -107,7 +107,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
/* We don't want to invert the alpha plane */
i_planes = p_pic->i_planes - 1;
vlc_memcpy(
memcpy(
p_outpic->p[A_PLANE].p_pixels, p_pic->p[A_PLANE].p_pixels,
p_pic->p[A_PLANE].i_pitch * p_pic->p[A_PLANE].i_lines );
}

2
modules/video_filter/panoramix.c
View File

@ -1004,7 +1004,7 @@ static void FilterPlanar( uint8_t *p_out, int i_out_pitch,
/* Unmodified video */
const int i_unmodified_width = i_copy_pitch - p_cfg->attenuate.i_left - p_cfg->attenuate.i_right;
vlc_memcpy( p_dst, p_src, i_unmodified_width );
memcpy( p_dst, p_src, i_unmodified_width );
p_dst += i_unmodified_width;
p_src += i_unmodified_width;

8
modules/video_filter/ripple.c
View File

@ -160,7 +160,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
for( i_line = 0 ; i_line < i_first_line ; i_line++ )
{
vlc_memcpy( p_out, p_in, p_pic->p[i_index].i_visible_pitch );
memcpy( p_out, p_in, p_pic->p[i_index].i_visible_pitch );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
}
@ -181,7 +181,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
if( i_offset < 0 )
{
vlc_memcpy( p_out, p_in - i_offset,
memcpy( p_out, p_in - i_offset,
p_pic->p[i_index].i_visible_pitch + i_offset );
p_in -= p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
@ -189,7 +189,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
}
else
{
vlc_memcpy( p_out + i_offset, p_in,
memcpy( p_out + i_offset, p_in,
p_pic->p[i_index].i_visible_pitch - i_offset );
memset( p_out, black_pixel, i_offset );
p_in -= p_pic->p[i_index].i_pitch;
@ -198,7 +198,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
}
else
{
vlc_memcpy( p_out, p_in, p_pic->p[i_index].i_visible_pitch );
memcpy( p_out, p_in, p_pic->p[i_index].i_visible_pitch );
p_in -= p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
}

6
modules/video_filter/wave.c
View File

@ -170,7 +170,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
{
if( i_offset < 0 )
{
vlc_memcpy( p_out, p_in - i_offset,
memcpy( p_out, p_in - i_offset,
i_visible_pitch + i_offset );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
@ -178,7 +178,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
}
else
{
vlc_memcpy( p_out + i_offset, p_in,
memcpy( p_out + i_offset, p_in,
i_visible_pitch - i_offset );
memset( p_out, black_pixel, i_offset );
p_in += p_pic->p[i_index].i_pitch;
@ -187,7 +187,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
}
else
{
vlc_memcpy( p_out, p_in, i_visible_pitch );
memcpy( p_out, p_in, i_visible_pitch );
p_in += p_pic->p[i_index].i_pitch;
p_out += p_outpic->p[i_index].i_pitch;
}

4
src/misc/picture.c
View File

@ -312,7 +312,7 @@ void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src )
p_src->i_pitch < 2*p_src->i_visible_pitch )
{
/* There are margins, but with the same width : perfect ! */
vlc_memcpy( p_dst->p_pixels, p_src->p_pixels,
memcpy( p_dst->p_pixels, p_src->p_pixels,
p_src->i_pitch * i_height );
}
else
@ -327,7 +327,7 @@ void plane_CopyPixels( plane_t *p_dst, const plane_t *p_src )
for( i_line = i_height; i_line--; )
{
vlc_memcpy( p_out, p_in, i_width );
memcpy( p_out, p_in, i_width );
p_in += p_src->i_pitch;
p_out += p_dst->i_pitch;
}

Write Preview
Loading…
Cancel
Save