annotate libmpdemux/demuxer.h @ 11744:70b8047bc7df

sync, tested :-P BTW, xml/pl fails to compile.
author nauj27
date Mon, 05 Jan 2004 10:39:04 +0000
parents 0908285ada31
children 77ff303c0eaa
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4933
429994672d8c 're-include' possibility
nick
parents: 4783
diff changeset
1 #ifndef __DEMUXER_H
429994672d8c 're-include' possibility
nick
parents: 4783
diff changeset
2 #define __DEMUXER_H 1
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
3
647
feffffff5d0e demux buffer increased 4m->8m
arpi_esp
parents: 589
diff changeset
4 #define MAX_PACKS 4096
5369
2d678eeb3d42 incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents: 5214
diff changeset
5 #ifdef HAVE_TV_BSDBT848
2d678eeb3d42 incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents: 5214
diff changeset
6 #define MAX_PACK_BYTES 0x2000000
2d678eeb3d42 incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents: 5214
diff changeset
7 #else
647
feffffff5d0e demux buffer increased 4m->8m
arpi_esp
parents: 589
diff changeset
8 #define MAX_PACK_BYTES 0x800000
5369
2d678eeb3d42 incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents: 5214
diff changeset
9 #endif
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
10
62f483490686 sorry...
arpi_esp
parents:
diff changeset
11 #define DEMUXER_TYPE_UNKNOWN 0
62f483490686 sorry...
arpi_esp
parents:
diff changeset
12 #define DEMUXER_TYPE_MPEG_ES 1
62f483490686 sorry...
arpi_esp
parents:
diff changeset
13 #define DEMUXER_TYPE_MPEG_PS 2
62f483490686 sorry...
arpi_esp
parents:
diff changeset
14 #define DEMUXER_TYPE_AVI 3
62f483490686 sorry...
arpi_esp
parents:
diff changeset
15 #define DEMUXER_TYPE_AVI_NI 4
62f483490686 sorry...
arpi_esp
parents:
diff changeset
16 #define DEMUXER_TYPE_AVI_NINI 5
62f483490686 sorry...
arpi_esp
parents:
diff changeset
17 #define DEMUXER_TYPE_ASF 6
1490
71424eb2b282 MOV file support - not works yet
arpi
parents: 1485
diff changeset
18 #define DEMUXER_TYPE_MOV 7
2687
8c75a9a639c1 vivo demuxer
arpi
parents: 2555
diff changeset
19 #define DEMUXER_TYPE_VIVO 8
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
20 #define DEMUXER_TYPE_TV 9
3101
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3071
diff changeset
21 #define DEMUXER_TYPE_FLI 10
3777
026ccd3dc489 added real demuxer
alex
parents: 3101
diff changeset
22 #define DEMUXER_TYPE_REAL 11
3786
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
23 #define DEMUXER_TYPE_Y4M 12
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
24 #define DEMUXER_TYPE_NUV 13
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 3801
diff changeset
25 #define DEMUXER_TYPE_FILM 14
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4189
diff changeset
26 #define DEMUXER_TYPE_ROQ 15
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
27 #define DEMUXER_TYPE_MF 16
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4642
diff changeset
28 #define DEMUXER_TYPE_AUDIO 17
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4933
diff changeset
29 #define DEMUXER_TYPE_OGG 18
5214
dd79075bbd98 added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents: 5133
diff changeset
30 #define DEMUXER_TYPE_BMP 19
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents: 6224
diff changeset
31 #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
32 #define DEMUXER_TYPE_RTP 21
6925
cc46462d0015 raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents: 6910
diff changeset
33 #define DEMUXER_TYPE_RAWDV 22
7364
b2445802532c .PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents: 6925
diff changeset
34 #define DEMUXER_TYPE_PVA 23
7382
89cbab549659 added smjpeg demuxer only for nexus' request
alex
parents: 7364
diff changeset
35 #define DEMUXER_TYPE_SMJPEG 24
8528
9d143176d95f XMMS Input plugin support
arpi
parents: 8208
diff changeset
36 #define DEMUXER_TYPE_XMMS 25
9065
59805b2d220a raw video demuxer, requested by Michael
arpi
parents: 9006
diff changeset
37 #define DEMUXER_TYPE_RAWVIDEO 26
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 9065
diff changeset
38 #define DEMUXER_TYPE_MPEG4_ES 27
9129
6ecc0b5c08cb libgif/libungif based demuxer support for libmpdemux.
arpi
parents: 9069
diff changeset
39 #define DEMUXER_TYPE_GIF 28
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9129
diff changeset
40 #define DEMUXER_TYPE_MPEG_TS 29
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9610
diff changeset
41 #define DEMUXER_TYPE_H264_ES 30
10024
c6fab860ab18 Added Matroska demuxing support.
mosu
parents: 9824
diff changeset
42 #define DEMUXER_TYPE_MATROSKA 31
10033
4ecb40d73e24 Add support for Realaudio files
rtognimp
parents: 10024
diff changeset
43 #define DEMUXER_TYPE_REALAUDIO 32
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 10033
diff changeset
44 #define DEMUXER_TYPE_MPEG_TY 33
11590
0908285ada31 LML-M4 mpeg4 capture card raw stream format support
arpi
parents: 11234
diff changeset
45 #define DEMUXER_TYPE_LMLM4 34
7382
89cbab549659 added smjpeg demuxer only for nexus' request
alex
parents: 7364
diff changeset
46
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
47 // 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
48 // 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
49 #define DEMUXER_TYPE_MIN 0
11590
0908285ada31 LML-M4 mpeg4 capture card raw stream format support
arpi
parents: 11234
diff changeset
50 #define DEMUXER_TYPE_MAX 34
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
51
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
52 #define DEMUXER_TYPE_DEMUXERS (1<<16)
4783
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
53 // A virtual demuxer type for the network code
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
54 #define DEMUXER_TYPE_PLAYLIST (2<<16)
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
55
10715
6549152f1f11 Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi@libero.it>.
mosu
parents: 10710
diff changeset
56 //This one is needed only to identify mpeg4 in mpeg2-ts, shouldn't be used explicitly,
6549152f1f11 Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi@libero.it>.
mosu
parents: 10710
diff changeset
57 // rather use ths usual _TYPE_TS
6549152f1f11 Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi@libero.it>.
mosu
parents: 10710
diff changeset
58 #define DEMUXER_TYPE_MPEG4_IN_TS (3<<16)
6549152f1f11 Proper demuxer number for the MPEG4-in-TS demuxer. Patch by Nico <nsabbi@libero.it>.
mosu
parents: 10710
diff changeset
59
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
60
62f483490686 sorry...
arpi_esp
parents:
diff changeset
61 #define DEMUXER_TIME_NONE 0
62f483490686 sorry...
arpi_esp
parents:
diff changeset
62 #define DEMUXER_TIME_PTS 1
62f483490686 sorry...
arpi_esp
parents:
diff changeset
63 #define DEMUXER_TIME_FILE 2
62f483490686 sorry...
arpi_esp
parents:
diff changeset
64 #define DEMUXER_TIME_BPS 3
62f483490686 sorry...
arpi_esp
parents:
diff changeset
65
62f483490686 sorry...
arpi_esp
parents:
diff changeset
66
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
67 // DEMUXER control commands/answers
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
68 #define DEMUXER_CTRL_NOTIMPL -1
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
69 #define DEMUXER_CTRL_DONTKNOW 0
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
70 #define DEMUXER_CTRL_OK 1
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
71 #define DEMUXER_CTRL_GUESS 2
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
72 #define DEMUXER_CTRL_GET_TIME_LENGTH 10
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
73 #define DEMUXER_CTRL_GET_PERCENT_POS 11
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
74
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
75 // Holds one packet/frame/whatever
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
76 typedef struct demux_packet_st {
62f483490686 sorry...
arpi_esp
parents:
diff changeset
77 int len;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
78 float pts;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
79 off_t pos; // position in index (AVI) or file (MPG)
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
80 unsigned char* buffer;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
81 int flags; // keyframe, etc
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
82 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
83 struct demux_packet_st* master; //pointer to the master packet if this one is a cloned one
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
84 struct demux_packet_st* next;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
85 } demux_packet_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
86
62f483490686 sorry...
arpi_esp
parents:
diff changeset
87 typedef struct {
62f483490686 sorry...
arpi_esp
parents:
diff changeset
88 int buffer_pos; // current buffer position
62f483490686 sorry...
arpi_esp
parents:
diff changeset
89 int buffer_size; // current buffer size
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
90 unsigned char* buffer; // current buffer, never free() it, always use free_demux_packet(buffer_ref);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
91 float pts; // current buffer's pts
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
92 int pts_bytes; // number of bytes read after last pts stamp
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
93 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
94 off_t pos; // position in the input stream (file)
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
95 off_t dpos; // position in the demuxed stream
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 746
diff changeset
96 int pack_no; // serial number of packet
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
97 int flags; // flags of current packet (keyframe etc)
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
98 //---------------
62f483490686 sorry...
arpi_esp
parents:
diff changeset
99 int packs; // number of packets in buffer
62f483490686 sorry...
arpi_esp
parents:
diff changeset
100 int bytes; // total bytes of packets in buffer
62f483490686 sorry...
arpi_esp
parents:
diff changeset
101 demux_packet_t *first; // read to current buffer from here
62f483490686 sorry...
arpi_esp
parents:
diff changeset
102 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
103 demux_packet_t *current;// needed for refcounting of the buffer
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
104 int id; // stream ID (for multiple audio/video streams)
62f483490686 sorry...
arpi_esp
parents:
diff changeset
105 struct demuxer_st *demuxer; // parent demuxer structure (stream handler)
62f483490686 sorry...
arpi_esp
parents:
diff changeset
106 // ---- asf -----
62f483490686 sorry...
arpi_esp
parents:
diff changeset
107 demux_packet_t *asf_packet; // read asf fragments here
62f483490686 sorry...
arpi_esp
parents:
diff changeset
108 int asf_seq;
2419
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2310
diff changeset
109 // ---- mov -----
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2310
diff changeset
110 unsigned int ss_mul,ss_div;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
111 // ---- stream header ----
62f483490686 sorry...
arpi_esp
parents:
diff changeset
112 void* sh;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
113 } demux_stream_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
114
3050
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
115 typedef struct demuxer_info_st {
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
116 char *name;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
117 char *author;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
118 char *encoder;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
119 char *comments;
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
120 char *copyright;
3050
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
121 } demuxer_info_t;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
122
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
123 #define MAX_A_STREAMS 256
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
124 #define MAX_V_STREAMS 256
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
125
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
126 typedef struct demuxer_st {
6224
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
127 off_t filepos; // input stream current pos.
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
128 off_t movi_start;
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
129 off_t movi_end;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
130 stream_t *stream;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
131 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
132 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
133 int file_format; // file format: mpeg/avi/asf
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1496
diff changeset
134 int seekable; // flag
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
135 //
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
136 demux_stream_t *audio; // audio buffer/demuxer
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
137 demux_stream_t *video; // video buffer/demuxer
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
138 demux_stream_t *sub; // dvd subtitle buffer/demuxer
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
139
62f483490686 sorry...
arpi_esp
parents:
diff changeset
140 // stream headers:
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
141 void* a_streams[MAX_A_STREAMS]; // audio streams (sh_audio_t)
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
142 void* v_streams[MAX_V_STREAMS]; // video sterams (sh_video_t)
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
143 char s_streams[32]; // dvd subtitles (flag)
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
144
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
145 void* priv; // fileformat-dependent data
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4642
diff changeset
146 char** info;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
147 } demuxer_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
148
62f483490686 sorry...
arpi_esp
parents:
diff changeset
149 inline static 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
150 demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t));
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
151 dp->len=len;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
152 dp->next=NULL;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
153 dp->pts=0;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
154 dp->pos=0;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
155 dp->flags=0;
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
156 dp->refcount=1;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
157 dp->master=NULL;
7776
75c5762e7b55 fill the extra bytes with zero
arpi
parents: 7748
diff changeset
158 dp->buffer=len?(unsigned char*)malloc(len+8):NULL;
75c5762e7b55 fill the extra bytes with zero
arpi
parents: 7748
diff changeset
159 if(len) memset(dp->buffer+len,0,8);
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
160 return dp;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
161 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
162
10687
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
163 inline static void resize_demux_packet(demux_packet_t* dp, int len)
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
164 {
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
165 if(len)
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
166 {
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
167 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
168 memset(dp->buffer+len,0,8);
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
169 }
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
170 else
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
171 {
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
172 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
173 dp->buffer=NULL;
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
174 }
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
175 dp->len=len;
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
176 }
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
177
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
178 inline static 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
179 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
180 while(pack->master) pack=pack->master; // find the master
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
181 memcpy(dp,pack,sizeof(demux_packet_t));
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
182 dp->next=NULL;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
183 dp->refcount=0;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
184 dp->master=pack;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
185 pack->refcount++;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
186 return dp;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
187 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
188
62f483490686 sorry...
arpi_esp
parents:
diff changeset
189 inline static void free_demux_packet(demux_packet_t* dp){
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
190 if (dp->master==NULL){ //dp is a master packet
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
191 dp->refcount--;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
192 if (dp->refcount==0){
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
193 if (dp->buffer) free(dp->buffer);
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
194 free(dp);
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
195 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
196 return;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
197 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
198 // dp is a clone:
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
199 free_demux_packet(dp->master);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
200 free(dp);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
201 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
202
62f483490686 sorry...
arpi_esp
parents:
diff changeset
203 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
204 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1623
diff changeset
205 void free_demuxer_stream(demux_stream_t *ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1623
diff changeset
206 void free_demuxer(demuxer_t *demuxer);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
207
62f483490686 sorry...
arpi_esp
parents:
diff changeset
208 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp);
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
209 void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t pos,int flags);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
210
62f483490686 sorry...
arpi_esp
parents:
diff changeset
211 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
212 int ds_fill_buffer(demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
213
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
214 inline static off_t ds_tell(demux_stream_t *ds){
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
215 return (ds->dpos-ds->buffer_size)+ds->buffer_pos;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
216 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
217
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
218 inline static int ds_tell_pts(demux_stream_t *ds){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
219 return (ds->pts_bytes-ds->buffer_size)+ds->buffer_pos;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
220 }
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
221
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
222 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len);
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
223 int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
224
62f483490686 sorry...
arpi_esp
parents:
diff changeset
225 #if 1
62f483490686 sorry...
arpi_esp
parents:
diff changeset
226 #define demux_getc(ds) (\
62f483490686 sorry...
arpi_esp
parents:
diff changeset
227 (ds->buffer_pos<ds->buffer_size) ? ds->buffer[ds->buffer_pos++] \
62f483490686 sorry...
arpi_esp
parents:
diff changeset
228 :((!ds_fill_buffer(ds))? (-1) : ds->buffer[ds->buffer_pos++] ) )
62f483490686 sorry...
arpi_esp
parents:
diff changeset
229 #else
62f483490686 sorry...
arpi_esp
parents:
diff changeset
230 inline static int demux_getc(demux_stream_t *ds){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
231 if(ds->buffer_pos>=ds->buffer_size){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
232 if(!ds_fill_buffer(ds)){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
233 // printf("DEMUX_GETC: EOF reached!\n");
62f483490686 sorry...
arpi_esp
parents:
diff changeset
234 return -1; // EOF
62f483490686 sorry...
arpi_esp
parents:
diff changeset
235 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
236 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
237 // printf("[%02X]",ds->buffer[ds->buffer_pos]);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
238 return ds->buffer[ds->buffer_pos++];
62f483490686 sorry...
arpi_esp
parents:
diff changeset
239 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
240 #endif
62f483490686 sorry...
arpi_esp
parents:
diff changeset
241
62f483490686 sorry...
arpi_esp
parents:
diff changeset
242 void ds_free_packs(demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
243 int ds_get_packet(demux_stream_t *ds,unsigned char **start);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
244 int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start);
5930
68cac7ecaf05 Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents: 5469
diff changeset
245 float ds_get_next_pts(demux_stream_t *ds);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
246
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4933
diff changeset
247 // 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
248 stream_t* new_ds_stream(demux_stream_t *ds);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
249
62f483490686 sorry...
arpi_esp
parents:
diff changeset
250 static inline int avi_stream_id(unsigned int id){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
251 unsigned char *p=(unsigned char *)&id;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
252 unsigned char a,b;
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
253 #if WORDS_BIGENDIAN
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
254 a=p[3]-'0'; b=p[2]-'0';
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
255 #else
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
256 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
257 #endif
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
258 if(a>9 || b>9) return 100; // invalid ID
62f483490686 sorry...
arpi_esp
parents:
diff changeset
259 return a*10+b;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
260 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
261
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
262 demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid,char* filename);
1496
8c3e93ef116d cleanup...
arpi
parents: 1490
diff changeset
263 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags);
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
264 demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
265
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
266 // AVI demuxer params:
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
267 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
268 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
269 extern int force_ni;
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
270 extern int pts_from_bps;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
271
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
272 extern int extension_parsing;
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
273
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
274 int demux_info_add(demuxer_t *demuxer, char *opt, char *param);
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
275 char* demux_info_get(demuxer_t *demuxer, char *opt);
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
276 int demux_info_print(demuxer_t *demuxer);
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
277 int demux_control(demuxer_t *demuxer, int cmd, void *arg);
4933
429994672d8c 're-include' possibility
nick
parents: 4783
diff changeset
278
429994672d8c 're-include' possibility
nick
parents: 4783
diff changeset
279 #endif
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
280
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
281 extern unsigned long demuxer_get_time_length(demuxer_t *demuxer);
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
282 extern int demuxer_get_percent_pos(demuxer_t *demuxer);
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
283
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
284 extern int demuxer_type_by_filename(char* filename);