Skip to content

V
vlc
Commit f1240107 authored by Sam Hocevar's avatar Sam Hocevar
Browse files
Options

- je ne ferai plus de commits d�biles � 5h du mat 

 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
 - je ne ferai plus de commits d�biles � 5h du mat
parent 5e22d74d
Hide whitespace changes
Inline Side-by-side
Showing with 158 additions and 153 deletions
include/input.h
View file @ f1240107
/******************************************************************************* /******************************************************************************
* input.h: input thread interface * input.h: input thread interface
* (c)1999 VideoLAN * (c)1999 VideoLAN
*******************************************************************************/ ******************************************************************************/
/* needs : "netlist.h", "config.h", "mtime.h" */ /* needs : "netlist.h", "config.h", "mtime.h" */
/* ?? missing: /* ?? missing:
* tables version control */ * tables version control */
/******************************************************************************* /******************************************************************************
* External structures * External structures
******************************************************************************* ******************************************************************************
* These structures, required here only as pointers destinations, are declared * These structures, required here only as pointers destinations, are declared
* in other headers. * in other headers.
*******************************************************************************/ ******************************************************************************/
struct video_cfg_s; /* video configuration descriptor */ struct video_cfg_s; /* video configuration descriptor */
struct vout_thread_s; /* video output thread */ struct vout_thread_s; /* video output thread */
struct stream_descriptor_s; /* PSI tables */ struct stream_descriptor_s; /* PSI tables */
/******************************************************************************* /******************************************************************************
* Constants related to input * Constants related to input
*******************************************************************************/ ******************************************************************************/
#define TS_PACKET_SIZE 188 /* size of a TS packet */ #define TS_PACKET_SIZE 188 /* size of a TS packet */
#define PES_HEADER_SIZE 14 /* size of the first part of a PES header */ #define PES_HEADER_SIZE 14 /* size of the first part of a PES header */
#define PSI_SECTION_SIZE 4096 /* Maximum size of a PSI section */ #define PSI_SECTION_SIZE 4096 /* Maximum size of a PSI section */
/******************************************************************************* /******************************************************************************
* ts_packet_t * ts_packet_t
******************************************************************************* ******************************************************************************
* Describe a TS packet. * Describe a TS packet.
*******************************************************************************/ ******************************************************************************/
typedef struct ts_packet_struct typedef struct ts_packet_struct
{ {
/* Nothing before this line, the code relies on that */ /* Nothing before this line, the code relies on that */
byte_t buffer[TS_PACKET_SIZE]; /* raw TS data packet */ byte_t buffer[TS_PACKET_SIZE]; /* raw TS data packet */
/* Decoders information */ /* Decoders information */
unsigned int i_payload_start; unsigned int i_payload_start;
/* start of the PES payload in this packet */ /* start of the PES payload in this packet */
unsigned int i_payload_end; /* guess ? :-) */ unsigned int i_payload_end; /* guess ? :-) */
/* Used to chain the TS packets that carry data for a same PES or PSI */ /* Used to chain the TS packets that carry data for a same PES or PSI */
struct ts_packet_struct * p_prev_ts; struct ts_packet_struct * p_prev_ts;
...@@ -46,78 +46,78 @@ typedef struct ts_packet_struct ...@@ -46,78 +46,78 @@ typedef struct ts_packet_struct
} ts_packet_t; } ts_packet_t;
/******************************************************************************* /******************************************************************************
* pes_packet_t * pes_packet_t
******************************************************************************* ******************************************************************************
* Describes an PES packet, with its properties, and pointers to the TS packets * Describes an PES packet, with its properties, and pointers to the TS packets
* containing it. * containing it.
*******************************************************************************/ ******************************************************************************/
typedef struct typedef struct
{ {
/* PES properties */ /* PES properties */
boolean_t b_data_loss; /* The previous (at least) PES packet boolean_t b_data_loss; /* The previous (at least) PES packet
* has been lost. The decoders will have to find a way to recover. */ * has been lost. The decoders will have to find a way to recover. */
boolean_t b_data_alignment; /* used to find the beginning of a boolean_t b_data_alignment; /* used to find the beginning of a
* video or audio unit */ * video or audio unit */
boolean_t b_has_pts; /* is the following field set ? */ boolean_t b_has_pts; /* is the following field set ? */
mtime_t i_pts; /* the PTS for this packet (if set above) */ mtime_t i_pts; /* the PTS for this packet (if set above) */
boolean_t b_random_access; boolean_t b_random_access;
/* if TRUE, in the payload of this packet, there is the first byte /* if TRUE, in the payload of this packet, there is the first byte
* of a video sequence header, or the first byte of an audio frame. * of a video sequence header, or the first byte of an audio frame.
*/ */
u8 i_stream_id; /* payload type and id */ u8 i_stream_id; /* payload type and id */
int i_pes_size; /* size of the current PES packet */ int i_pes_size; /* size of the current PES packet */
int i_ts_packets; /* number of TS packets in this PES */ int i_ts_packets; /* number of TS packets in this PES */
/* Demultiplexer environment */ /* Demultiplexer environment */
boolean_t b_discard_payload; /* is the packet messed up ? */ boolean_t b_discard_payload; /* is the packet messed up ? */
byte_t * p_pes_header; /* pointer to the PES header */ byte_t * p_pes_header; /* pointer to the PES header */
byte_t * p_pes_header_save; /* temporary buffer */ byte_t * p_pes_header_save; /* temporary buffer */
/* Pointers to TS packets (TS packets are then linked by the p_prev_ts and /* Pointers to TS packets (TS packets are then linked by the p_prev_ts and
p_next_ts fields of the ts_packet_t struct) */ p_next_ts fields of the ts_packet_t struct) */
ts_packet_t * p_first_ts; /* The first TS packet containing this ts_packet_t * p_first_ts; /* The first TS packet containing this
* PES (used by decoders). */ * PES (used by decoders). */
ts_packet_t * p_last_ts; /* The last TS packet gathered at present ts_packet_t * p_last_ts; /* The last TS packet gathered at present
* (used by the demultiplexer). */ * (used by the demultiplexer). */
} pes_packet_t; } pes_packet_t;
/******************************************************************************* /******************************************************************************
* psi_section_t * psi_section_t
******************************************************************************* ******************************************************************************
* Describes a PSI section. Beware, it doesn't contain pointers to the TS * Describes a PSI section. Beware, it doesn't contain pointers to the TS
* packets that contain it as for a PES, but the data themselves * packets that contain it as for a PES, but the data themselves
*******************************************************************************/ ******************************************************************************/
typedef struct typedef struct
{ {
byte_t buffer[PSI_SECTION_SIZE]; byte_t buffer[PSI_SECTION_SIZE];
boolean_t b_running_section; /* Is there a section being decoded ? */ boolean_t b_running_section; /* Is there a section being decoded ? */
u16 i_length; u16 i_length;
u16 i_current_position; u16 i_current_position;
} psi_section_t; } psi_section_t;
/******************************************************************************* /******************************************************************************
* es_descriptor_t: elementary stream descriptor * es_descriptor_t: elementary stream descriptor
******************************************************************************* ******************************************************************************
* Describes an elementary stream, and includes fields required to handle and * Describes an elementary stream, and includes fields required to handle and
* demultiplex this elementary stream. * demultiplex this elementary stream.
*******************************************************************************/ ******************************************************************************/
typedef struct typedef struct
{ {
u16 i_id; /* stream ID, PID for TS streams */ u16 i_id; /* stream ID, PID for TS streams */
u8 i_type; /* stream type */ u8 i_type; /* stream type */
boolean_t b_pcr; /* does the stream include a PCR ? */ boolean_t b_pcr; /* does the stream include a PCR ? */
/* ?? b_pcr will be replaced by something else: since a PCR can't be shared /* ?? b_pcr will be replaced by something else: since a PCR can't be shared
* between several ES, we will probably store the PCR fields directly here, * between several ES, we will probably store the PCR fields directly here,
* and one of those fields will probably (again) be used as a test of the * and one of those fields will probably (again) be used as a test of the
* PCR presence */ * PCR presence */
boolean_t b_psi; /* does the stream have to be handled by the boolean_t b_psi; /* does the stream have to be handled by the
PSI decoder ? */ PSI decoder ? */
/* Markers */ /* Markers */
int i_continuity_counter; int i_continuity_counter;
boolean_t b_discontinuity; boolean_t b_discontinuity;
...@@ -125,16 +125,16 @@ typedef struct ...@@ -125,16 +125,16 @@ typedef struct
/* PES packets */ /* PES packets */
pes_packet_t * p_pes_packet; pes_packet_t * p_pes_packet;
/* current PES packet we are gathering */ /* current PES packet we are gathering */
/* PSI packets */ /* PSI packets */
psi_section_t * p_psi_section; /* idem for a PSI stream */ psi_section_t * p_psi_section; /* idem for a PSI stream */
/* Decoder informations */ /* Decoder informations */
void * p_dec; /* p_dec is void *, since we don't know a void * p_dec; /* p_dec is void *, since we don't know a
* priori whether it is adec_thread_t or * priori whether it is adec_thread_t or
* vdec_thread_t. We will use explicit * vdec_thread_t. We will use explicit
* casts. */ * casts. */
/* ?? video stream descriptor ? */ /* ?? video stream descriptor ? */
/* ?? audio stream descriptor ? */ /* ?? audio stream descriptor ? */
...@@ -145,10 +145,10 @@ typedef struct ...@@ -145,10 +145,10 @@ typedef struct
#ifdef STATS #ifdef STATS
/* Stats */ /* Stats */
count_t c_bytes; /* total bytes read */ count_t c_bytes; /* total bytes read */
count_t c_payload_bytes; /* total of payload usefull bytes */ count_t c_payload_bytes;/* total of payload usefull bytes */
count_t c_packets; /* total packets read */ count_t c_packets; /* total packets read */
count_t c_invalid_packets; /* invalid packets read */ count_t c_invalid_packets; /* invalid packets read */
/* ?? ... other stats */ /* ?? ... other stats */
#endif #endif
} es_descriptor_t; } es_descriptor_t;
...@@ -156,33 +156,32 @@ typedef struct ...@@ -156,33 +156,32 @@ typedef struct
/* Special PID values - note that the PID is only on 13 bits, and that values /* Special PID values - note that the PID is only on 13 bits, and that values
* greater than 0x1fff have no meaning in a stream */ * greater than 0x1fff have no meaning in a stream */
#define PROGRAM_ASSOCIATION_TABLE_PID 0x0000 #define PROGRAM_ASSOCIATION_TABLE_PID 0x0000
#define CONDITIONNAL_ACCESS_TABLE_PID 0x0001 /* not used */ #define CONDITIONNAL_ACCESS_TABLE_PID 0x0001 /* not used */
#define EMPTY_PID 0xffff /* empty record in a table */ #define EMPTY_PID 0xffff /* empty record in a table */
/* ES streams types - see ISO/IEC 13818-1 table 2-29 numbers */ /* ES streams types - see ISO/IEC 13818-1 table 2-29 numbers */
#define MPEG1_VIDEO_ES 0x01 #define MPEG1_VIDEO_ES 0x01
#define MPEG2_VIDEO_ES 0x02 #define MPEG2_VIDEO_ES 0x02
#define MPEG1_AUDIO_ES 0x03 #define MPEG1_AUDIO_ES 0x03
#define MPEG2_AUDIO_ES 0x04 #define MPEG2_AUDIO_ES 0x04
#define AC3_AUDIO_ES 0x05
/******************************************************************************* /******************************************************************************
* program_descriptor_t * program_descriptor_t
******************************************************************************* ******************************************************************************
* Describes a program and list associated elementary streams. It is build by * Describes a program and list associated elementary streams. It is build by
* the PSI decoder upon the informations carried in program map sections * the PSI decoder upon the informations carried in program map sections
*******************************************************************************/ ******************************************************************************/
typedef struct typedef struct
{ {
/* Program characteristics */ /* Program characteristics */
u16 i_number; /* program number */ u16 i_number; /* program number */
u8 i_version; /* version number */ u8 i_version; /* version number */
boolean_t b_is_ok; /* Is the description up to date ?*/ boolean_t b_is_ok; /* Is the description up to date ?*/
u16 i_pcr_pid; /* PCR ES */ u16 i_pcr_pid; /* PCR ES */
int i_es_number; int i_es_number;
es_descriptor_t ** ap_es; /* array of pointers to ES */ es_descriptor_t ** ap_es; /* array of pointers to ES */
#ifdef DVB_EXTENSIONS #ifdef DVB_EXTENSIONS
/* Service Descriptor (program name) */ /* Service Descriptor (program name) */
...@@ -200,63 +199,69 @@ typedef struct ...@@ -200,63 +199,69 @@ typedef struct
#endif #endif
} pgrm_descriptor_t; } pgrm_descriptor_t;
/******************************************************************************* /******************************************************************************
* pcr_descriptor_t * pcr_descriptor_t
******************************************************************************* ******************************************************************************
* Contains informations used to synchronise the decoder with the server * Contains informations used to synchronise the decoder with the server
*******************************************************************************/ ******************************************************************************/
typedef struct pcr_descriptor_struct typedef struct pcr_descriptor_struct
{ {
vlc_mutex_t lock; /* pcr modification lock */ vlc_mutex_t lock; /* pcr modification lock */
mtime_t delta_clock; mtime_t delta_clock;
mtime_t delta_decode; mtime_t delta_decode;
/* represents decoder_time - pcr_time in usecondes */ /* represents decoder_time - pcr_time in usecondes */
mtime_t last_pcr; mtime_t last_pcr;
count_t c_average; count_t c_average;
/* counter used to compute dynamic average values */ /* counter used to compute dynamic average values */
count_t c_pts; count_t c_pts;
#ifdef STATS #ifdef STATS
/* Stats */ /* Stats */
count_t c_average_jitter; count_t c_average_jitter;
mtime_t max_jitter; /* the evalueted maximum jitter */ mtime_t max_jitter; /* the evalueted maximum jitter */
mtime_t average_jitter; /* the evalueted average jitter */ mtime_t average_jitter; /* the evalueted average jitter */
count_t c_pcr; /* the number of PCR which have been decoded */ count_t c_pcr; /* the number of PCR which have been decoded */
#endif #endif
} pcr_descriptor_t; } pcr_descriptor_t;
/******************************************************************************* /******************************************************************************
* stream_descriptor_t * stream_descriptor_t
******************************************************************************* ******************************************************************************
* Describes a transport stream and list its associated programs. Build upon * Describes a transport stream and list its associated programs. Build upon
* the informations carried in program association sections * the informations carried in program association sections
*******************************************************************************/ ******************************************************************************/
typedef struct typedef struct
{ {
u16 i_stream_id; /* stream id */ u16 i_stream_id; /* stream id */
/* Program Association Table status */ /* Program Association Table status */
u8 i_PAT_version; /* version number */ u8 i_PAT_version; /* version number */
boolean_t b_is_PAT_complete; /* Is the PAT complete ?*/ boolean_t b_is_PAT_complete; /* Is the PAT complete ?*/
u8 i_known_PAT_sections; /* Number of section we received so far */ u8 i_known_PAT_sections;
byte_t a_known_PAT_sections[32]; /* Already received sections */ /* Number of section we received so far */
byte_t a_known_PAT_sections[32];
/* Already received sections */
/* Program Map Table status */ /* Program Map Table status */
boolean_t b_is_PMT_complete; /* Is the PMT complete ?*/ boolean_t b_is_PMT_complete; /* Is the PMT complete ?*/
u8 i_known_PMT_sections; /* Number of section we received so far */ u8 i_known_PMT_sections;
byte_t a_known_PMT_sections[32]; /* Already received sections */ /* Number of section we received so far */
byte_t a_known_PMT_sections[32];
/* Already received sections */
/* Service Description Table status */ /* Service Description Table status */
u8 i_SDT_version; /* version number */ u8 i_SDT_version; /* version number */
boolean_t b_is_SDT_complete; /* Is the SDT complete ?*/ boolean_t b_is_SDT_complete; /* Is the SDT complete ?*/
u8 i_known_SDT_sections; /* Number of section we received so far */ u8 i_known_SDT_sections;
byte_t a_known_SDT_sections[32]; /* Already received sections */ /* Number of section we received so far */
byte_t a_known_SDT_sections[32];
/* Already received sections */
/* Programs description */ /* Programs description */
int i_pgrm_number; /* Number of program number we have */ int i_pgrm_number; /* Number of program number we have */
pgrm_descriptor_t ** ap_programs; /* Array of pointers to pgrm */ pgrm_descriptor_t ** ap_programs; /* Array of pointers to pgrm */
#ifdef STATS #ifdef STATS
/* Stats */ /* Stats */
...@@ -264,24 +269,24 @@ typedef struct ...@@ -264,24 +269,24 @@ typedef struct
#endif #endif
} stream_descriptor_t; } stream_descriptor_t;
/******************************************************************************* /******************************************************************************
* input_netlist_t * input_netlist_t
*******************************************************************************/ ******************************************************************************/
typedef struct typedef struct
{ {
vlc_mutex_t lock; /* netlist modification lock */ vlc_mutex_t lock; /* netlist modification lock */
struct iovec p_ts_free[INPUT_MAX_TS + INPUT_TS_READ_ONCE]; struct iovec p_ts_free[INPUT_MAX_TS + INPUT_TS_READ_ONCE];
/* FIFO or LIFO of free TS packets */ /* FIFO or LIFO of free TS packets */
ts_packet_t * p_ts_packets; ts_packet_t * p_ts_packets;
/* pointer to the first TS packet we allocated */ /* pointer to the first TS packet we allocated */
pes_packet_t * p_pes_free[INPUT_MAX_PES + 1]; pes_packet_t * p_pes_free[INPUT_MAX_PES + 1];
/* FIFO or LIFO of free PES packets */ /* FIFO or LIFO of free PES packets */
pes_packet_t * p_pes_packets; pes_packet_t * p_pes_packets;
/* pointer to the first PES packet we allocated */ /* pointer to the first PES packet we allocated */
/* To use the efficiency of the scatter/gather IO operations. We implemented it /* To use the efficiency of the scatter/gather IO operations. We implemented
* in 2 ways, as we don't know yet which one is better : as a FIFO (code * it in 2 ways, as we don't know yet which one is better : as a FIFO (code
* simplier) or as a LIFO stack (when we doesn't care of the ordering, this * simplier) or as a LIFO stack (when we doesn't care of the ordering, this
* allow to drastically improve the cache performance) */ * allow to drastically improve the cache performance) */
#ifdef INPUT_LIFO_TS_NETLIST #ifdef INPUT_LIFO_TS_NETLIST
...@@ -296,14 +301,14 @@ typedef struct ...@@ -296,14 +301,14 @@ typedef struct
#endif #endif
} input_netlist_t; } input_netlist_t;
/******************************************************************************* /******************************************************************************
* input_thread_t * input_thread_t
******************************************************************************* ******************************************************************************
* This structure includes all the local static variables of an input thread, * This structure includes all the local static variables of an input thread,
* including the netlist and the ES descriptors * including the netlist and the ES descriptors
* Note that p_es must be defined as a static table, otherwise we would have to * Note that p_es must be defined as a static table, otherwise we would have to
* update all reference to it each time the table would be reallocated * update all reference to it each time the table would be reallocated
*******************************************************************************/ ******************************************************************************/
/* function pointers */ /* function pointers */
struct input_thread_struct; struct input_thread_struct;
...@@ -316,73 +321,73 @@ typedef void (*f_clean_t)( struct input_thread_struct * ); ...@@ -316,73 +321,73 @@ typedef void (*f_clean_t)( struct input_thread_struct * );
typedef struct input_thread_struct typedef struct input_thread_struct
{ {
/* Thread properties and locks */ /* Thread properties and locks */
boolean_t b_die; /* 'die' flag */ boolean_t b_die; /* 'die' flag */
boolean_t b_error; /* deadlock */ boolean_t b_error; /* deadlock */
vlc_thread_t thread_id; /* id for thread functions */ vlc_thread_t thread_id; /* id for thread functions */
vlc_mutex_t programs_lock; /* programs modification lock */ vlc_mutex_t programs_lock; /* programs modification lock */
vlc_mutex_t es_lock; /* es modification lock */ vlc_mutex_t es_lock; /* es modification lock */
/* Input method description */ /* Input method description */
int i_method; /* input method */ int i_method; /* input method */
int i_handle; /* file/socket descriptor */ int i_handle; /* file/socket descriptor */
int i_vlan_id; /* id for vlan method */ int i_vlan_id; /* id for vlan method */
f_open_t p_open; /* pointer to the opener of the method */ f_open_t p_open; /* pointer to the opener of the method */
f_read_t p_read; /* pointer to the reading function */ f_read_t p_read; /* pointer to the reading function */
f_clean_t p_clean; /* pointer to the destroying function */ f_clean_t p_clean; /* pointer to the destroying function */
/* General stream description */ /* General stream description */
stream_descriptor_t * p_stream; /* PAT tables */ stream_descriptor_t * p_stream; /* PAT tables */
es_descriptor_t p_es[INPUT_MAX_ES]; /* carried elementary streams */ es_descriptor_t p_es[INPUT_MAX_ES]; /* carried elementary streams */
pcr_descriptor_t * p_pcr; /* PCR struct used for synchronisation */ pcr_descriptor_t * p_pcr; /* PCR struct used for synchronisation */
/* List of streams to demux */ /* List of streams to demux */
es_descriptor_t * pp_selected_es[INPUT_MAX_SELECTED_ES]; es_descriptor_t * pp_selected_es[INPUT_MAX_SELECTED_ES];
/* Netlists */ /* Netlists */
input_netlist_t netlist; /* see above */ input_netlist_t netlist; /* see above */
/* ?? default settings for new decoders */ /* ?? default settings for new decoders */
struct aout_thread_s * p_aout; /* audio output thread structure */ struct aout_thread_s * p_aout; /* audio output thread structure */
#ifdef STATS #ifdef STATS
/* Stats */ /* Stats */
count_t c_loops; /* number of loops */ count_t c_loops; /* number of loops */
count_t c_bytes; /* total of bytes read */ count_t c_bytes; /* total of bytes read */
count_t c_payload_bytes; /* total of payload useful bytes */ count_t c_payload_bytes; /* total of payload useful bytes */
count_t c_ts_packets_read; /* total of packets read */ count_t c_ts_packets_read; /* total of packets read */
count_t c_ts_packets_trashed; /* total of trashed packets */ count_t c_ts_packets_trashed; /* total of trashed packets */
/* ?? ... other stats */ /* ?? ... other stats */
#endif #endif
} input_thread_t; } input_thread_t;
/* Input methods */ /* Input methods */
#define INPUT_METHOD_NONE 0 /* input thread is inactive */ #define INPUT_METHOD_NONE 0 /* input thread is inactive */
#define INPUT_METHOD_TS_FILE 10 /* TS stream is read from a file */ #define INPUT_METHOD_TS_FILE 10 /* TS stream is read from a file */
#define INPUT_METHOD_TS_UCAST 20 /* TS UDP unicast */ #define INPUT_METHOD_TS_UCAST 20 /* TS UDP unicast */
#define INPUT_METHOD_TS_MCAST 21 /* TS UDP multicast */ #define INPUT_METHOD_TS_MCAST 21 /* TS UDP multicast */
#define INPUT_METHOD_TS_BCAST 22 /* TS UDP broadcast */ #define INPUT_METHOD_TS_BCAST 22 /* TS UDP broadcast */
#define INPUT_METHOD_TS_VLAN_BCAST 32 /* TS UDP broadcast with VLANs */ #define INPUT_METHOD_TS_VLAN_BCAST 32 /* TS UDP broadcast with VLANs */
/******************************************************************************* /******************************************************************************
* input_cfg_t: input thread configuration structure * input_cfg_t: input thread configuration structure
******************************************************************************* ******************************************************************************
* This structure is passed as a parameter to input_CreateTtread(). It includes * This structure is passed as a parameter to input_CreateTtread(). It includes
* several fields describing potential properties of a new object. * several fields describing potential properties of a new object.
* The 'i_properties' field allow to set only a subset of the required * The 'i_properties' field allow to set only a subset of the required
* properties, asking the called function to use default settings for * properties, asking the called function to use default settings for
* the other ones. * the other ones.
*******************************************************************************/ ******************************************************************************/
typedef struct input_cfg_struct typedef struct input_cfg_struct
{ {
u64 i_properties; u64 i_properties;
/* Input method properties */ /* Input method properties */
int i_method; /* input method */ int i_method; /* input method */
char * psz_filename; /* filename */ char * psz_filename; /* filename */
char * psz_hostname; /* server hostname */ char * psz_hostname; /* server hostname */
char * psz_ip; /* server IP */ char * psz_ip; /* server IP */
int i_port; /* port */ int i_port; /* port */
int i_vlan; /* vlan number */ int i_vlan; /* vlan number */
/* ??... default settings for new decoders */ /* ??... default settings for new decoders */
struct aout_thread_s * p_aout; /* audio output thread structure */ struct aout_thread_s * p_aout; /* audio output thread structure */
...@@ -397,9 +402,9 @@ typedef struct input_cfg_struct ...@@ -397,9 +402,9 @@ typedef struct input_cfg_struct
#define INPUT_CFG_PORT (1 << 10) #define INPUT_CFG_PORT (1 << 10)
#define INPUT_CFG_VLAN (1 << 11) #define INPUT_CFG_VLAN (1 << 11)
/****************************************************************************** /*****************************************************************************
* Prototypes * Prototypes
******************************************************************************/ *****************************************************************************/
input_thread_t *input_CreateThread ( input_cfg_t *p_cfg ); input_thread_t *input_CreateThread ( input_cfg_t *p_cfg );
void input_DestroyThread ( input_thread_t *p_input ); void input_DestroyThread ( input_thread_t *p_input );
......
src/generic_decoder/generic_decoder.c
View file @ f1240107
...@@ -388,8 +388,8 @@ static void IdentifyPES( gdec_thread_t *p_gdec, pes_packet_t *p_pes, int i_strea ...@@ -388,8 +388,8 @@ static void IdentifyPES( gdec_thread_t *p_gdec, pes_packet_t *p_pes, int i_strea
if( i_stream_id == 0xbd ) if( i_stream_id == 0xbd )
{ {
/* Dolby AC-3 stream - might be specific to DVD PS streams */ /* Dolby AC-3 stream - might be specific to DVD PS streams */
i_type = AC3_AUDIO_ES; i_type = MPEG2_AUDIO_ES;
intf_DbgMsg("PES %p identified as AC3\n", p_pes); intf_DbgMsg("PES %p identified as AUDIO AC3\n", p_pes);
} }
else if( (i_stream_id & 0xe0) == 0xc0 ) else if( (i_stream_id & 0xe0) == 0xc0 )
{ {
...@@ -398,7 +398,7 @@ static void IdentifyPES( gdec_thread_t *p_gdec, pes_packet_t *p_pes, int i_strea ...@@ -398,7 +398,7 @@ static void IdentifyPES( gdec_thread_t *p_gdec, pes_packet_t *p_pes, int i_strea
* an ISO/IEC 13818-3 is capable of decoding an ISO/IEC 11172-3 stream, * an ISO/IEC 13818-3 is capable of decoding an ISO/IEC 11172-3 stream,
* the first one is used */ * the first one is used */
i_type = MPEG2_AUDIO_ES; i_type = MPEG2_AUDIO_ES;
intf_DbgMsg("PES %p identified as AUDIO\n", p_pes); intf_DbgMsg("PES %p identified as AUDIO MPEG\n", p_pes);
} }
else if( (i_stream_id & 0xf0) == 0xe0 ) else if( (i_stream_id & 0xf0) == 0xe0 )
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment