Changeset adff2a8501514d36861150435134522fbef78c33

Timestamp:

16/04/01 14:34:28 (8 years ago)

Author:

Cyril Deguet <asmax@videolan.org>

git-committer:

Cyril Deguet <asmax@videolan.org> 987424468 +0000

git-parent:

[6116299e395a1d8a27c1a7280749a0a7d59d0d66]

git-author:

Cyril Deguet <asmax@videolan.org> 987424468 +0000

Message:

Re-added the new packet allocation method in PS input, using packet caches.
With warning level 1, you can see when a packet is allocated or freed; the
goal is to never call 'malloc' nor 'free', except at the beginning of the
stream.
The size of the different caches can be adjusted in plugins/mpeg/input_ps.h.
If 'free' is called too often, it means that a cache is too small, so try
to increase its size.

Files:

• include/input_ext-dec.h (modified) (2 diffs)
• plugins/mpeg/input_ps.c (modified) (12 diffs)
• plugins/mpeg/input_ps.h (modified) (2 diffs)

include/input_ext-dec.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-7 2001/04/05 16:37:15
+8 2001/04/16 12:34:28
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -34 +34 @@
-    /* Nothing before this line, the code relies on that */
-    byte_t *                p_buffer;                     /* raw data packet */
+    long                    l_size;                           /* buffer size */
-
-    /* Decoders information */

plugins/mpeg/input_ps.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-4 2001/04/13 05:36:12 stef
+5 2001/04/16 12:34:28 asmax
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -144 +144 @@
-{
-    thread_ps_data_t *  p_method;
+    packet_cache_t *    p_packet_cache;
-
-    if( (p_method =
@@ -152 +153 @@
-        return;
-    }
-
-    p_input->p_plugin_data = (void *)p_method;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    /* Re-open the socket as a buffered FILE stream */
-    if( (p_method->stream = fdopen( p_input->i_handle, "r" )) == NULL )
@@ -215 +268 @@
-        rewind( p_method->stream );
-        vlc_mutex_lock( &p_input->stream.stream_lock );
-
-        /* file input method */
-        p_input->stream.i_method = INPUT_METHOD_FILE;
-
-        p_input->stream.p_selected_area->i_tell = 0;
-        if( p_demux_data->b_has_PSM )
@@ -297 +346 @@
-        /* The programs will be added when we read them. */
-        vlc_mutex_lock( &p_input->stream.stream_lock );
-
-        /* file input method */
-        p_input->stream.i_method = INPUT_METHOD_FILE;
-
-        p_input->stream.pp_programs[0]->b_is_ok = 0;
-        vlc_mutex_unlock( &p_input->stream.stream_lock );
@@ -430 +475 @@
-
-        /* Fetch a packet of the appropriate size. */
-
+
+
-        {
-            intf_ErrMsg( "Out of memory" );
@@ -491 +537 @@
- * NewPacket: allocates a data packet
- *****************************************************************************/
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-    /* Safety check */
-i
-
-i
+l
+
+l
-        return NULL;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -519 +664 @@
-    p_data->p_next = NULL;
-    p_data->b_discard_payload = 0;
-
-    p_data->p_payload_start = p_data->p_buffer;
-i
+l
-
-    return( p_data );
-
+
+
+
-
-/*****************************************************************************
- * NewPES: allocates a pes packet
- *****************************************************************************/
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        return NULL;
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    p_pes->b_data_alignment = p_pes->b_discontinuity =
-        p_pes->i_pts = p_pes->i_dts = 0;
@@ -545 +713 @@
-
-    return( p_pes );
+    
-}
-
@@ -550 +719 @@
- * DeletePacket: deletes a data packet
- *****************************************************************************/
-garbag
+packet_cach
-                          data_packet_t * p_data )
-{
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -562 +786 @@
- * DeletePES: deletes a PES packet and associated data packets
- *****************************************************************************/
-
-
+
+
+
-    data_packet_t *     p_data;
-    data_packet_t *     p_next;
-
+    if ( (p_cache = (packet_cache_t *)p_packet_cache) == NULL )
+    {
+        intf_ErrMsg( "Packet cache not initialized" );
+        return;
+    }
+
+    ASSERT( p_pes);
+
-    p_data = p_pes->p_first;
-
@@ -572 +805 @@
-    {
-        p_next = p_data->p_next;
-
-
+
-        p_data = p_next;
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+

plugins/mpeg/input_ps.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-4 2001/04/05 16:37:15
+5 2001/04/16 12:34:28
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *          Cyril Deguet <asmax@via.ecp.fr>
- *
- * This program is free software; you can redistribute it and/or modify
@@ -30 +31 @@
-    FILE *                  stream;
-} thread_ps_data_t;
+
+
+#define DATA_CACHE_SIZE 150
+#define PES_CACHE_SIZE 150
+#define SMALL_CACHE_SIZE 150
+#define LARGE_CACHE_SIZE 150
+#define MAX_SMALL_SIZE 50     // frontier between small and large packets
+
+typedef struct
+{
+    data_packet_t **        p_stack;
+    long                    l_index;
+} data_packet_cache_t;
+
+
+typedef struct
+{
+    pes_packet_t **         p_stack;
+    long                    l_index;
+} pes_packet_cache_t;
+
+
+typedef struct
+{
+    byte_t *                p_data;
+    long                    l_size;
+} packet_buffer_t;
+
+
+typedef struct
+{
+    packet_buffer_t *       p_stack;
+    long                    l_index;
+} small_buffer_cache_t;
+
+
+typedef struct
+{
+    packet_buffer_t *       p_stack;
+    long                    l_index;
+} large_buffer_cache_t;
+
+
+typedef struct
+{
+    data_packet_cache_t     data;
+    pes_packet_cache_t      pes;
+    small_buffer_cache_t    small;
+    large_buffer_cache_t    large;
+} packet_cache_t;
+
+