Hidden gory buffer management details in a private section of data_packet_t.

include/input_ext-dec.h

@@ -2,7 +2,7 @@
  * input_ext-dec.h: structures exported to the VideoLAN decoders
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: input_ext-dec.h,v 1.47 2001/12/27 03:47:08 massiot Exp $
+ * $Id: input_ext-dec.h,v 1.48 2001/12/29 03:07:51 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Michel Kaempf <maxx@via.ecp.fr>
@@ -40,21 +40,25 @@
  *****************************************************************************
  * Describe a data packet.
  *****************************************************************************/
+#define DATA_PACKET                                                         \
+    /* start of the PS or TS packet */                                      \
+    byte_t *                p_demux_start;                                  \
+    /* start of the PES payload in this packet */                           \
+    byte_t *                p_payload_start;                                \
+    byte_t *                p_payload_end; /* guess ? :-) */                \
+    /* is the packet messed up ? */                                         \
+    boolean_t               b_discard_payload;
+
 typedef struct data_packet_s
 {
-    /* Decoders information */
-    byte_t *                p_demux_start;   /* start of the PS or TS packet */
-    byte_t *                p_payload_start;
-                                  /* start of the PES payload in this packet */
-    byte_t *                p_payload_end;                    /* guess ? :-) */
-    boolean_t               b_discard_payload;  /* is the packet messed up ? */
-
-    /* Used to chain the TS packets that carry data for a same PES or PSI */
+    /* Used to chain the packets that carry data for a same PES or PSI */
     struct data_packet_s *  p_next;
 
-    /* Buffer manager information */ 
-    byte_t *                p_buffer;                     /* raw data packet */
-    unsigned int            i_size;                           /* buffer size */
+    DATA_PACKET
+
+    /* Please note that at least one buffer allocator (in particular, the
+     * Next Generation Buffer Allocator) extends this structure with
+     * private data after DATA_PACKET. */
 } data_packet_t;
 
 /*****************************************************************************
@@ -65,6 +69,9 @@ typedef struct data_packet_s
  *****************************************************************************/
 typedef struct pes_packet_s
 {
+    /* Chained list to the next PES packet (depending on the context) */
+    struct pes_packet_s *   p_next;
+
     /* PES properties */
     boolean_t               b_data_alignment;  /* used to find the beginning of
                                                 * a video or audio unit      */
@@ -76,18 +83,15 @@ typedef struct pes_packet_s
     int                     i_rate;                /* current pace of reading
                                                     * (see stream_control.h) */
 
-    int                     i_pes_size;    /* size of the current PES packet */
+    unsigned int            i_pes_size;    /* size of the current PES packet */
 
     /* Chained list to packets */
     data_packet_t *         p_first;      /* The first packet contained by this
                                            * PES (used by decoders). */
     data_packet_t *         p_last;    /* The last packet contained by this
                                           PES (used by the buffer allocator) */
-    int                     i_nb_data; /* Number of data packets in the chained
+    unsigned int            i_nb_data; /* Number of data packets in the chained
                                                                         list */
-
-    /* Chained list used by the input buffers manager */
-    struct pes_packet_s *   p_next;
 } pes_packet_t;
 
 /*****************************************************************************

plugins/dvd/input_dvd.c

@@ -9,7 +9,7 @@
  *  -dvd_udf to find files
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_dvd.c,v 1.112 2001/12/29 00:39:49 massiot Exp $
+ * $Id: input_dvd.c,v 1.113 2001/12/29 03:07:51 massiot Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -123,9 +123,9 @@ DECLARE_BUFFERS_SHARED( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_INIT( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_END_SHARED( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_NEWPACKET_SHARED( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPACKET_SHARED( FLAGS, NB_LIFO, 150 );
+DECLARE_BUFFERS_DELETEPACKET_SHARED( FLAGS, NB_LIFO, 1000 );
 DECLARE_BUFFERS_NEWPES( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPES_SHARED( FLAGS, NB_LIFO, 150, 150 );
+DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 1000 );
 DECLARE_BUFFERS_TOIO( FLAGS, DVD_LB_SIZE );
 DECLARE_BUFFERS_SHAREBUFFER( FLAGS );
 

plugins/dvdread/input_dvdread.c

@@ -6,7 +6,7 @@
  * It depends on: libdvdread for ifo files and block reading.
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_dvdread.c,v 1.7 2001/12/29 00:39:49 massiot Exp $
+ * $Id: input_dvdread.c,v 1.8 2001/12/29 03:07:51 massiot Exp $
  *
  * Author: Stphane Borel <stef@via.ecp.fr>
  *
@@ -114,9 +114,9 @@ DECLARE_BUFFERS_SHARED( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_INIT( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_END_SHARED( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_NEWPACKET_SHARED( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPACKET_SHARED( FLAGS, NB_LIFO, 150 );
+DECLARE_BUFFERS_DELETEPACKET_SHARED( FLAGS, NB_LIFO, 1000 );
 DECLARE_BUFFERS_NEWPES( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPES_SHARED( FLAGS, NB_LIFO, 150, 150 );
+DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 1000 );
 DECLARE_BUFFERS_TOIO( FLAGS, DVD_LB_SIZE );
 DECLARE_BUFFERS_SHAREBUFFER( FLAGS );
 

plugins/mpeg_system/input_es.c

@@ -2,7 +2,7 @@
  * input_es.c: Elementary Stream demux and packet management
  *****************************************************************************
  * Copyright (C) 2001 VideoLAN
- * $Id: input_es.c,v 1.8 2001/12/27 03:47:08 massiot Exp $
+ * $Id: input_es.c,v 1.9 2001/12/29 03:07:51 massiot Exp $
  *
  * Author: Christophe Massiot <massiot@via.ecp.fr>
  *
@@ -98,7 +98,7 @@ DECLARE_BUFFERS_END( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_NEWPACKET( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_DELETEPACKET( FLAGS, NB_LIFO, 150 );
 DECLARE_BUFFERS_NEWPES( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 150, 150 );
+DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 150 );
 DECLARE_BUFFERS_TOIO( FLAGS, ES_PACKET_SIZE );
 
 /*****************************************************************************

plugins/mpeg_system/input_ps.c

@@ -2,7 +2,7 @@
  * input_ps.c: PS demux and packet management
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_ps.c,v 1.8 2001/12/27 03:47:09 massiot Exp $
+ * $Id: input_ps.c,v 1.9 2001/12/29 03:07:51 massiot Exp $
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *          Cyril Deguet <asmax@via.ecp.fr>
@@ -100,9 +100,9 @@ DECLARE_BUFFERS_EMBEDDED( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_INIT( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_END( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_NEWPACKET( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPACKET( FLAGS, NB_LIFO, 150 );
+DECLARE_BUFFERS_DELETEPACKET( FLAGS, NB_LIFO, 300 );
 DECLARE_BUFFERS_NEWPES( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 150, 150 );
+DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 300 );
 
 
 /*****************************************************************************

plugins/mpeg_system/input_ts.c

@@ -2,7 +2,7 @@
  * input_ts.c: TS demux and netlist management
  *****************************************************************************
  * Copyright (C) 1998-2001 VideoLAN
- * $Id: input_ts.c,v 1.7 2001/12/27 03:47:09 massiot Exp $
+ * $Id: input_ts.c,v 1.8 2001/12/29 03:07:51 massiot Exp $
  *
  * Authors: Henri Fallon <henri@videolan.org>
  *
@@ -101,7 +101,7 @@ DECLARE_BUFFERS_END( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_NEWPACKET( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_DELETEPACKET( FLAGS, NB_LIFO, 1000 );
 DECLARE_BUFFERS_NEWPES( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 1000, 150 );
+DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 150 );
 DECLARE_BUFFERS_TOIO( FLAGS, TS_PACKET_SIZE );
 
 /*****************************************************************************

plugins/vcd/input_vcd.c

@@ -102,9 +102,9 @@ DECLARE_BUFFERS_EMBEDDED( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_INIT( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_END( FLAGS, NB_LIFO );
 DECLARE_BUFFERS_NEWPACKET( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPACKET( FLAGS, NB_LIFO, 150 );
+DECLARE_BUFFERS_DELETEPACKET( FLAGS, NB_LIFO, 1000 );
 DECLARE_BUFFERS_NEWPES( FLAGS, NB_LIFO );
-DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 150, 150 );
+DECLARE_BUFFERS_DELETEPES( FLAGS, NB_LIFO, 1000 );
 
 
 /*****************************************************************************