annotate libmpdemux/demuxer.h @ 27370:14c5017f40d2

Change a bunch of video/audio-output-specific preprocessor directives from a HAVE_ prefix to a CONFIG_ prefix.
author diego
date Sun, 03 Aug 2008 15:21:40 +0000
parents 40057010b1fa
children bfebea06911d
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25956
diff changeset
1 #ifndef MPLAYER_DEMUXER_H
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25956
diff changeset
2 #define MPLAYER_DEMUXER_H
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
3
27063
290ba4821dda Add missing #includes that are required for things used in the header.
diego
parents: 26926
diff changeset
4 #include <sys/types.h>
26143
268ecf0e1ba4 Add missing header #includes to fix 'make checkheaders'.
diego
parents: 26086
diff changeset
5 #include <stdint.h>
268ecf0e1ba4 Add missing header #includes to fix 'make checkheaders'.
diego
parents: 26086
diff changeset
6 #include <stdlib.h>
268ecf0e1ba4 Add missing header #includes to fix 'make checkheaders'.
diego
parents: 26086
diff changeset
7 #include <string.h>
268ecf0e1ba4 Add missing header #includes to fix 'make checkheaders'.
diego
parents: 26086
diff changeset
8
268ecf0e1ba4 Add missing header #includes to fix 'make checkheaders'.
diego
parents: 26086
diff changeset
9 #include "stream/stream.h"
27341
e7c989f7a7c9 Start unifying names of internal preprocessor directives.
diego
parents: 27282
diff changeset
10 #ifdef CONFIG_ASS
18937
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
11 #include "libass/ass_types.h"
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
12 #endif
9e95ac641e77 Initial libass release (without mencoder support).
eugeni
parents: 18934
diff changeset
13
647
feffffff5d0e demux buffer increased 4m->8m
arpi_esp
parents: 589
diff changeset
14 #define MAX_PACKS 4096
27370
14c5017f40d2 Change a bunch of video/audio-output-specific preprocessor directives from
diego
parents: 27363
diff changeset
15 #ifdef CONFIG_TV_BSDBT848
5369
2d678eeb3d42 incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents: 5214
diff changeset
16 #define MAX_PACK_BYTES 0x2000000
2d678eeb3d42 incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents: 5214
diff changeset
17 #else
647
feffffff5d0e demux buffer increased 4m->8m
arpi_esp
parents: 589
diff changeset
18 #define MAX_PACK_BYTES 0x800000
5369
2d678eeb3d42 incremented PACK_BYTES for BSDBT848 - by Charles Henrich
alex
parents: 5214
diff changeset
19 #endif
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
20
62f483490686 sorry...
arpi_esp
parents:
diff changeset
21 #define DEMUXER_TYPE_UNKNOWN 0
62f483490686 sorry...
arpi_esp
parents:
diff changeset
22 #define DEMUXER_TYPE_MPEG_ES 1
62f483490686 sorry...
arpi_esp
parents:
diff changeset
23 #define DEMUXER_TYPE_MPEG_PS 2
62f483490686 sorry...
arpi_esp
parents:
diff changeset
24 #define DEMUXER_TYPE_AVI 3
62f483490686 sorry...
arpi_esp
parents:
diff changeset
25 #define DEMUXER_TYPE_AVI_NI 4
62f483490686 sorry...
arpi_esp
parents:
diff changeset
26 #define DEMUXER_TYPE_AVI_NINI 5
62f483490686 sorry...
arpi_esp
parents:
diff changeset
27 #define DEMUXER_TYPE_ASF 6
1490
71424eb2b282 MOV file support - not works yet
arpi
parents: 1485
diff changeset
28 #define DEMUXER_TYPE_MOV 7
2687
8c75a9a639c1 vivo demuxer
arpi
parents: 2555
diff changeset
29 #define DEMUXER_TYPE_VIVO 8
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
30 #define DEMUXER_TYPE_TV 9
3101
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3071
diff changeset
31 #define DEMUXER_TYPE_FLI 10
3777
026ccd3dc489 added real demuxer
alex
parents: 3101
diff changeset
32 #define DEMUXER_TYPE_REAL 11
3786
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
33 #define DEMUXER_TYPE_Y4M 12
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
34 #define DEMUXER_TYPE_NUV 13
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 3801
diff changeset
35 #define DEMUXER_TYPE_FILM 14
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4189
diff changeset
36 #define DEMUXER_TYPE_ROQ 15
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
37 #define DEMUXER_TYPE_MF 16
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4642
diff changeset
38 #define DEMUXER_TYPE_AUDIO 17
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4933
diff changeset
39 #define DEMUXER_TYPE_OGG 18
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents: 6224
diff changeset
40 #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
41 #define DEMUXER_TYPE_RTP 21
6925
cc46462d0015 raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents: 6910
diff changeset
42 #define DEMUXER_TYPE_RAWDV 22
7364
b2445802532c .PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents: 6925
diff changeset
43 #define DEMUXER_TYPE_PVA 23
7382
89cbab549659 added smjpeg demuxer only for nexus' request
alex
parents: 7364
diff changeset
44 #define DEMUXER_TYPE_SMJPEG 24
8528
9d143176d95f XMMS Input plugin support
arpi
parents: 8208
diff changeset
45 #define DEMUXER_TYPE_XMMS 25
9065
59805b2d220a raw video demuxer, requested by Michael
arpi
parents: 9006
diff changeset
46 #define DEMUXER_TYPE_RAWVIDEO 26
9069
0d2b25a821c9 raw mpeg4-es support (you need to set -fps manually!)
arpi
parents: 9065
diff changeset
47 #define DEMUXER_TYPE_MPEG4_ES 27
9129
6ecc0b5c08cb libgif/libungif based demuxer support for libmpdemux.
arpi
parents: 9069
diff changeset
48 #define DEMUXER_TYPE_GIF 28
9610
76c6d8f1ebf5 this is a combo patch that:
arpi
parents: 9129
diff changeset
49 #define DEMUXER_TYPE_MPEG_TS 29
9824
39b68c2664ec H264-ES demuxer
michael
parents: 9610
diff changeset
50 #define DEMUXER_TYPE_H264_ES 30
10024
c6fab860ab18 Added Matroska demuxing support.
mosu
parents: 9824
diff changeset
51 #define DEMUXER_TYPE_MATROSKA 31
10033
4ecb40d73e24 Add support for Realaudio files
rtognimp
parents: 10024
diff changeset
52 #define DEMUXER_TYPE_REALAUDIO 32
10263
0df8816f4665 TiVo demuxer and sub-cc/osd decoder
arpi
parents: 10033
diff changeset
53 #define DEMUXER_TYPE_MPEG_TY 33
11590
0908285ada31 LML-M4 mpeg4 capture card raw stream format support
arpi
parents: 11234
diff changeset
54 #define DEMUXER_TYPE_LMLM4 34
12164
77ff303c0eaa demux_lavf
michael
parents: 11590
diff changeset
55 #define DEMUXER_TYPE_LAVF 35
12175
da8e39bfe121 nsv (Nullsoft streaming video) demuxer
rtognimp
parents: 12164
diff changeset
56 #define DEMUXER_TYPE_NSV 36
14276
fa80ed52127b TwinVQ decoder and demuxer
rtognimp
parents: 14160
diff changeset
57 #define DEMUXER_TYPE_VQF 37
14693
37116118ab6a avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents: 14276
diff changeset
58 #define DEMUXER_TYPE_AVS 38
15720
e999d58f94fd added AAC ADTS demuxer
nicodvb
parents: 15285
diff changeset
59 #define DEMUXER_TYPE_AAC 39
15958
087142ef3a2d musepack demuxing and decoding support (demuxing is v7 bitstream only).
reimar
parents: 15720
diff changeset
60 #define DEMUXER_TYPE_MPC 40
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
61 #define DEMUXER_TYPE_MPEG_PES 41
16310
fb95057e370e support MPEG in GXF container with extension-based detection.
reimar
parents: 16175
diff changeset
62 #define DEMUXER_TYPE_MPEG_GXF 42
19861
b251bca5820c Add demux_nut to MPlayer repo
ods15
parents: 19478
diff changeset
63 #define DEMUXER_TYPE_NUT 43
22971
a1b2fbb000fc Add lavf_preferred demuxer for lavf formats we want to be probed
reimar
parents: 22137
diff changeset
64 #define DEMUXER_TYPE_LAVF_PREFERRED 44
25266
239330301b33 Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents: 23689
diff changeset
65 #define DEMUXER_TYPE_RTP_NEMESI 45
7382
89cbab549659 added smjpeg demuxer only for nexus' request
alex
parents: 7364
diff changeset
66
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
67 // 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
68 // 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
69 #define DEMUXER_TYPE_MIN 0
25266
239330301b33 Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents: 23689
diff changeset
70 #define DEMUXER_TYPE_MAX 45
4765
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
71
d0c2c8af46b4 Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents: 4694
diff changeset
72 #define DEMUXER_TYPE_DEMUXERS (1<<16)
4783
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
73 // A virtual demuxer type for the network code
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
74 #define DEMUXER_TYPE_PLAYLIST (2<<16)
17f29765ea77 Support for retriving mp3 playlist from the network
albeu
parents: 4765
diff changeset
75
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
76
18241
b19dada1aeeb 3 - Move a definition of MP_NOPTS_VALUE from muxer.h to demuxer.h to
rtognimp
parents: 17636
diff changeset
77 #define MP_NOPTS_VALUE (-1LL<<63) //both int64_t and double should be able to represent this exactly
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
78
62f483490686 sorry...
arpi_esp
parents:
diff changeset
79
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
80 // DEMUXER control commands/answers
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
81 #define DEMUXER_CTRL_NOTIMPL -1
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
82 #define DEMUXER_CTRL_DONTKNOW 0
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
83 #define DEMUXER_CTRL_OK 1
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
84 #define DEMUXER_CTRL_GUESS 2
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
85 #define DEMUXER_CTRL_GET_TIME_LENGTH 10
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
86 #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
87 #define DEMUXER_CTRL_SWITCH_AUDIO 12
20747
d639a26d9141 added definition of DEMUXER_CTRL_RESYNC
nicodvb
parents: 19861
diff changeset
88 #define DEMUXER_CTRL_RESYNC 13
20948
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20876
diff changeset
89 #define DEMUXER_CTRL_SWITCH_VIDEO 14
21005
78d74a06b827 new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents: 20948
diff changeset
90 #define DEMUXER_CTRL_IDENTIFY_PROGRAM 15
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25883
diff changeset
91 #define DEMUXER_CTRL_CORRECT_PTS 16
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
92
25883
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25706
diff changeset
93 #define SEEK_ABSOLUTE (1 << 0)
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25706
diff changeset
94 #define SEEK_FACTOR (1 << 1)
baf32110d3fc Use defines to give names to the different seek flags.
reimar
parents: 25706
diff changeset
95
27282
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27269
diff changeset
96 #define MP_INPUT_BUFFER_PADDING_SIZE 8
27269
21e634c01f9f Move duplicate FF_INPUT_BUFFER_PADDING_SIZE handling into demuxer.h
reimar
parents: 27063
diff changeset
97
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
98 // Holds one packet/frame/whatever
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
99 typedef struct demux_packet_st {
62f483490686 sorry...
arpi_esp
parents:
diff changeset
100 int len;
18309
87161f96fa66 Change common pts variables from floats to doubles. Individual demuxers
uau
parents: 18242
diff changeset
101 double pts;
22137
3d415b28e5e4 Another round of subtitle code cleanup
reimar
parents: 21780
diff changeset
102 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
103 double stream_pts;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
104 off_t pos; // position in index (AVI) or file (MPG)
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
105 unsigned char* buffer;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
106 int flags; // keyframe, etc
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
107 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
108 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
109 struct demux_packet_st* next;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
110 } demux_packet_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
111
62f483490686 sorry...
arpi_esp
parents:
diff changeset
112 typedef struct {
62f483490686 sorry...
arpi_esp
parents:
diff changeset
113 int buffer_pos; // current buffer position
62f483490686 sorry...
arpi_esp
parents:
diff changeset
114 int buffer_size; // current buffer size
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
115 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
116 double pts; // current buffer's pts
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
117 int pts_bytes; // number of bytes read after last pts stamp
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
118 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
119 off_t pos; // position in the input stream (file)
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1375
diff changeset
120 off_t dpos; // position in the demuxed stream
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 746
diff changeset
121 int pack_no; // serial number of packet
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
122 int flags; // flags of current packet (keyframe etc)
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
123 //---------------
62f483490686 sorry...
arpi_esp
parents:
diff changeset
124 int packs; // number of packets in buffer
62f483490686 sorry...
arpi_esp
parents:
diff changeset
125 int bytes; // total bytes of packets in buffer
62f483490686 sorry...
arpi_esp
parents:
diff changeset
126 demux_packet_t *first; // read to current buffer from here
62f483490686 sorry...
arpi_esp
parents:
diff changeset
127 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
128 demux_packet_t *current;// needed for refcounting of the buffer
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
129 int id; // stream ID (for multiple audio/video streams)
62f483490686 sorry...
arpi_esp
parents:
diff changeset
130 struct demuxer_st *demuxer; // parent demuxer structure (stream handler)
62f483490686 sorry...
arpi_esp
parents:
diff changeset
131 // ---- asf -----
62f483490686 sorry...
arpi_esp
parents:
diff changeset
132 demux_packet_t *asf_packet; // read asf fragments here
62f483490686 sorry...
arpi_esp
parents:
diff changeset
133 int asf_seq;
2419
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2310
diff changeset
134 // ---- mov -----
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2310
diff changeset
135 unsigned int ss_mul,ss_div;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
136 // ---- stream header ----
62f483490686 sorry...
arpi_esp
parents:
diff changeset
137 void* sh;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
138 } demux_stream_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
139
3050
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
140 typedef struct demuxer_info_st {
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
141 char *name;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
142 char *author;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
143 char *encoder;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
144 char *comments;
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
145 char *copyright;
3050
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
146 } demuxer_info_t;
9ed968c05954 added demuxer_info
alex
parents: 2790
diff changeset
147
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
148 #define MAX_A_STREAMS 256
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
149 #define MAX_V_STREAMS 256
20872
a8b42366e68a Make subtitle stream handling more similar to audio and video streams.
reimar
parents: 20749
diff changeset
150 #define MAX_S_STREAMS 32
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
151
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
152 struct demuxer_st;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
153
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18558
diff changeset
154 extern int correct_pts;
25919
382672c7480a Allow demuxers to choose a default value for correct_pts
reimar
parents: 25883
diff changeset
155 extern int user_correct_pts;
18917
d9a75b26da6c Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents: 18558
diff changeset
156
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
157 /**
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
158 * Demuxer description structure
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
159 */
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
160 typedef struct demuxers_desc_st {
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
161 const char *info; ///< What is it (long name and/or description)
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
162 const char *name; ///< Demuxer name, used with -demuxer switch
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
163 const char *shortdesc; ///< Description printed at demuxer detection
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
164 const char *author; ///< Demuxer author(s)
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
165 const char *comment; ///< Comment, printed with -demuxer help
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
166
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
167 int type; ///< DEMUXER_TYPE_xxx
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
168 int safe_check; ///< If 1 detection is safe and fast, do it before file extension check
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
169
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
170 /// Check if can demux the file, return DEMUXER_TYPE_xxx on success
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
171 int (*check_file)(struct demuxer_st *demuxer); ///< Mandatory if safe_check == 1, else optional
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
172 /// Get packets from file, return 0 on eof
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
173 int (*fill_buffer)(struct demuxer_st *demuxer, demux_stream_t *ds); ///< Mandatory
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
174 /// Open the demuxer, return demuxer on success, NULL on failure
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
175 struct demuxer_st* (*open)(struct demuxer_st *demuxer); ///< Optional
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
176 /// Close the demuxer
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
177 void (*close)(struct demuxer_st *demuxer); ///< Optional
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
178 // Seek
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17611
diff changeset
179 void (*seek)(struct demuxer_st *demuxer, float rel_seek_secs, float audio_delay, int flags); ///< Optional
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
180 // Control
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
181 int (*control)(struct demuxer_st *demuxer, int cmd, void *arg); ///< Optional
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
182 } demuxer_desc_t;
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
183
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
184 typedef struct demux_chapter_s
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
185 {
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
186 uint64_t start, end;
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
187 char* name;
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
188 } demux_chapter_t;
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
189
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
190 typedef struct demux_attachment_s
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
191 {
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
192 char* name;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
193 char* type;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
194 void* data;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
195 unsigned int data_size;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
196 } demux_attachment_t;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
197
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
198 typedef struct demuxer_st {
25706
f0d45f8866e8 First step towards making all demuxer_desc_t const
reimar
parents: 25657
diff changeset
199 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
200 off_t filepos; // input stream current pos.
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
201 off_t movi_start;
79b2b4c3c435 off_t fields reordered, to avoid problems due to struct padding
arpi
parents: 6192
diff changeset
202 off_t movi_end;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
203 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
204 double stream_pts; // current stream pts, if applicable (e.g. dvd)
26037
bee99864f397 New member in demuxer_t: reference_clock.
nicodvb
parents: 26029
diff changeset
205 double reference_clock;
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
206 char *filename; ///< Needed by avs_check_file
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
207 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
208 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
209 int file_format; // file format: mpeg/avi/asf
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1496
diff changeset
210 int seekable; // flag
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
211 //
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
212 demux_stream_t *audio; // audio buffer/demuxer
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
213 demux_stream_t *video; // video buffer/demuxer
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
214 demux_stream_t *sub; // dvd subtitle buffer/demuxer
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
215
62f483490686 sorry...
arpi_esp
parents:
diff changeset
216 // stream headers:
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4551
diff changeset
217 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
218 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
219 void *s_streams[MAX_S_STREAMS]; // dvd subtitles (flag)
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
220
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
221 demux_chapter_t* chapters;
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
222 int num_chapters;
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
223
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
224 demux_attachment_t* attachments;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
225 int num_attachments;
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
226
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1428
diff changeset
227 void* priv; // fileformat-dependent data
4694
a21735031d6a Audio file demuxer. Extended version for demuxer info.
albeu
parents: 4642
diff changeset
228 char** info;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
229 } demuxer_t;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
230
21005
78d74a06b827 new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents: 20948
diff changeset
231 typedef struct {
78d74a06b827 new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents: 20948
diff changeset
232 int progid; //program id
78d74a06b827 new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents: 20948
diff changeset
233 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
234 } demux_program_t;
78d74a06b827 new DEMUXER_CTRL_IDENTIFY_PROGRAM to identify programs (a+v+s)
nicodvb
parents: 20948
diff changeset
235
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
236 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
237 demux_packet_t* dp=(demux_packet_t*)malloc(sizeof(demux_packet_t));
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
238 dp->len=len;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
239 dp->next=NULL;
25956
7e4a2ab8b61c Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.
reimar
parents: 25919
diff changeset
240 dp->pts=MP_NOPTS_VALUE;
22137
3d415b28e5e4 Another round of subtitle code cleanup
reimar
parents: 21780
diff changeset
241 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
242 dp->stream_pts = MP_NOPTS_VALUE;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
243 dp->pos=0;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
244 dp->flags=0;
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
245 dp->refcount=1;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
246 dp->master=NULL;
17611
831762e82a47 do not forget to initialize dp->buffer
henry
parents: 17599
diff changeset
247 dp->buffer=NULL;
27282
16beae919ff1 Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents: 27269
diff changeset
248 if (len > 0 && (dp->buffer = (unsigned char *)malloc(len + MP_INPUT_BUFFER_PADDING_SIZE)))
17597
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
249 memset(dp->buffer + len, 0, 8);
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
250 else
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
251 dp->len = 0;
6192
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
252 return dp;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
253 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
254
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
255 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
256 {
17597
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
257 if(len > 0)
10687
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
258 {
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
259 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
260 }
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
261 else
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
262 {
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
263 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
264 dp->buffer=NULL;
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
265 }
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
266 dp->len=len;
17597
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
267 if (dp->buffer)
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
268 memset(dp->buffer + len, 0, 8);
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
269 else
a3a4f7408f90 add some sanity checks to new/resize_demux_packet
reimar
parents: 17569
diff changeset
270 dp->len = 0;
10687
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
271 }
f8d6f7d59ceb - initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents: 10263
diff changeset
272
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
273 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
274 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
275 while(pack->master) pack=pack->master; // find the master
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
276 memcpy(dp,pack,sizeof(demux_packet_t));
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
277 dp->next=NULL;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
278 dp->refcount=0;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
279 dp->master=pack;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
280 pack->refcount++;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
281 return dp;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
282 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
283
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
284 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
285 if (dp->master==NULL){ //dp is a master packet
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
286 dp->refcount--;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
287 if (dp->refcount==0){
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
288 if (dp->buffer) free(dp->buffer);
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
289 free(dp);
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
290 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
291 return;
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
292 }
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
293 // dp is a clone:
f03fe2e84efd clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents: 5930
diff changeset
294 free_demux_packet(dp->master);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
295 free(dp);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
296 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
297
18558
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
298 #ifndef SIZE_MAX
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
299 #define SIZE_MAX ((size_t)-1)
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
300 #endif
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
301
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
302 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
303 if (nmemb > SIZE_MAX / size) {
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
304 free(ptr);
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
305 return NULL;
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
306 }
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
307 return realloc(ptr, nmemb * size);
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
308 }
4928dd61f136 Fix potential integer overflows in memory allocation.
rtogni
parents: 18309
diff changeset
309
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
310 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
311 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1623
diff changeset
312 void free_demuxer_stream(demux_stream_t *ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1623
diff changeset
313 void free_demuxer(demuxer_t *demuxer);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
314
62f483490686 sorry...
arpi_esp
parents:
diff changeset
315 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
316 void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len, double pts, off_t pos, int flags);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
317
62f483490686 sorry...
arpi_esp
parents:
diff changeset
318 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
319 int ds_fill_buffer(demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
320
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
321 static inline off_t ds_tell(demux_stream_t *ds){
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
322 return (ds->dpos-ds->buffer_size)+ds->buffer_pos;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
323 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
324
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
325 static inline int ds_tell_pts(demux_stream_t *ds){
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
326 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
327 }
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 647
diff changeset
328
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
329 int demux_read_data(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
330 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
331 int *read, uint32_t pattern);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
332
16504
aa2b250ba16b add a demux_peekc function that allows to just "have a look" at the next
reimar
parents: 16369
diff changeset
333 #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
334 (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
335 :((unlikely(!ds_fill_buffer(ds)))? (-1) : ds->buffer[ds->buffer_pos] ) )
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
336 #if 1
62f483490686 sorry...
arpi_esp
parents:
diff changeset
337 #define demux_getc(ds) (\
16369
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
338 (likely(ds->buffer_pos<ds->buffer_size)) ? ds->buffer[ds->buffer_pos++] \
8ea2e7ab3106 faster mpg and much faster gxf demuxing
reimar
parents: 16346
diff changeset
339 :((unlikely(!ds_fill_buffer(ds)))? (-1) : ds->buffer[ds->buffer_pos++] ) )
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
340 #else
23443
051d5ffee36a Use 'static inline' instead of 'inline static' to avoid warnings
zuxy
parents: 23433
diff changeset
341 static inline int demux_getc(demux_stream_t *ds){
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
342 if(ds->buffer_pos>=ds->buffer_size){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
343 if(!ds_fill_buffer(ds)){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
344 // printf("DEMUX_GETC: EOF reached!\n");
62f483490686 sorry...
arpi_esp
parents:
diff changeset
345 return -1; // EOF
62f483490686 sorry...
arpi_esp
parents:
diff changeset
346 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
347 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
348 // printf("[%02X]",ds->buffer[ds->buffer_pos]);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
349 return ds->buffer[ds->buffer_pos++];
62f483490686 sorry...
arpi_esp
parents:
diff changeset
350 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
351 #endif
62f483490686 sorry...
arpi_esp
parents:
diff changeset
352
62f483490686 sorry...
arpi_esp
parents:
diff changeset
353 void ds_free_packs(demux_stream_t *ds);
62f483490686 sorry...
arpi_esp
parents:
diff changeset
354 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
355 int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
356 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
357 double ds_get_next_pts(demux_stream_t *ds);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
358
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4933
diff changeset
359 // 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
360 stream_t* new_ds_stream(demux_stream_t *ds);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
361
62f483490686 sorry...
arpi_esp
parents:
diff changeset
362 static inline int avi_stream_id(unsigned int id){
62f483490686 sorry...
arpi_esp
parents:
diff changeset
363 unsigned char *p=(unsigned char *)&id;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
364 unsigned char a,b;
1309
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
365 #if WORDS_BIGENDIAN
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
366 a=p[3]-'0'; b=p[2]-'0';
598e3047ce13 Add some preliminary support for non-x86 architectures to mplayer
jkeil
parents: 979
diff changeset
367 #else
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
368 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
369 #endif
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
370 if(a>9 || b>9) return 100; // invalid ID
62f483490686 sorry...
arpi_esp
parents:
diff changeset
371 return a*10+b;
62f483490686 sorry...
arpi_esp
parents:
diff changeset
372 }
62f483490686 sorry...
arpi_esp
parents:
diff changeset
373
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
374 demuxer_t* demux_open(stream_t *stream,int file_format,int aid,int vid,int sid,char* filename);
26926
1e6241274552 added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents: 26369
diff changeset
375 void demux_flush(demuxer_t *demuxer);
17636
b849a99cdc3c Second-try commit of this patch.
corey
parents: 17611
diff changeset
376 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
377 demuxer_t* new_demuxers_demuxer(demuxer_t* vd, demuxer_t* ad, demuxer_t* sd);
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
378
2555
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
379 // AVI demuxer params:
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
380 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
381 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
382 extern int force_ni;
66837325b929 config.h cleanup, few things added to steram/demuxer headers
arpi
parents: 2419
diff changeset
383 extern int pts_from_bps;
589
62f483490686 sorry...
arpi_esp
parents:
diff changeset
384
9006
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
385 extern int extension_parsing;
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
386
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
387 int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param);
23611
ecbb54f8d299 make opt argument of demux_info_get const.
reimar
parents: 23571
diff changeset
388 char* demux_info_get(demuxer_t *demuxer, const char *opt);
3071
a5f378f982cc added demux_info
alex
parents: 3050
diff changeset
389 int demux_info_print(demuxer_t *demuxer);
8208
ae5a2ae1c349 demuxer_control(), percent position and time length query implemented in
arpi
parents: 8030
diff changeset
390 int demux_control(demuxer_t *demuxer, int cmd, void *arg);
4933
429994672d8c 're-include' possibility
nick
parents: 4783
diff changeset
391
27363
40057010b1fa Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents: 27341
diff changeset
392 #ifdef CONFIG_OGGVORBIS
13127
957fc21fc10a Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents: 12175
diff changeset
393 /* Found in demux_ogg.c */
957fc21fc10a Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents: 12175
diff changeset
394 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
395 int demux_ogg_sub_id(demuxer_t *demuxer, int index);
957fc21fc10a Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents: 12175
diff changeset
396 #endif
957fc21fc10a Do not use globals. Put the variables into the appropriate demuxer struct instead.
mosu
parents: 12175
diff changeset
397
20749
eafd9953b505 added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents: 20747
diff changeset
398 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
399 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
400 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
401 extern int demuxer_switch_audio(demuxer_t *demuxer, int index);
20948
7c91b80cabc1 added code to switch video stream
nicodvb
parents: 20876
diff changeset
402 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
403
d00997f12257 extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents: 8528
diff changeset
404 extern int demuxer_type_by_filename(char* filename);
16175
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
405
6b86089c2edd Demuxer modularization
rtognimp
parents: 15958
diff changeset
406 extern void demuxer_help(void);
16321
efbfac98cab1 Allow forcing of demuxers and codecs by prepending '+'
reimar
parents: 16310
diff changeset
407 extern int get_demuxer_type_from_name(char *demuxer_name, int *force);
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
408
25657
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
409 int demuxer_add_attachment(demuxer_t* demuxer, const char* name,
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
410 const char* type, const void* data, size_t size);
dfeb8ea2a7a8 Add demuxer interface for attachments.
eugeni
parents: 25575
diff changeset
411
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
412 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
413 int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, float *seek_pts, int *num_chapters, char **chapter_name);
19342
4e68a3881201 Add matroska chapter seeking capability.
eugeni
parents: 19053
diff changeset
414
25358
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
415 /// Get current chapter index if available.
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
416 int demuxer_get_current_chapter(demuxer_t *demuxer);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
417 /// Get chapter name by index if available.
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
418 char *demuxer_chapter_name(demuxer_t *demuxer, int chapter);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
419 /// Get chapter display name by index.
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
420 char *demuxer_chapter_display_name(demuxer_t *demuxer, int chapter);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
421 /// Get chapter start time and end time by index if available.
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
422 float demuxer_chapter_time(demuxer_t *demuxer, int chapter, float *end);
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
423 /// Get total chapter number.
89b3a18bfa66 Add demuxer functions for chapter feature.
ulion
parents: 25266
diff changeset
424 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
425 /// 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
426 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
427 /// 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
428 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
429 /// 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
430 int demuxer_angles_count(demuxer_t *demuxer);
23571
f3dd45afeaf7 Fix demuxer.h multiple inclusion guard
uau
parents: 23443
diff changeset
431
26086
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26084
diff changeset
432 // get the index of a track
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26084
diff changeset
433 // lang is a comma-separated list
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26084
diff changeset
434 int demuxer_audio_track_by_lang(demuxer_t* demuxer, char* lang);
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26084
diff changeset
435 int demuxer_sub_track_by_lang(demuxer_t* demuxer, char* lang);
c9a877daca42 Demuxer-independent functions for selecting tracks based on language.
eugeni
parents: 26084
diff changeset
436
26269
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26143
diff changeset
437 // find the default track
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26143
diff changeset
438 // for subtitles, it is the first track with default attribute
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26143
diff changeset
439 // for audio, additionally, the first track is selected if no track has default attribute set
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26143
diff changeset
440 int demuxer_default_audio_track(demuxer_t* d);
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26143
diff changeset
441 int demuxer_default_sub_track(demuxer_t* d);
65ad20416dd7 Support 'default' attribute for audio and subtitle tracks.
eugeni
parents: 26143
diff changeset
442
26029
4129c8cfa742 Add MPLAYER_ prefix to multiple inclusion guards.
diego
parents: 25956
diff changeset
443 #endif /* MPLAYER_DEMUXER_H */