From 5b55ee1bb0a0212b967f8f4a33824ffc6b7c7f09 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 3 May 2008 17:16:59 +0300 Subject: [PATCH] Use vlc_memset/vlc_memcpy --- modules/access/dshow/dshow.cpp | 4 +- modules/audio_filter/converter/a52tospdif.c | 10 +-- modules/audio_filter/converter/dtstospdif.c | 16 ++--- .../audio_filter/converter/mpgatofixed32.c | 3 +- modules/audio_filter/resampler/bandlimited.c | 13 ++-- modules/audio_filter/resampler/linear.c | 2 +- modules/audio_filter/resampler/trivial.c | 4 +- modules/audio_filter/resampler/ugly.c | 2 +- modules/audio_mixer/trivial.c | 6 +- modules/audio_output/auhal.c | 19 +++--- modules/audio_output/directx.c | 3 +- modules/audio_output/hd1000a.cpp | 2 +- modules/audio_output/portaudio.c | 7 +-- modules/audio_output/sdl.c | 4 +- modules/audio_output/waveout.c | 12 ++-- modules/codec/dirac.c | 4 +- modules/codec/dmo/dmo.c | 4 +- modules/codec/faad.c | 10 +-- modules/codec/ffmpeg/scale.c | 2 +- modules/codec/ffmpeg/video.c | 5 +- modules/codec/mash.cpp | 6 +- modules/codec/rawvideo.c | 11 ++-- modules/codec/sdl_image.c | 2 +- modules/codec/tarkin.c | 2 +- modules/codec/theora.c | 4 +- modules/codec/twolame.c | 3 +- modules/gui/beos/AudioOutput.cpp | 10 +-- modules/gui/fbosd.c | 24 +++---- modules/mux/mpeg/pes.c | 4 +- modules/mux/mpeg/ts.c | 5 +- modules/stream_out/switcher.c | 22 +++---- modules/video_chroma/i420_rgb.h | 3 +- modules/video_chroma/i420_ymga.c | 4 +- modules/video_chroma/i422_i420.c | 23 +++---- modules/video_filter/alphamask.c | 8 +-- modules/video_filter/blend.c | 6 +- modules/video_filter/bluescreen.c | 2 +- modules/video_filter/clone.c | 4 +- modules/video_filter/colorthres.c | 9 +-- modules/video_filter/crop.c | 2 +- modules/video_filter/croppadd.c | 15 ++--- modules/video_filter/deinterlace.c | 63 +++++++------------ .../dynamicoverlay/dynamicoverlay.c | 5 +- .../dynamicoverlay/dynamicoverlay_commands.c | 4 +- modules/video_filter/erase.c | 2 +- modules/video_filter/gradient.c | 27 ++++---- modules/video_filter/grain.c | 2 +- modules/video_filter/invert.c | 2 +- modules/video_filter/magnify.c | 17 ++--- modules/video_filter/motionblur.c | 2 +- modules/video_filter/motiondetect.c | 15 ++--- modules/video_filter/noise.c | 5 +- modules/video_filter/panoramix.c | 28 ++++----- modules/video_filter/psychedelic.c | 7 +-- modules/video_filter/puzzle.c | 12 ++-- modules/video_filter/ripple.c | 20 +++--- modules/video_filter/seamcarving.c | 11 ++-- modules/video_filter/sharpen.c | 10 ++- modules/video_filter/transform.c | 4 +- modules/video_filter/wall.c | 2 +- modules/video_filter/wave.c | 17 +++-- modules/video_output/fb.c | 4 +- modules/video_output/snapshot.c | 5 +- src/audio_output/dec.c | 4 +- src/video_output/vout_pictures.c | 8 +-- 65 files changed, 249 insertions(+), 328 deletions(-) diff --git a/modules/access/dshow/dshow.cpp b/modules/access/dshow/dshow.cpp index 1f04e940cb..53db60c275 100644 --- a/modules/access/dshow/dshow.cpp +++ b/modules/access/dshow/dshow.cpp @@ -1644,7 +1644,7 @@ static block_t *ReadCompressed( access_t *p_access ) } sample.p_sample->GetPointer( &p_data ); - p_access->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size ); + vlc_memcpy( p_block->p_buffer, p_data, i_data_size ); sample.p_sample->Release(); /* The caller got what he wanted */ @@ -1733,7 +1733,7 @@ static int Demux( demux_t *p_demux ) #endif p_block = block_New( p_demux, i_data_size ); - p_demux->p_libvlc->pf_memcpy( p_block->p_buffer, p_data, i_data_size ); + vlc_memcpy( p_block->p_buffer, p_data, i_data_size ); p_block->i_pts = p_block->i_dts = i_pts; sample.p_sample->Release(); diff --git a/modules/audio_filter/converter/a52tospdif.c b/modules/audio_filter/converter/a52tospdif.c index f3b095e590..98b3319d96 100644 --- a/modules/audio_filter/converter/a52tospdif.c +++ b/modules/audio_filter/converter/a52tospdif.c @@ -100,15 +100,15 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, /* Copy the S/PDIF headers. */ if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') ) { - p_filter->p_libvlc->pf_memcpy( p_out, p_sync_be, 6 ); + vlc_memcpy( p_out, p_sync_be, 6 ); p_out[4] = p_in[5] & 0x7; /* bsmod */ p_out[6] = (i_frame_size >> 4) & 0xff; p_out[7] = (i_frame_size << 4) & 0xff; - p_filter->p_libvlc->pf_memcpy( &p_out[8], p_in, i_frame_size * 2 ); + vlc_memcpy( &p_out[8], p_in, i_frame_size * 2 ); } else { - p_filter->p_libvlc->pf_memcpy( p_out, p_sync_le, 6 ); + vlc_memcpy( p_out, p_sync_le, 6 ); p_out[5] = p_in[5] & 0x7; /* bsmod */ p_out[6] = (i_frame_size << 4) & 0xff; p_out[7] = (i_frame_size >> 4) & 0xff; @@ -124,8 +124,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, } #endif } - p_filter->p_libvlc->pf_memset( p_out + 8 + i_frame_size * 2, 0, - AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 ); + vlc_memset( p_out + 8 + i_frame_size * 2, 0, + AOUT_SPDIF_SIZE - i_frame_size * 2 - 8 ); p_out_buf->i_nb_samples = p_in_buf->i_nb_samples; p_out_buf->i_nb_bytes = AOUT_SPDIF_SIZE; diff --git a/modules/audio_filter/converter/dtstospdif.c b/modules/audio_filter/converter/dtstospdif.c index 11cdeff2f7..7827d5e2d2 100644 --- a/modules/audio_filter/converter/dtstospdif.c +++ b/modules/audio_filter/converter/dtstospdif.c @@ -138,9 +138,9 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, } /* Backup frame */ - p_filter->p_libvlc->pf_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes * - p_filter->p_sys->i_frames, p_in_buf->p_buffer, - p_in_buf->i_nb_bytes ); + vlc_memcpy( p_filter->p_sys->p_buf + p_in_buf->i_nb_bytes * + p_filter->p_sys->i_frames, + p_in_buf->p_buffer, p_in_buf->i_nb_bytes ); p_filter->p_sys->i_frames++; @@ -174,14 +174,14 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, /* Copy the S/PDIF headers. */ if( p_filter->output.i_format == VLC_FOURCC('s','p','d','b') ) { - p_filter->p_libvlc->pf_memcpy( p_out, p_sync_be, 6 ); + vlc_memcpy( p_out, p_sync_be, 6 ); p_out[5] = i_ac5_spdif_type; p_out[6] = (( i_length ) >> 5 ) & 0xFF; p_out[7] = ( i_length << 3 ) & 0xFF; } else { - p_filter->p_libvlc->pf_memcpy( p_out, p_sync_le, 6 ); + vlc_memcpy( p_out, p_sync_le, 6 ); p_out[4] = i_ac5_spdif_type; p_out[6] = ( i_length << 3 ) & 0xFF; p_out[7] = (( i_length ) >> 5 ) & 0xFF; @@ -217,13 +217,13 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, } else { - p_filter->p_libvlc->pf_memcpy( p_out + 8, p_in, i_length ); + vlc_memcpy( p_out + 8, p_in, i_length ); } if( i_fz > i_length + 8 ) { - p_filter->p_libvlc->pf_memset( p_out + 8 + i_length_padded, 0, - i_fz - i_length_padded - 8 ); + vlc_memset( p_out + 8 + i_length_padded, 0, + i_fz - i_length_padded - 8 ); } } diff --git a/modules/audio_filter/converter/mpgatofixed32.c b/modules/audio_filter/converter/mpgatofixed32.c index 70d6bdda05..4a3efcf76b 100644 --- a/modules/audio_filter/converter/mpgatofixed32.c +++ b/modules/audio_filter/converter/mpgatofixed32.c @@ -215,8 +215,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, break; case 1: - p_filter->p_libvlc->pf_memcpy( p_samples, p_left, - i_samples * sizeof(mad_fixed_t) ); + vlc_memcpy( p_samples, p_left, i_samples * sizeof(mad_fixed_t) ); break; default: diff --git a/modules/audio_filter/resampler/bandlimited.c b/modules/audio_filter/resampler/bandlimited.c index 3402224e57..711da81fed 100644 --- a/modules/audio_filter/resampler/bandlimited.c +++ b/modules/audio_filter/resampler/bandlimited.c @@ -246,14 +246,13 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, /* Copy all our samples in p_in */ if( p_filter->p_sys->i_old_wing ) { - p_aout->p_libvlc->pf_memcpy( p_in, p_filter->p_sys->p_buf, - p_filter->p_sys->i_old_wing * 2 * - p_filter->input.i_bytes_per_frame ); + vlc_memcpy( p_in, p_filter->p_sys->p_buf, + p_filter->p_sys->i_old_wing * 2 * + p_filter->input.i_bytes_per_frame ); } - p_aout->p_libvlc->pf_memcpy( p_in + p_filter->p_sys->i_old_wing * 2 * - i_nb_channels, p_in_buf->p_buffer, - p_in_buf->i_nb_samples * - p_filter->input.i_bytes_per_frame ); + vlc_memcpy( p_in + p_filter->p_sys->i_old_wing * 2 * i_nb_channels, + p_in_buf->p_buffer, + p_in_buf->i_nb_samples * p_filter->input.i_bytes_per_frame ); /* Make sure the output buffer is reset */ memset( p_out, 0, p_out_buf->i_size ); diff --git a/modules/audio_filter/resampler/linear.c b/modules/audio_filter/resampler/linear.c index 308101b6b8..4ce247c82a 100644 --- a/modules/audio_filter/resampler/linear.c +++ b/modules/audio_filter/resampler/linear.c @@ -176,7 +176,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, return; } - p_aout->p_libvlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes ); + vlc_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes ); /* Take care of the previous input sample (if any) */ if( !p_filter->b_continuity ) diff --git a/modules/audio_filter/resampler/trivial.c b/modules/audio_filter/resampler/trivial.c index 5db69e0284..bb40f60db0 100644 --- a/modules/audio_filter/resampler/trivial.c +++ b/modules/audio_filter/resampler/trivial.c @@ -98,8 +98,8 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, { /* For whatever reason the buffer allocator decided to allocate * a new buffer. Currently, this never happens. */ - p_aout->p_libvlc->pf_memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer, - __MIN(i_out_nb, i_in_nb) * i_sample_bytes ); + vlc_memcpy( p_out_buf->p_buffer, p_in_buf->p_buffer, + __MIN(i_out_nb, i_in_nb) * i_sample_bytes ); } if ( i_out_nb > i_in_nb ) diff --git a/modules/audio_filter/resampler/ugly.c b/modules/audio_filter/resampler/ugly.c index f843073555..c22f6c7049 100644 --- a/modules/audio_filter/resampler/ugly.c +++ b/modules/audio_filter/resampler/ugly.c @@ -113,7 +113,7 @@ static void DoWork( aout_instance_t * p_aout, aout_filter_t * p_filter, return; } - p_aout->p_libvlc->pf_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes ); + vlc_memcpy( p_in, p_in_buf->p_buffer, p_in_buf->i_nb_bytes ); for( i_out = i_out_nb ; i_out-- ; ) { diff --git a/modules/audio_mixer/trivial.c b/modules/audio_mixer/trivial.c index 4ecc43ed5e..69d72c2393 100644 --- a/modules/audio_mixer/trivial.c +++ b/modules/audio_mixer/trivial.c @@ -103,8 +103,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer ) { aout_buffer_t * p_old_buffer; - if ( i_available_bytes > 0 ) - p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_available_bytes ); + vlc_memcpy( p_out, p_in, i_available_bytes ); i_nb_bytes -= i_available_bytes; p_out += i_available_bytes; @@ -120,8 +119,7 @@ static void DoWork( aout_instance_t * p_aout, aout_buffer_t * p_buffer ) } else { - if ( i_nb_bytes > 0 ) - p_aout->p_libvlc->pf_memcpy( p_out, p_in, i_nb_bytes ); + vlc_memcpy( p_out, p_in, i_nb_bytes ); p_input->p_first_byte_to_mix = p_in + i_nb_bytes; break; } diff --git a/modules/audio_output/auhal.c b/modules/audio_output/auhal.c index 7448898a55..067f8dd931 100644 --- a/modules/audio_output/auhal.c +++ b/modules/audio_output/auhal.c @@ -1312,7 +1312,9 @@ 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 ); - p_aout->p_libvlc->pf_memcpy( ioData->mBuffers[0].mData, &p_sys->p_remainder_buffer[p_sys->i_read_bytes], i_mData_bytes ); + vlc_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; current_date += (mtime_t) ( (mtime_t) 1000000 / p_aout->output.output.i_rate ) * ( i_mData_bytes / 4 / aout_FormatNbChannels( &p_aout->output.output ) ); // 4 is fl32 specific @@ -1331,13 +1333,16 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, { uint32_t i_second_mData_bytes = __MIN( p_buffer->i_nb_bytes, ioData->mBuffers[0].mDataByteSize - i_mData_bytes ); - p_aout->p_libvlc->pf_memcpy( (uint8_t *)ioData->mBuffers[0].mData + i_mData_bytes, p_buffer->p_buffer, i_second_mData_bytes ); + vlc_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_nb_bytes - i_second_mData_bytes; - p_aout->p_libvlc->pf_memcpy( p_sys->p_remainder_buffer, &p_buffer->p_buffer[i_second_mData_bytes], p_sys->i_total_bytes ); + vlc_memcpy( p_sys->p_remainder_buffer, + &p_buffer->p_buffer[i_second_mData_bytes], + p_sys->i_total_bytes ); } else { @@ -1349,7 +1354,8 @@ static OSStatus RenderCallbackAnalog( vlc_object_t *_p_aout, } else { - p_aout->p_libvlc->pf_memset( (uint8_t *)ioData->mBuffers[0].mData +i_mData_bytes, 0, ioData->mBuffers[0].mDataByteSize - i_mData_bytes ); + vlc_memset( (uint8_t *)ioData->mBuffers[0].mData +i_mData_bytes, + 0,ioData->mBuffers[0].mDataByteSize - i_mData_bytes ); i_mData_bytes += ioData->mBuffers[0].mDataByteSize - i_mData_bytes; } } @@ -1391,13 +1397,12 @@ static OSStatus RenderCallbackSPDIF( AudioDeviceID inDevice, msg_Warn( p_aout, "bytesize: %d nb_bytes: %d", (int)BUFFER.mDataByteSize, (int)p_buffer->i_nb_bytes ); /* move data into output data buffer */ - p_aout->p_libvlc->pf_memcpy( BUFFER.mData, - p_buffer->p_buffer, p_buffer->i_nb_bytes ); + vlc_memcpy( BUFFER.mData, p_buffer->p_buffer, p_buffer->i_nb_bytes ); aout_BufferFree( p_buffer ); } else { - p_aout->p_libvlc->pf_memset( BUFFER.mData, 0, BUFFER.mDataByteSize ); + vlc_memset( BUFFER.mData, 0, BUFFER.mDataByteSize ); } #undef BUFFER diff --git a/modules/audio_output/directx.c b/modules/audio_output/directx.c index 22573cb130..ea6f7cb827 100644 --- a/modules/audio_output/directx.c +++ b/modules/audio_output/directx.c @@ -960,8 +960,7 @@ static int FillBuffer( aout_instance_t *p_aout, int i_frame, p_sys->i_bits_per_sample ); } - p_aout->p_libvlc->pf_memcpy( p_write_position, p_buffer->p_buffer, - l_bytes1 ); + vlc_memcpy( p_write_position, p_buffer->p_buffer, l_bytes1 ); aout_BufferFree( p_buffer ); } diff --git a/modules/audio_output/hd1000a.cpp b/modules/audio_output/hd1000a.cpp index 590ad8eb75..0bfc80e624 100644 --- a/modules/audio_output/hd1000a.cpp +++ b/modules/audio_output/hd1000a.cpp @@ -237,7 +237,7 @@ static int Thread( aout_instance_t * p_aout ) #define i p_sys->nNextBufferIndex if( p_buffer == NULL ) { - p_aout->p_libvlc->pf_memset( p_sys->ppBuffers[ i ], 0, + vlc_memset( p_aout, p_sys->ppBuffers[ i ], 0, p_sys->nBufferSize ); } else diff --git a/modules/audio_output/portaudio.c b/modules/audio_output/portaudio.c index a78885d1fa..4aab589939 100644 --- a/modules/audio_output/portaudio.c +++ b/modules/audio_output/portaudio.c @@ -147,8 +147,8 @@ static int paCallback( const void *inputBuffer, void *outputBuffer, p_sys->i_channels, p_sys->pi_chan_table, p_sys->i_bits_per_sample ); } - p_aout->p_libvlc->pf_memcpy( outputBuffer, p_buffer->p_buffer, - framesPerBuffer * p_sys->i_sample_size ); + vlc_memcpy( outputBuffer, p_buffer->p_buffer, + framesPerBuffer * p_sys->i_sample_size ); /* aout_BufferFree may be dangereous here, but then so is * aout_OutputNextBuffer (calls aout_BufferFree internally). * one solution would be to link the no longer useful buffers @@ -160,8 +160,7 @@ static int paCallback( const void *inputBuffer, void *outputBuffer, else /* Audio output buffer shortage -> stop the fill process and wait */ { - p_aout->p_libvlc->pf_memset( outputBuffer, 0, - framesPerBuffer * p_sys->i_sample_size ); + vlc_memset( outputBuffer, 0, framesPerBuffer * p_sys->i_sample_size ); } return 0; } diff --git a/modules/audio_output/sdl.c b/modules/audio_output/sdl.c index edff93e4b6..6dd31cef09 100644 --- a/modules/audio_output/sdl.c +++ b/modules/audio_output/sdl.c @@ -261,12 +261,12 @@ static void SDLCallback( void * _p_aout, uint8_t * p_stream, int i_len ) if ( p_buffer != NULL ) { - p_aout->p_libvlc->pf_memcpy( p_stream, p_buffer->p_buffer, i_len ); + vlc_memcpy( p_stream, p_buffer->p_buffer, i_len ); aout_BufferFree( p_buffer ); } else { - p_aout->p_libvlc->pf_memset( p_stream, 0, i_len ); + vlc_memset( p_stream, 0, i_len ); } } diff --git a/modules/audio_output/waveout.c b/modules/audio_output/waveout.c index 95b583c093..6d022c6d50 100644 --- a/modules/audio_output/waveout.c +++ b/modules/audio_output/waveout.c @@ -858,9 +858,9 @@ static int PlayWaveOut( aout_instance_t *p_aout, HWAVEOUT h_waveout, */ if(b_spdif) { - p_aout->p_libvlc->pf_memcpy( p_aout->output.p_sys->p_silence_buffer, - p_buffer->p_buffer, - p_aout->output.p_sys->i_buffer_size ); + vlc_memcpy( p_aout->output.p_sys->p_silence_buffer, + p_buffer->p_buffer, + p_aout->output.p_sys->i_buffer_size ); p_aout->output.p_sys->i_repeat_counter = 2; } } else { @@ -870,10 +870,8 @@ static int PlayWaveOut( aout_instance_t *p_aout, HWAVEOUT h_waveout, p_aout->output.p_sys->i_repeat_counter--; if(!p_aout->output.p_sys->i_repeat_counter) { - p_aout->p_libvlc->pf_memset( p_aout->output.p_sys->p_silence_buffer, - 0x00, - p_aout->output.p_sys->i_buffer_size - ); + vlc_memset( p_aout->output.p_sys->p_silence_buffer, + 0x00, p_aout->output.p_sys->i_buffer_size ); } } p_waveheader->lpData = p_aout->output.p_sys->p_silence_buffer; diff --git a/modules/codec/dirac.c b/modules/codec/dirac.c index 19168ccfc4..b2da566546 100644 --- a/modules/codec/dirac.c +++ b/modules/codec/dirac.c @@ -190,7 +190,7 @@ static picture_t *GetNewPicture( decoder_t *p_dec ) for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) { - p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width ); + vlc_memcpy( p_dst, p_src, i_width ); p_src += i_width; p_dst += i_dst_stride; } @@ -410,7 +410,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++ ) { - p_enc->p_libvlc->pf_memcpy( p_dst, p_src, i_width ); + vlc_memcpy( p_dst, p_src, i_width ); p_dst += i_width; p_src += i_src_stride; } diff --git a/modules/codec/dmo/dmo.c b/modules/codec/dmo/dmo.c index c635a07d89..1ca9241038 100644 --- a/modules/codec/dmo/dmo.c +++ b/modules/codec/dmo/dmo.c @@ -962,7 +962,7 @@ static void CopyPicture( decoder_t *p_dec, picture_t *p_pic, uint8_t *p_in ) for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) { - p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width ); + vlc_memcpy( p_dst, p_src, i_width ); p_src += i_width; p_dst += i_dst_stride; } @@ -1444,7 +1444,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++ ) { - p_enc->p_libvlc->pf_memcpy( p_dst, p_src, i_width ); + vlc_memcpy( p_dst, p_src, i_width ); p_dst += i_width; p_src += i_src_stride; } diff --git a/modules/codec/faad.c b/modules/codec/faad.c index 9f54fb7baf..cc39540fcd 100644 --- a/modules/codec/faad.c +++ b/modules/codec/faad.c @@ -231,9 +231,9 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) /* FIXME: multiple blocks per frame */ if( p_block->i_buffer > i_header_size ) { - p_dec->p_libvlc->pf_memcpy( p_block->p_buffer, - p_block->p_buffer + i_header_size, - p_block->i_buffer - i_header_size ); + vlc_memcpy( p_block->p_buffer, + p_block->p_buffer + i_header_size, + p_block->i_buffer - i_header_size ); p_block->i_buffer -= i_header_size; } } @@ -248,8 +248,8 @@ static aout_buffer_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) if( p_block->i_buffer > 0 ) { - p_dec->p_libvlc->pf_memcpy( &p_sys->p_buffer[p_sys->i_buffer], - p_block->p_buffer, p_block->i_buffer ); + vlc_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; } diff --git a/modules/codec/ffmpeg/scale.c b/modules/codec/ffmpeg/scale.c index f4032e14ab..343a9798d9 100644 --- a/modules/codec/ffmpeg/scale.c +++ b/modules/codec/ffmpeg/scale.c @@ -118,7 +118,7 @@ int E_(OpenScaler)( vlc_object_t *p_this ) return VLC_EGENERIC; } - swscale_fast_memcpy = p_filter->p_libvlc->pf_memcpy; + swscale_fast_memcpy = vlc_memcpy; /* Set CPU capabilities */ i_cpu = vlc_CPU(); diff --git a/modules/codec/ffmpeg/video.c b/modules/codec/ffmpeg/video.c index d2faa83c8b..d8fd65ae1f 100644 --- a/modules/codec/ffmpeg/video.c +++ b/modules/codec/ffmpeg/video.c @@ -547,8 +547,7 @@ picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block ) } p_sys->p_buffer = p_sys->p_buffer_orig; p_sys->i_buffer = p_block->i_buffer; - p_dec->p_libvlc->pf_memcpy( p_sys->p_buffer, p_block->p_buffer, - p_block->i_buffer ); + vlc_memcpy( p_sys->p_buffer, p_block->p_buffer, p_block->i_buffer ); memset( p_sys->p_buffer + p_block->i_buffer, 0, FF_INPUT_BUFFER_PADDING_SIZE ); @@ -835,7 +834,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++ ) { - p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_size ); + vlc_memcpy( p_dst, p_src, i_size ); p_src += i_src_stride; p_dst += i_dst_stride; } diff --git a/modules/codec/mash.cpp b/modules/codec/mash.cpp index 12a9eaf184..74e63f885a 100644 --- a/modules/codec/mash.cpp +++ b/modules/codec/mash.cpp @@ -213,11 +213,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(); - p_dec->p_libvlc->pf_memcpy( p_pic->p[0].p_pixels, p_frame, i_width*i_height ); + vlc_memcpy( p_dec, p_pic->p[0].p_pixels, p_frame, i_width*i_height ); p_frame += i_width * i_height; - p_dec->p_libvlc->pf_memcpy( p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 ); + vlc_memcpy( p_dec, p_pic->p[1].p_pixels, p_frame, i_width*i_height/4 ); p_frame += i_width * i_height/4; - p_dec->p_libvlc->pf_memcpy( p_pic->p[2].p_pixels, p_frame, i_width*i_height/4 ); + vlc_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); diff --git a/modules/codec/rawvideo.c b/modules/codec/rawvideo.c index 57da0bebd6..42642dc7b7 100644 --- a/modules/codec/rawvideo.c +++ b/modules/codec/rawvideo.c @@ -276,7 +276,7 @@ static void FillPicture( decoder_t *p_dec, block_t *p_block, picture_t *p_pic ) for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) { - p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_width ); + vlc_memcpy( p_dst, p_src, i_width ); p_src += p_sys->b_invert ? -i_width : i_width; p_dst += i_width; } @@ -347,12 +347,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++ ) { - p_dec->p_libvlc->pf_memcpy( p_tmp, p_bottom, - pic.p[i].i_visible_pitch ); - p_dec->p_libvlc->pf_memcpy( p_bottom, p_top, - pic.p[i].i_visible_pitch ); - p_dec->p_libvlc->pf_memcpy( p_top, p_tmp, - pic.p[i].i_visible_pitch ); + 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 ); p_top += i_pitch; p_bottom -= i_pitch; } diff --git a/modules/codec/sdl_image.c b/modules/codec/sdl_image.c index 065c47a766..f2e57f31b7 100644 --- a/modules/codec/sdl_image.c +++ b/modules/codec/sdl_image.c @@ -208,7 +208,7 @@ static picture_t *DecodeBlock( decoder_t *p_dec, block_t **pp_block ) for ( i = 0; i < p_surface->h; i++ ) { - p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_pitch ); + vlc_memcpy( p_dst, p_src, i_pitch ); p_src += p_surface->pitch; p_dst += p_pic->p[0].i_pitch; } diff --git a/modules/codec/tarkin.c b/modules/codec/tarkin.c index c13a4c0af9..3436fa7312 100644 --- a/modules/codec/tarkin.c +++ b/modules/codec/tarkin.c @@ -314,7 +314,7 @@ static void tarkin_CopyPicture( decoder_t *p_dec, picture_t *p_pic, for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) { - p_dec->p_libvlc->pf_memcpy( p_dst, p_src, i_src_stride ); + vlc_memcpy( p_dst, p_src, i_src_stride ); p_src += i_src_stride; p_dst += i_dst_stride; diff --git a/modules/codec/theora.c b/modules/codec/theora.c index 0ac1e76963..982a798688 100644 --- a/modules/codec/theora.c +++ b/modules/codec/theora.c @@ -563,8 +563,8 @@ static void theora_CopyPicture( decoder_t *p_dec, picture_t *p_pic, for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines; i_line++ ) { - p_dec->p_libvlc->pf_memcpy( p_dst, p_src + i_src_xoffset, - i_plane ? yuv->uv_width : yuv->y_width ); + vlc_memcpy( p_dst, p_src + i_src_xoffset, + i_plane ? yuv->uv_width : yuv->y_width ); p_src += i_src_stride; p_dst += i_dst_stride; } diff --git a/modules/codec/twolame.c b/modules/codec/twolame.c index 8bcdccd790..17dec1e160 100644 --- a/modules/codec/twolame.c +++ b/modules/codec/twolame.c @@ -289,8 +289,7 @@ static block_t *Encode( encoder_t *p_enc, aout_buffer_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 ); - p_enc->p_libvlc->pf_memcpy( p_block->p_buffer, p_sys->p_out_buffer, - i_used ); + vlc_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; diff --git a/modules/gui/beos/AudioOutput.cpp b/modules/gui/beos/AudioOutput.cpp index 9e3f1a4533..67e088427f 100644 --- a/modules/gui/beos/AudioOutput.cpp +++ b/modules/gui/beos/AudioOutput.cpp @@ -152,18 +152,18 @@ static void Play( void * _p_aout, void * _p_buffer, size_t i_size, if( p_aout_buffer != NULL ) { - p_aout->p_libvlc->pf_memcpy( p_buffer, p_aout_buffer->p_buffer, - MIN( i_size, p_aout_buffer->i_nb_bytes ) ); + vlc_memcpy( p_buffer, p_aout_buffer->p_buffer, + MIN( i_size, p_aout_buffer->i_nb_bytes ) ); if( p_aout_buffer->i_nb_bytes < i_size ) { - p_aout->p_libvlc->pf_memset( p_buffer + p_aout_buffer->i_nb_bytes, - 0, i_size - p_aout_buffer->i_nb_bytes ); + vlc_memset( p_buffer + p_aout_buffer->i_nb_bytes, + 0, i_size - p_aout_buffer->i_nb_bytes ); } aout_BufferFree( p_aout_buffer ); } else { - p_aout->p_libvlc->pf_memset( p_buffer, 0, i_size ); + vlc_memset( p_buffer, 0, i_size ); } } diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c index 0c2ab016aa..e4b1a85c4d 100644 --- a/modules/gui/fbosd.c +++ b/modules/gui/fbosd.c @@ -331,8 +331,7 @@ static int Create( vlc_object_t *p_this ) msg_Err( p_intf, "out of memory" ); return VLC_ENOMEM; } - p_intf->p_libvlc->pf_memcpy( p_sys->p_style, &default_text_style, - sizeof( text_style_t ) ); + vlc_memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t ) ); p_intf->pf_run = Run; @@ -417,9 +416,8 @@ static int Create( vlc_object_t *p_this ) for( i = 0; i < FBOSD_RENDER_MAX; i++ ) { - p_intf->p_libvlc->pf_memcpy( &p_sys->render[i].text_style, - &default_text_style, - sizeof( text_style_t ) ); + vlc_memcpy( &p_sys->render[i].text_style, &default_text_style, + sizeof( text_style_t ) ); } p_sys->b_clear = var_CreateGetBoolCommand( p_intf, "fbosd-clear" ); @@ -841,9 +839,8 @@ static int RenderPicture( intf_thread_t *p_intf, int i_x_offset, int i_y_offset, if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch ) { /* There are margins, but with the same width : perfect ! */ - p_intf->p_libvlc->pf_memcpy( - p_dest->p[i].p_pixels, p_src->p[i].p_pixels, - p_src->p[i].i_pitch * p_src->p[i].i_visible_lines ); + vlc_memcpy( p_dest->p[i].p_pixels, p_src->p[i].p_pixels, + p_src->p[i].i_pitch * p_src->p[i].i_visible_lines ); } else { @@ -873,8 +870,8 @@ static int RenderPicture( intf_thread_t *p_intf, int i_x_offset, int i_y_offset, p_out += ( i_y_offset * p_dest->p[i].i_pitch ); for( i_line = 0; i_line < ( p_src->p[i].i_visible_lines - i_y_clip ); i_line++ ) { - p_intf->p_libvlc->pf_memcpy( p_out + i_x, p_in, - p_src->p[i].i_visible_pitch - i_x_clip ); + vlc_memcpy( p_out + i_x, p_in, + p_src->p[i].i_visible_pitch - i_x_clip ); p_in += p_src->p[i].i_pitch; p_out += p_dest->p[i].i_pitch; } @@ -932,8 +929,7 @@ static picture_t *RenderText( intf_thread_t *p_intf, const char *psz_string, #else fmt_out = p_region->fmt; fmt_out.i_bits_per_pixel = 32; - p_intf->p_libvlc->pf_memcpy( p_fmt, &fmt_out, - sizeof(video_format_t) ); + vlc_memcpy( p_fmt, &fmt_out, sizeof(video_format_t) ); p_dest = AllocatePicture( VLC_OBJECT(p_intf), &fmt_out ); if( !p_dest ) @@ -1276,8 +1272,8 @@ static void RenderClear( intf_thread_t *p_intf, struct fbosd_render_t *render ) { intf_sys_t *p_sys = (intf_sys_t*) p_intf->p_sys; - p_intf->p_libvlc->pf_memcpy( &render->text_style, &default_text_style, - sizeof( text_style_t ) ); + vlc_memcpy( &render->text_style, &default_text_style, + sizeof( text_style_t ) ); free( render->psz_string ); render->psz_string = NULL; diff --git a/modules/mux/mpeg/pes.c b/modules/mux/mpeg/pes.c index e27f3b6ad5..e7e64864c7 100644 --- a/modules/mux/mpeg/pes.c +++ b/modules/mux/mpeg/pes.c @@ -306,8 +306,8 @@ int E_( EStoPES )( sout_instance_t *p_sout, block_t **pp_pes, block_t *p_es, p_pes->i_length = 0; if( i_pes_payload > 0 ) { - p_sout->p_libvlc->pf_memcpy( p_pes->p_buffer + i_pes_header, - p_data, i_pes_payload ); + vlc_memcpy( p_pes->p_buffer + i_pes_header, p_data, + i_pes_payload ); } i_pes_count++; } diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c index 02f27602c9..0d32129fad 100644 --- a/modules/mux/mpeg/ts.c +++ b/modules/mux/mpeg/ts.c @@ -1677,7 +1677,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 ); - p_mux->p_libvlc->pf_memcpy( p_new->p_buffer, p_data->p_buffer, STD_PES_PAYLOAD ); + vlc_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 @@ -1706,8 +1706,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 ); - p_mux->p_libvlc->pf_memcpy( &p_data->p_buffer[i_size], p_next->p_buffer, - i_copy ); + vlc_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; diff --git a/modules/stream_out/switcher.c b/modules/stream_out/switcher.c index 694dcdc764..658d153194 100644 --- a/modules/stream_out/switcher.c +++ b/modules/stream_out/switcher.c @@ -860,10 +860,8 @@ 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) ); - p_stream->p_libvlc->pf_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])); + vlc_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++ ) { @@ -877,24 +875,24 @@ 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) ); - p_stream->p_libvlc->pf_memcpy( id->p_frame->motion_val[i], - id->ff_enc_c->coded_frame->motion_val[i], - 2 * stride * height * sizeof(int16_t) ); + vlc_memcpy( id->p_frame->motion_val[i], + id->ff_enc_c->coded_frame->motion_val[i], + 2 * stride * height * sizeof(int16_t) ); } if ( id->ff_enc_c->coded_frame->ref_index[i] ) { id->p_frame->ref_index[i] = malloc( b8_stride * 2 * mb_height * sizeof(int8_t) ); - p_stream->p_libvlc->pf_memcpy( id->p_frame->ref_index[i], - id->ff_enc_c->coded_frame->ref_index[i], - b8_stride * 2 * mb_height * sizeof(int8_t)); + vlc_memcpy( id->p_frame->ref_index[i], + id->ff_enc_c->coded_frame->ref_index[i], + b8_stride * 2 * mb_height * sizeof(int8_t)); } } } #endif p_out = block_New( p_stream, i_out ); - p_stream->p_libvlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out ); + vlc_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; @@ -937,7 +935,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 ); - p_stream->p_libvlc->pf_memcpy( p_out->p_buffer, id->p_buffer_out, i_out ); + vlc_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; diff --git a/modules/video_chroma/i420_rgb.h b/modules/video_chroma/i420_rgb.h index 109ea96bec..6b54c9bfe9 100644 --- a/modules/video_chroma/i420_rgb.h +++ b/modules/video_chroma/i420_rgb.h @@ -283,8 +283,7 @@ void E_(I420_A8B8G8R8) ( vout_thread_t *, picture_t *, picture_t * ); while( (i_scale_count -= p_vout->render.i_height) > 0 ) \ { \ /* Height increment: copy previous picture line */ \ - p_vout->p_libvlc->pf_memcpy( p_pic, p_pic_start, \ - p_vout->output.i_width * BPP ); \ + vlc_memcpy( p_pic, p_pic_start, p_vout->output.i_width * BPP ); \ p_pic = (void*)((uint8_t*)p_pic + p_dest->p->i_pitch ); \ } \ i_scale_count += p_vout->output.i_height; \ diff --git a/modules/video_chroma/i420_ymga.c b/modules/video_chroma/i420_ymga.c index 1024049305..f3cb90594f 100644 --- a/modules/video_chroma/i420_ymga.c +++ b/modules/video_chroma/i420_ymga.c @@ -109,8 +109,8 @@ static void I420_YMGA( vout_thread_t *p_vout, picture_t *p_source, int i_x; /* Copy the Y part */ - p_vout->p_libvlc->pf_memcpy( p_dest->Y_PIXELS, p_source->Y_PIXELS, - p_dest->p[Y_PLANE].i_pitch * p_dest->p[Y_PLANE].i_visible_lines ); + vlc_memcpy( p_dest->Y_PIXELS, p_source->Y_PIXELS, + p_dest->p[Y_PLANE].i_pitch * p_dest->p[Y_PLANE].i_visible_lines ); /* Copy the U:V part */ for( i_x = p_dest->p[U_PLANE].i_pitch * p_dest->p[U_PLANE].i_visible_lines / 64; diff --git a/modules/video_chroma/i422_i420.c b/modules/video_chroma/i422_i420.c index ea79eb7b2b..1af3648678 100644 --- a/modules/video_chroma/i422_i420.c +++ b/modules/video_chroma/i422_i420.c @@ -119,15 +119,14 @@ static void I422_I420( vout_thread_t *p_vout, picture_t *p_source, uint8_t *p_u = p_source->U_PIXELS + (i_y-1)*i_spuv; uint8_t *p_dv = p_dest->V_PIXELS + (i_y/2-1)*i_dpuv; uint8_t *p_v = p_source->V_PIXELS + (i_y-1)*i_spuv; - void *(*pf_memcpy)(void *, const void *, size_t) = p_vout->p_libvlc->pf_memcpy; i_y /= 2; for ( ; i_y--; ) { - pf_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy; - pf_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy; - pf_memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv; - pf_memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv; + 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; } } @@ -149,15 +148,14 @@ static void I422_YV12( vout_thread_t *p_vout, picture_t *p_source, uint8_t *p_u = p_source->U_PIXELS + (i_y-1)*i_spuv; uint8_t *p_dv = p_dest->U_PIXELS + (i_y/2-1)*i_dpuv; /* U and V are swapped */ uint8_t *p_v = p_source->V_PIXELS + (i_y-1)*i_spuv; - void *(*pf_memcpy)(void *, const void *, size_t) = p_vout->p_libvlc->pf_memcpy; i_y /= 2; for ( ; i_y--; ) { - pf_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy; - pf_memcpy(p_dy, p_y, i_width); p_dy -= i_dpy; p_y -= i_spy; - pf_memcpy(p_du, p_u, i_width/2); p_du -= i_dpuv; p_u -= 2*i_spuv; - pf_memcpy(p_dv, p_v, i_width/2); p_dv -= i_dpuv; p_v -= 2*i_spuv; + 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; } } @@ -168,7 +166,6 @@ static void I422_YUVA( vout_thread_t *p_vout, picture_t *p_source, picture_t *p_dest ) { I422_I420( p_vout, p_source, p_dest ); - p_vout->p_libvlc->pf_memset( p_dest->p[A_PLANE].p_pixels, 0xff, - p_dest->p[A_PLANE].i_lines - * p_dest->p[A_PLANE].i_pitch ); + vlc_memset( p_dest->p[A_PLANE].p_pixels, 0xff, + p_dest->p[A_PLANE].i_lines * p_dest->p[A_PLANE].i_pitch ); } diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c index 809bbc26e9..57c255b886 100644 --- a/modules/video_filter/alphamask.c +++ b/modules/video_filter/alphamask.c @@ -180,16 +180,14 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) for( i_line = 0; i_line < i_lines; i_line++, p_src += i_src_pitch, p_dst += i_dst_pitch ) { - p_filter->p_libvlc->pf_memcpy( - p_dst, p_src, i_visible_pitch ); + vlc_memcpy( p_dst, p_src, i_visible_pitch ); } } else { /* plane sizes match */ - p_filter->p_libvlc->pf_memcpy( - p_apic->p_pixels, p_mask->p_pixels, - p_mask->i_pitch * p_mask->i_lines ); + vlc_memcpy( p_apic->p_pixels, p_mask->p_pixels, + p_mask->i_pitch * p_mask->i_lines ); } } vlc_mutex_unlock( &p_sys->mask_lock ); diff --git a/modules/video_filter/blend.c b/modules/video_filter/blend.c index 951b60ba8b..9f04db0b50 100644 --- a/modules/video_filter/blend.c +++ b/modules/video_filter/blend.c @@ -1100,7 +1100,7 @@ static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst, p_src2_y += i_src2_pitch ) { /* Completely opaque. Completely overwrite underlying pixel */ - p_filter->p_libvlc->pf_memcpy( p_dst_y, p_src2_y, i_width ); + vlc_memcpy( p_dst_y, p_src2_y, i_width ); if( b_even_scanline ) { p_dst_u += i_dst_pitch/2; @@ -1110,8 +1110,8 @@ static void BlendI420I420_no_alpha( filter_t *p_filter, picture_t *p_dst, } else { - p_filter->p_libvlc->pf_memcpy( p_dst_u, p_src2_u, i_width/2 ); - p_filter->p_libvlc->pf_memcpy( p_dst_v, p_src2_v, i_width/2 ); + vlc_memcpy( p_dst_u, p_src2_u, i_width/2 ); + vlc_memcpy( p_dst_v, p_src2_v, i_width/2 ); } b_even_scanline = !b_even_scanline; if( i_y%2 == 1 ) diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c index ed0b5ae206..579e30fda2 100644 --- a/modules/video_filter/bluescreen.c +++ b/modules/video_filter/bluescreen.c @@ -199,7 +199,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } } /* Gaussian convolution to make it look cleaner */ - p_filter->p_libvlc->pf_memset( p_a, 0, 2 * i_pitch ); + vlc_memset( p_a, 0, 2 * i_pitch ); for( i = 2; i < i_lines - 2; i++ ) { p_a[i*i_pitch] = 0x00; diff --git a/modules/video_filter/clone.c b/modules/video_filter/clone.c index 01a53dd802..1b97b50d9b 100644 --- a/modules/video_filter/clone.c +++ b/modules/video_filter/clone.c @@ -357,7 +357,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) if( i_in_pitch == i_copy_pitch && i_out_pitch == i_copy_pitch ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_in_pitch + vlc_memcpy( p_out, p_in, i_in_pitch * p_outpic->p[i_plane].i_visible_lines ); } else @@ -367,7 +367,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) while( p_in < p_in_end ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch ); + vlc_memcpy( p_out, p_in, i_copy_pitch ); p_in += i_in_pitch; p_out += i_out_pitch; } diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c index bb0bfabe43..63fe0c836c 100644 --- a/modules/video_filter/colorthres.c +++ b/modules/video_filter/colorthres.c @@ -185,14 +185,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_out_v = p_outpic->p[V_PLANE].p_pixels; /* Create grayscale version of input */ - p_filter->p_libvlc-> - pf_memcpy( p_out_y, p_in_y, p_pic->p[Y_PLANE].i_visible_lines + vlc_memcpy( p_out_y, p_in_y, p_pic->p[Y_PLANE].i_visible_lines * p_pic->p[Y_PLANE].i_pitch - 8 ); - p_filter->p_libvlc-> - pf_memset( p_out_u, 0x80, p_pic->p[U_PLANE].i_visible_lines + vlc_memset( p_out_u, 0x80, p_pic->p[U_PLANE].i_visible_lines * p_pic->p[U_PLANE].i_pitch - 8 ); - p_filter->p_libvlc-> - pf_memset( p_out_v, 0x80, p_pic->p[U_PLANE].i_visible_lines + vlc_memset( p_out_v, 0x80, p_pic->p[U_PLANE].i_visible_lines * p_pic->p[U_PLANE].i_pitch - 8 ); /* diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c index 4dd65285b1..0ea4e78335 100644 --- a/modules/video_filter/crop.c +++ b/modules/video_filter/crop.c @@ -534,7 +534,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) while( p_out < p_out_end ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch ); + vlc_memcpy( p_out, p_in, i_copy_pitch ); p_in += i_in_pitch; p_out += i_out_pitch; } diff --git a/modules/video_filter/croppadd.c b/modules/video_filter/croppadd.c index 469aeac1ef..ede94207e5 100644 --- a/modules/video_filter/croppadd.c +++ b/modules/video_filter/croppadd.c @@ -151,8 +151,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_in += i_ycrop * p_plane->i_pitch; /* Padd on the top */ - p_filter->p_libvlc->pf_memset( p_out, i_padd_color, - i_ypadd * p_outplane->i_pitch ); + vlc_memset( p_out, i_padd_color, i_ypadd * p_outplane->i_pitch ); p_out += i_ypadd * p_outplane->i_pitch; int i_line; @@ -165,19 +164,17 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) p_in += i_xcrop * i_pixel_pitch; /* Padd on the left */ - p_filter->p_libvlc->pf_memset( p_out, i_padd_color, - i_xpadd * i_pixel_pitch ); + vlc_memset( p_out, i_padd_color, i_xpadd * i_pixel_pitch ); p_out += i_xpadd * i_pixel_pitch; /* Copy the image and crop on the right */ - p_filter->p_libvlc->pf_memcpy( p_out, p_in, - i_width * i_pixel_pitch ); + vlc_memcpy( p_out, p_in, i_width * i_pixel_pitch ); p_out += i_width * i_pixel_pitch; p_in += i_width * i_pixel_pitch; /* Padd on the right */ - p_filter->p_libvlc->pf_memset( p_out, i_padd_color, - ( i_outwidth - i_width ) * i_pixel_pitch ); + vlc_memset( p_out, i_padd_color, + ( i_outwidth - i_width ) * i_pixel_pitch ); /* Got to begining of the next line */ p_in = p_in_next; @@ -185,7 +182,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } /* Padd on the bottom */ - p_filter->p_libvlc->pf_memset( p_out, i_padd_color, + vlc_memset( p_out, i_padd_color, ( i_outheight - i_ypadd - i_height ) * p_outplane->i_pitch ); } diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c index 1e8d55b836..b89269aab9 100644 --- a/modules/video_filter/deinterlace.c +++ b/modules/video_filter/deinterlace.c @@ -594,8 +594,7 @@ static void RenderDiscard( vout_thread_t *p_vout, for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; @@ -610,11 +609,9 @@ static void RenderDiscard( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; p_in += i_increment; } @@ -623,8 +620,7 @@ static void RenderDiscard( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; p_in += i_increment; } @@ -663,8 +659,7 @@ static void RenderBob( vout_thread_t *p_vout, /* For BOTTOM field we need to add the first line */ if( i_field == 1 ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; } @@ -673,28 +668,24 @@ static void RenderBob( vout_thread_t *p_vout, for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; } - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } break; @@ -702,8 +693,7 @@ static void RenderBob( vout_thread_t *p_vout, /* For BOTTOM field we need to add the first line */ if( i_field == 1 ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; } @@ -714,13 +704,11 @@ static void RenderBob( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; @@ -730,24 +718,21 @@ static void RenderBob( vout_thread_t *p_vout, { for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; } } - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } break; } @@ -778,8 +763,7 @@ static void RenderLinear( vout_thread_t *p_vout, /* For BOTTOM field we need to add the first line */ if( i_field == 1 ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; } @@ -788,8 +772,7 @@ static void RenderLinear( vout_thread_t *p_vout, for( ; p_out < p_out_end ; ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); p_out += p_outpic->p[i_plane].i_pitch; @@ -800,16 +783,14 @@ static void RenderLinear( vout_thread_t *p_vout, p_out += p_outpic->p[i_plane].i_pitch; } - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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; - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_memcpy( p_out, p_in, p_pic->p[i_plane].i_pitch ); } } EndMerge(); @@ -866,8 +847,7 @@ static void RenderBlend( vout_thread_t *p_vout, case VLC_FOURCC('I','Y','U','V'): case VLC_FOURCC('Y','V','1','2'): /* First line: simple copy */ - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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 */ @@ -883,8 +863,7 @@ static void RenderBlend( vout_thread_t *p_vout, case VLC_FOURCC('I','4','2','2'): /* First line: simple copy */ - p_vout->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_plane].i_pitch ); + vlc_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 */ diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c index e44302f570..82bbb955af 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c @@ -368,9 +368,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date ) *pp_region = NULL; break; } - p_filter->p_libvlc->pf_memcpy( (*pp_region)->p_style, - &p_overlay->fontstyle, - sizeof(struct text_style_t) ); + vlc_memcpy( (*pp_region)->p_style, &p_overlay->fontstyle, + sizeof(struct text_style_t) ); } else { diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c index fea3180d35..c4cb9975b5 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c @@ -537,8 +537,8 @@ 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 ) { - p_filter->p_libvlc->pf_memcpy( p_out, p_in, - p_ovl->data.p_pic->p[i_plane].i_visible_pitch ); + vlc_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; } diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c index 7649bff835..482c2f96ae 100644 --- a/modules/video_filter/erase.c +++ b/modules/video_filter/erase.c @@ -277,7 +277,7 @@ static void FilterErase( filter_t *p_filter, picture_t *p_inpic, i_width = __MIN( i_visible_pitch - i_x, i_width ); /* Copy original pixel buffer */ - p_filter->p_libvlc->pf_memcpy( p_outpix, p_inpix, i_pitch * i_lines ); + vlc_memcpy( p_outpix, p_inpix, i_pitch * i_lines ); /* Horizontal linear interpolation of masked areas */ p_outpix = p_outpic->p[i_plane].p_pixels + i_y*i_pitch + i_x; diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index 8a73cf84b5..0835c7f09b 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -346,18 +346,18 @@ static void FilterGradient( filter_t *p_filter, picture_t *p_inpic, if( p_filter->p_sys->b_cartoon ) { - p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels, p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); } else { - p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, + vlc_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, + vlc_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); } @@ -490,20 +490,20 @@ static void FilterEdge( filter_t *p_filter, picture_t *p_inpic, if( p_filter->p_sys->b_cartoon ) { - p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels, p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); } else { - p_filter->p_libvlc->pf_memset( p_outpic->p[Y_PLANE].p_pixels, 0xff, + vlc_memset( p_outpic->p[Y_PLANE].p_pixels, 0xff, p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, + vlc_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, + vlc_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); } @@ -660,16 +660,15 @@ static void FilterHough( filter_t *p_filter, picture_t *p_inpic, msg_Dbg(p_filter, "Precalculation done"); } - p_filter->p_libvlc->pf_memset( p_hough, 0, - i_diag * i_nb_steps * sizeof(int) ); + vlc_memset( p_hough, 0, i_diag * i_nb_steps * sizeof(int) ); - p_filter->p_libvlc->pf_memcpy( + vlc_memcpy( p_outpic->p[Y_PLANE].p_pixels, p_inpic->p[Y_PLANE].p_pixels, p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memcpy( + vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels, p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memcpy( + vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c index 0042ff603b..f5ba969b93 100644 --- a/modules/video_filter/grain.c +++ b/modules/video_filter/grain.c @@ -195,7 +195,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) const int i_lines = p_pic->p[i_index].i_lines; const int i_pitch = p_pic->p[i_index].i_pitch; - p_filter->p_libvlc->pf_memcpy( p_out, p_in, i_lines * i_pitch ); + vlc_memcpy( p_out, p_in, i_lines * i_pitch ); } diff --git a/modules/video_filter/invert.c b/modules/video_filter/invert.c index 424ef51f61..69c70eaf7f 100644 --- a/modules/video_filter/invert.c +++ b/modules/video_filter/invert.c @@ -127,7 +127,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; - p_filter->p_libvlc->pf_memcpy( + vlc_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 ); } diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c index fd0cb06b97..0d6859f3d1 100644 --- a/modules/video_filter/magnify.c +++ b/modules/video_filter/magnify.c @@ -361,8 +361,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) { for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) { - p_vout->p_libvlc-> - pf_memcpy( p_outpic->p[i_plane].p_pixels, p_pic->p[i_plane].p_pixels, + vlc_memcpy( p_outpic->p[i_plane].p_pixels, p_pic->p[i_plane].p_pixels, p_outpic->p[i_plane].i_lines * p_outpic->p[i_plane].i_pitch ); } } @@ -379,7 +378,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) { for( y=0; yp[i_plane].i_visible_lines; y++) { - p_vout->p_libvlc->pf_memcpy( + vlc_memcpy( p_outpic->p[i_plane].p_pixels+y*p_outpic->p[i_plane].i_pitch, p_converted->p[i_plane].p_pixels+y*p_converted->p[i_plane].i_pitch, p_converted->p[i_plane].i_visible_pitch ); @@ -391,7 +390,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) v_w = p_oyp->i_pitch*ZOOM_FACTOR/(VIS_ZOOM*o_zoom); v_h = (o_y+p_oyp->i_lines*ZOOM_FACTOR/o_zoom)/VIS_ZOOM; /* top line */ - p_vout->p_libvlc->pf_memset( p_oyp->p_pixels + vlc_memset( p_oyp->p_pixels + o_y/VIS_ZOOM*p_oyp->i_pitch + o_x/VIS_ZOOM, 0xff, v_w+1 ); @@ -407,7 +406,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) ] = 0xff; } /* bottom line */ - p_vout->p_libvlc->pf_memset( p_oyp->p_pixels + vlc_memset( p_oyp->p_pixels + v_h*p_oyp->i_pitch + o_x/VIS_ZOOM, 0xff, v_w+1 ); @@ -450,18 +449,14 @@ o o X o o o X X X X X o o X X X X o o o X X X X X o o X X X o o o X X X o o X o if( p_vout->p_sys->b_visible ) { /* zoom gauge */ - p_vout->p_libvlc->pf_memset( p_oyp->p_pixels - + (v_h+9)*p_oyp->i_pitch, - 0xff, 41 ); + vlc_memset( p_oyp->p_pixels + (v_h+9)*p_oyp->i_pitch, 0xff, 41 ); for( y = v_h + 10; y < v_h + 90; y++ ) { int width = v_h + 90 - y; width = (width*width)/160; if( (80 - y + v_h)*10 < o_zoom ) { - p_vout->p_libvlc->pf_memset( p_oyp->p_pixels - + y*p_oyp->i_pitch, - 0xff, width ); + vlc_memset( p_oyp->p_pixels + y*p_oyp->i_pitch, 0xff, width ); } else { diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index d8128a16c6..0ebfbdc281 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -223,7 +223,7 @@ static void Copy( filter_t *p_filter, picture_t *p_pic ) int i_plane; for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ ) { - p_filter->p_libvlc->pf_memcpy( + vlc_memcpy( p_filter->p_sys->pp_planes[i_plane], p_pic->p[i_plane].p_pixels, p_pic->p[i_plane].i_pitch * p_pic->p[i_plane].i_visible_lines ); } diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c index 0f6ee3c777..73ba4fff3a 100644 --- a/modules/video_filter/motiondetect.c +++ b/modules/video_filter/motiondetect.c @@ -161,11 +161,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic ) } p_outpix = p_outpic->p[Y_PLANE].p_pixels; - p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels, - p_inpic->p[U_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].p_pixels, p_inpic->p[U_PLANE].i_pitch * p_inpic->p[U_PLANE].i_visible_lines ); - p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels, - p_inpic->p[V_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].p_pixels, p_inpic->p[V_PLANE].i_pitch * p_inpic->p[V_PLANE].i_visible_lines ); if( !p_sys->p_oldpix || !p_sys->p_buf ) @@ -442,12 +440,9 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_inpic ) /** * We're done. Lets keep a copy of the picture */ - p_filter->p_libvlc->pf_memcpy( p_oldpix, p_inpix, - i_src_pitch * i_num_lines ); - p_filter->p_libvlc->pf_memcpy( p_oldpix_u, p_inpix_u, - i_src_pitch_u * i_num_lines_u ); - p_filter->p_libvlc->pf_memcpy( p_oldpix_v, p_inpix_v, - i_src_pitch_u * i_num_lines_u ); + vlc_memcpy( p_oldpix, p_inpix, i_src_pitch * i_num_lines ); + vlc_memcpy( p_oldpix_u, p_inpix_u, i_src_pitch_u * i_num_lines_u ); + vlc_memcpy( p_oldpix_v, p_inpix_v, i_src_pitch_u * i_num_lines_u ); vlc_mutex_unlock( &p_filter->p_sys->lock ); diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c index 47f0003ed5..e1ce7ad630 100644 --- a/modules/video_filter/noise.c +++ b/modules/video_filter/noise.c @@ -154,9 +154,8 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) if( rand()%8 ) { /* line isn't noisy */ - p_filter->p_libvlc->pf_memcpy( p_out+i_line*i_pitch, - p_in+i_line*i_pitch, - i_num_cols ); + vlc_memcpy( p_out+i_line*i_pitch, p_in+i_line*i_pitch, + i_num_cols ); } else { diff --git a/modules/video_filter/panoramix.c b/modules/video_filter/panoramix.c index d160eb875d..1dcc26cffa 100644 --- a/modules/video_filter/panoramix.c +++ b/modules/video_filter/panoramix.c @@ -1047,17 +1047,17 @@ static void RenderPlanarYUV( vout_thread_t *p_vout, picture_t *p_pic ) while( p_in < p_in_end ) { #ifndef OVERLAP - p_vout->p_libvlc->pf_memcpy( p_out , p_in, i_copy_pitch); + vlc_memcpy( p_out, p_in, i_copy_pitch); #else if (p_vout->p_sys->i_col > 2) { length /= 2; if (i_col == 0) - p_vout->p_libvlc->pf_memcpy( p_out + length , p_in, i_copy_pitch - length); + vlc_memcpy( p_out + length , p_in, i_copy_pitch - length); else if (i_col + 1 == p_vout->p_sys->i_col) - p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch - length); - else - p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch); + vlc_memcpy( p_out, p_in - length, i_copy_pitch - length); + else + vlc_memcpy( p_out, p_in - length, i_copy_pitch); if ((i_col == 0)) // black bar @@ -1078,7 +1078,7 @@ static void RenderPlanarYUV( vout_thread_t *p_vout, picture_t *p_pic ) length *= 2; } else - p_vout->p_libvlc->pf_memcpy( p_out , p_in, i_copy_pitch); + vlc_memcpy( p_out , p_in, i_copy_pitch); if (p_vout->p_sys->b_attenuate) { @@ -1390,18 +1390,18 @@ static void RenderPackedRGB( vout_thread_t *p_vout, picture_t *p_pic ) while( p_in < p_in_end ) { #ifndef OVERLAP - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch); + vlc_memcpy( p_out, p_in, i_copy_pitch ); #else if (p_vout->p_sys->i_col > 2) { // vertical blend length /= 2; if (i_col == 0) - p_vout->p_libvlc->pf_memcpy( p_out + length, p_in, i_copy_pitch - length); + vlc_memcpy( p_out + length, p_in, i_copy_pitch - length); else if (i_col + 1 == p_vout->p_sys->i_col) - p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch - length); - else - p_vout->p_libvlc->pf_memcpy( p_out, p_in - length, i_copy_pitch); + vlc_memcpy( p_out, p_in - length, i_copy_pitch - length); + else + vlc_memcpy( p_out, p_in - length, i_copy_pitch); if ((i_col == 0)) // black bar @@ -1428,7 +1428,7 @@ static void RenderPackedRGB( vout_thread_t *p_vout, picture_t *p_pic ) length *= 2; } else - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch); + vlc_memcpy( p_out, p_in, i_copy_pitch); // vertical blend // first blended zone @@ -1768,9 +1768,9 @@ static void RenderPackedYUV( vout_thread_t *p_vout, picture_t *p_pic ) while( p_in < p_in_end ) { #ifndef OVERLAP - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch); + vlc_memcpy( p_out, p_in, i_copy_pitch); #else - p_vout->p_libvlc->pf_memcpy( p_out + i_col * length, p_in + i_col * length, i_copy_pitch - length); + vlc_memcpy( p_out + i_col * length, p_in + i_col * length, i_copy_pitch - length); p_out += LeftOffset; p_in += LeftOffset; #ifndef GAMMA diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c index 9ea7301346..9bc0e0ac80 100644 --- a/modules/video_filter/psychedelic.c +++ b/modules/video_filter/psychedelic.c @@ -160,10 +160,10 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) v = p_filter->p_sys->v; for( y = 0; yp[U_PLANE].i_lines; y++) { - p_filter->p_libvlc->pf_memset( + vlc_memset( p_outpic->p[U_PLANE].p_pixels+y*p_outpic->p[U_PLANE].i_pitch, u, p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memset( + vlc_memset( p_outpic->p[V_PLANE].p_pixels+y*p_outpic->p[V_PLANE].i_pitch, v, p_outpic->p[V_PLANE].i_pitch ); if( v == 0 && u != 0 ) @@ -177,8 +177,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } /* luminance */ - p_filter->p_libvlc->pf_memcpy( - p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[Y_PLANE].p_pixels, p_pic->p[Y_PLANE].p_pixels, p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); /* image visualization */ diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c index 42c12f365d..9e56b05354 100644 --- a/modules/video_filter/puzzle.c +++ b/modules/video_filter/puzzle.c @@ -398,8 +398,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) uint8_t color = ( i_plane == Y_PLANE ? 0x0 : 0x80 ); for( ; i_row < i_last_row; i_row++, i_orow++ ) { - p_vout->p_libvlc-> - pf_memset( p_out->p_pixels + i_row * i_pitch + vlc_memset( p_out->p_pixels + i_row * i_pitch + i_col * i_pitch / i_cols, color, i_pitch / i_cols ); } @@ -408,8 +407,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) { for( ; i_row < i_last_row; i_row++, i_orow++ ) { - p_vout->p_libvlc-> - pf_memcpy( p_out->p_pixels + i_row * i_pitch + vlc_memcpy( p_out->p_pixels + i_row * i_pitch + i_col * i_pitch / i_cols, p_in->p_pixels + i_orow * i_pitch + i_ocol * i_pitch / i_cols, @@ -430,8 +428,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) int i_last_row = i_row + 1; i_row *= p_in->i_lines / i_rows; i_last_row *= p_in->i_lines / i_rows; - p_vout->p_libvlc-> - pf_memset( p_out->p_pixels + i_row * i_pitch + vlc_memset( p_out->p_pixels + i_row * i_pitch + i_col * i_pitch / i_cols, 0xff, i_pitch / i_cols ); for( ; i_row < i_last_row; i_row++ ) @@ -442,8 +439,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) + (i_col+1) * i_pitch / i_cols - 1 ] = 0xff; } i_row--; - p_vout->p_libvlc-> - pf_memset( p_out->p_pixels + i_row * i_pitch + vlc_memset( p_out->p_pixels + i_row * i_pitch + i_col * i_pitch / i_cols, 0xff, i_pitch / i_cols ); } diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c index d387d20fdc..79846f815d 100644 --- a/modules/video_filter/ripple.c +++ b/modules/video_filter/ripple.c @@ -155,8 +155,7 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) for( i_line = 0 ; i_line < i_first_line ; i_line++ ) { - p_filter->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_index].i_visible_pitch ); + vlc_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; } @@ -177,27 +176,24 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { if( i_offset < 0 ) { - p_filter->p_libvlc->pf_memcpy( p_out, p_in - i_offset, - p_pic->p[i_index].i_visible_pitch + i_offset ); + vlc_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; - p_filter->p_libvlc->pf_memset( p_out + i_offset, - black_pixel, -i_offset ); + vlc_memset( p_out + i_offset, black_pixel, -i_offset ); } else { - p_filter->p_libvlc->pf_memcpy( p_out + i_offset, p_in, - p_pic->p[i_index].i_visible_pitch - i_offset ); - p_filter->p_libvlc->pf_memset( p_out, black_pixel, - i_offset ); + vlc_memcpy( p_out + i_offset, p_in, + p_pic->p[i_index].i_visible_pitch - i_offset ); + vlc_memset( p_out, black_pixel, i_offset ); p_in -= p_pic->p[i_index].i_pitch; p_out += p_outpic->p[i_index].i_pitch; } } else { - p_filter->p_libvlc->pf_memcpy( p_out, p_in, - p_pic->p[i_index].i_visible_pitch ); + vlc_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; } diff --git a/modules/video_filter/seamcarving.c b/modules/video_filter/seamcarving.c index f1a1ecc44a..e5d63faecc 100644 --- a/modules/video_filter/seamcarving.c +++ b/modules/video_filter/seamcarving.c @@ -166,16 +166,15 @@ static void FilterSeamCarving( filter_t *p_filter, picture_t *p_inpic, p_filter->p_sys->p_grad = (int*)malloc(i_src_pitch * i_num_lines * sizeof(int)); //#if defined( DRAW_GRADIENT ) || defined( DRAW_ENERGY ) || defined( DRAW_SEAM ) - p_filter->p_libvlc->pf_memcpy( p_outpic->p[Y_PLANE].p_pixels, - p_inpic->p[Y_PLANE].p_pixels, + vlc_memcpy( p_outpic->p[Y_PLANE].p_pixels, p_inpic->p[Y_PLANE].p_pixels, p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); //#else -// p_filter->p_libvlc->pf_memset( p_outpix, 0x80, +// vlc_memset( p_outpix, 0x80, // p_outpic->p[Y_PLANE].i_lines * p_outpic->p[Y_PLANE].i_pitch ); //#endif - p_filter->p_libvlc->pf_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, + vlc_memset( p_outpic->p[U_PLANE].p_pixels, 0x80, p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, + vlc_memset( p_outpic->p[V_PLANE].p_pixels, 0x80, p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); #if defined( DRAW_GRADIENT ) || defined( DRAW_ENERGY ) || defined( DRAW_SEAM ) @@ -190,7 +189,7 @@ static void FilterSeamCarving( filter_t *p_filter, picture_t *p_inpic, i_src_visible = RemoveVerticalSeam( p_filter, p_outpic, p_outpic, i_src_visible ); int y; for( y = 0; y < p_outpic->p[Y_PLANE].i_lines; y++ ) - p_filter->p_libvlc->pf_memset( p_outpic->p[Y_PLANE].p_pixels + y*p_outpic->p[Y_PLANE].i_pitch + i_src_visible, 0x00, p_outpic->p[Y_PLANE].i_pitch - i_src_visible ); + vlc_memset( p_outpic->p[Y_PLANE].p_pixels + y*p_outpic->p[Y_PLANE].i_pitch + i_src_visible, 0x00, p_outpic->p[Y_PLANE].i_pitch - i_src_visible ); j += k; if( j == 100 ) k = -1; if( j == 1 ) k = 1; diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c index 359dc63d5c..362019be73 100644 --- a/modules/video_filter/sharpen.c +++ b/modules/video_filter/sharpen.c @@ -229,13 +229,11 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) } - p_filter->p_libvlc->pf_memcpy( p_outpic->p[U_PLANE].p_pixels, - p_pic->p[U_PLANE].p_pixels, - p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); + vlc_memcpy( p_outpic->p[U_PLANE].p_pixels, p_pic->p[U_PLANE].p_pixels, + p_outpic->p[U_PLANE].i_lines * p_outpic->p[U_PLANE].i_pitch ); - p_filter->p_libvlc->pf_memcpy( p_outpic->p[V_PLANE].p_pixels, - p_pic->p[V_PLANE].p_pixels, - p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); + vlc_memcpy( p_outpic->p[V_PLANE].p_pixels, p_pic->p[V_PLANE].p_pixels, + p_outpic->p[V_PLANE].i_lines * p_outpic->p[V_PLANE].i_pitch ); p_outpic->date = p_pic->date; diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index 60bd1566c1..a8f5af4372 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -521,8 +521,8 @@ static void FilterPlanar( vout_thread_t *p_vout, for( ; p_in < p_in_end ; ) { p_in_end -= p_pic->p[i_index].i_pitch; - p_vout->p_libvlc->pf_memcpy( p_out, p_in_end, - p_pic->p[i_index].i_visible_pitch ); + vlc_memcpy( p_out, p_in_end, + p_pic->p[i_index].i_visible_pitch ); p_out += p_pic->p[i_index].i_pitch; } } diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c index 0658d53855..d780e59a65 100644 --- a/modules/video_filter/wall.c +++ b/modules/video_filter/wall.c @@ -547,7 +547,7 @@ static void Render( vout_thread_t *p_vout, picture_t *p_pic ) while( p_in < p_in_end ) { - p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch ); + vlc_memcpy( p_out, p_in, i_copy_pitch ); p_in += i_in_pitch; p_out += i_out_pitch; } diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c index b30ce551f3..9fb782af3b 100644 --- a/modules/video_filter/wave.c +++ b/modules/video_filter/wave.c @@ -166,27 +166,24 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic ) { if( i_offset < 0 ) { - p_filter->p_libvlc->pf_memcpy( p_out, p_in - i_offset, - i_visible_pitch + i_offset ); + vlc_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; - p_filter->p_libvlc->pf_memset( p_out + i_offset, - black_pixel, -i_offset ); + vlc_memset( p_out + i_offset, black_pixel, -i_offset ); } else { - p_filter->p_libvlc->pf_memcpy( p_out + i_offset, p_in, - i_visible_pitch - i_offset ); - p_filter->p_libvlc->pf_memset( p_out, black_pixel, - i_offset ); + vlc_memcpy( p_out + i_offset, p_in, + i_visible_pitch - i_offset ); + vlc_memset( p_out, black_pixel, i_offset ); p_in += p_pic->p[i_index].i_pitch; p_out += p_outpic->p[i_index].i_pitch; } } else { - p_filter->p_libvlc->pf_memcpy( p_out, p_in, - i_visible_pitch ); + vlc_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; } diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c index 8a9b3b0c1a..735a423c7f 100644 --- a/modules/video_output/fb.c +++ b/modules/video_output/fb.c @@ -751,8 +751,8 @@ static int panned=0; if( !p_vout->p_sys->b_hw_accel ) { - p_vout->p_libvlc->pf_memcpy( p_vout->p_sys->p_video, p_pic->p->p_pixels, - p_vout->p_sys->i_page_size ); + vlc_memcpy( p_vout->p_sys->p_video, p_pic->p->p_pixels, + p_vout->p_sys->i_page_size ); } } diff --git a/modules/video_output/snapshot.c b/modules/video_output/snapshot.c index ab119317ae..c203b193aa 100644 --- a/modules/video_output/snapshot.c +++ b/modules/video_output/snapshot.c @@ -382,9 +382,8 @@ static void Display( vout_thread_t *p_vout, picture_t *p_pic ) i_index = p_vout->p_sys->i_index; - p_vout->p_libvlc->pf_memcpy( p_vout->p_sys->p_list[i_index]->p_data, - p_pic->p->p_pixels, - p_vout->p_sys->i_datasize ); + vlc_memcpy( p_vout->p_sys->p_list[i_index]->p_data, p_pic->p->p_pixels, + p_vout->p_sys->i_datasize ); i_date = snapshot_GetMovietime( p_vout ); diff --git a/src/audio_output/dec.c b/src/audio_output/dec.c index 8a543fc5a8..2bfb43ce27 100644 --- a/src/audio_output/dec.c +++ b/src/audio_output/dec.c @@ -368,8 +368,8 @@ int aout_DecPlay( aout_instance_t * p_aout, aout_input_t * p_input, / p_input->input.i_rate; aout_BufferAlloc( &p_input->input_alloc, duration, NULL, p_new_buffer ); - p_aout->p_libvlc->pf_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer, - p_buffer->i_nb_bytes ); + vlc_memcpy( p_new_buffer->p_buffer, p_buffer->p_buffer, + p_buffer->i_nb_bytes ); p_new_buffer->i_nb_samples = p_buffer->i_nb_samples; p_new_buffer->i_nb_bytes = p_buffer->i_nb_bytes; p_new_buffer->start_date = p_buffer->start_date; diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c index 4149e8cfd2..22fc9139f1 100644 --- a/src/video_output/vout_pictures.c +++ b/src/video_output/vout_pictures.c @@ -928,9 +928,8 @@ void __vout_CopyPicture( vlc_object_t *p_this, if( p_src->p[i].i_pitch == p_dest->p[i].i_pitch ) { /* There are margins, but with the same width : perfect ! */ - p_this->p_libvlc->pf_memcpy( - p_dest->p[i].p_pixels, p_src->p[i].p_pixels, - p_src->p[i].i_pitch * p_src->p[i].i_visible_lines ); + vlc_memcpy( p_dest->p[i].p_pixels, p_src->p[i].p_pixels, + p_src->p[i].i_pitch * p_src->p[i].i_visible_lines ); } else { @@ -943,8 +942,7 @@ void __vout_CopyPicture( vlc_object_t *p_this, for( i_line = p_src->p[i].i_visible_lines; i_line--; ) { - p_this->p_libvlc->pf_memcpy( p_out, p_in, - p_src->p[i].i_visible_pitch ); + vlc_memcpy( p_out, p_in, p_src->p[i].i_visible_pitch ); p_in += p_src->p[i].i_pitch; p_out += p_dest->p[i].i_pitch; } -- 2.39.5