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