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