* ./src/input/input_ext-plugins.c: reverted my previous fix which wasn't
authorSam Hocevar <sam@videolan.org>
Sun, 21 Jul 2002 23:40:24 +0000 (23:40 +0000)
committerSam Hocevar <sam@videolan.org>
Sun, 21 Jul 2002 23:40:24 +0000 (23:40 +0000)
    really a fix.
  * ./plugins/memcpy/fastmemcpy.h: commented out suspicious code.

plugins/mad/mad_libmad.c
plugins/memcpy/fastmemcpy.h
src/input/input_ext-plugins.c

index 0ece7ce..82d326b 100644 (file)
@@ -77,8 +77,8 @@ enum mad_flow libmad_input(void *data, struct mad_stream *p_libmad_stream)
             Remaining=p_libmad_stream->bufend-p_libmad_stream->next_frame;
             if( p_mad_adec->buffer != p_libmad_stream->next_frame )
             {
-                p_mad_adec->p_fifo->p_vlc->pf_memcpy( p_mad_adec->buffer,
-                                    p_libmad_stream->next_frame, Remaining );
+                memcpy( p_mad_adec->buffer,
+                        p_libmad_stream->next_frame, Remaining );
             }
             ReadStart=p_mad_adec->buffer+Remaining;
             ReadSize=(MAD_BUFFER_MDLEN)-Remaining;
@@ -106,14 +106,12 @@ enum mad_flow libmad_input(void *data, struct mad_stream *p_libmad_stream)
         {
             ReadSize = p_mad_adec->p_data->p_payload_end
                         - p_mad_adec->p_data->p_payload_start;
-            p_mad_adec->p_fifo->p_vlc->pf_memcpy( ReadStart,
-                                p_mad_adec->p_data->p_payload_start, ReadSize );
+            memcpy( ReadStart, p_mad_adec->p_data->p_payload_start, ReadSize );
             NextDataPacket( p_mad_adec->p_fifo, &p_mad_adec->p_data );
         }
         else
         {
-            p_mad_adec->p_fifo->p_vlc->pf_memcpy( ReadStart,
-                         p_mad_adec->p_data->p_payload_start, ReadSize );
+            memcpy( ReadStart, p_mad_adec->p_data->p_payload_start, ReadSize );
             p_mad_adec->p_data->p_payload_start += ReadSize;
         }
 
index 15e77b8..e00c840 100644 (file)
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * fastmemcpy.h : fast memcpy routines
  *****************************************************************************
- * $Id: fastmemcpy.h,v 1.3 2002/04/03 22:36:50 massiot Exp $
+ * $Id: fastmemcpy.h,v 1.4 2002/07/21 23:40:23 sam Exp $
  *
  * Authors: various Linux kernel hackers
  *          various MPlayer hackers
@@ -275,6 +275,7 @@ void * _M( fast_memcpy )(void * to, const void * from, size_t len)
 
 //     printf(" %d %d\n", (int)from&1023, (int)to&1023);
        // Pure Assembly cuz gcc is a bit unpredictable ;)
+# if 0
        if(i>=BLOCK_SIZE/64)
                asm volatile(
                        "xorl %%eax, %%eax      \n\t"
@@ -334,6 +335,7 @@ void * _M( fast_memcpy )(void * to, const void * from, size_t len)
                                : "r" (BLOCK_SIZE), "i" (BLOCK_SIZE/64), "i" (CONFUSION_FACTOR)
                                : "%eax", "%ebx"
                );
+#endif
 
        for(; i>0; i--)
        {
index 5f2dddc..8548f64 100644 (file)
@@ -2,7 +2,7 @@
  * input_ext-plugins.c: useful functions for access and demux plug-ins
  *****************************************************************************
  * Copyright (C) 2001, 2002 VideoLAN
- * $Id: input_ext-plugins.c,v 1.15 2002/07/21 14:32:35 sam Exp $
+ * $Id: input_ext-plugins.c,v 1.16 2002/07/21 23:40:24 sam Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -549,11 +549,9 @@ ssize_t input_FillBuffer( input_thread_t * p_input )
     if( i_ret < 0 ) i_ret = 0;
 
     /* We take back the lock before fiddling with buffers */
-    vlc_mutex_lock( &p_input->p_method_data->lock );
     p_input->p_data_buffer = p_buf;
     p_input->p_current_data = (byte_t *)p_buf + sizeof(data_buffer_t);
     p_input->p_last_data = p_input->p_current_data + i_remains + i_ret;
-    vlc_mutex_unlock( &p_input->p_method_data->lock );
 
     return( (ssize_t)i_remains + i_ret );
 }