* Mandatory step for video output IV and the audio output quality

[vlc] / include / input_ext-dec.h

diff --git a/include/input_ext-dec.h b/include/input_ext-dec.h
index a8d1b11e5a61122a27dcea5c8c36f2a0fc78043b..688669190b93ef3fa53627742ad33118ff04df41 100644 (file)
--- a/include/input_ext-dec.h
+++ b/include/input_ext-dec.h
@@ -2,9 +2,10 @@
  * input_ext-dec.h: structures exported to the VideoLAN decoders
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: input_ext-dec.h,v 1.19 2001/01/22 18:04:10 massiot Exp $
+ * $Id: input_ext-dec.h,v 1.31 2001/05/01 04:18:17 sam Exp $
  *
- * Authors:
+ * Authors: Christophe Massiot <massiot@via.ecp.fr>
+ *          Michel Kaempf <maxx@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,6 +33,7 @@ typedef struct data_packet_s
 {
     /* Nothing before this line, the code relies on that */
     byte_t *                p_buffer;                     /* raw data packet */
+    long                    l_size;                           /* buffer size */
 
     /* Decoders information */
     byte_t *                p_payload_start;
@@ -39,6 +41,8 @@ typedef struct data_packet_s
     byte_t *                p_payload_end;                    /* guess ? :-) */
     boolean_t               b_discard_payload;  /* is the packet messed up ? */
 
+    int *                   pi_refcount;
+
     /* Used to chain the TS packets that carry data for a same PES or PSI */
     struct data_packet_s *  p_next;
 } data_packet_t;
@@ -52,15 +56,15 @@ typedef struct data_packet_s
 typedef struct pes_packet_s
 {
     /* PES properties */
-    boolean_t               b_messed_up;  /* At least one of the data packets
-                                           * has a questionable content      */
     boolean_t               b_data_alignment;  /* used to find the beginning of
                                                 * a video or audio unit      */
     boolean_t               b_discontinuity; /* This packet doesn't follow the
                                               * previous one                 */
 
-    mtime_t                 i_pts;/* the PTS for this packet (zero if unset) */
-    mtime_t                 i_dts;/* the DTS for this packet (zero if unset) */
+    mtime_t                 i_pts;    /* PTS for this packet (zero if unset) */
+    mtime_t                 i_dts;    /* DTS for this packet (zero if unset) */
+    int                     i_rate;                /* current pace of reading
+                                                    * (see stream_control.h) */
 
     int                     i_pes_size;    /* size of the current PES packet */
 
@@ -161,10 +165,13 @@ typedef struct bit_stream_s
      */
     /* Current data packet (in the current PES packet of the PES stream) */
     data_packet_t *         p_data;
-    /* Pointer to the next byte that is to be read (in the current TS packet) */
+    /* Pointer to the next byte that is to be read (in the current packet) */
     byte_t *                p_byte;
-    /* Pointer to the last byte that is to be read (in the current TS packet */
+    /* Pointer to the last byte that is to be read (in the current packet */
     byte_t *                p_end;
+    /* Temporary buffer in case we're not aligned when changing data packets */
+    WORD_TYPE               i_showbits_buffer;
+    data_packet_t           showbits_data;
 } bit_stream_t;
 
 /*****************************************************************************
@@ -205,7 +212,7 @@ u32  UnalignedGetBits( struct bit_stream_s *, unsigned int );
  *****************************************************************************/
 static __inline__ void AlignWord( bit_stream_t * p_bit_stream )
 {
-    while( (p_bit_stream->p_byte - p_bit_stream->p_data->p_buffer)
+    while( (ptrdiff_t)p_bit_stream->p_byte
              & (sizeof(WORD_TYPE) - 1) )
     {
         if( p_bit_stream->p_byte < p_bit_stream->p_end )
@@ -493,7 +500,10 @@ typedef struct decoder_config_s
     struct stream_ctrl_s *  p_stream_ctrl;
     struct decoder_fifo_s * p_decoder_fifo;
     void                 (* pf_init_bit_stream)( struct bit_stream_s *,
-                                                 struct decoder_fifo_s * );
+                                                 struct decoder_fifo_s *,
+                 void (* pf_bitstream_callback)( struct bit_stream_s *,
+                                                 boolean_t ),
+                                                 void * );
 } decoder_config_t;
 
 /*****************************************************************************
@@ -535,15 +545,10 @@ typedef struct vdec_config_s
  *****************************************************************************
  * Pointers given to audio decoders threads.
  *****************************************************************************/
-struct aout_thread_s;
-
 typedef struct adec_config_s
 {
-    struct aout_thread_s *  p_aout;
-
-    struct aout_fifo_s * (* pf_create_fifo)( struct aout_thread_s *,
-                                            struct aout_fifo_s * );
-    void                 (* pf_destroy_fifo)( struct aout_thread_s *);
+    struct aout_fifo_s * (* pf_create_fifo)( struct aout_fifo_s * );
+    void                 (* pf_destroy_fifo)( void );
 
     decoder_config_t        decoder_config;
 } adec_config_t;