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