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