]> git.sesse.net Git - vlc/commitdiff
Use vlc_memset/vlc_memcpy
authorRémi Denis-Courmont <rem@videolan.org>
Sat, 3 May 2008 14:16:59 +0000 (17:16 +0300)
committerRémi Denis-Courmont <rem@videolan.org>
Sat, 3 May 2008 14:17:30 +0000 (17:17 +0300)
65 files changed:
modules/access/dshow/dshow.cpp
modules/audio_filter/converter/a52tospdif.c
modules/audio_filter/converter/dtstospdif.c
modules/audio_filter/converter/mpgatofixed32.c
modules/audio_filter/resampler/bandlimited.c
modules/audio_filter/resampler/linear.c
modules/audio_filter/resampler/trivial.c
modules/audio_filter/resampler/ugly.c
modules/audio_mixer/trivial.c
modules/audio_output/auhal.c
modules/audio_output/directx.c
modules/audio_output/hd1000a.cpp
modules/audio_output/portaudio.c
modules/audio_output/sdl.c
modules/audio_output/waveout.c
modules/codec/dirac.c
modules/codec/dmo/dmo.c
modules/codec/faad.c
modules/codec/ffmpeg/scale.c
modules/codec/ffmpeg/video.c
modules/codec/mash.cpp
modules/codec/rawvideo.c
modules/codec/sdl_image.c
modules/codec/tarkin.c
modules/codec/theora.c
modules/codec/twolame.c
modules/gui/beos/AudioOutput.cpp
modules/gui/fbosd.c
modules/mux/mpeg/pes.c
modules/mux/mpeg/ts.c
modules/stream_out/switcher.c
modules/video_chroma/i420_rgb.h
modules/video_chroma/i420_ymga.c
modules/video_chroma/i422_i420.c
modules/video_filter/alphamask.c
modules/video_filter/blend.c
modules/video_filter/bluescreen.c
modules/video_filter/clone.c
modules/video_filter/colorthres.c
modules/video_filter/crop.c
modules/video_filter/croppadd.c
modules/video_filter/deinterlace.c
modules/video_filter/dynamicoverlay/dynamicoverlay.c
modules/video_filter/dynamicoverlay/dynamicoverlay_commands.c
modules/video_filter/erase.c
modules/video_filter/gradient.c
modules/video_filter/grain.c
modules/video_filter/invert.c
modules/video_filter/magnify.c
modules/video_filter/motionblur.c
modules/video_filter/motiondetect.c
modules/video_filter/noise.c
modules/video_filter/panoramix.c
modules/video_filter/psychedelic.c
modules/video_filter/puzzle.c
modules/video_filter/ripple.c
modules/video_filter/seamcarving.c
modules/video_filter/sharpen.c
modules/video_filter/transform.c
modules/video_filter/wall.c
modules/video_filter/wave.c
modules/video_output/fb.c
modules/video_output/snapshot.c
src/audio_output/dec.c
src/video_output/vout_pictures.c

index 1f04e940cb602f105c22ae477184d06e524e9f04..53db60c2755b5861288e93cc7e2baf2f188b5622 100644 (file)
@@ -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();
 
index f3b095e5902e83dbb4adaa8457393dc6318283f9..98b3319d964aef114f431134be2836e63462eec0 100644 (file)
@@ -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;
index 11cdeff2f741cece0eaa2f4a1c010aef68131d88..7827d5e2d2ae2a70f62f007a311ce6e939044698 100644 (file)
@@ -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 );
         }
     }
 
index 70d6bdda05ca1be6b2d0d8017c03edfa4f05abbc..4a3efcf76b03013ca095e73bc659c45a0d082d03 100644 (file)
@@ -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:
index 3402224e57b2af91b341189dc308d43c7f18e9bf..711da81fedfbe00a65a26715c0ecf059103474eb 100644 (file)
@@ -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 );
index 308101b6b85f032408d6540feb225b01fedde729..4ce247c82a2d042a270f6a08962dd96073b37812 100644 (file)
@@ -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 )
index 5db69e0284579aef4178e52059e0056e0c96289c..bb40f60db06540c97745fb662a87177f5d4c8943 100644 (file)
@@ -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 )
index f843073555fc0433a84a6baecab3fdf66e21cd8b..c22f6c70498d919c05eb6021172b3e1a9362f7be 100644 (file)
@@ -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-- ; )
     {
index 4ecc43ed5edeebc9568e50f1a580a9197c79237e..69d72c2393648dc9027b0f16b519dbe4985e01d2 100644 (file)
@@ -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;
         }
index 7448898a554e7ebc9e113ed2bd37fd8c1bcd3620..067f8dd93150a3e371f4178e85692d88d6b0a3e6 100644 (file)
@@ -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
 
index 22573cb130f9321c8bb462408c1bfacdd52e22ac..ea6f7cb827c52aa4b992e9ef190f29b42a9ac650 100644 (file)
@@ -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 );
     }
 
index 590ad8eb75c8357056d8edcc91c91193fc286568..0bfc80e624dcef5523a0b20aa8bd11b122e2aead 100644 (file)
@@ -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
index a78885d1fa9a677f20fba65f22f11fbf9c739d87..4aab58993965a734b4a527faae2c9f506a013efe 100644 (file)
@@ -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;
 }
index edff93e4b6f739f7406669745749af67d55d99e5..6dd31cef091521086084cafeb66cda0b214b1734 100644 (file)
@@ -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 );
     }
 }
 
index 95b583c0937476d1149df61dc8730e0f89d0f131..6d022c6d5054c768dc70acb876d93a9b4f91eff3 100644 (file)
@@ -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;
index 19168ccfc432460616f1792c3feba5f4e776cde1..b2da56654608c3455d58c6925ceae28c9f3caa7e 100644 (file)
@@ -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;
         }
index c635a07d89eceb7bb6cb1b7f10c22fca87a3b9db..1ca9241038a695b5897d3ee2ee590bf49ab7583a 100644 (file)
@@ -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;
             }
index 9f54fb7bafcdeb2d9be4bcfd9df801812ca875a7..cc39540fcdfd1e0c916eb346823f335f5ce2598b 100644 (file)
@@ -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;
     }
index f4032e14abdc7469dc9aa418ee7ebf7b58e3997f..343a9798d9b068d0cee075d7a547ae6097c2f289 100644 (file)
@@ -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();
index d2faa83c8b28d0a4ce81594f51d3b167bd219c27..d8fd65ae1f6852533ebbcb7942bcaa509784dbd5 100644 (file)
@@ -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;
                 }
index 12a9eaf184097182aac2a9107230abb25875c441..74e63f885a843cba4f65a1e7d3d70aa58ee96828 100644 (file)
@@ -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);
index 57da0bebd6cfe4acc93fd40e9800e8a96cec11a0..42642dc7b7a9978f0658fd5341e6fe8534a837d9 100644 (file)
@@ -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;
             }
index 065c47a766fce890dbac9aa407afcc5803064cde..f2e57f31b742d5a67814fe9baab6df635a730a87 100644 (file)
@@ -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;
             }
index c13a4c0af91006020b78a805a70283c4aa3c5490..3436fa7312fa622972956cc04605e82c448ee943 100644 (file)
@@ -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;
index 0ac1e76963b15a6dfbdcd265b13bc95479f51930..982a7986885948f7a75668e891ccc9a98c403d91 100644 (file)
@@ -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;
         }
index 8bcdccd790c65617c06b73dffa246170daa9752e..17dec1e1608876b69ba6c6749c65e5448c74be4b 100644 (file)
@@ -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;
index 9e3f1a453317f4e41317365336620b35e9567255..67e088427fb6606340b8407387022dcfb1294d2b 100644 (file)
@@ -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 );
     }
 }
 
index 0c2ab016aa4299ed8b0bed58037661b5853c1653..e4b1a85c4da3db96fe9fd754b9135f1077af9f05 100644 (file)
@@ -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;
 
index e27f3b6ad5d6478fbe6afd4208d9f04ccdf413c3..e7e64864c7eef264cf0b34102e3a129c47c25c1b 100644 (file)
@@ -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++;
         }
index 02f27602c9fd6603380001260d752d92921cd882..0d32129fadfc485c47895444c2996388640dcf11 100644 (file)
@@ -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;
index 694dcdc764ca2f48064331881309806435ff4351..658d153194865a786b71571c585e5e309d6a3237 100644 (file)
@@ -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;
index 109ea96becce563e5b6a72c86109302f4ca34b76..6b54c9bfe9ec1193ff5a4e252714f19feea6cf95 100644 (file)
@@ -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;                             \
index 102404930542a342f96a6a78afa5fe92697aa005..f3cb90594fc05324a3ee5988c733c1454ee01551 100644 (file)
@@ -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;
index ea79eb7b2b444f769b11f77fc107690adb111114..1af364867809617135ccc8d4f9740bda9352b011 100644 (file)
@@ -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 );
 }
index 809bbc26e9bddbb55f1c46d1663360ce0d24cb0c..57c255b8863dc66dec2a281fe89e05360ad6cd2b 100644 (file)
@@ -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 );
index 951b60ba8befc34ff78f8ba8e45742fecda394d4..9f04db0b5031341773d14f712caa894e3f67794d 100644 (file)
@@ -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 )
index ed0b5ae2062e27b191754ac98b271c779cf3a3d6..579e30fda2d88d3ac28ff339550e3e838a5330a6 100644 (file)
@@ -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;
index 01a53dd8023a93ae5b2b34ca30d35f7499e3e340..1b97b50d9b7597e359722de3899eb0eed806b974 100644 (file)
@@ -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;
                 }
index bb0bfabe43979100a91bf3c251566d4ab56d5910..63fe0c836ce273237b8fdb218329666f550112c3 100644 (file)
@@ -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 );
 
     /*
index 4dd65285b15ad2b7d282bc497fb50ab40f052d29..0ea4e78335eb7d106fe48ec2c295b5d16cf41988 100644 (file)
@@ -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;
         }
index 469aeac1efd25e117f65d1df087ab288ca251bc4..ede94207e5a96f7c2601273eeaa7eb9e0d967ee2 100644 (file)
@@ -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 );
     }
 
index 1e8d55b836a08096910ce031c66a2958ece875a8..b89269aab974a8705fe6d2cc6434e2a752c63c9c 100644 (file)
@@ -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 */
index e44302f5704d6be67fb33461aa6b81725fb005fb..82bbb955afacab83c8d5cd04d8d31d750467c2dc 100644 (file)
@@ -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
         {
index fea3180d354f1313caefd4549a66ecdc381e6536..c4cb9975b5e4637bbf5ddfbe0b3d06496b5c342d 100644 (file)
@@ -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;
             }
index 7649bff835548a8dbceea5594216b75d36912b01..482c2f96ae955284abf901386f7310daa9bdbc7a 100644 (file)
@@ -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;
index 8a73cf84b55279bc59ffc0573bc428885b78aca6..0835c7f09b02928eabec8d4da775a62541edb026 100644 (file)
@@ -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 );
 
index 0042ff603b71c5cbe1bd6dad578374bb30ad205a..f5ba969b93e29dc5ce52b1f5876fd871bff56c91 100644 (file)
@@ -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 );
 
     }
 
index 424ef51f61c13e8600cf5f561aa395b6a64d39e5..69c70eaf7f129738a22d0635213177e99bed36b4 100644 (file)
@@ -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 );
     }
index fd0cb06b974a1e1c26e836ea9b6cf0ca04c42fc9..0d6859f3d12e7c8006210bd4fb2b8ad05ab3cb2a 100644 (file)
@@ -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; y<p_converted->p[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
             {
index d8128a16c624c87a304e2ef6d5ac44b6690c1b44..0ebfbdc281b22f29ff6281f1df8f6d20bcc091ff 100644 (file)
@@ -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 );
     }
index 0f6ee3c777a915e219f05219593cd53df72ea8bd..73ba4fff3a93ea4f8f7a2d271646fa9e19de4ab0 100644 (file)
@@ -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 );
 
index 47f0003ed529845a85dfc3a2a96490e3aaba15ec..e1ce7ad6305dbf36bf915a78ee7bc5633601a187 100644 (file)
@@ -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
             {
index d160eb875d94b9f477676f02f77a1e0a15d2db64..1dcc26cffab8899fc8b344cd34b5127fec762e61 100644 (file)
@@ -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
index 9ea7301346158d7efcf10c998f1a01564cc5b7fa..9bc0e0ac8084bdc64d25c450544701869f0fa7ba 100644 (file)
@@ -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; y<p_outpic->p[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 */
index 42c12f365d7d1338fa79dbd123b3552567320002..9e56b05354542a708ca3bf3468cfd0eacc8b3261 100644 (file)
@@ -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 );
     }
index d387d20fdc6385687666f18a7026abfa599690a7..79846f815d7047a0962d6bfb7db8a98aa2770f46 100644 (file)
@@ -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;
             }
index f1a1ecc44a062e6ab81743ceb92edfef5dee7ce1..e5d63faeccb605d7d3cc64da18a31de480cdb407 100644 (file)
@@ -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;
index 359dc63d5cb5e302a720493f444698943e1b3083..362019be7329bac4e90d8c0a9cc272aa859d4cd0 100644 (file)
@@ -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;
index 60bd1566c174ef0f4fcf4bbeae59aa9ed02de53c..a8f5af437221372ade148fca7284328cdf05ddc7 100644 (file)
@@ -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;
                 }
             }
index 0658d53855073dc37cac66fec1e52cfb78d4b445..d780e59a655f47ad6ab01b4e206999315e5b3c1b 100644 (file)
@@ -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;
                 }
index b30ce551f34c738a73a6cb0fbf3b6e1f4e7998b1..9fb782af3bfcede850aaf60fe5e1b0326719f82d 100644 (file)
@@ -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;
             }
index 8a9b3b0c1a65e29c14bda32b11ac0785391b3bfa..735a423c7fbff1e9eee53cbfc2f163eb0248544a 100644 (file)
@@ -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 );
     }
 }
 
index ab119317aef69f0063e17218eb88266fb7a98f37..c203b193aa96e2da98bf6f7d05e46f06143fc229 100644 (file)
@@ -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 );
 
index 8a543fc5a82187c8323a37c9045c3878da109f30..2bfb43ce275eb4f4c0f0c582be77288629d32e1e 100644 (file)
@@ -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;
index 4149e8cfd29523df3715e4b003b9a4cb17e2a352..22fc9139f1663dfe8fedf4e5ac1c75be353966c3 100644 (file)
@@ -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;
             }