Mercurial > mplayer.hg
annotate libmpdemux/demuxer.h @ 25746:330af0160c2d
Fix code to prevent from accessing queue->packets[-1].pts that causes a crash.
Found and patched by Reimar.
author | ulion |
---|---|
date | Thu, 17 Jan 2008 02:18:49 +0000 |
parents | f0d45f8866e8 |
children | baf32110d3fc |
rev | line source |
---|---|
23689
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
23611
diff
changeset
|
1 #ifndef DEMUXER_H |
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
23611
diff
changeset
|
2 #define DEMUXER_H |
589 | 3 |
18937
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
4 #ifdef USE_ASS |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
5 #include "libass/ass_types.h" |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
6 #endif |
9e95ac641e77
Initial libass release (without mencoder support).
eugeni
parents:
18934
diff
changeset
|
7 |
647 | 8 #define MAX_PACKS 4096 |
5369
2d678eeb3d42
incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents:
5214
diff
changeset
|
9 #ifdef HAVE_TV_BSDBT848 |
2d678eeb3d42
incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents:
5214
diff
changeset
|
10 #define MAX_PACK_BYTES 0x2000000 |
2d678eeb3d42
incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents:
5214
diff
changeset
|
11 #else |
647 | 12 #define MAX_PACK_BYTES 0x800000 |
5369
2d678eeb3d42
incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents:
5214
diff
changeset
|
13 #endif |
589 | 14 |
15 #define DEMUXER_TYPE_UNKNOWN 0 | |
16 #define DEMUXER_TYPE_MPEG_ES 1 | |
17 #define DEMUXER_TYPE_MPEG_PS 2 | |
18 #define DEMUXER_TYPE_AVI 3 | |
19 #define DEMUXER_TYPE_AVI_NI 4 | |
20 #define DEMUXER_TYPE_AVI_NINI 5 | |
21 #define DEMUXER_TYPE_ASF 6 | |
1490 | 22 #define DEMUXER_TYPE_MOV 7 |
2687 | 23 #define DEMUXER_TYPE_VIVO 8 |
2790 | 24 #define DEMUXER_TYPE_TV 9 |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3071
diff
changeset
|
25 #define DEMUXER_TYPE_FLI 10 |
3777 | 26 #define DEMUXER_TYPE_REAL 11 |
3786
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
27 #define DEMUXER_TYPE_Y4M 12 |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
28 #define DEMUXER_TYPE_NUV 13 |
4189 | 29 #define DEMUXER_TYPE_FILM 14 |
4451 | 30 #define DEMUXER_TYPE_ROQ 15 |
4551 | 31 #define DEMUXER_TYPE_MF 16 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4642
diff
changeset
|
32 #define DEMUXER_TYPE_AUDIO 17 |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4933
diff
changeset
|
33 #define DEMUXER_TYPE_OGG 18 |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6224
diff
changeset
|
34 #define DEMUXER_TYPE_RAWAUDIO 20 |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6883
diff
changeset
|
35 #define DEMUXER_TYPE_RTP 21 |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
36 #define DEMUXER_TYPE_RAWDV 22 |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
6925
diff
changeset
|
37 #define DEMUXER_TYPE_PVA 23 |
7382 | 38 #define DEMUXER_TYPE_SMJPEG 24 |
8528 | 39 #define DEMUXER_TYPE_XMMS 25 |
9065 | 40 #define DEMUXER_TYPE_RAWVIDEO 26 |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
41 #define DEMUXER_TYPE_MPEG4_ES 27 |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
42 #define DEMUXER_TYPE_GIF 28 |
9610 | 43 #define DEMUXER_TYPE_MPEG_TS 29 |
9824 | 44 #define DEMUXER_TYPE_H264_ES 30 |
10024 | 45 #define DEMUXER_TYPE_MATROSKA 31 |
10033 | 46 #define DEMUXER_TYPE_REALAUDIO 32 |
10263 | 47 #define DEMUXER_TYPE_MPEG_TY 33 |
11590 | 48 #define DEMUXER_TYPE_LMLM4 34 |
12164 | 49 #define DEMUXER_TYPE_LAVF 35 |
12175 | 50 #define DEMUXER_TYPE_NSV 36 |
14276 | 51 #define DEMUXER_TYPE_VQF 37 |
14693
37116118ab6a
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
14276
diff
changeset
|
52 #define DEMUXER_TYPE_AVS 38 |
15720 | 53 #define DEMUXER_TYPE_AAC 39 |
15958
087142ef3a2d
musepack demuxing and decoding support (demuxing is v7 bitstream only).
reimar
parents:
15720
diff
changeset
|
54 #define DEMUXER_TYPE_MPC 40 |
16175 | 55 #define DEMUXER_TYPE_MPEG_PES 41 |
16310
fb95057e370e
support MPEG in GXF container with extension-based detection.
reimar
parents:
16175
diff
changeset
|
56 #define DEMUXER_TYPE_MPEG_GXF 42 |
19861 | 57 #define DEMUXER_TYPE_NUT 43 |
22971
a1b2fbb000fc
Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents:
22137
diff
changeset
|
58 #define DEMUXER_TYPE_LAVF_PREFERRED 44 |
25266
239330301b33
Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents:
23689
diff
changeset
|
59 #define DEMUXER_TYPE_RTP_NEMESI 45 |
7382 | 60 |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4694
diff
changeset
|
61 // This should always match the higest demuxer type number. |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4694
diff
changeset
|
62 // Unless you want to disallow users to force the demuxer to some types |
5369
2d678eeb3d42
incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents:
5214
diff
changeset
|
63 #define DEMUXER_TYPE_MIN 0 |
25266
239330301b33
Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents:
23689
diff
changeset
|
64 #define DEMUXER_TYPE_MAX 45 |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4694
diff
changeset
|
65 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4694
diff
changeset
|
66 #define DEMUXER_TYPE_DEMUXERS (1<<16) |
4783 | 67 // A virtual demuxer type for the network code |
68 #define DEMUXER_TYPE_PLAYLIST (2<<16) | |
69 | |
589 | 70 |
18241
b19dada1aeeb
3 - Move a definition of MP_NOPTS_VALUE from muxer.h to demuxer.h to
rtognimp
parents:
17636
diff
changeset
|
71 #define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly |
589 | 72 |
73 | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
74 // DEMUXER control commands/answers |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
75 #define DEMUXER_CTRL_NOTIMPL -1 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
76 #define DEMUXER_CTRL_DONTKNOW 0 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
77 #define DEMUXER_CTRL_OK 1 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
78 #define DEMUXER_CTRL_GUESS 2 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
79 #define DEMUXER_CTRL_GET_TIME_LENGTH 10 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
80 #define DEMUXER_CTRL_GET_PERCENT_POS 11 |
15046
b7aa70b05d76
Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents:
14693
diff
changeset
|
81 #define DEMUXER_CTRL_SWITCH_AUDIO 12 |
20747 | 82 #define DEMUXER_CTRL_RESYNC 13 |
20948 | 83 #define DEMUXER_CTRL_SWITCH_VIDEO 14 |
21005
78d74a06b827
new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents:
20948
diff
changeset
|
84 #define DEMUXER_CTRL_IDENTIFY_PROGRAM 15 |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
85 |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1375
diff
changeset
|
86 // Holds one packet/frame/whatever |
589 | 87 typedef struct demux_packet_st { |
88 int len; | |
18309
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
89 double pts; |
22137 | 90 double endpts; |
21780
c9795699c414
added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer
nicodvb
parents:
21005
diff
changeset
|
91 double stream_pts; |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1428
diff
changeset
|
92 off_t pos; // position in index (AVI) or file (MPG) |
589 | 93 unsigned char* buffer; |
979 | 94 int flags; // keyframe, etc |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
95 int refcount; //refcounter for the master packet, if 0, buffer can be free()d |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
96 struct demux_packet_st* master; //pointer to the master packet if this one is a cloned one |
589 | 97 struct demux_packet_st* next; |
98 } demux_packet_t; | |
99 | |
100 typedef struct { | |
101 int buffer_pos; // current buffer position | |
102 int buffer_size; // current buffer size | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
103 unsigned char* buffer; // current buffer, never free() it, always use free_demux_packet(buffer_ref); |
18309
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
104 double pts; // current buffer's pts |
746 | 105 int pts_bytes; // number of bytes read after last pts stamp |
589 | 106 int eof; // end of demuxed stream? (true if all buffer empty) |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1375
diff
changeset
|
107 off_t pos; // position in the input stream (file) |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1375
diff
changeset
|
108 off_t dpos; // position in the demuxed stream |
889 | 109 int pack_no; // serial number of packet |
979 | 110 int flags; // flags of current packet (keyframe etc) |
589 | 111 //--------------- |
112 int packs; // number of packets in buffer | |
113 int bytes; // total bytes of packets in buffer | |
114 demux_packet_t *first; // read to current buffer from here | |
115 demux_packet_t *last; // append new packets from input stream to here | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
116 demux_packet_t *current;// needed for refcounting of the buffer |
589 | 117 int id; // stream ID (for multiple audio/video streams) |
118 struct demuxer_st *demuxer; // parent demuxer structure (stream handler) | |
119 // ---- asf ----- | |
120 demux_packet_t *asf_packet; // read asf fragments here | |
121 int asf_seq; | |
2419 | 122 // ---- mov ----- |
123 unsigned int ss_mul,ss_div; | |
589 | 124 // ---- stream header ---- |
125 void* sh; | |
126 } demux_stream_t; | |
127 | |
3050 | 128 typedef struct demuxer_info_st { |
129 char *name; | |
130 char *author; | |
131 char *encoder; | |
132 char *comments; | |
3071 | 133 char *copyright; |
3050 | 134 } demuxer_info_t; |
135 | |
4642 | 136 #define MAX_A_STREAMS 256 |
137 #define MAX_V_STREAMS 256 | |
20872
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20749
diff
changeset
|
138 #define MAX_S_STREAMS 32 |
4642 | 139 |
16175 | 140 struct demuxer_st; |
141 | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18558
diff
changeset
|
142 extern int correct_pts; |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18558
diff
changeset
|
143 |
16175 | 144 /** |
145 * Demuxer description structure | |
146 */ | |
147 typedef struct demuxers_desc_st { | |
148 const char *info; ///< What is it (long name and/or description) | |
149 const char *name; ///< Demuxer name, used with -demuxer switch | |
150 const char *shortdesc; ///< Description printed at demuxer detection | |
151 const char *author; ///< Demuxer author(s) | |
152 const char *comment; ///< Comment, printed with -demuxer help | |
153 | |
154 int type; ///< DEMUXER_TYPE_xxx | |
155 int safe_check; ///< If 1 detection is safe and fast, do it before file extension check | |
156 | |
157 /// Check if can demux the file, return DEMUXER_TYPE_xxx on success | |
158 int (*check_file)(struct demuxer_st *demuxer); ///< Mandatory if safe_check == 1, else optional | |
159 /// Get packets from file, return 0 on eof | |
160 int (*fill_buffer)(struct demuxer_st *demuxer, demux_stream_t *ds); ///< Mandatory | |
161 /// Open the demuxer, return demuxer on success, NULL on failure | |
162 struct demuxer_st* (*open)(struct demuxer_st *demuxer); ///< Optional | |
163 /// Close the demuxer | |
164 void (*close)(struct demuxer_st *demuxer); ///< Optional | |
165 // Seek | |
17636 | 166 void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional |
16175 | 167 // Control |
168 int (*control)(struct demuxer_st *demuxer, int cmd, void *arg); ///< Optional | |
169 } demuxer_desc_t; | |
170 | |
19342 | 171 typedef struct demux_chapter_s |
172 { | |
173 uint64_t start, end; | |
174 char* name; | |
175 } demux_chapter_t; | |
176 | |
25657 | 177 typedef struct demux_attachment_s |
178 { | |
179 char* name; | |
180 char* type; | |
181 void* data; | |
182 unsigned int data_size; | |
183 } demux_attachment_t; | |
184 | |
589 | 185 typedef struct demuxer_st { |
25706
f0d45f8866e8
First step towards making all demuxer_desc_t const
reimar
parents:
25657
diff
changeset
|
186 const demuxer_desc_t *desc; ///< Demuxer description structure |
6224
79b2b4c3c435
off_t fields reordered, to avoid problems due to struct padding
arpi
parents:
6192
diff
changeset
|
187 off_t filepos; // input stream current pos. |
79b2b4c3c435
off_t fields reordered, to avoid problems due to struct padding
arpi
parents:
6192
diff
changeset
|
188 off_t movi_start; |
79b2b4c3c435
off_t fields reordered, to avoid problems due to struct padding
arpi
parents:
6192
diff
changeset
|
189 off_t movi_end; |
589 | 190 stream_t *stream; |
21780
c9795699c414
added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer
nicodvb
parents:
21005
diff
changeset
|
191 double stream_pts; // current stream pts, if applicable (e.g. dvd) |
16175 | 192 char *filename; ///< Needed by avs_check_file |
589 | 193 int synced; // stream synced (used by mpeg) |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
194 int type; // demuxer type: mpeg PS, mpeg ES, avi, avi-ni, avi-nini, asf |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
195 int file_format; // file format: mpeg/avi/asf |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1496
diff
changeset
|
196 int seekable; // flag |
589 | 197 // |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1428
diff
changeset
|
198 demux_stream_t *audio; // audio buffer/demuxer |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1428
diff
changeset
|
199 demux_stream_t *video; // video buffer/demuxer |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1428
diff
changeset
|
200 demux_stream_t *sub; // dvd subtitle buffer/demuxer |
589 | 201 |
202 // stream headers: | |
4642 | 203 void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t) |
204 void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t) | |
20872
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20749
diff
changeset
|
205 void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag) |
19342 | 206 |
207 demux_chapter_t* chapters; | |
208 int num_chapters; | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1428
diff
changeset
|
209 |
25657 | 210 demux_attachment_t* attachments; |
211 int num_attachments; | |
212 | |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1428
diff
changeset
|
213 void* priv; // fileformat-dependent data |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4642
diff
changeset
|
214 char** info; |
589 | 215 } demuxer_t; |
216 | |
21005
78d74a06b827
new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents:
20948
diff
changeset
|
217 typedef struct { |
78d74a06b827
new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents:
20948
diff
changeset
|
218 int progid; //program id |
78d74a06b827
new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents:
20948
diff
changeset
|
219 int aid, vid, sid; //audio, video and subtitle id |
78d74a06b827
new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents:
20948
diff
changeset
|
220 } demux_program_t; |
78d74a06b827
new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents:
20948
diff
changeset
|
221 |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
222 static inline demux_packet_t* new_demux_packet(int len){ |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6883
diff
changeset
|
223 demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t)); |
589 | 224 dp->len=len; |
225 dp->next=NULL; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18558
diff
changeset
|
226 // still using 0 by default in case there is some code that uses 0 for both |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18558
diff
changeset
|
227 // unknown and a valid pts value |
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18558
diff
changeset
|
228 dp->pts=correct_pts ? MP_NOPTS_VALUE : 0; |
22137 | 229 dp->endpts=MP_NOPTS_VALUE; |
21780
c9795699c414
added stream_pts to demuxer_t and demux_packet_t to hold the time value reported by the stream layer
nicodvb
parents:
21005
diff
changeset
|
230 dp->stream_pts = MP_NOPTS_VALUE; |
589 | 231 dp->pos=0; |
979 | 232 dp->flags=0; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
233 dp->refcount=1; |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
234 dp->master=NULL; |
17611 | 235 dp->buffer=NULL; |
17599 | 236 if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + 8))) |
17597 | 237 memset(dp->buffer + len, 0, 8); |
238 else | |
239 dp->len = 0; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
240 return dp; |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
241 } |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
242 |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
243 static inline void resize_demux_packet(demux_packet_t* dp, int len) |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
244 { |
17597 | 245 if(len > 0) |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
246 { |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
247 dp->buffer=(unsigned char *)realloc(dp->buffer,len+8); |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
248 } |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
249 else |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
250 { |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
251 if(dp->buffer) free(dp->buffer); |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
252 dp->buffer=NULL; |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
253 } |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
254 dp->len=len; |
17597 | 255 if (dp->buffer) |
256 memset(dp->buffer + len, 0, 8); | |
257 else | |
258 dp->len = 0; | |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
259 } |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10263
diff
changeset
|
260 |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
261 static inline demux_packet_t* clone_demux_packet(demux_packet_t* pack){ |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6883
diff
changeset
|
262 demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t)); |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
263 while(pack->master) pack=pack->master; // find the master |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
264 memcpy(dp,pack,sizeof(demux_packet_t)); |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
265 dp->next=NULL; |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
266 dp->refcount=0; |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
267 dp->master=pack; |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
268 pack->refcount++; |
589 | 269 return dp; |
270 } | |
271 | |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
272 static inline void free_demux_packet(demux_packet_t* dp){ |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
273 if (dp->master==NULL){ //dp is a master packet |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
274 dp->refcount--; |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
275 if (dp->refcount==0){ |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
276 if (dp->buffer) free(dp->buffer); |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
277 free(dp); |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
278 } |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
279 return; |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
280 } |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
281 // dp is a clone: |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
282 free_demux_packet(dp->master); |
589 | 283 free(dp); |
284 } | |
285 | |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
286 #ifndef SIZE_MAX |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
287 #define SIZE_MAX ((size_t)-1) |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
288 #endif |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
289 |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
290 static inline void *realloc_struct(void *ptr, size_t nmemb, size_t size) { |
18558
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
291 if (nmemb > SIZE_MAX / size) { |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
292 free(ptr); |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
293 return NULL; |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
294 } |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
295 return realloc(ptr, nmemb * size); |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
296 } |
4928dd61f136
Fix potential integer overflows in memory allocation.
rtogni
parents:
18309
diff
changeset
|
297 |
589 | 298 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id); |
16175 | 299 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename); |
1643 | 300 void free_demuxer_stream(demux_stream_t *ds); |
301 void free_demuxer(demuxer_t *demuxer); | |
589 | 302 |
303 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp); | |
18309
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
304 void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len, double pts, off_t pos, int flags); |
589 | 305 |
306 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds); | |
307 int ds_fill_buffer(demux_stream_t *ds); | |
308 | |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
309 static inline off_t ds_tell(demux_stream_t *ds){ |
589 | 310 return (ds->dpos-ds->buffer_size)+ds->buffer_pos; |
311 } | |
312 | |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
313 static inline int ds_tell_pts(demux_stream_t *ds){ |
746 | 314 return (ds->pts_bytes-ds->buffer_size)+ds->buffer_pos; |
315 } | |
316 | |
589 | 317 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len); |
746 | 318 int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len); |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
16504
diff
changeset
|
319 int demux_pattern_3(demux_stream_t *ds, unsigned char *mem, int maxlen, |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
16504
diff
changeset
|
320 int *read, uint32_t pattern); |
589 | 321 |
16504
aa2b250ba16b
add a demux_peekc function that allows to just "have a look" at the next
reimar
parents:
16369
diff
changeset
|
322 #define demux_peekc(ds) (\ |
aa2b250ba16b
add a demux_peekc function that allows to just "have a look" at the next
reimar
parents:
16369
diff
changeset
|
323 (likely(ds->buffer_pos<ds->buffer_size)) ? ds->buffer[ds->buffer_pos] \ |
aa2b250ba16b
add a demux_peekc function that allows to just "have a look" at the next
reimar
parents:
16369
diff
changeset
|
324 :((unlikely(!ds_fill_buffer(ds)))? (-1) : ds->buffer[ds->buffer_pos] ) ) |
589 | 325 #if 1 |
326 #define demux_getc(ds) (\ | |
16369 | 327 (likely(ds->buffer_pos<ds->buffer_size)) ? ds->buffer[ds->buffer_pos++] \ |
328 :((unlikely(!ds_fill_buffer(ds)))? (-1) : ds->buffer[ds->buffer_pos++] ) ) | |
589 | 329 #else |
23443
051d5ffee36a
Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents:
23433
diff
changeset
|
330 static inline int demux_getc(demux_stream_t *ds){ |
589 | 331 if(ds->buffer_pos>=ds->buffer_size){ |
332 if(!ds_fill_buffer(ds)){ | |
333 // printf("DEMUX_GETC: EOF reached!\n"); | |
334 return -1; // EOF | |
335 } | |
336 } | |
337 // printf("[%02X]",ds->buffer[ds->buffer_pos]); | |
338 return ds->buffer[ds->buffer_pos++]; | |
339 } | |
340 #endif | |
341 | |
342 void ds_free_packs(demux_stream_t *ds); | |
343 int ds_get_packet(demux_stream_t *ds,unsigned char **start); | |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18241
diff
changeset
|
344 int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts); |
589 | 345 int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start); |
18309
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
346 double ds_get_next_pts(demux_stream_t *ds); |
589 | 347 |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4933
diff
changeset
|
348 // This is defined here because demux_stream_t ins't defined in stream.h |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4933
diff
changeset
|
349 stream_t* new_ds_stream(demux_stream_t *ds); |
589 | 350 |
351 static inline int avi_stream_id(unsigned int id){ | |
352 unsigned char *p=(unsigned char *)&id; | |
353 unsigned char a,b; | |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
979
diff
changeset
|
354 #if WORDS_BIGENDIAN |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
979
diff
changeset
|
355 a=p[3]-'0'; b=p[2]-'0'; |
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
979
diff
changeset
|
356 #else |
589 | 357 a=p[0]-'0'; b=p[1]-'0'; |
1309
598e3047ce13
Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents:
979
diff
changeset
|
358 #endif |
589 | 359 if(a>9 || b>9) return 100; // invalid ID |
360 return a*10+b; | |
361 } | |
362 | |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8528
diff
changeset
|
363 demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid,char* filename); |
17636 | 364 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,float audio_delay,int flags); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4694
diff
changeset
|
365 demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd); |
589 | 366 |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2419
diff
changeset
|
367 // AVI demuxer params: |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2419
diff
changeset
|
368 extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index |
11234
9767665d49e0
Saving and loading external index file. Patch by Jason Tackaberry <tack@auc.ca>
alex
parents:
10715
diff
changeset
|
369 extern char *index_file_save, *index_file_load; |
2555
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2419
diff
changeset
|
370 extern int force_ni; |
66837325b929
config.h cleanup, few things added to steram/demuxer headers
arpi
parents:
2419
diff
changeset
|
371 extern int pts_from_bps; |
589 | 372 |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8528
diff
changeset
|
373 extern int extension_parsing; |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8528
diff
changeset
|
374 |
19053
75327b24e06f
marks several string parameters as const, as they are not modified inside the function, Patch by Stefan Huehner, stefan AT huehner-org
reynaldo
parents:
18937
diff
changeset
|
375 int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param); |
23611 | 376 char* demux_info_get(demuxer_t *demuxer, const char *opt); |
3071 | 377 int demux_info_print(demuxer_t *demuxer); |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
378 int demux_control(demuxer_t *demuxer, int cmd, void *arg); |
4933 | 379 |
13127
957fc21fc10a
Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents:
12175
diff
changeset
|
380 #ifdef HAVE_OGGVORBIS |
957fc21fc10a
Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents:
12175
diff
changeset
|
381 /* Found in demux_ogg.c */ |
957fc21fc10a
Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents:
12175
diff
changeset
|
382 int demux_ogg_num_subs(demuxer_t *demuxer); |
957fc21fc10a
Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents:
12175
diff
changeset
|
383 int demux_ogg_sub_id(demuxer_t *demuxer, int index); |
25495 | 384 const char *demux_ogg_sub_lang(demuxer_t *demuxer, int index); |
13127
957fc21fc10a
Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents:
12175
diff
changeset
|
385 #endif |
957fc21fc10a
Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents:
12175
diff
changeset
|
386 |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20747
diff
changeset
|
387 extern int demuxer_get_current_time(demuxer_t *demuxer); |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16321
diff
changeset
|
388 extern double demuxer_get_time_length(demuxer_t *demuxer); |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8030
diff
changeset
|
389 extern int demuxer_get_percent_pos(demuxer_t *demuxer); |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
390 extern int demuxer_switch_audio(demuxer_t *demuxer, int index); |
20948 | 391 extern int demuxer_switch_video(demuxer_t *demuxer, int index); |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8528
diff
changeset
|
392 |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8528
diff
changeset
|
393 extern int demuxer_type_by_filename(char* filename); |
16175 | 394 |
395 extern void demuxer_help(void); | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
396 extern int get_demuxer_type_from_name(char *demuxer_name, int *force); |
19342 | 397 |
25657 | 398 int demuxer_add_attachment(demuxer_t* demuxer, const char* name, |
399 const char* type, const void* data, size_t size); | |
400 | |
19342 | 401 int demuxer_add_chapter(demuxer_t* demuxer, const char* name, uint64_t start, uint64_t end); |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19435
diff
changeset
|
402 int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, float *seek_pts, int *num_chapters, char **chapter_name); |
19342 | 403 |
25358 | 404 /// Get current chapter index if available. |
405 int demuxer_get_current_chapter(demuxer_t *demuxer); | |
406 /// Get chapter name by index if available. | |
407 char *demuxer_chapter_name(demuxer_t *demuxer, int chapter); | |
408 /// Get chapter display name by index. | |
409 char *demuxer_chapter_display_name(demuxer_t *demuxer, int chapter); | |
410 /// Get chapter start time and end time by index if available. | |
411 float demuxer_chapter_time(demuxer_t *demuxer, int chapter, float *end); | |
412 /// Get total chapter number. | |
413 int demuxer_chapter_count(demuxer_t *demuxer); | |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25495
diff
changeset
|
414 /// Get current angle index. |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25495
diff
changeset
|
415 int demuxer_get_current_angle(demuxer_t *demuxer); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25495
diff
changeset
|
416 /// Set angle. |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25495
diff
changeset
|
417 int demuxer_set_angle(demuxer_t *demuxer, int angle); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25495
diff
changeset
|
418 /// Get number of angles. |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25495
diff
changeset
|
419 int demuxer_angles_count(demuxer_t *demuxer); |
23571 | 420 |
23689
3f0d00abc073
Do not use leading underscores in multiple inclusion guards, they are reserved.
diego
parents:
23611
diff
changeset
|
421 #endif /* DEMUXER_H */ |