annotate libmpdemux/demuxer.h @ 8763:19e96e60a3d0

Speed optimizations (runs twise as fast) and bugfix (wrong cutoff frequency buffer over run noise and garbeled output when wrong input format)
author anders
date Sat, 04 Jan 2003 06:19:25 +0000
parents 9d143176d95f
children d00997f12257
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
7382
89cbab549659 added smjpeg demuxer only for nexus' request
alex
parents: 7364
diff changeset
37
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
38 // 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
39 // 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
40 #define DEMUXER_TYPE_MIN 0
7364
b2445802532c .PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents: 6925
diff changeset
41 #define DEMUXER_TYPE_MAX 23
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
42
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
43 #define DEMUXER_TYPE_DEMUXERS (1<<16)
4783
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
44 // A virtual demuxer type for the network code
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
45 #define DEMUXER_TYPE_PLAYLIST (2<<16)
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
46
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
47
62f483490686 sorry...
arpi_esp
parents:
diff changeset
48 #define DEMUXER_TIME_NONE 0
62f483490686 sorry...
arpi_esp
parents:
diff changeset
49 #define DEMUXER_TIME_PTS 1
62f483490686 sorry...
arpi_esp
parents:
diff changeset
50 #define DEMUXER_TIME_FILE 2
62f483490686 sorry...
arpi_esp
parents:
diff changeset
51 #define DEMUXER_TIME_BPS 3
62f483490686 sorry...
arpi_esp
parents:
diff changeset
52
62f483490686 sorry...
arpi_esp
parents:
diff changeset
53
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
54 // DEMUXER control commands/answers
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
55 #define DEMUXER_CTRL_NOTIMPL -1
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
56 #define DEMUXER_CTRL_DONTKNOW 0
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
57 #define DEMUXER_CTRL_OK 1
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
58 #define DEMUXER_CTRL_GUESS 2
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
59 #define DEMUXER_CTRL_GET_TIME_LENGTH 10
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
60 #define DEMUXER_CTRL_GET_PERCENT_POS 11
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
61
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
62 // Holds one packet/frame/whatever
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
63 typedef struct demux_packet_st {
62f483490686 sorry...
arpi_esp
parents:
diff changeset
64 int len;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
65 float pts;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
66 off_t pos; // position in index (AVI) or file (MPG)
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
67 unsigned char* buffer;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
68 int flags; // keyframe, etc
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
69 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
70 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
71 struct demux_packet_st* next;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
72 } demux_packet_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
73
62f483490686 sorry...
arpi_esp
parents:
diff changeset
74 typedef struct {
62f483490686 sorry...
arpi_esp
parents:
diff changeset
75 int buffer_pos; // current buffer position
62f483490686 sorry...
arpi_esp
parents:
diff changeset
76 int buffer_size; // current buffer size
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
77 unsigned char* buffer; // current buffer, never free() it, always use free_demux_packet(buffer_ref);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
78 float pts; // current buffer's pts
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
79 int pts_bytes; // number of bytes read after last pts stamp
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
80 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
81 off_t pos; // position in the input stream (file)
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
82 off_t dpos; // position in the demuxed stream
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 746
diff changeset
83 int pack_no; // serial number of packet
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
84 int flags; // flags of current packet (keyframe etc)
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
85 //---------------
62f483490686 sorry...
arpi_esp
parents:
diff changeset
86 int packs; // number of packets in buffer
62f483490686 sorry...
arpi_esp
parents:
diff changeset
87 int bytes; // total bytes of packets in buffer
62f483490686 sorry...
arpi_esp
parents:
diff changeset
88 demux_packet_t *first; // read to current buffer from here
62f483490686 sorry...
arpi_esp
parents:
diff changeset
89 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
90 demux_packet_t *current;// needed for refcounting of the buffer
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
91 int id; // stream ID (for multiple audio/video streams)
62f483490686 sorry...
arpi_esp
parents:
diff changeset
92 struct demuxer_st *demuxer; // parent demuxer structure (stream handler)
62f483490686 sorry...
arpi_esp
parents:
diff changeset
93 // ---- asf -----
62f483490686 sorry...
arpi_esp
parents:
diff changeset
94 demux_packet_t *asf_packet; // read asf fragments here
62f483490686 sorry...
arpi_esp
parents:
diff changeset
95 int asf_seq;
2419
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2310
diff changeset
96 // ---- mov -----
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2310
diff changeset
97 unsigned int ss_mul,ss_div;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
98 // ---- stream header ----
62f483490686 sorry...
arpi_esp
parents:
diff changeset
99 void* sh;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
100 } demux_stream_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
101
3050
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
102 typedef struct demuxer_info_st {
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
103 char *name;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
104 char *author;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
105 char *encoder;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
106 char *comments;
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
107 char *copyright;
3050
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
108 } demuxer_info_t;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
109
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
110 #define MAX_A_STREAMS 256
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
111 #define MAX_V_STREAMS 256
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
112
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
113 typedef struct demuxer_st {
6224
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
114 off_t filepos; // input stream current pos.
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
115 off_t movi_start;
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
116 off_t movi_end;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
117 stream_t *stream;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
118 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
119 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
120 int file_format; // file format: mpeg/avi/asf
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1496
diff changeset
121 int seekable; // flag
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
122 //
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
123 demux_stream_t *audio; // audio buffer/demuxer
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
124 demux_stream_t *video; // video buffer/demuxer
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
125 demux_stream_t *sub; // dvd subtitle buffer/demuxer
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
126
62f483490686 sorry...
arpi_esp
parents:
diff changeset
127 // stream headers:
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
128 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
129 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
130 char s_streams[32]; // dvd subtitles (flag)
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
131
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
132 void* priv; // fileformat-dependent data
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4642
diff changeset
133 char** info;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
134 } demuxer_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
135
62f483490686 sorry...
arpi_esp
parents:
diff changeset
136 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
137 demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t));
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
138 dp->len=len;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
139 dp->next=NULL;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
140 dp->pts=0;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
141 dp->pos=0;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
142 dp->flags=0;
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
143 dp->refcount=1;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
144 dp->master=NULL;
7776
75c5762e7b55 fill the extra bytes with zero
arpi
parents: 7748
diff changeset
145 dp->buffer=len?(unsigned char*)malloc(len+8):NULL;
75c5762e7b55 fill the extra bytes with zero
arpi
parents: 7748
diff changeset
146 if(len) memset(dp->buffer+len,0,8);
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
147 return dp;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
148 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
149
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
150 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
151 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
152 while(pack->master) pack=pack->master; // find the master
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
153 memcpy(dp,pack,sizeof(demux_packet_t));
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
154 dp->next=NULL;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
155 dp->refcount=0;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
156 dp->master=pack;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
157 pack->refcount++;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
158 return dp;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
159 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
160
62f483490686 sorry...
arpi_esp
parents:
diff changeset
161 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
162 if (dp->master==NULL){ //dp is a master packet
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
163 dp->refcount--;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
164 if (dp->refcount==0){
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
165 if (dp->buffer) free(dp->buffer);
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
166 free(dp);
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
167 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
168 return;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
169 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
170 // dp is a clone:
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
171 free_demux_packet(dp->master);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
172 free(dp);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
173 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
174
62f483490686 sorry...
arpi_esp
parents:
diff changeset
175 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
176 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
177 void free_demuxer_stream(demux_stream_t *ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1623
diff changeset
178 void free_demuxer(demuxer_t *demuxer);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
179
62f483490686 sorry...
arpi_esp
parents:
diff changeset
180 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
181 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
182
62f483490686 sorry...
arpi_esp
parents:
diff changeset
183 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
184 int ds_fill_buffer(demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
185
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
186 inline static off_t ds_tell(demux_stream_t *ds){
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
187 return (ds->dpos-ds->buffer_size)+ds->buffer_pos;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
188 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
189
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
190 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
191 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
192 }
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
193
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
194 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
195 int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
196
62f483490686 sorry...
arpi_esp
parents:
diff changeset
197 #if 1
62f483490686 sorry...
arpi_esp
parents:
diff changeset
198 #define demux_getc(ds) (\
62f483490686 sorry...
arpi_esp
parents:
diff changeset
199 (ds->buffer_pos<ds->buffer_size) ? ds->buffer[ds->buffer_pos++] \
62f483490686 sorry...
arpi_esp
parents:
diff changeset
200 :((!ds_fill_buffer(ds))? (-1) : ds->buffer[ds->buffer_pos++] ) )
62f483490686 sorry...
arpi_esp
parents:
diff changeset
201 #else
62f483490686 sorry...
arpi_esp
parents:
diff changeset
202 inline static int demux_getc(demux_stream_t *ds){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
203 if(ds->buffer_pos>=ds->buffer_size){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
204 if(!ds_fill_buffer(ds)){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
205 // printf("DEMUX_GETC: EOF reached!\n");
62f483490686 sorry...
arpi_esp
parents:
diff changeset
206 return -1; // EOF
62f483490686 sorry...
arpi_esp
parents:
diff changeset
207 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
208 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
209 // printf("[%02X]",ds->buffer[ds->buffer_pos]);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
210 return ds->buffer[ds->buffer_pos++];
62f483490686 sorry...
arpi_esp
parents:
diff changeset
211 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
212 #endif
62f483490686 sorry...
arpi_esp
parents:
diff changeset
213
62f483490686 sorry...
arpi_esp
parents:
diff changeset
214 void ds_free_packs(demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
215 int ds_get_packet(demux_stream_t *ds,unsigned char **start);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
216 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
217 float ds_get_next_pts(demux_stream_t *ds);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
218
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4933
diff changeset
219 // 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
220 stream_t* new_ds_stream(demux_stream_t *ds);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
221
62f483490686 sorry...
arpi_esp
parents:
diff changeset
222 static inline int avi_stream_id(unsigned int id){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
223 unsigned char *p=(unsigned char *)&id;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
224 unsigned char a,b;
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
225 #if WORDS_BIGENDIAN
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
226 a=p[3]-'0'; b=p[2]-'0';
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
227 #else
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
228 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
229 #endif
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
230 if(a>9 || b>9) return 100; // invalid ID
62f483490686 sorry...
arpi_esp
parents:
diff changeset
231 return a*10+b;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
232 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
233
1496
8c3e93ef116d cleanup...
arpi
parents: 1490
diff changeset
234 demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid);
8c3e93ef116d cleanup...
arpi
parents: 1490
diff changeset
235 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
236 demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
237
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
238 // AVI demuxer params:
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
239 extern int index_mode; // -1=untouched 0=don't use index 1=use (geneate) index
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
240 extern int force_ni;
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
241 extern int pts_from_bps;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
242
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
243 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
244 char* demux_info_get(demuxer_t *demuxer, char *opt);
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
245 int demux_info_print(demuxer_t *demuxer);
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
246 int demux_control(demuxer_t *demuxer, int cmd, void *arg);
4933
429994672d8c 're-include' possibility
nick
parents: 4783
diff changeset
247
429994672d8c 're-include' possibility
nick
parents: 4783
diff changeset
248 #endif
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
249
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
250 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
251 extern int demuxer_get_percent_pos(demuxer_t *demuxer);