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