comparison mpegts.c @ 5542:b0818d132889 libavformat

remove useless type declarations
author bcoudurier
date Wed, 13 Jan 2010 22:52:22 +0000
parents 39a8e1dd9f9d
children 072cb3a1d4a7
comparison
equal deleted inserted replaced
5541:79e17d3fdc9e 5542:b0818d132889
38 synchronisation is lost */ 38 synchronisation is lost */
39 #define MAX_RESYNC_SIZE 65536 39 #define MAX_RESYNC_SIZE 65536
40 40
41 #define MAX_PES_PAYLOAD 200*1024 41 #define MAX_PES_PAYLOAD 200*1024
42 42
43 typedef struct PESContext PESContext;
44
45 enum MpegTSFilterType { 43 enum MpegTSFilterType {
46 MPEGTS_PES, 44 MPEGTS_PES,
47 MPEGTS_SECTION, 45 MPEGTS_SECTION,
48 }; 46 };
49 47
85 unsigned int id; //program id/service id 83 unsigned int id; //program id/service id
86 unsigned int nb_pids; 84 unsigned int nb_pids;
87 unsigned int pids[MAX_PIDS_PER_PROGRAM]; 85 unsigned int pids[MAX_PIDS_PER_PROGRAM];
88 }; 86 };
89 87
90 struct MpegTSContext { 88 typedef struct MpegTSContext {
91 /* user data */ 89 /* user data */
92 AVFormatContext *stream; 90 AVFormatContext *stream;
93 /** raw packet size, including FEC if present */ 91 /** raw packet size, including FEC if present */
94 int raw_packet_size; 92 int raw_packet_size;
95 93
120 struct Program *prg; 118 struct Program *prg;
121 119
122 120
123 /** filters for various streams specified by PMT + for the PAT and PMT */ 121 /** filters for various streams specified by PMT + for the PAT and PMT */
124 MpegTSFilter *pids[NB_PID_MAX]; 122 MpegTSFilter *pids[NB_PID_MAX];
125 }; 123 } MpegTSContext;
126 124
127 /* TS stream handling */ 125 /* TS stream handling */
128 126
129 enum MpegTSState { 127 enum MpegTSState {
130 MPEGTS_HEADER = 0, 128 MPEGTS_HEADER = 0,
137 /* enough for PES header + length */ 135 /* enough for PES header + length */
138 #define PES_START_SIZE 6 136 #define PES_START_SIZE 6
139 #define PES_HEADER_SIZE 9 137 #define PES_HEADER_SIZE 9
140 #define MAX_PES_HEADER_SIZE (9 + 255) 138 #define MAX_PES_HEADER_SIZE (9 + 255)
141 139
142 struct PESContext { 140 typedef struct PESContext {
143 int pid; 141 int pid;
144 int pcr_pid; /**< if -1 then all packets containing PCR are considered */ 142 int pcr_pid; /**< if -1 then all packets containing PCR are considered */
145 int stream_type; 143 int stream_type;
146 MpegTSContext *ts; 144 MpegTSContext *ts;
147 AVFormatContext *stream; 145 AVFormatContext *stream;
155 int extended_stream_id; 153 int extended_stream_id;
156 int64_t pts, dts; 154 int64_t pts, dts;
157 int64_t ts_packet_pos; /**< position of first TS packet of this PES packet */ 155 int64_t ts_packet_pos; /**< position of first TS packet of this PES packet */
158 uint8_t header[MAX_PES_HEADER_SIZE]; 156 uint8_t header[MAX_PES_HEADER_SIZE];
159 uint8_t *buffer; 157 uint8_t *buffer;
160 }; 158 } PESContext;
161 159
162 extern AVInputFormat mpegts_demuxer; 160 extern AVInputFormat mpegts_demuxer;
163 161
164 static void clear_program(MpegTSContext *ts, unsigned int programid) 162 static void clear_program(MpegTSContext *ts, unsigned int programid)
165 { 163 {