Mercurial > mplayer.hg
annotate libmpdemux/demuxer.c @ 27499:1dfad1b382fa
libass: fix type mismatch between size parameter and the way it's used
author | aurel |
---|---|
date | Fri, 05 Sep 2008 22:59:01 +0000 |
parents | d47744b95b78 |
children | 4ac70bd6acac |
rev | line source |
---|---|
1 | 1 //=================== DEMUXER v2.5 ========================= |
2 | |
1430 | 3 #include <stdio.h> |
4 #include <stdlib.h> | |
3150 | 5 #include <string.h> |
1430 | 6 #include <unistd.h> |
7 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
8 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
9 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
10 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
11 #include "config.h" |
1567 | 12 #include "mp_msg.h" |
1584 | 13 #include "help_mp.h" |
17012 | 14 #include "m_config.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
15 |
17200
a1b8eeffdfcd
include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents:
17012
diff
changeset
|
16 #include "libvo/fastmemcpy.h" |
a1b8eeffdfcd
include fastmemcpy.h before stream.h, so it is used for the stream_read
reimar
parents:
17012
diff
changeset
|
17 |
22605
4d81dbdf46b9
Add explicit location for headers from the stream/ directory.
diego
parents:
22488
diff
changeset
|
18 #include "stream/stream.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
19 #include "demuxer.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
20 #include "stheader.h" |
4551 | 21 #include "mf.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
22 |
17012 | 23 #include "libaf/af_format.h" |
5084 | 24 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
25 #ifdef CONFIG_ASS |
25654
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
26 #include "libass/ass.h" |
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
27 #include "libass/ass_mp.h" |
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
28 #endif |
0190aa38aae2
Init and destroy ass_tracks in demuxer.c based on sh_sub->type value.
eugeni
parents:
25652
diff
changeset
|
29 |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
30 #ifdef CONFIG_LIBAVCODEC |
27282
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
31 #include "libavcodec/avcodec.h" |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
32 #if MP_INPUT_BUFFER_PADDING_SIZE < FF_INPUT_BUFFER_PADDING_SIZE |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
33 #error MP_INPUT_BUFFER_PADDING_SIZE is too small! |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
34 #endif |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
35 #endif |
16beae919ff1
Avoid including avcodec.h in demuxer.h (and thus many other files) just to get
reimar
parents:
27059
diff
changeset
|
36 |
22142
84f95595f31f
Fix a few gcc warnings, approved by Diego and Reimar.
rathann
parents:
21809
diff
changeset
|
37 extern void resync_video_stream(sh_video_t *sh_video); |
16877
9081ae3a702c
move resync_audio_stream after seeking to demuxer.c
reimar
parents:
16572
diff
changeset
|
38 extern void resync_audio_stream(sh_audio_t *sh_audio); |
16175 | 39 |
40 // Demuxer list | |
25707
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
41 extern const demuxer_desc_t demuxer_desc_rawaudio; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
42 extern const demuxer_desc_t demuxer_desc_rawvideo; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
43 extern const demuxer_desc_t demuxer_desc_tv; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
44 extern const demuxer_desc_t demuxer_desc_mf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
45 extern const demuxer_desc_t demuxer_desc_avi; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
46 extern const demuxer_desc_t demuxer_desc_y4m; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
47 extern const demuxer_desc_t demuxer_desc_asf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
48 extern const demuxer_desc_t demuxer_desc_nuv; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
49 extern const demuxer_desc_t demuxer_desc_real; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
50 extern const demuxer_desc_t demuxer_desc_smjpeg; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
51 extern const demuxer_desc_t demuxer_desc_matroska; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
52 extern const demuxer_desc_t demuxer_desc_realaudio; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
53 extern const demuxer_desc_t demuxer_desc_vqf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
54 extern const demuxer_desc_t demuxer_desc_mov; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
55 extern const demuxer_desc_t demuxer_desc_vivo; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
56 extern const demuxer_desc_t demuxer_desc_fli; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
57 extern const demuxer_desc_t demuxer_desc_film; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
58 extern const demuxer_desc_t demuxer_desc_roq; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
59 extern const demuxer_desc_t demuxer_desc_gif; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
60 extern const demuxer_desc_t demuxer_desc_ogg; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
61 extern const demuxer_desc_t demuxer_desc_avs; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
62 extern const demuxer_desc_t demuxer_desc_pva; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
63 extern const demuxer_desc_t demuxer_desc_nsv; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
64 extern const demuxer_desc_t demuxer_desc_mpeg_ts; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
65 extern const demuxer_desc_t demuxer_desc_lmlm4; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
66 extern const demuxer_desc_t demuxer_desc_mpeg_ps; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
67 extern const demuxer_desc_t demuxer_desc_mpeg_pes; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
68 extern const demuxer_desc_t demuxer_desc_mpeg_es; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
69 extern const demuxer_desc_t demuxer_desc_mpeg_gxf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
70 extern const demuxer_desc_t demuxer_desc_mpeg4_es; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
71 extern const demuxer_desc_t demuxer_desc_h264_es; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
72 extern const demuxer_desc_t demuxer_desc_rawdv; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
73 extern const demuxer_desc_t demuxer_desc_mpc; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
74 extern const demuxer_desc_t demuxer_desc_audio; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
75 extern const demuxer_desc_t demuxer_desc_xmms; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
76 extern const demuxer_desc_t demuxer_desc_mpeg_ty; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
77 extern const demuxer_desc_t demuxer_desc_rtp; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
78 extern const demuxer_desc_t demuxer_desc_rtp_nemesi; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
79 extern const demuxer_desc_t demuxer_desc_lavf; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
80 extern const demuxer_desc_t demuxer_desc_lavf_preferred; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
81 extern const demuxer_desc_t demuxer_desc_aac; |
d4fe6e23283e
Make all demuxer_desc_t const, thus moving them to .rodata
reimar
parents:
25706
diff
changeset
|
82 extern const demuxer_desc_t demuxer_desc_nut; |
16175 | 83 |
25876
edfe8baed49f
copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents:
25872
diff
changeset
|
84 /* Please do not add any new demuxers here. If you want to implement a new |
25880
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
85 * demuxer, add it to libavformat, except for wrappers around external |
4df11ac927fc
clarify comments/docs about lav* being the preferred place to implement new
ivo
parents:
25876
diff
changeset
|
86 * libraries and demuxers requiring binary support. */ |
25876
edfe8baed49f
copy note on new demuxers and codecs to the top of the array as well to be
ivo
parents:
25872
diff
changeset
|
87 |
27054 | 88 const demuxer_desc_t *const demuxer_list[] = { |
27055 | 89 &demuxer_desc_rawaudio, |
90 &demuxer_desc_rawvideo, | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
91 #ifdef CONFIG_TV |
27055 | 92 &demuxer_desc_tv, |
16175 | 93 #endif |
27055 | 94 &demuxer_desc_mf, |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
95 #ifdef CONFIG_LIBAVFORMAT |
27055 | 96 &demuxer_desc_lavf_preferred, |
23069
93948eb0280f
demuxer_desc_lavf_preferred depends on USE_LIBAVFORMAT or USE_LIBAVFORMAT_SO
nicodvb
parents:
22971
diff
changeset
|
97 #endif |
27055 | 98 &demuxer_desc_avi, |
99 &demuxer_desc_y4m, | |
100 &demuxer_desc_asf, | |
101 &demuxer_desc_nsv, | |
102 &demuxer_desc_nuv, | |
103 &demuxer_desc_real, | |
104 &demuxer_desc_smjpeg, | |
105 &demuxer_desc_matroska, | |
106 &demuxer_desc_realaudio, | |
107 &demuxer_desc_vqf, | |
108 &demuxer_desc_mov, | |
109 &demuxer_desc_vivo, | |
110 &demuxer_desc_fli, | |
111 &demuxer_desc_film, | |
112 &demuxer_desc_roq, | |
27385
2113bd9c6bd9
Rename preprocessor directives related to image libraries.
diego
parents:
27363
diff
changeset
|
113 #ifdef CONFIG_GIF |
27055 | 114 &demuxer_desc_gif, |
16175 | 115 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
116 #ifdef CONFIG_OGGVORBIS |
27055 | 117 &demuxer_desc_ogg, |
16175 | 118 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
119 #ifdef CONFIG_WIN32DLL |
27055 | 120 &demuxer_desc_avs, |
16175 | 121 #endif |
27055 | 122 &demuxer_desc_pva, |
123 &demuxer_desc_mpeg_ts, | |
124 &demuxer_desc_lmlm4, | |
125 &demuxer_desc_mpeg_ps, | |
126 &demuxer_desc_mpeg_pes, | |
127 &demuxer_desc_mpeg_es, | |
128 &demuxer_desc_mpeg_gxf, | |
129 &demuxer_desc_mpeg4_es, | |
130 &demuxer_desc_h264_es, | |
131 &demuxer_desc_audio, | |
132 &demuxer_desc_mpeg_ty, | |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27395
diff
changeset
|
133 #ifdef CONFIG_LIVE555 |
27055 | 134 &demuxer_desc_rtp, |
16175 | 135 #endif |
27397
d47744b95b78
Give a CONFIG_ prefix to preprocessor directives that lacked one and
diego
parents:
27395
diff
changeset
|
136 #ifdef CONFIG_LIBNEMESI |
27055 | 137 &demuxer_desc_rtp_nemesi, |
25266
239330301b33
Make libnemesi use specific struct and DEMUXER_TYPE
lu_zero
parents:
25197
diff
changeset
|
138 #endif |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
139 #ifdef CONFIG_LIBAVFORMAT |
27055 | 140 &demuxer_desc_lavf, |
16175 | 141 #endif |
27395 | 142 #ifdef CONFIG_MUSEPACK |
27055 | 143 &demuxer_desc_mpc, |
26873
a90971b955af
Move native musepack demuxer further down in demuxer list
reimar
parents:
26758
diff
changeset
|
144 #endif |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
145 #ifdef CONFIG_LIBDV095 |
27055 | 146 &demuxer_desc_rawdv, |
18900
0b53e6d1b27f
move some ill-behaving demuxers further down the list
reimar
parents:
18708
diff
changeset
|
147 #endif |
27055 | 148 &demuxer_desc_aac, |
27363
40057010b1fa
Change a bunch of codec-specific preprocessor directives from a HAVE_
diego
parents:
27341
diff
changeset
|
149 #ifdef CONFIG_LIBNUT |
27055 | 150 &demuxer_desc_nut, |
19861 | 151 #endif |
27391
1d2faa1020fb
Rename a bunch of miscellaneous preprocessor directives.
diego
parents:
27385
diff
changeset
|
152 #ifdef CONFIG_XMMS |
27055 | 153 &demuxer_desc_xmms, |
18900
0b53e6d1b27f
move some ill-behaving demuxers further down the list
reimar
parents:
18708
diff
changeset
|
154 #endif |
27055 | 155 /* Please do not add any new demuxers here. If you want to implement a new |
156 * demuxer, add it to libavformat, except for wrappers around external | |
157 * libraries and demuxers requiring binary support. */ | |
158 NULL | |
16175 | 159 }; |
160 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
161 void free_demuxer_stream(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
162 { |
1643 | 163 ds_free_packs(ds); |
164 free(ds); | |
165 } | |
166 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
167 demux_stream_t *new_demuxer_stream(struct demuxer_st *demuxer, int id) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
168 { |
27055 | 169 demux_stream_t *ds = malloc(sizeof(demux_stream_t)); |
170 ds->buffer_pos = ds->buffer_size = 0; | |
171 ds->buffer = NULL; | |
172 ds->pts = 0; | |
173 ds->pts_bytes = 0; | |
174 ds->eof = 0; | |
175 ds->pos = 0; | |
176 ds->dpos = 0; | |
177 ds->pack_no = 0; | |
27045 | 178 |
27055 | 179 ds->packs = 0; |
180 ds->bytes = 0; | |
181 ds->first = ds->last = ds->current = NULL; | |
182 ds->id = id; | |
183 ds->demuxer = demuxer; | |
27045 | 184 |
27055 | 185 ds->asf_seq = -1; |
186 ds->asf_packet = NULL; | |
27045 | 187 |
27055 | 188 ds->ss_mul = ds->ss_div = 0; |
27045 | 189 |
27055 | 190 ds->sh = NULL; |
191 return ds; | |
1 | 192 } |
193 | |
16175 | 194 |
195 /** | |
196 * Get demuxer description structure for a given demuxer type | |
197 * | |
198 * @param file_format type of the demuxer | |
199 * @return structure for the demuxer, NULL if not found | |
200 */ | |
27054 | 201 static const demuxer_desc_t *get_demuxer_desc_from_type(int file_format) |
16175 | 202 { |
27055 | 203 int i; |
16175 | 204 |
27055 | 205 for (i = 0; demuxer_list[i]; i++) |
206 if (file_format == demuxer_list[i]->type) | |
207 return demuxer_list[i]; | |
16175 | 208 |
27055 | 209 return NULL; |
16175 | 210 } |
211 | |
212 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
213 demuxer_t *new_demuxer(stream_t *stream, int type, int a_id, int v_id, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
214 int s_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
215 { |
27055 | 216 demuxer_t *d = malloc(sizeof(demuxer_t)); |
217 memset(d, 0, sizeof(demuxer_t)); | |
218 d->stream = stream; | |
219 d->stream_pts = MP_NOPTS_VALUE; | |
220 d->reference_clock = MP_NOPTS_VALUE; | |
221 d->movi_start = stream->start_pos; | |
222 d->movi_end = stream->end_pos; | |
223 d->seekable = 1; | |
224 d->synced = 0; | |
225 d->filepos = 0; | |
226 d->audio = new_demuxer_stream(d, a_id); | |
227 d->video = new_demuxer_stream(d, v_id); | |
228 d->sub = new_demuxer_stream(d, s_id); | |
229 d->type = type; | |
230 if (type) | |
231 if (!(d->desc = get_demuxer_desc_from_type(type))) | |
27056 | 232 mp_msg(MSGT_DEMUXER, MSGL_ERR, |
233 "BUG! Invalid demuxer type in new_demuxer(), " | |
234 "big troubles ahead."); | |
27055 | 235 if (filename) // Filename hack for avs_check_file |
236 d->filename = strdup(filename); | |
237 stream_reset(stream); | |
238 stream_seek(stream, stream->start_pos); | |
239 return d; | |
1 | 240 } |
241 | |
24022
4d576e0ed40b
When a new subtitle stream becomes available check if it is the one that
reimar
parents:
23865
diff
changeset
|
242 extern int dvdsub_id; |
4d576e0ed40b
When a new subtitle stream becomes available check if it is the one that
reimar
parents:
23865
diff
changeset
|
243 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
244 sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
245 { |
27055 | 246 if (id > MAX_S_STREAMS - 1 || id < 0) { |
27056 | 247 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
248 "Requested sub stream id overflow (%d > %d)\n", id, | |
249 MAX_S_STREAMS); | |
27055 | 250 return NULL; |
251 } | |
252 if (demuxer->s_streams[id]) | |
253 mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id); | |
254 else { | |
255 sh_sub_t *sh = calloc(1, sizeof(sh_sub_t)); | |
256 demuxer->s_streams[id] = sh; | |
257 sh->sid = sid; | |
258 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid); | |
259 } | |
260 return demuxer->s_streams[id]; | |
20872
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20851
diff
changeset
|
261 } |
a8b42366e68a
Make subtitle stream handling more similar to audio and video streams.
reimar
parents:
20851
diff
changeset
|
262 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
263 void free_sh_sub(sh_sub_t *sh) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
264 { |
23592 | 265 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_sub at %p\n", sh); |
26085 | 266 free(sh->extradata); |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
267 #ifdef CONFIG_ASS |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
268 if (sh->ass_track) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
269 ass_free_track(sh->ass_track); |
25702
c4275201a489
Add a forgotten #ifdef USE_ASS around ass_free_track
reimar
parents:
25657
diff
changeset
|
270 #endif |
26082 | 271 free(sh->lang); |
23592 | 272 free(sh); |
273 } | |
274 | |
27054 | 275 sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
276 { |
27055 | 277 if (id > MAX_A_STREAMS - 1 || id < 0) { |
27056 | 278 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
279 "Requested audio stream id overflow (%d > %d)\n", id, | |
280 MAX_A_STREAMS); | |
27052 | 281 return NULL; |
4642 | 282 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
283 if (demuxer->a_streams[id]) |
27055 | 284 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_AudioStreamRedefined, id); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
285 else { |
26874 | 286 sh_audio_t *sh = calloc(1, sizeof(sh_audio_t)); |
27055 | 287 mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundAudioStream, id); |
26874 | 288 demuxer->a_streams[id] = sh; |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
289 sh->aid = aid; |
26876 | 290 sh->ds = demuxer->audio; |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
291 // set some defaults |
27055 | 292 sh->samplesize = 2; |
293 sh->sample_format = AF_FORMAT_S16_NE; | |
294 sh->audio_out_minsize = 8192; /* default size, maybe not enough for Win32/ACM */ | |
295 sh->pts = MP_NOPTS_VALUE; | |
296 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid); | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
297 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
298 return demuxer->a_streams[id]; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
299 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
300 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
301 void free_sh_audio(demuxer_t *demuxer, int id) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
302 { |
18708
9e2b300db17b
Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents:
18404
diff
changeset
|
303 sh_audio_t *sh = demuxer->a_streams[id]; |
9e2b300db17b
Change free_sh_audio() to take demuxer and stream id as parameters
uau
parents:
18404
diff
changeset
|
304 demuxer->a_streams[id] = NULL; |
27055 | 305 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_audio at %p\n", sh); |
26085 | 306 free(sh->wf); |
307 free(sh->codecdata); | |
26082 | 308 free(sh->lang); |
1643 | 309 free(sh); |
310 } | |
311 | |
27054 | 312 sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid) |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
313 { |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
314 if (id > MAX_V_STREAMS - 1 || id < 0) { |
27056 | 315 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
316 "Requested video stream id overflow (%d > %d)\n", id, | |
317 MAX_V_STREAMS); | |
27052 | 318 return NULL; |
4642 | 319 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
320 if (demuxer->v_streams[id]) |
27055 | 321 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_VideoStreamRedefined, id); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
322 else { |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
323 sh_video_t *sh = calloc(1, sizeof(sh_video_t)); |
27055 | 324 mp_msg(MSGT_DEMUXER, MSGL_V, MSGTR_FoundVideoStream, id); |
26875
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
325 demuxer->v_streams[id] = sh; |
c276296cb6f8
Simplify/make new_sh behaviour more consistent when a stream gets redefined.
reimar
parents:
26874
diff
changeset
|
326 sh->vid = vid; |
26876 | 327 sh->ds = demuxer->video; |
27055 | 328 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
329 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
330 return demuxer->v_streams[id]; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
331 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
332 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
333 void free_sh_video(sh_video_t *sh) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
334 { |
27055 | 335 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing sh_video at %p\n", sh); |
26085 | 336 free(sh->bih); |
1643 | 337 free(sh); |
338 } | |
339 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
340 void free_demuxer(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
341 { |
1643 | 342 int i; |
27056 | 343 mp_msg(MSGT_DEMUXER, MSGL_DBG2, "DEMUXER: freeing demuxer at %p\n", |
344 demuxer); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
345 if (demuxer->desc->close) |
27055 | 346 demuxer->desc->close(demuxer); |
16175 | 347 // Very ugly hack to make it behave like old implementation |
348 if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS) | |
27055 | 349 goto skip_streamfree; |
1643 | 350 // free streams: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
351 for (i = 0; i < MAX_A_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
352 if (demuxer->a_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
353 free_sh_audio(demuxer, i); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
354 for (i = 0; i < MAX_V_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
355 if (demuxer->v_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
356 free_sh_video(demuxer->v_streams[i]); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
357 for (i = 0; i < MAX_S_STREAMS; i++) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
358 if (demuxer->s_streams[i]) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
359 free_sh_sub(demuxer->s_streams[i]); |
1643 | 360 // free demuxers: |
361 free_demuxer_stream(demuxer->audio); | |
362 free_demuxer_stream(demuxer->video); | |
5412 | 363 free_demuxer_stream(demuxer->sub); |
27055 | 364 skip_streamfree: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
365 if (demuxer->info) { |
27055 | 366 for (i = 0; demuxer->info[i] != NULL; i++) |
367 free(demuxer->info[i]); | |
368 free(demuxer->info); | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
369 } |
26085 | 370 free(demuxer->filename); |
19342 | 371 if (demuxer->chapters) { |
27055 | 372 for (i = 0; i < demuxer->num_chapters; i++) |
373 free(demuxer->chapters[i].name); | |
374 free(demuxer->chapters); | |
19342 | 375 } |
25657 | 376 if (demuxer->attachments) { |
27055 | 377 for (i = 0; i < demuxer->num_attachments; i++) { |
378 free(demuxer->attachments[i].name); | |
379 free(demuxer->attachments[i].type); | |
380 free(demuxer->attachments[i].data); | |
381 } | |
382 free(demuxer->attachments); | |
25657 | 383 } |
1643 | 384 free(demuxer); |
385 } | |
386 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
387 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
388 void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
389 { |
1 | 390 // append packet to DS stream: |
391 ++ds->packs; | |
27055 | 392 ds->bytes += dp->len; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
393 if (ds->last) { |
27055 | 394 // next packet in stream |
395 ds->last->next = dp; | |
396 ds->last = dp; | |
1 | 397 } else { |
27055 | 398 // first packet in stream |
399 ds->first = ds->last = dp; | |
1 | 400 } |
27056 | 401 mp_dbg(MSGT_DEMUXER, MSGL_DBG2, |
402 "DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n", | |
403 (ds == ds->demuxer->audio) ? "d_audio" : "d_video", dp->len, | |
404 dp->pts, (unsigned int) dp->pos, ds->demuxer->audio->packs, | |
405 ds->demuxer->video->packs); | |
1 | 406 } |
407 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
408 void ds_read_packet(demux_stream_t *ds, stream_t *stream, int len, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
409 double pts, off_t pos, int flags) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
410 { |
27055 | 411 demux_packet_t *dp = new_demux_packet(len); |
412 len = stream_read(stream, dp->buffer, len); | |
10891
65ed62e138fa
Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents:
10882
diff
changeset
|
413 resize_demux_packet(dp, len); |
27045 | 414 dp->pts = pts; |
27055 | 415 dp->pos = pos; |
416 dp->flags = flags; | |
1 | 417 // append packet to DS stream: |
27055 | 418 ds_add_packet(ds, dp); |
1 | 419 } |
420 | |
421 // return value: | |
422 // 0 = EOF or no stream found or invalid type | |
423 // 1 = successfully read a packet | |
424 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
425 int demux_fill_buffer(demuxer_t *demux, demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
426 { |
27055 | 427 // Note: parameter 'ds' can be NULL! |
428 return demux->desc->fill_buffer(demux, ds); | |
1 | 429 } |
430 | |
431 // return value: | |
432 // 0 = EOF | |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
433 // 1 = successful |
26037 | 434 #define MAX_ACUMULATED_PACKETS 64 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
435 int ds_fill_buffer(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
436 { |
27055 | 437 demuxer_t *demux = ds->demuxer; |
438 if (ds->current) | |
439 free_demux_packet(ds->current); | |
440 ds->current = NULL; | |
441 if (mp_msg_test(MSGT_DEMUXER, MSGL_DBG3)) { | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
442 if (ds == demux->audio) |
27056 | 443 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
444 "ds_fill_buffer(d_audio) called\n"); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
445 else if (ds == demux->video) |
27056 | 446 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
447 "ds_fill_buffer(d_video) called\n"); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
448 else if (ds == demux->sub) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
449 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, "ds_fill_buffer(d_sub) called\n"); |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
450 else |
27056 | 451 mp_dbg(MSGT_DEMUXER, MSGL_DBG3, |
452 "ds_fill_buffer(unknown 0x%X) called\n", (unsigned int) ds); | |
27055 | 453 } |
454 while (1) { | |
455 if (ds->packs) { | |
456 demux_packet_t *p = ds->first; | |
26071
449ad51bd8c7
in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents:
26037
diff
changeset
|
457 #if 0 |
27055 | 458 if (demux->reference_clock != MP_NOPTS_VALUE) { |
27059 | 459 if ( p->pts != MP_NOPTS_VALUE |
460 && p->pts > demux->reference_clock | |
461 && ds->packs < MAX_ACUMULATED_PACKETS) { | |
27055 | 462 if (demux_fill_buffer(demux, ds)) |
463 continue; | |
464 } | |
465 } | |
26071
449ad51bd8c7
in ds_fill_buffer() disabled the code that demuxes until the arrival of the right reference_clock
nicodvb
parents:
26037
diff
changeset
|
466 #endif |
27055 | 467 // copy useful data: |
468 ds->buffer = p->buffer; | |
469 ds->buffer_pos = 0; | |
470 ds->buffer_size = p->len; | |
471 ds->pos = p->pos; | |
472 ds->dpos += p->len; // !!! | |
473 ++ds->pack_no; | |
474 if (p->pts != MP_NOPTS_VALUE) { | |
475 ds->pts = p->pts; | |
476 ds->pts_bytes = 0; | |
477 } | |
478 ds->pts_bytes += p->len; // !!! | |
479 if (p->stream_pts != MP_NOPTS_VALUE) | |
480 demux->stream_pts = p->stream_pts; | |
481 ds->flags = p->flags; | |
482 // unlink packet: | |
483 ds->bytes -= p->len; | |
484 ds->current = p; | |
485 ds->first = p->next; | |
486 if (!ds->first) | |
487 ds->last = NULL; | |
488 --ds->packs; | |
489 return 1; | |
490 } | |
27056 | 491 if (demux->audio->packs >= MAX_PACKS |
492 || demux->audio->bytes >= MAX_PACK_BYTES) { | |
493 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, | |
494 demux->audio->packs, demux->audio->bytes); | |
27055 | 495 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
496 break; | |
497 } | |
27056 | 498 if (demux->video->packs >= MAX_PACKS |
499 || demux->video->bytes >= MAX_PACK_BYTES) { | |
500 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, | |
501 demux->video->packs, demux->video->bytes); | |
27055 | 502 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
503 break; | |
504 } | |
505 if (!demux_fill_buffer(demux, ds)) { | |
27056 | 506 mp_dbg(MSGT_DEMUXER, MSGL_DBG2, |
507 "ds_fill_buffer()->demux_fill_buffer() failed\n"); | |
27055 | 508 break; // EOF |
509 } | |
1 | 510 } |
27055 | 511 ds->buffer_pos = ds->buffer_size = 0; |
512 ds->buffer = NULL; | |
27056 | 513 mp_msg(MSGT_DEMUXER, MSGL_V, |
514 "ds_fill_buffer: EOF reached (stream: %s) \n", | |
515 ds == demux->audio ? "audio" : "video"); | |
27055 | 516 ds->eof = 1; |
517 return 0; | |
1 | 518 } |
519 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
520 int demux_read_data(demux_stream_t *ds, unsigned char *mem, int len) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
521 { |
27055 | 522 int x; |
523 int bytes = 0; | |
524 while (len > 0) { | |
525 x = ds->buffer_size - ds->buffer_pos; | |
526 if (x == 0) { | |
527 if (!ds_fill_buffer(ds)) | |
528 return bytes; | |
529 } else { | |
530 if (x > len) | |
531 x = len; | |
532 if (mem) | |
533 fast_memcpy(mem + bytes, &ds->buffer[ds->buffer_pos], x); | |
534 bytes += x; | |
535 len -= x; | |
536 ds->buffer_pos += x; | |
537 } | |
538 } | |
539 return bytes; | |
1 | 540 } |
541 | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
542 /** |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
543 * \brief read data until the given 3-byte pattern is encountered, up to maxlen |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
544 * \param mem memory to read data into, may be NULL to discard data |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
545 * \param maxlen maximum number of bytes to read |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
546 * \param read number of bytes actually read |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
547 * \param pattern pattern to search for (lowest 8 bits are ignored) |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
548 * \return whether pattern was found |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
549 */ |
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
550 int demux_pattern_3(demux_stream_t *ds, unsigned char *mem, int maxlen, |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
551 int *read, uint32_t pattern) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
552 { |
27055 | 553 register uint32_t head = 0xffffff00; |
554 register uint32_t pat = pattern & 0xffffff00; | |
555 int total_len = 0; | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
556 do { |
27055 | 557 register unsigned char *ds_buf = &ds->buffer[ds->buffer_size]; |
558 int len = ds->buffer_size - ds->buffer_pos; | |
559 register long pos = -len; | |
560 if (unlikely(pos >= 0)) { // buffer is empty | |
561 ds_fill_buffer(ds); | |
562 continue; | |
563 } | |
564 do { | |
565 head |= ds_buf[pos]; | |
566 head <<= 8; | |
567 } while (++pos && head != pat); | |
568 len += pos; | |
569 if (total_len + len > maxlen) | |
570 len = maxlen - total_len; | |
571 len = demux_read_data(ds, mem ? &mem[total_len] : NULL, len); | |
572 total_len += len; | |
573 } while ((head != pat || total_len < 3) && total_len < maxlen && !ds->eof); | |
574 if (read) | |
575 *read = total_len; | |
576 return total_len >= 3 && head == pat; | |
17417
960b2fa1567e
function to read from a demuxer up to (and including) the specified
reimar
parents:
17366
diff
changeset
|
577 } |
746 | 578 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
579 void ds_free_packs(demux_stream_t *ds) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
580 { |
27055 | 581 demux_packet_t *dp = ds->first; |
582 while (dp) { | |
583 demux_packet_t *dn = dp->next; | |
584 free_demux_packet(dp); | |
585 dp = dn; | |
586 } | |
587 if (ds->asf_packet) { | |
588 // free unfinished .asf fragments: | |
589 free(ds->asf_packet->buffer); | |
590 free(ds->asf_packet); | |
591 ds->asf_packet = NULL; | |
592 } | |
593 ds->first = ds->last = NULL; | |
594 ds->packs = 0; // !!!!! | |
595 ds->bytes = 0; | |
596 if (ds->current) | |
597 free_demux_packet(ds->current); | |
598 ds->current = NULL; | |
599 ds->buffer = NULL; | |
600 ds->buffer_pos = ds->buffer_size; | |
601 ds->pts = 0; | |
602 ds->pts_bytes = 0; | |
1 | 603 } |
604 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
605 int ds_get_packet(demux_stream_t *ds, unsigned char **start) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
606 { |
24826 | 607 int len; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
608 if (ds->buffer_pos >= ds->buffer_size) { |
27052 | 609 if (!ds_fill_buffer(ds)) { |
1 | 610 // EOF |
611 *start = NULL; | |
612 return -1; | |
27052 | 613 } |
1 | 614 } |
27055 | 615 len = ds->buffer_size - ds->buffer_pos; |
24826 | 616 *start = &ds->buffer[ds->buffer_pos]; |
27055 | 617 ds->buffer_pos += len; |
24826 | 618 return len; |
1 | 619 } |
554 | 620 |
27055 | 621 int ds_get_packet_pts(demux_stream_t *ds, unsigned char **start, double *pts) |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
622 { |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
623 int len; |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
624 *pts = MP_NOPTS_VALUE; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
625 if (ds->buffer_pos >= ds->buffer_size) { |
27052 | 626 if (!ds_fill_buffer(ds)) { |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
627 // EOF |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
628 *start = NULL; |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
629 return -1; |
27052 | 630 } |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
631 } |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18900
diff
changeset
|
632 // Return pts unless this read starts from the middle of a packet |
25956
7e4a2ab8b61c
Change to always use MP_NOPTS_VALUE (instead of sometimes 0) for unknown pts.
reimar
parents:
25919
diff
changeset
|
633 if (!ds->buffer_pos) |
27052 | 634 *pts = ds->current->pts; |
27055 | 635 len = ds->buffer_size - ds->buffer_pos; |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
636 *start = &ds->buffer[ds->buffer_pos]; |
27055 | 637 ds->buffer_pos += len; |
18242
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
638 return len; |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
639 } |
caac2ca98168
4 - Implement a better way to calculate current audio pts and use it for
rtognimp
parents:
18237
diff
changeset
|
640 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
641 int ds_get_packet_sub(demux_stream_t *ds, unsigned char **start) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
642 { |
24826 | 643 int len; |
27055 | 644 if (ds->buffer_pos >= ds->buffer_size) { |
27052 | 645 *start = NULL; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
646 if (!ds->packs) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
647 return -1; // no sub |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
648 if (!ds_fill_buffer(ds)) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
649 return -1; // EOF |
554 | 650 } |
27055 | 651 len = ds->buffer_size - ds->buffer_pos; |
24826 | 652 *start = &ds->buffer[ds->buffer_pos]; |
27055 | 653 ds->buffer_pos += len; |
24826 | 654 return len; |
554 | 655 } |
656 | |
18309
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
657 double ds_get_next_pts(demux_stream_t *ds) |
87161f96fa66
Change common pts variables from floats to doubles. Individual demuxers
uau
parents:
18242
diff
changeset
|
658 { |
27055 | 659 demuxer_t *demux = ds->demuxer; |
660 while (!ds->first) { | |
27056 | 661 if (demux->audio->packs >= MAX_PACKS |
662 || demux->audio->bytes >= MAX_PACK_BYTES) { | |
663 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyAudioInBuffer, | |
664 demux->audio->packs, demux->audio->bytes); | |
27055 | 665 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
666 return MP_NOPTS_VALUE; | |
667 } | |
27056 | 668 if (demux->video->packs >= MAX_PACKS |
669 || demux->video->bytes >= MAX_PACK_BYTES) { | |
670 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_TooManyVideoInBuffer, | |
671 demux->video->packs, demux->video->bytes); | |
27055 | 672 mp_msg(MSGT_DEMUXER, MSGL_HINT, MSGTR_MaybeNI); |
673 return MP_NOPTS_VALUE; | |
674 } | |
675 if (!demux_fill_buffer(demux, ds)) | |
676 return MP_NOPTS_VALUE; | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
677 } |
27055 | 678 return ds->first->pts; |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
679 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
680 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
681 // ==================================================================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
682 |
16175 | 683 void demuxer_help(void) |
684 { | |
27055 | 685 int i; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
686 |
27055 | 687 mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n"); |
688 mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n"); | |
689 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n"); | |
690 for (i = 0; demuxer_list[i]; i++) { | |
691 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers | |
692 continue; | |
693 if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment)) | |
694 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n", | |
27056 | 695 demuxer_list[i]->name, demuxer_list[i]->type, |
696 demuxer_list[i]->info, demuxer_list[i]->comment); | |
27055 | 697 else |
698 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s\n", | |
27056 | 699 demuxer_list[i]->name, demuxer_list[i]->type, |
700 demuxer_list[i]->info); | |
27055 | 701 } |
16175 | 702 } |
703 | |
14693
37116118ab6a
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
14666
diff
changeset
|
704 |
16175 | 705 /** |
706 * Get demuxer type for a given demuxer name | |
707 * | |
708 * @param demuxer_name string with demuxer name of demuxer number | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
709 * @param force will be set if demuxer should be forced. |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
710 * May be NULL. |
16175 | 711 * @return DEMUXER_TYPE_xxx, -1 if error or not found |
712 */ | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
713 int get_demuxer_type_from_name(char *demuxer_name, int *force) |
16175 | 714 { |
27055 | 715 int i; |
716 long type_int; | |
717 char *endptr; | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
718 |
27055 | 719 if (!demuxer_name || !demuxer_name[0]) |
720 return DEMUXER_TYPE_UNKNOWN; | |
721 if (force) | |
722 *force = demuxer_name[0] == '+'; | |
723 if (demuxer_name[0] == '+') | |
724 demuxer_name = &demuxer_name[1]; | |
725 for (i = 0; demuxer_list[i]; i++) { | |
726 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Can't select special demuxers from commandline | |
727 continue; | |
728 if (strcmp(demuxer_name, demuxer_list[i]->name) == 0) | |
729 return demuxer_list[i]->type; | |
730 } | |
16175 | 731 |
27055 | 732 // No match found, try to parse name as an integer (demuxer number) |
733 type_int = strtol(demuxer_name, &endptr, 0); | |
734 if (*endptr) // Conversion failed | |
735 return -1; | |
736 if ((type_int > 0) && (type_int <= DEMUXER_TYPE_MAX)) | |
737 return (int) type_int; | |
738 | |
26437 | 739 return -1; |
16175 | 740 } |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
741 |
27055 | 742 int extension_parsing = 1; // 0=off 1=mixed (used only for unstable formats) |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
743 |
27055 | 744 int correct_pts = 0; |
745 int user_correct_pts = -1; | |
18917
d9a75b26da6c
Add a new video pts tracking mode, enabled by option -correct-pts.
uau
parents:
18900
diff
changeset
|
746 |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
747 /* |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
748 NOTE : Several demuxers may be opened at the same time so |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
749 demuxers should NEVER rely on an external var to enable them |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
750 self. If a demuxer can't do any auto-detection it should only use |
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
751 file_format. The user can explicitly set file_format with the -demuxer |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
752 option so there is really no need for another extra var. |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
753 For convenience an option can be added to set file_format directly |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
754 to the right type (ex: rawaudio,rawvideo). |
25197
eb2c5925ec34
Fix typos in comments to stop them hurting my eyes
reimar
parents:
24826
diff
changeset
|
755 Also the stream can override the file_format so a demuxer which rely |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
756 on a special stream type can set file_format at the stream level |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
757 (ex: tv,mf). |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
758 */ |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
759 |
27054 | 760 static demuxer_t *demux_open_stream(stream_t *stream, int file_format, |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
761 int force, int audio_id, int video_id, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
762 int dvdsub_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
763 { |
27055 | 764 demuxer_t *demuxer = NULL; |
1659 | 765 |
27055 | 766 sh_video_t *sh_video = NULL; |
26437 | 767 |
27055 | 768 const demuxer_desc_t *demuxer_desc; |
769 int fformat = 0; | |
770 int i; | |
26437 | 771 |
27055 | 772 // If somebody requested a demuxer check it |
773 if (file_format) { | |
774 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) { | |
27056 | 775 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
776 video_id, dvdsub_id, filename); | |
27055 | 777 if (demuxer_desc->check_file) |
778 fformat = demuxer_desc->check_file(demuxer); | |
779 if (force || !demuxer_desc->check_file) | |
780 fformat = demuxer_desc->type; | |
781 if (fformat != 0) { | |
782 if (fformat == demuxer_desc->type) { | |
783 demuxer_t *demux2 = demuxer; | |
784 // Move messages to demuxer detection code? | |
27056 | 785 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
786 MSGTR_Detected_XXX_FileFormat, | |
787 demuxer_desc->shortdesc); | |
27055 | 788 file_format = fformat; |
27056 | 789 if (!demuxer->desc->open |
790 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 791 demuxer = demux2; |
792 goto dmx_open; | |
793 } | |
794 } else { | |
795 // Format changed after check, recurse | |
796 free_demuxer(demuxer); | |
27056 | 797 return demux_open_stream(stream, fformat, force, audio_id, |
798 video_id, dvdsub_id, filename); | |
27055 | 799 } |
800 } | |
801 // Check failed for forced demuxer, quit | |
802 free_demuxer(demuxer); | |
803 return NULL; | |
20303 | 804 } |
805 } | |
27055 | 806 // Test demuxers with safe file checks |
807 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
808 if (demuxer_desc->safe_check) { | |
27056 | 809 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
810 video_id, dvdsub_id, filename); | |
27055 | 811 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { |
812 if (fformat == demuxer_desc->type) { | |
813 demuxer_t *demux2 = demuxer; | |
27056 | 814 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
815 MSGTR_Detected_XXX_FileFormat, | |
816 demuxer_desc->shortdesc); | |
27055 | 817 file_format = fformat; |
27056 | 818 if (!demuxer->desc->open |
819 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 820 demuxer = demux2; |
821 goto dmx_open; | |
822 } | |
823 } else { | |
824 if (fformat == DEMUXER_TYPE_PLAYLIST) | |
825 return demuxer; // handled in mplayer.c | |
826 // Format changed after check, recurse | |
827 free_demuxer(demuxer); | |
828 demuxer = demux_open_stream(stream, fformat, force, | |
27056 | 829 audio_id, video_id, |
830 dvdsub_id, filename); | |
27055 | 831 if (demuxer) |
832 return demuxer; // done! | |
833 file_format = DEMUXER_TYPE_UNKNOWN; | |
834 } | |
835 } | |
836 free_demuxer(demuxer); | |
837 demuxer = NULL; | |
26379 | 838 } |
839 } | |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
840 |
27055 | 841 // If no forced demuxer perform file extension based detection |
27056 | 842 // Ok. We're over the stable detectable fileformats, the next ones are |
843 // a bit fuzzy. So by default (extension_parsing==1) try extension-based | |
844 // detection first: | |
845 if (file_format == DEMUXER_TYPE_UNKNOWN && filename | |
846 && extension_parsing == 1) { | |
27055 | 847 file_format = demuxer_type_by_filename(filename); |
848 if (file_format != DEMUXER_TYPE_UNKNOWN) { | |
849 // we like recursion :) | |
27056 | 850 demuxer = demux_open_stream(stream, file_format, force, audio_id, |
851 video_id, dvdsub_id, filename); | |
27055 | 852 if (demuxer) |
853 return demuxer; // done! | |
854 file_format = DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing... | |
27056 | 855 mp_msg(MSGT_DEMUXER, MSGL_V, |
856 "demuxer: continue fuzzy content-based format guessing...\n"); | |
26437 | 857 } |
858 } | |
27055 | 859 // Try detection for all other demuxers |
860 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
861 if (!demuxer_desc->safe_check && demuxer_desc->check_file) { | |
27056 | 862 demuxer = new_demuxer(stream, demuxer_desc->type, audio_id, |
863 video_id, dvdsub_id, filename); | |
27055 | 864 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { |
865 if (fformat == demuxer_desc->type) { | |
866 demuxer_t *demux2 = demuxer; | |
27056 | 867 mp_msg(MSGT_DEMUXER, MSGL_INFO, |
868 MSGTR_Detected_XXX_FileFormat, | |
869 demuxer_desc->shortdesc); | |
27055 | 870 file_format = fformat; |
27056 | 871 if (!demuxer->desc->open |
872 || (demux2 = demuxer->desc->open(demuxer))) { | |
27055 | 873 demuxer = demux2; |
874 goto dmx_open; | |
875 } | |
876 } else { | |
877 if (fformat == DEMUXER_TYPE_PLAYLIST) | |
878 return demuxer; // handled in mplayer.c | |
879 // Format changed after check, recurse | |
880 free_demuxer(demuxer); | |
881 demuxer = demux_open_stream(stream, fformat, force, | |
27056 | 882 audio_id, video_id, |
883 dvdsub_id, filename); | |
27055 | 884 if (demuxer) |
885 return demuxer; // done! | |
886 file_format = DEMUXER_TYPE_UNKNOWN; | |
887 } | |
888 } | |
889 free_demuxer(demuxer); | |
890 demuxer = NULL; | |
891 } | |
892 } | |
26437 | 893 |
27055 | 894 return NULL; |
895 //====== File format recognized, set up these for compatibility: ========= | |
896 dmx_open: | |
897 | |
898 demuxer->file_format = file_format; | |
899 | |
900 if ((sh_video = demuxer->video->sh) && sh_video->bih) { | |
901 int biComp = le2me_32(sh_video->bih->biCompression); | |
27056 | 902 mp_msg(MSGT_DEMUX, MSGL_INFO, |
903 "VIDEO: [%.4s] %dx%d %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", | |
904 (char *) &biComp, sh_video->bih->biWidth, | |
905 sh_video->bih->biHeight, sh_video->bih->biBitCount, | |
906 sh_video->fps, sh_video->i_bps * 0.008f, | |
27055 | 907 sh_video->i_bps / 1024.0f); |
908 } | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
909 #ifdef CONFIG_ASS |
27055 | 910 if (ass_enabled && ass_library) { |
911 for (i = 0; i < MAX_S_STREAMS; ++i) { | |
912 sh_sub_t *sh = demuxer->s_streams[i]; | |
913 if (sh && sh->type == 'a') { | |
914 sh->ass_track = ass_new_track(ass_library); | |
915 if (sh->ass_track && sh->extradata) | |
27056 | 916 ass_process_codec_private(sh->ass_track, sh->extradata, |
917 sh->extradata_len); | |
27055 | 918 } else if (sh && sh->type != 'v') |
919 sh->ass_track = ass_default_track(ass_library); | |
920 } | |
921 } | |
26437 | 922 #endif |
27055 | 923 return demuxer; |
26437 | 924 } |
925 | |
27054 | 926 char *audio_stream = NULL; |
27056 | 927 char *sub_stream = NULL; |
9709 | 928 int audio_stream_cache = 0; |
7867 | 929 |
27056 | 930 char *demuxer_name = NULL; // parameter from -demuxer |
16175 | 931 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer |
27056 | 932 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer |
16175 | 933 |
7867 | 934 extern int hr_mp3_seek; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
935 |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
936 extern float stream_cache_min_percent; |
16152
10a69a812eff
remove unused cache-prefill and create cache-seek-min that controls when seek_long is prefered over waiting for cache to fill
iive
parents:
15958
diff
changeset
|
937 extern float stream_cache_seek_min_percent; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
938 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
939 demuxer_t *demux_open(stream_t *vs, int file_format, int audio_id, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
940 int video_id, int dvdsub_id, char *filename) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
941 { |
27055 | 942 stream_t *as = NULL, *ss = NULL; |
943 demuxer_t *vd, *ad = NULL, *sd = NULL; | |
944 demuxer_t *res; | |
945 int afmt = DEMUXER_TYPE_UNKNOWN, sfmt = DEMUXER_TYPE_UNKNOWN; | |
946 int demuxer_type; | |
947 int audio_demuxer_type = 0, sub_demuxer_type = 0; | |
948 int demuxer_force = 0, audio_demuxer_force = 0, sub_demuxer_force = 0; | |
16175 | 949 |
27056 | 950 if ((demuxer_type = |
951 get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) { | |
952 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-demuxer %s does not exist.\n", | |
953 demuxer_name); | |
27055 | 954 } |
27056 | 955 if ((audio_demuxer_type = |
956 get_demuxer_type_from_name(audio_demuxer_name, | |
957 &audio_demuxer_force)) < 0) { | |
958 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-audio-demuxer %s does not exist.\n", | |
959 audio_demuxer_name); | |
27055 | 960 } |
27056 | 961 if ((sub_demuxer_type = |
962 get_demuxer_type_from_name(sub_demuxer_name, | |
963 &sub_demuxer_force)) < 0) { | |
964 mp_msg(MSGT_DEMUXER, MSGL_ERR, "-sub-demuxer %s does not exist.\n", | |
965 sub_demuxer_name); | |
27055 | 966 } |
26437 | 967 |
27055 | 968 if (audio_stream) { |
969 as = open_stream(audio_stream, 0, &afmt); | |
970 if (!as) { | |
27056 | 971 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenAudioStream, |
972 audio_stream); | |
27055 | 973 return NULL; |
974 } | |
975 if (audio_stream_cache) { | |
27056 | 976 if (!stream_enable_cache |
977 (as, audio_stream_cache * 1024, | |
978 audio_stream_cache * 1024 * (stream_cache_min_percent / | |
979 100.0), | |
980 audio_stream_cache * 1024 * (stream_cache_seek_min_percent / | |
981 100.0))) { | |
27055 | 982 free_stream(as); |
27056 | 983 mp_msg(MSGT_DEMUXER, MSGL_ERR, |
984 "Can't enable audio stream cache\n"); | |
27055 | 985 return NULL; |
986 } | |
987 } | |
26379 | 988 } |
27055 | 989 if (sub_stream) { |
990 ss = open_stream(sub_stream, 0, &sfmt); | |
991 if (!ss) { | |
27056 | 992 mp_msg(MSGT_DEMUXER, MSGL_ERR, MSGTR_CannotOpenSubtitlesStream, |
993 sub_stream); | |
27055 | 994 return NULL; |
995 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
996 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
997 |
27055 | 998 vd = demux_open_stream(vs, demuxer_type ? demuxer_type : file_format, |
27056 | 999 demuxer_force, audio_stream ? -2 : audio_id, |
1000 video_id, sub_stream ? -2 : dvdsub_id, filename); | |
27055 | 1001 if (!vd) { |
1002 if (as) | |
1003 free_stream(as); | |
1004 if (ss) | |
1005 free_stream(ss); | |
1006 return NULL; | |
1007 } | |
1008 if (as) { | |
27056 | 1009 ad = demux_open_stream(as, |
1010 audio_demuxer_type ? audio_demuxer_type : afmt, | |
1011 audio_demuxer_force, audio_id, -2, -2, | |
1012 audio_stream); | |
27055 | 1013 if (!ad) { |
27056 | 1014 mp_msg(MSGT_DEMUXER, MSGL_WARN, MSGTR_OpeningAudioDemuxerFailed, |
1015 audio_stream); | |
27055 | 1016 free_stream(as); |
27056 | 1017 } else if (ad->audio->sh |
1018 && ((sh_audio_t *) ad->audio->sh)->format == 0x55) // MP3 | |
27055 | 1019 hr_mp3_seek = 1; // Enable high res seeking |
9709 | 1020 } |
27055 | 1021 if (ss) { |
1022 sd = demux_open_stream(ss, sub_demuxer_type ? sub_demuxer_type : sfmt, | |
27056 | 1023 sub_demuxer_force, -2, -2, dvdsub_id, |
1024 sub_stream); | |
27055 | 1025 if (!sd) { |
27056 | 1026 mp_msg(MSGT_DEMUXER, MSGL_WARN, |
1027 MSGTR_OpeningSubtitlesDemuxerFailed, sub_stream); | |
27055 | 1028 free_stream(ss); |
1029 } | |
1030 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1031 |
27055 | 1032 if (ad && sd) |
1033 res = new_demuxers_demuxer(vd, ad, sd); | |
1034 else if (ad) | |
1035 res = new_demuxers_demuxer(vd, ad, vd); | |
1036 else if (sd) | |
1037 res = new_demuxers_demuxer(vd, vd, sd); | |
1038 else | |
1039 res = vd; | |
25919
382672c7480a
Allow demuxers to choose a default value for correct_pts
reimar
parents:
25883
diff
changeset
|
1040 |
27055 | 1041 correct_pts = user_correct_pts; |
1042 if (correct_pts < 0) | |
27056 | 1043 correct_pts = demux_control(res, DEMUXER_CTRL_CORRECT_PTS, NULL) |
1044 == DEMUXER_CTRL_OK; | |
27055 | 1045 return res; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1046 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1047 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1048 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1049 void demux_flush(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1050 { |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1051 ds_free_packs(demuxer->video); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1052 ds_free_packs(demuxer->audio); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1053 ds_free_packs(demuxer->sub); |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1054 } |
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1055 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1056 int demux_seek(demuxer_t *demuxer, float rel_seek_secs, float audio_delay, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1057 int flags) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1058 { |
27055 | 1059 demux_stream_t *d_audio = demuxer->audio; |
1060 demux_stream_t *d_video = demuxer->video; | |
1061 sh_audio_t *sh_audio = d_audio->sh; | |
1062 sh_video_t *sh_video = d_video->sh; | |
20851
6602a90a06ec
consistency fix: STREAM_CTRL_GET_TIME_LENGTH and STREAM_CTRL_GET_CURRENT_TIME now return time in (double) seconds
nicodvb
parents:
20841
diff
changeset
|
1063 double tmp = 0; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1064 double pts; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1065 |
27055 | 1066 if (!demuxer->seekable) { |
1067 if (demuxer->file_format == DEMUXER_TYPE_AVI) | |
1068 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekRawAVI); | |
27341
e7c989f7a7c9
Start unifying names of internal preprocessor directives.
diego
parents:
27282
diff
changeset
|
1069 #ifdef CONFIG_TV |
27055 | 1070 else if (demuxer->file_format == DEMUXER_TYPE_TV) |
1071 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_TVInputNotSeekable); | |
2790 | 1072 #endif |
27055 | 1073 else |
1074 mp_msg(MSGT_SEEK, MSGL_WARN, MSGTR_CantSeekFile); | |
1075 return 0; | |
1076 } | |
26437 | 1077 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1078 demux_flush(demuxer); |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1079 // clear demux buffers: |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1080 if (sh_audio) |
27055 | 1081 sh_audio->a_buffer_len = 0; |
1082 | |
27045 | 1083 demuxer->stream->eof = 0; |
27055 | 1084 demuxer->video->eof = 0; |
1085 demuxer->audio->eof = 0; | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1086 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1087 if (sh_video) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1088 sh_video->timer = 0; // !!!!!! |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1089 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1090 if (flags & SEEK_ABSOLUTE) |
27055 | 1091 pts = 0.0f; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1092 else { |
27055 | 1093 if (demuxer->stream_pts == MP_NOPTS_VALUE) |
1094 goto dmx_seek; | |
1095 pts = demuxer->stream_pts; | |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1096 } |
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1097 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1098 if (flags & SEEK_FACTOR) { |
27056 | 1099 if (stream_control(demuxer->stream, STREAM_CTRL_GET_TIME_LENGTH, &tmp) |
1100 == STREAM_UNSUPPORTED) | |
27055 | 1101 goto dmx_seek; |
1102 pts += tmp * rel_seek_secs; | |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1103 } else |
27055 | 1104 pts += rel_seek_secs; |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1105 |
27056 | 1106 if (stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_TIME, &pts) != |
1107 STREAM_UNSUPPORTED) { | |
27055 | 1108 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); |
1109 return 1; | |
20748
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1110 } |
865b71a83296
now demux_seek() tries to seek aided by the stream layer, if possible
nicodvb
parents:
20319
diff
changeset
|
1111 |
27055 | 1112 dmx_seek: |
1113 if (demuxer->desc->seek) | |
1114 demuxer->desc->seek(demuxer, rel_seek_secs, audio_delay, flags); | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1115 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1116 if (sh_audio) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1117 resync_audio_stream(sh_audio); |
16877
9081ae3a702c
move resync_audio_stream after seeking to demuxer.c
reimar
parents:
16572
diff
changeset
|
1118 |
27055 | 1119 return 1; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1120 } |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1121 |
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:
18917
diff
changeset
|
1122 int demux_info_add(demuxer_t *demuxer, const char *opt, const char *param) |
3050 | 1123 { |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1124 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1125 int n = 0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1126 |
3050 | 1127 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1128 for (n = 0; info && info[2 * n] != NULL; n++) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1129 if (!strcasecmp(opt, info[2 * n])) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1130 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_DemuxerInfoChanged, opt, |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1131 param); |
27055 | 1132 free(info[2 * n + 1]); |
1133 info[2 * n + 1] = strdup(param); | |
27052 | 1134 return 0; |
27055 | 1135 } |
1136 } | |
27051 | 1137 |
27056 | 1138 info = demuxer->info = (char **) realloc(info, |
1139 (2 * (n + 2)) * sizeof(char *)); | |
27055 | 1140 info[2 * n] = strdup(opt); |
1141 info[2 * n + 1] = strdup(param); | |
1142 memset(&info[2 * (n + 1)], 0, 2 * sizeof(char *)); | |
3050 | 1143 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1144 return 1; |
3050 | 1145 } |
1146 | |
1147 int demux_info_print(demuxer_t *demuxer) | |
1148 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1149 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1150 int n; |
3050 | 1151 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1152 if (!info) |
27055 | 1153 return 0; |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1154 |
27055 | 1155 mp_msg(MSGT_DEMUX, MSGL_INFO, MSGTR_ClipInfo); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1156 for (n = 0; info[2 * n] != NULL; n++) { |
27056 | 1157 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n", info[2 * n], |
1158 info[2 * n + 1]); | |
1159 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, | |
1160 info[2 * n]); | |
1161 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, | |
1162 info[2 * n + 1]); | |
15789
32d9c8a0a02b
adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents:
15780
diff
changeset
|
1163 } |
18237
4231482179b6
Get ride of the several if(identify) messy lines and rearangment of some of the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three
reynaldo
parents:
18128
diff
changeset
|
1164 mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n); |
4189 | 1165 |
1166 return 0; | |
3050 | 1167 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1168 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1169 char *demux_info_get(demuxer_t *demuxer, const char *opt) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1170 { |
27055 | 1171 int i; |
1172 char **info = demuxer->info; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1173 |
27055 | 1174 for (i = 0; info && info[2 * i] != NULL; i++) { |
1175 if (!strcasecmp(opt, info[2 * i])) | |
1176 return info[2 * i + 1]; | |
1177 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1178 |
27055 | 1179 return NULL; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1180 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1181 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1182 int demux_control(demuxer_t *demuxer, int cmd, void *arg) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1183 { |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1184 |
16175 | 1185 if (demuxer->desc->control) |
27055 | 1186 return demuxer->desc->control(demuxer, cmd, arg); |
16175 | 1187 |
1188 return DEMUXER_CTRL_NOTIMPL; | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1189 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1190 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1191 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1192 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1193 double demuxer_get_time_length(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1194 { |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16326
diff
changeset
|
1195 double get_time_ans; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1196 sh_video_t *sh_video = demuxer->video->sh; |
16925 | 1197 sh_audio_t *sh_audio = demuxer->audio->sh; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1198 // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW |
27056 | 1199 if (demux_control |
1200 (demuxer, DEMUXER_CTRL_GET_TIME_LENGTH, (void *) &get_time_ans) <= 0) { | |
27055 | 1201 if (sh_video && sh_video->i_bps && sh_audio && sh_audio->i_bps) |
27056 | 1202 get_time_ans = (double) (demuxer->movi_end - |
1203 demuxer->movi_start) / (sh_video->i_bps + | |
1204 sh_audio->i_bps); | |
27055 | 1205 else if (sh_video && sh_video->i_bps) |
27056 | 1206 get_time_ans = (double) (demuxer->movi_end - |
1207 demuxer->movi_start) / sh_video->i_bps; | |
27055 | 1208 else if (sh_audio && sh_audio->i_bps) |
27056 | 1209 get_time_ans = (double) (demuxer->movi_end - |
1210 demuxer->movi_start) / sh_audio->i_bps; | |
27055 | 1211 else |
1212 get_time_ans = 0; | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1213 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1214 return get_time_ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1215 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1216 |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1217 /** |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1218 * \brief demuxer_get_current_time() returns the time of the current play in three possible ways: |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1219 * either when the stream reader satisfies STREAM_CTRL_GET_CURRENT_TIME (e.g. dvd) |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1220 * or using sh_video->pts when the former method fails |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1221 * 0 otherwise |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1222 * \return the current play time |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1223 */ |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1224 int demuxer_get_current_time(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1225 { |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1226 double get_time_ans = 0; |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1227 sh_video_t *sh_video = demuxer->video->sh; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1228 if (demuxer->stream_pts != MP_NOPTS_VALUE) |
21782
99ab6c41eb1e
use demuxer->stream_pts rather than stream_control(STREAM_CTRL_GET_CURRENT_TIME)
nicodvb
parents:
21780
diff
changeset
|
1229 get_time_ans = demuxer->stream_pts; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1230 else if (sh_video) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1231 get_time_ans = sh_video->pts; |
20749
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1232 return (int) get_time_ans; |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1233 } |
eafd9953b505
added demuxer_get_current_time() to get the current playtime (possibly aided by the stream layer)
nicodvb
parents:
20748
diff
changeset
|
1234 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1235 int demuxer_get_percent_pos(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1236 { |
14197
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1237 int ans = 0; |
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1238 int res = demux_control(demuxer, DEMUXER_CTRL_GET_PERCENT_POS, &ans); |
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
1239 int len = (demuxer->movi_end - demuxer->movi_start) / 100; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1240 if (res <= 0) { |
27055 | 1241 if (len > 0) |
1242 ans = (demuxer->filepos - demuxer->movi_start) / len; | |
1243 else | |
1244 ans = 0; | |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
1245 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1246 if (ans < 0) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1247 ans = 0; |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1248 if (ans > 100) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1249 ans = 100; |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1250 return ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1251 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1252 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1253 int demuxer_switch_audio(demuxer_t *demuxer, int index) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1254 { |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1255 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_AUDIO, &index); |
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1256 if (res == DEMUXER_CTRL_NOTIMPL) |
27055 | 1257 index = demuxer->audio->id; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1258 if (demuxer->audio->id >= 0) |
27055 | 1259 demuxer->audio->sh = demuxer->a_streams[demuxer->audio->id]; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1260 else |
27055 | 1261 demuxer->audio->sh = NULL; |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
1262 return index; |
15046
b7aa70b05d76
Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents:
14934
diff
changeset
|
1263 } |
19342 | 1264 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1265 int demuxer_switch_video(demuxer_t *demuxer, int index) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1266 { |
20948 | 1267 int res = demux_control(demuxer, DEMUXER_CTRL_SWITCH_VIDEO, &index); |
1268 if (res == DEMUXER_CTRL_NOTIMPL) | |
27055 | 1269 index = demuxer->video->id; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1270 if (demuxer->video->id >= 0) |
27055 | 1271 demuxer->video->sh = demuxer->v_streams[demuxer->video->id]; |
26089
e2f35d90ad39
Set audio->sh correctly when switching audio tracks. The same for video tracks.
eugeni
parents:
26088
diff
changeset
|
1272 else |
27055 | 1273 demuxer->video->sh = NULL; |
20948 | 1274 return index; |
1275 } | |
1276 | |
27054 | 1277 int demuxer_add_attachment(demuxer_t *demuxer, const char *name, |
1278 const char *type, const void *data, size_t size) | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1279 { |
25657 | 1280 if (!(demuxer->num_attachments & 31)) |
27056 | 1281 demuxer->attachments = realloc(demuxer->attachments, |
1282 (demuxer->num_attachments + 32) * sizeof(demux_attachment_t)); | |
25657 | 1283 |
1284 demuxer->attachments[demuxer->num_attachments].name = strdup(name); | |
1285 demuxer->attachments[demuxer->num_attachments].type = strdup(type); | |
1286 demuxer->attachments[demuxer->num_attachments].data = malloc(size); | |
1287 memcpy(demuxer->attachments[demuxer->num_attachments].data, data, size); | |
1288 demuxer->attachments[demuxer->num_attachments].data_size = size; | |
1289 | |
27055 | 1290 return demuxer->num_attachments++; |
25657 | 1291 } |
1292 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1293 int demuxer_add_chapter(demuxer_t *demuxer, const char *name, uint64_t start, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1294 uint64_t end) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1295 { |
19342 | 1296 if (demuxer->chapters == NULL) |
27055 | 1297 demuxer->chapters = malloc(32 * sizeof(*demuxer->chapters)); |
19342 | 1298 else if (!(demuxer->num_chapters % 32)) |
27056 | 1299 demuxer->chapters = realloc(demuxer->chapters, |
1300 (demuxer->num_chapters + 32) * | |
1301 sizeof(*demuxer->chapters)); | |
19342 | 1302 |
1303 demuxer->chapters[demuxer->num_chapters].start = start; | |
1304 demuxer->chapters[demuxer->num_chapters].end = end; | |
27057
42332b47d6aa
Support NULL name parameter for demuxer_add_chapter.
reimar
parents:
27056
diff
changeset
|
1305 demuxer->chapters[demuxer->num_chapters].name = strdup(name ? name : MSGTR_Unknown); |
19342 | 1306 |
27055 | 1307 return demuxer->num_chapters++; |
19342 | 1308 } |
1309 | |
19435 | 1310 /** |
27051 | 1311 * \brief demuxer_seek_chapter() seeks to a chapter in two possible ways: |
19435 | 1312 * either using the demuxer->chapters structure set by the demuxer |
1313 * or asking help to the stream layer (e.g. dvd) | |
19439 | 1314 * \param chapter - chapter number wished - 0-based |
19435 | 1315 * \param mode 0: relative to current main pts, 1: absolute |
1316 * \param seek_pts set by the function to the pts to seek to (if demuxer->chapters is set) | |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1317 * \param num_chapters number of chapters present (set by this function is param is not null) |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1318 * \param chapter_name name of chapter found (set by this function is param is not null) |
19435 | 1319 * \return -1 on error, current chapter if successful |
1320 */ | |
1321 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1322 int demuxer_seek_chapter(demuxer_t *demuxer, int chapter, int mode, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1323 float *seek_pts, int *num_chapters, |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1324 char **chapter_name) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1325 { |
19435 | 1326 int ris; |
1327 int current, total; | |
1328 sh_video_t *sh_video = demuxer->video->sh; | |
1329 sh_audio_t *sh_audio = demuxer->audio->sh; | |
1330 | |
1331 if (!demuxer->num_chapters || !demuxer->chapters) { | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1332 if (!mode) { |
27056 | 1333 ris = stream_control(demuxer->stream, |
1334 STREAM_CTRL_GET_CURRENT_CHAPTER, ¤t); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1335 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1336 return -1; |
19438
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1337 chapter += current; |
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1338 } |
263e95c47aec
support relative seeking in the stream-driven case
nicodvb
parents:
19435
diff
changeset
|
1339 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1340 demux_flush(demuxer); |
19435 | 1341 |
27056 | 1342 ris = stream_control(demuxer->stream, STREAM_CTRL_SEEK_TO_CHAPTER, |
1343 &chapter); | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1344 if (ris != STREAM_UNSUPPORTED) |
20839
950ea3171afc
in demux_seek() if STREAM_CTRL_SEEK_TO_CHAPTER suceeds call DEMUXER_CTRL_RESYNC to notify the demuxer of the change
nicodvb
parents:
20749
diff
changeset
|
1345 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1346 if (sh_video) { |
19435 | 1347 ds_fill_buffer(demuxer->video); |
1348 resync_video_stream(sh_video); | |
1349 } | |
1350 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1351 if (sh_audio) { |
19435 | 1352 ds_fill_buffer(demuxer->audio); |
1353 resync_audio_stream(sh_audio); | |
1354 } | |
27056 | 1355 // exit status may be ok, but main() doesn't have to seek itself |
1356 // (because e.g. dvds depend on sectors, not on pts) | |
19435 | 1357 *seek_pts = -1.0; |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1358 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1359 if (num_chapters) { |
27056 | 1360 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, |
1361 num_chapters) == STREAM_UNSUPPORTED) | |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1362 *num_chapters = 0; |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1363 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1364 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1365 if (chapter_name) { |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1366 *chapter_name = NULL; |
25314
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1367 if (num_chapters && *num_chapters) { |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1368 char *tmp = malloc(16); |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1369 if (tmp) { |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1370 sprintf(tmp, " of %3d", *num_chapters); |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1371 *chapter_name = tmp; |
02e2e7a5599a
Fix memory leak that tmp allocated but maybe not used.
ulion
parents:
25266
diff
changeset
|
1372 } |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1373 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1374 } |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1375 |
26758
9fb1d2c3dbd4
cosmetics: Remove pointless parentheses from return statements.
diego
parents:
26437
diff
changeset
|
1376 return ris != STREAM_UNSUPPORTED ? chapter : -1; |
27055 | 1377 } else { // chapters structure is set in the demuxer |
19435 | 1378 total = demuxer->num_chapters; |
1379 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1380 if (mode == 1) //absolute seeking |
19435 | 1381 current = chapter; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1382 else { //relative seeking |
19435 | 1383 uint64_t now; |
27056 | 1384 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0.)) |
1385 * 1000 + .5; | |
19435 | 1386 |
1387 for (current = total - 1; current >= 0; --current) { | |
27054 | 1388 demux_chapter_t *chapter = demuxer->chapters + current; |
19435 | 1389 if (chapter->start <= now) |
1390 break; | |
1391 } | |
1392 current += chapter; | |
1393 } | |
1394 | |
1395 if (current >= total) | |
27055 | 1396 return -1; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1397 if (current < 0) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1398 current = 0; |
19435 | 1399 |
1400 *seek_pts = demuxer->chapters[current].start / 1000.0; | |
1401 | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1402 if (num_chapters) |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1403 *num_chapters = demuxer->num_chapters; |
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1404 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1405 if (chapter_name) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1406 if (demuxer->chapters[current].name) |
19479
8dd04ec733f5
100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
nicodvb
parents:
19478
diff
changeset
|
1407 *chapter_name = strdup(demuxer->chapters[current].name); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1408 else |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1409 *chapter_name = NULL; |
19479
8dd04ec733f5
100l: *chapter_name was copied from the pointer rather than strupd()-ed (and next free()d in mplayer.c
nicodvb
parents:
19478
diff
changeset
|
1410 } |
19478
bab82c53e433
demuxer_seek_chapter() returns informations about chapters count and name
nicodvb
parents:
19439
diff
changeset
|
1411 |
19435 | 1412 return current; |
1413 } | |
1414 } | |
25358 | 1415 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1416 int demuxer_get_current_chapter(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1417 { |
25358 | 1418 int chapter = -1; |
1419 if (!demuxer->num_chapters || !demuxer->chapters) { | |
1420 if (stream_control(demuxer->stream, STREAM_CTRL_GET_CURRENT_CHAPTER, | |
1421 &chapter) == STREAM_UNSUPPORTED) | |
1422 chapter = -1; | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1423 } else { |
25358 | 1424 sh_video_t *sh_video = demuxer->video->sh; |
1425 sh_audio_t *sh_audio = demuxer->audio->sh; | |
1426 uint64_t now; | |
27056 | 1427 now = (sh_video ? sh_video->pts : (sh_audio ? sh_audio->pts : 0)) |
1428 * 1000 + 0.5; | |
25358 | 1429 for (chapter = demuxer->num_chapters - 1; chapter >= 0; --chapter) { |
1430 if (demuxer->chapters[chapter].start <= now) | |
1431 break; | |
1432 } | |
1433 } | |
1434 return chapter; | |
1435 } | |
1436 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1437 char *demuxer_chapter_name(demuxer_t *demuxer, int chapter) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1438 { |
25358 | 1439 if (demuxer->num_chapters && demuxer->chapters) { |
27056 | 1440 if (chapter >= 0 && chapter < demuxer->num_chapters |
1441 && demuxer->chapters[chapter].name) | |
25358 | 1442 return strdup(demuxer->chapters[chapter].name); |
1443 } | |
1444 return NULL; | |
1445 } | |
1446 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1447 char *demuxer_chapter_display_name(demuxer_t *demuxer, int chapter) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1448 { |
25358 | 1449 char *chapter_name = demuxer_chapter_name(demuxer, chapter); |
1450 if (chapter_name) { | |
1451 char *tmp = malloc(strlen(chapter_name) + 14); | |
1452 snprintf(tmp, 63, "(%d) %s", chapter + 1, chapter_name); | |
27051 | 1453 free(chapter_name); |
25358 | 1454 return tmp; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1455 } else { |
25358 | 1456 int chapter_num = demuxer_chapter_count(demuxer); |
1457 char tmp[30]; | |
1458 if (chapter_num <= 0) | |
1459 sprintf(tmp, "(%d)", chapter + 1); | |
1460 else | |
1461 sprintf(tmp, "(%d) of %d", chapter + 1, chapter_num); | |
1462 return strdup(tmp); | |
1463 } | |
1464 } | |
1465 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1466 float demuxer_chapter_time(demuxer_t *demuxer, int chapter, float *end) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1467 { |
25358 | 1468 if (demuxer->num_chapters && demuxer->chapters && chapter >= 0 |
27055 | 1469 && chapter < demuxer->num_chapters) { |
25358 | 1470 if (end) |
1471 *end = demuxer->chapters[chapter].end / 1000.0; | |
1472 return demuxer->chapters[chapter].start / 1000.0; | |
1473 } | |
1474 return -1.0; | |
1475 } | |
1476 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1477 int demuxer_chapter_count(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1478 { |
25358 | 1479 if (!demuxer->num_chapters || !demuxer->chapters) { |
1480 int num_chapters = 0; | |
1481 if (stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_CHAPTERS, | |
1482 &num_chapters) == STREAM_UNSUPPORTED) | |
1483 num_chapters = 0; | |
1484 return num_chapters; | |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1485 } else |
25358 | 1486 return demuxer->num_chapters; |
1487 } | |
1488 | |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1489 int demuxer_angles_count(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1490 { |
27055 | 1491 int ris, angles = -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1492 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1493 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_NUM_ANGLES, &angles); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1494 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1495 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1496 return angles; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1497 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1498 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1499 int demuxer_get_current_angle(demuxer_t *demuxer) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1500 { |
27055 | 1501 int ris, curr_angle = -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1502 ris = stream_control(demuxer->stream, STREAM_CTRL_GET_ANGLE, &curr_angle); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1503 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1504 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1505 return curr_angle; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1506 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1507 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1508 |
27047
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1509 int demuxer_set_angle(demuxer_t *demuxer, int angle) |
6ff2454fe5ec
cosmetics: Make all function declarations consistent by moving the opening
diego
parents:
27046
diff
changeset
|
1510 { |
27055 | 1511 int ris, angles = -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1512 sh_video_t *sh_video = demuxer->video->sh; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1513 sh_audio_t *sh_audio = demuxer->audio->sh; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1514 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1515 angles = demuxer_angles_count(demuxer); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1516 if ((angles < 1) || (angle > angles)) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1517 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1518 |
26926
1e6241274552
added and reused demux_flush() instead of emptying the demux_stream buffers;
nicodvb
parents:
26876
diff
changeset
|
1519 demux_flush(demuxer); |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1520 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1521 ris = stream_control(demuxer->stream, STREAM_CTRL_SET_ANGLE, &angle); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1522 if (ris == STREAM_UNSUPPORTED) |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1523 return -1; |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1524 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1525 demux_control(demuxer, DEMUXER_CTRL_RESYNC, NULL); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1526 if (sh_video) { |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1527 ds_fill_buffer(demuxer->video); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1528 resync_video_stream(sh_video); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1529 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1530 |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1531 if (sh_audio) { |
25575
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1532 ds_fill_buffer(demuxer->audio); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1533 resync_audio_stream(sh_audio); |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1534 } |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1535 |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1536 return angle; |
f94eee219ee0
wrapper functions to get/set angle: the wrapping is needed to RESYNC the demuxer; patch by oattila chello hu
nicodvb
parents:
25444
diff
changeset
|
1537 } |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1538 |
27054 | 1539 int demuxer_audio_track_by_lang(demuxer_t *d, char *lang) |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1540 { |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1541 int i, len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1542 lang += strspn(lang, ","); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1543 while ((len = strcspn(lang, ",")) > 0) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1544 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1545 sh_audio_t *sh = d->a_streams[i]; |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1546 if (sh && sh->lang && strncmp(sh->lang, lang, len) == 0) |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1547 return sh->aid; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1548 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1549 lang += len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1550 lang += strspn(lang, ","); |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1551 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1552 return -1; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1553 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1554 |
27054 | 1555 int demuxer_sub_track_by_lang(demuxer_t *d, char *lang) |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1556 { |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1557 int i, len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1558 lang += strspn(lang, ","); |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1559 while ((len = strcspn(lang, ",")) > 0) { |
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1560 for (i = 0; i < MAX_S_STREAMS; ++i) { |
27054 | 1561 sh_sub_t *sh = d->s_streams[i]; |
26086
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1562 if (sh && sh->lang && strncmp(sh->lang, lang, len) == 0) |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1563 return sh->sid; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1564 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1565 lang += len; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1566 lang += strspn(lang, ","); |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1567 } |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1568 return -1; |
c9a877daca42
Demuxer-independent functions for selecting tracks based on language.
eugeni
parents:
26085
diff
changeset
|
1569 } |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1570 |
27054 | 1571 int demuxer_default_audio_track(demuxer_t *d) |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1572 { |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1573 int i; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1574 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1575 sh_audio_t *sh = d->a_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1576 if (sh && sh->default_track) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1577 return sh->aid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1578 } |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1579 for (i = 0; i < MAX_A_STREAMS; ++i) { |
27054 | 1580 sh_audio_t *sh = d->a_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1581 if (sh) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1582 return sh->aid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1583 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1584 return -1; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1585 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1586 |
27054 | 1587 int demuxer_default_sub_track(demuxer_t *d) |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1588 { |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1589 int i; |
27049
762a9c6bfb43
cosmetics: Consistently format all if, for, while constructs.
diego
parents:
27048
diff
changeset
|
1590 for (i = 0; i < MAX_S_STREAMS; ++i) { |
27054 | 1591 sh_sub_t *sh = d->s_streams[i]; |
26269
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1592 if (sh && sh->default_track) |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1593 return sh->sid; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1594 } |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1595 return -1; |
65ad20416dd7
Support 'default' attribute for audio and subtitle tracks.
eugeni
parents:
26089
diff
changeset
|
1596 } |