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