Mercurial > mplayer.hg
annotate libmpdemux/demuxer.c @ 17133:a2b24e0d7772
prevent flicker on b-frames, trivial port from vf_spp
author | henry |
---|---|
date | Wed, 07 Dec 2005 20:04:16 +0000 |
parents | 6ff3379a0862 |
children | a1b8eeffdfcd |
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 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
16 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
17 #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
|
18 #include "stheader.h" |
4551 | 19 #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
|
20 |
17012 | 21 #include "libaf/af_format.h" |
22 #include "libvo/fastmemcpy.h" | |
5084 | 23 |
16877
9081ae3a702c
move resync_audio_stream after seeking to demuxer.c
reimar
parents:
16572
diff
changeset
|
24 extern void resync_audio_stream(sh_audio_t *sh_audio); |
16175 | 25 |
26 // Demuxer list | |
27 extern demuxer_desc_t demuxer_desc_rawaudio; | |
28 extern demuxer_desc_t demuxer_desc_rawvideo; | |
29 extern demuxer_desc_t demuxer_desc_tv; | |
30 extern demuxer_desc_t demuxer_desc_mf; | |
31 extern demuxer_desc_t demuxer_desc_avi; | |
32 extern demuxer_desc_t demuxer_desc_y4m; | |
33 extern demuxer_desc_t demuxer_desc_asf; | |
34 extern demuxer_desc_t demuxer_desc_nsv; | |
35 extern demuxer_desc_t demuxer_desc_nuv; | |
36 extern demuxer_desc_t demuxer_desc_real; | |
37 extern demuxer_desc_t demuxer_desc_smjpeg; | |
38 extern demuxer_desc_t demuxer_desc_matroska; | |
39 extern demuxer_desc_t demuxer_desc_realaudio; | |
40 extern demuxer_desc_t demuxer_desc_vqf; | |
41 extern demuxer_desc_t demuxer_desc_mov; | |
42 extern demuxer_desc_t demuxer_desc_vivo; | |
43 extern demuxer_desc_t demuxer_desc_fli; | |
44 extern demuxer_desc_t demuxer_desc_film; | |
45 extern demuxer_desc_t demuxer_desc_roq; | |
46 extern demuxer_desc_t demuxer_desc_gif; | |
47 extern demuxer_desc_t demuxer_desc_ogg; | |
48 extern demuxer_desc_t demuxer_desc_avs; | |
49 extern demuxer_desc_t demuxer_desc_pva; | |
50 extern demuxer_desc_t demuxer_desc_mpeg_ts; | |
51 extern demuxer_desc_t demuxer_desc_lmlm4; | |
52 extern demuxer_desc_t demuxer_desc_mpeg_ps; | |
53 extern demuxer_desc_t demuxer_desc_mpeg_pes; | |
54 extern demuxer_desc_t demuxer_desc_mpeg_es; | |
16310
fb95057e370e
support MPEG in GXF container with extension-based detection.
reimar
parents:
16291
diff
changeset
|
55 extern demuxer_desc_t demuxer_desc_mpeg_gxf; |
16175 | 56 extern demuxer_desc_t demuxer_desc_mpeg4_es; |
57 extern demuxer_desc_t demuxer_desc_h264_es; | |
58 extern demuxer_desc_t demuxer_desc_rawdv; | |
16412 | 59 extern demuxer_desc_t demuxer_desc_mpc; |
16175 | 60 extern demuxer_desc_t demuxer_desc_audio; |
61 extern demuxer_desc_t demuxer_desc_xmms; | |
62 extern demuxer_desc_t demuxer_desc_mpeg_ty; | |
63 extern demuxer_desc_t demuxer_desc_rtp; | |
64 extern demuxer_desc_t demuxer_desc_lavf; | |
65 extern demuxer_desc_t demuxer_desc_aac; | |
66 | |
67 demuxer_desc_t* demuxer_list[] = { | |
68 &demuxer_desc_rawaudio, | |
69 &demuxer_desc_rawvideo, | |
70 #ifdef USE_TV | |
71 &demuxer_desc_tv, | |
72 #endif | |
73 &demuxer_desc_mf, | |
74 &demuxer_desc_avi, | |
75 &demuxer_desc_y4m, | |
76 &demuxer_desc_asf, | |
77 &demuxer_desc_nsv, | |
78 &demuxer_desc_nuv, | |
79 &demuxer_desc_real, | |
80 &demuxer_desc_smjpeg, | |
81 #ifdef HAVE_MATROSKA | |
82 &demuxer_desc_matroska, | |
83 #endif | |
84 &demuxer_desc_realaudio, | |
85 &demuxer_desc_vqf, | |
86 &demuxer_desc_mov, | |
87 &demuxer_desc_vivo, | |
88 &demuxer_desc_fli, | |
89 &demuxer_desc_film, | |
90 &demuxer_desc_roq, | |
91 #ifdef HAVE_GIF | |
92 &demuxer_desc_gif, | |
93 #endif | |
94 #ifdef HAVE_OGGVORBIS | |
95 &demuxer_desc_ogg, | |
96 #endif | |
97 #ifdef USE_WIN32DLL | |
98 &demuxer_desc_avs, | |
99 #endif | |
100 &demuxer_desc_pva, | |
101 &demuxer_desc_mpeg_ts, | |
102 &demuxer_desc_lmlm4, | |
103 &demuxer_desc_mpeg_ps, | |
104 &demuxer_desc_mpeg_pes, | |
105 &demuxer_desc_mpeg_es, | |
16310
fb95057e370e
support MPEG in GXF container with extension-based detection.
reimar
parents:
16291
diff
changeset
|
106 &demuxer_desc_mpeg_gxf, |
16175 | 107 &demuxer_desc_mpeg4_es, |
108 &demuxer_desc_h264_es, | |
109 #ifdef HAVE_LIBDV095 | |
110 &demuxer_desc_rawdv, | |
111 #endif | |
16412 | 112 &demuxer_desc_mpc, |
16175 | 113 &demuxer_desc_audio, |
114 #ifdef HAVE_XMMS | |
115 &demuxer_desc_xmms, | |
116 #endif | |
117 &demuxer_desc_mpeg_ty, | |
16572
56a5f69e9b35
"LIVE.COM Streaming Media" is now called "LIVE555 Streaming Media".
rsf
parents:
16522
diff
changeset
|
118 #ifdef STREAMING_LIVE555 |
16175 | 119 &demuxer_desc_rtp, |
120 #endif | |
121 #ifdef USE_LIBAVFORMAT | |
122 &demuxer_desc_lavf, | |
123 #endif | |
124 &demuxer_desc_aac, | |
125 NULL | |
126 }; | |
127 | |
14046
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
128 // Should be set to 1 by demux module if ids it passes to new_sh_audio and |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
129 // new_sh_video don't match aids and vids it accepts from the command line |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
130 int demux_aid_vid_mismatch = 0; |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
131 |
1643 | 132 void free_demuxer_stream(demux_stream_t *ds){ |
133 ds_free_packs(ds); | |
134 free(ds); | |
135 } | |
136 | |
1 | 137 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){ |
138 demux_stream_t* ds=malloc(sizeof(demux_stream_t)); | |
139 ds->buffer_pos=ds->buffer_size=0; | |
140 ds->buffer=NULL; | |
141 ds->pts=0; | |
746 | 142 ds->pts_bytes=0; |
1 | 143 ds->eof=0; |
144 ds->pos=0; | |
145 ds->dpos=0; | |
889 | 146 ds->pack_no=0; |
1 | 147 //--------------- |
148 ds->packs=0; | |
149 ds->bytes=0; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
150 ds->first=ds->last=ds->current=NULL; |
1 | 151 ds->id=id; |
152 ds->demuxer=demuxer; | |
153 //---------------- | |
154 ds->asf_seq=-1; | |
155 ds->asf_packet=NULL; | |
291 | 156 //---------------- |
7754 | 157 ds->ss_mul=ds->ss_div=0; |
2419 | 158 //---------------- |
291 | 159 ds->sh=NULL; |
1 | 160 return ds; |
161 } | |
162 | |
16175 | 163 |
164 /** | |
165 * Get demuxer description structure for a given demuxer type | |
166 * | |
167 * @param file_format type of the demuxer | |
168 * @return structure for the demuxer, NULL if not found | |
169 */ | |
170 static demuxer_desc_t* get_demuxer_desc_from_type(int file_format) | |
171 { | |
172 int i; | |
173 | |
174 for (i = 0; demuxer_list[i]; i++) | |
175 if (file_format == demuxer_list[i]->type) | |
176 return demuxer_list[i]; | |
177 | |
178 return NULL; | |
179 } | |
180 | |
181 | |
182 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id,char *filename){ | |
1 | 183 demuxer_t *d=malloc(sizeof(demuxer_t)); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
184 memset(d,0,sizeof(demuxer_t)); |
1 | 185 d->stream=stream; |
598 | 186 d->movi_start=stream->start_pos; |
187 d->movi_end=stream->end_pos; | |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
188 d->seekable=1; |
1 | 189 d->synced=0; |
190 d->filepos=0; | |
191 d->audio=new_demuxer_stream(d,a_id); | |
192 d->video=new_demuxer_stream(d,v_id); | |
552 | 193 d->sub=new_demuxer_stream(d,s_id); |
1 | 194 d->type=type; |
16175 | 195 if(type) |
196 if (!(d->desc = get_demuxer_desc_from_type(type))) | |
197 mp_msg(MSGT_DEMUXER,MSGL_ERR,"BUG! Invalid demuxer type in new_demuxer(), big troubles ahead."); | |
198 if(filename) // Filename hack for avs_check_file | |
199 d->filename=strdup(filename); | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
200 stream_reset(stream); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
201 stream_seek(stream,stream->start_pos); |
1 | 202 return d; |
203 } | |
204 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
205 sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){ |
5084 | 206 if(id > MAX_A_STREAMS-1 || id < 0) |
4642 | 207 { |
208 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested audio stream id overflow (%d > %d)\n", | |
209 id, MAX_A_STREAMS); | |
210 return NULL; | |
211 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
212 if(demuxer->a_streams[id]){ |
1584 | 213 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
|
214 } else { |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
215 sh_audio_t *sh; |
6951 | 216 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundAudioStream,id); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
217 demuxer->a_streams[id]=malloc(sizeof(sh_audio_t)); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
218 memset(demuxer->a_streams[id],0,sizeof(sh_audio_t)); |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
219 sh = demuxer->a_streams[id]; |
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
220 // set some defaults |
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
221 sh->samplesize=2; |
14245 | 222 sh->sample_format=AF_FORMAT_S16_NE; |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
223 sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/ |
14046
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
224 if (identify && !demux_aid_vid_mismatch) |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
225 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_AUDIO_ID=%d\n", id); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
226 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
227 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
|
228 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
229 |
1643 | 230 void free_sh_audio(sh_audio_t* sh){ |
13946 | 231 mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_audio at %p\n",sh); |
1643 | 232 if(sh->wf) free(sh->wf); |
233 free(sh); | |
234 } | |
235 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
236 sh_video_t* new_sh_video(demuxer_t *demuxer,int id){ |
5084 | 237 if(id > MAX_V_STREAMS-1 || id < 0) |
4642 | 238 { |
239 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested video stream id overflow (%d > %d)\n", | |
240 id, MAX_V_STREAMS); | |
241 return NULL; | |
242 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
243 if(demuxer->v_streams[id]){ |
1584 | 244 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_VideoStreamRedefined,id); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
245 } else { |
6951 | 246 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_FoundVideoStream,id); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
247 demuxer->v_streams[id]=malloc(sizeof(sh_video_t)); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
248 memset(demuxer->v_streams[id],0,sizeof(sh_video_t)); |
14046
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
249 if (identify && !demux_aid_vid_mismatch) |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
250 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_VIDEO_ID=%d\n", id); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
251 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
252 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
|
253 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
254 |
1643 | 255 void free_sh_video(sh_video_t* sh){ |
13946 | 256 mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing sh_video at %p\n",sh); |
1657 | 257 if(sh->bih) free(sh->bih); |
1643 | 258 free(sh); |
259 } | |
260 | |
261 void free_demuxer(demuxer_t *demuxer){ | |
262 int i; | |
13946 | 263 mp_msg(MSGT_DEMUXER,MSGL_DBG2,"DEMUXER: freeing demuxer at %p\n",demuxer); |
16175 | 264 if(demuxer->desc->close) |
265 demuxer->desc->close(demuxer); | |
266 // Very ugly hack to make it behave like old implementation | |
267 if (demuxer->desc->type == DEMUXER_TYPE_DEMUXERS) | |
16291
f443f849531b
Do not free demuxer before using demuxer->desc->type (happened when using -audiofile).
reimar
parents:
16198
diff
changeset
|
268 goto skip_streamfree; |
1643 | 269 // free streams: |
14666
91bbfcb66883
Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).
reimar
parents:
14502
diff
changeset
|
270 for(i = 0; i < MAX_A_STREAMS; i++) |
1643 | 271 if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]); |
14666
91bbfcb66883
Memleak fixes. Based on patch by Timothy Lee (timothy lee at siriushk com).
reimar
parents:
14502
diff
changeset
|
272 for(i = 0; i < MAX_V_STREAMS; i++) |
1643 | 273 if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]); |
274 //if(sh_audio) free_sh_audio(sh_audio); | |
275 //if(sh_video) free_sh_video(sh_video); | |
276 // free demuxers: | |
277 free_demuxer_stream(demuxer->audio); | |
278 free_demuxer_stream(demuxer->video); | |
5412 | 279 free_demuxer_stream(demuxer->sub); |
16291
f443f849531b
Do not free demuxer before using demuxer->desc->type (happened when using -audiofile).
reimar
parents:
16198
diff
changeset
|
280 skip_streamfree: |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
281 if(demuxer->info) { |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
282 for(i=0;demuxer->info[i] != NULL; i++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
283 free(demuxer->info[i]); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
284 free(demuxer->info); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
285 } |
16175 | 286 if(demuxer->filename) |
287 free(demuxer->filename); | |
1643 | 288 free(demuxer); |
289 } | |
290 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
291 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
292 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp){ |
1 | 293 // demux_packet_t* dp=new_demux_packet(len); |
294 // stream_read(stream,dp->buffer,len); | |
295 // dp->pts=pts; //(float)pts/90000.0f; | |
296 // dp->pos=pos; | |
297 // append packet to DS stream: | |
298 ++ds->packs; | |
299 ds->bytes+=dp->len; | |
300 if(ds->last){ | |
301 // next packet in stream | |
302 ds->last->next=dp; | |
303 ds->last=dp; | |
304 } else { | |
305 // first packet in stream | |
306 ds->first=ds->last=dp; | |
307 } | |
1567 | 308 mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%u [packs: A=%d V=%d]\n", |
1 | 309 (ds==ds->demuxer->audio)?"d_audio":"d_video", |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
310 dp->len,dp->pts,(unsigned int)dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs); |
1 | 311 } |
312 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
313 void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t pos,int flags){ |
1 | 314 demux_packet_t* dp=new_demux_packet(len); |
10891
65ed62e138fa
Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents:
10882
diff
changeset
|
315 len = stream_read(stream,dp->buffer,len); |
65ed62e138fa
Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents:
10882
diff
changeset
|
316 resize_demux_packet(dp, len); |
1 | 317 dp->pts=pts; //(float)pts/90000.0f; |
318 dp->pos=pos; | |
979 | 319 dp->flags=flags; |
1 | 320 // append packet to DS stream: |
321 ds_add_packet(ds,dp); | |
322 } | |
323 | |
324 // return value: | |
325 // 0 = EOF or no stream found or invalid type | |
326 // 1 = successfully read a packet | |
327 | |
328 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ | |
329 // Note: parameter 'ds' can be NULL! | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
330 // printf("demux->type=%d\n",demux->type); |
16175 | 331 return demux->desc->fill_buffer(demux, ds); |
1 | 332 } |
333 | |
334 // return value: | |
335 // 0 = EOF | |
336 // 1 = succesfull | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
337 int ds_fill_buffer(demux_stream_t *ds){ |
1 | 338 demuxer_t *demux=ds->demuxer; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
339 if(ds->current) free_demux_packet(ds->current); |
1 | 340 if(verbose>2){ |
1567 | 341 if(ds==demux->audio) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_audio) called\n");else |
342 if(ds==demux->video) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_video) called\n");else | |
5470
e80d66b5e4a7
added debug printf for dvdsub - from dvdnav patch by Kees Cook <mplayer@outflux.net>
arpi
parents:
5469
diff
changeset
|
343 if(ds==demux->sub) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_sub) called\n");else |
1567 | 344 mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(unknown 0x%X) called\n",(unsigned int)ds); |
1 | 345 } |
346 while(1){ | |
347 if(ds->packs){ | |
348 demux_packet_t *p=ds->first; | |
349 // copy useful data: | |
350 ds->buffer=p->buffer; | |
351 ds->buffer_pos=0; | |
352 ds->buffer_size=p->len; | |
353 ds->pos=p->pos; | |
354 ds->dpos+=p->len; // !!! | |
889 | 355 ++ds->pack_no; |
746 | 356 if(p->pts){ |
357 ds->pts=p->pts; | |
358 ds->pts_bytes=0; | |
359 } | |
360 ds->pts_bytes+=p->len; // !!! | |
979 | 361 ds->flags=p->flags; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
362 // unlink packet: |
1 | 363 ds->bytes-=p->len; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
364 ds->current=p; |
1 | 365 ds->first=p->next; |
366 if(!ds->first) ds->last=NULL; | |
367 --ds->packs; | |
368 return 1; //ds->buffer_size; | |
369 } | |
370 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){ | |
1584 | 371 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes); |
372 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 373 break; |
374 } | |
375 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){ | |
1584 | 376 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes); |
377 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 378 break; |
379 } | |
1421 | 380 if(!demux_fill_buffer(demux,ds)){ |
1567 | 381 mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"ds_fill_buffer()->demux_fill_buffer() failed\n"); |
1421 | 382 break; // EOF |
383 } | |
1 | 384 } |
385 ds->buffer_pos=ds->buffer_size=0; | |
386 ds->buffer=NULL; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
387 ds->current=NULL; |
1567 | 388 mp_msg(MSGT_DEMUXER,MSGL_V,"ds_fill_buffer: EOF reached (stream: %s) \n",ds==demux->audio?"audio":"video"); |
1 | 389 ds->eof=1; |
390 return 0; | |
391 } | |
392 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
393 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len){ |
1 | 394 int x; |
395 int bytes=0; | |
396 while(len>0){ | |
397 x=ds->buffer_size-ds->buffer_pos; | |
398 if(x==0){ | |
399 if(!ds_fill_buffer(ds)) return bytes; | |
400 } else { | |
401 if(x>len) x=len; | |
402 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
403 bytes+=x;len-=x;ds->buffer_pos+=x; | |
404 } | |
405 } | |
406 return bytes; | |
407 } | |
408 | |
746 | 409 int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len){ |
410 int x; | |
411 int bytes=0; | |
412 while(len>0){ | |
413 x=ds->buffer_size-ds->buffer_pos; | |
414 if(x==0){ | |
415 if(!ds_fill_buffer(ds)) return bytes; | |
416 } else { | |
417 if(x>len) x=len; | |
418 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
419 bytes+=x;len-=x;ds->buffer_pos+=x; | |
420 return bytes; // stop at end of package! (for correct timestamping) | |
421 } | |
422 } | |
423 return bytes; | |
424 } | |
425 | |
426 | |
1 | 427 void ds_free_packs(demux_stream_t *ds){ |
428 demux_packet_t *dp=ds->first; | |
429 while(dp){ | |
430 demux_packet_t *dn=dp->next; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
431 free_demux_packet(dp); |
1 | 432 dp=dn; |
433 } | |
434 if(ds->asf_packet){ | |
435 // free unfinished .asf fragments: | |
436 free(ds->asf_packet->buffer); | |
437 free(ds->asf_packet); | |
438 ds->asf_packet=NULL; | |
439 } | |
440 ds->first=ds->last=NULL; | |
441 ds->packs=0; // !!!!! | |
442 ds->bytes=0; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
443 if(ds->current) free_demux_packet(ds->current); |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
444 ds->current=NULL; |
1 | 445 ds->buffer=NULL; |
446 ds->buffer_pos=ds->buffer_size; | |
828 | 447 ds->pts=0; ds->pts_bytes=0; |
1 | 448 } |
449 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
450 int ds_get_packet(demux_stream_t *ds,unsigned char **start){ |
1 | 451 while(1){ |
452 int len; | |
453 if(ds->buffer_pos>=ds->buffer_size){ | |
454 if(!ds_fill_buffer(ds)){ | |
455 // EOF | |
456 *start = NULL; | |
457 return -1; | |
458 } | |
459 } | |
460 len=ds->buffer_size-ds->buffer_pos; | |
461 *start = &ds->buffer[ds->buffer_pos]; | |
462 ds->buffer_pos+=len; | |
463 return len; | |
464 } | |
465 } | |
554 | 466 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
467 int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){ |
554 | 468 while(1){ |
469 int len; | |
470 if(ds->buffer_pos>=ds->buffer_size){ | |
471 *start = NULL; | |
472 if(!ds->packs) return -1; // no sub | |
473 if(!ds_fill_buffer(ds)) return -1; // EOF | |
474 } | |
475 len=ds->buffer_size-ds->buffer_pos; | |
476 *start = &ds->buffer[ds->buffer_pos]; | |
477 ds->buffer_pos+=len; | |
478 return len; | |
479 } | |
480 } | |
481 | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
482 float ds_get_next_pts(demux_stream_t *ds) { |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
483 demuxer_t* demux = ds->demuxer; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
484 while(!ds->first) { |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
485 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){ |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
486 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes); |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
487 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
488 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
489 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
490 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){ |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
491 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes); |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
492 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
493 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
494 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
495 if(!demux_fill_buffer(demux,ds)) |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
496 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
497 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
498 return ds->first->pts; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
499 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
500 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
501 // ==================================================================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
502 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
503 // commandline options, flags: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
504 extern int force_ni; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
505 extern int pts_from_bps; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
506 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7482
diff
changeset
|
507 //extern int audio_id; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7482
diff
changeset
|
508 //extern int video_id; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7482
diff
changeset
|
509 //extern int dvdsub_id; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
510 |
16175 | 511 void demuxer_help(void) |
512 { | |
513 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
|
514 |
16175 | 515 mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n"); |
516 mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: type info: (comment)\n"); | |
16522 | 517 if (identify) |
518 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_DEMUXERS\n"); | |
16175 | 519 for (i = 0; demuxer_list[i]; i++) { |
520 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Don't display special demuxers | |
521 continue; | |
522 if (demuxer_list[i]->comment && strlen(demuxer_list[i]->comment)) | |
523 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s (%s)\n", | |
524 demuxer_list[i]->name, demuxer_list[i]->type, demuxer_list[i]->info, demuxer_list[i]->comment); | |
525 else | |
526 mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %2d %s\n", | |
527 demuxer_list[i]->name, demuxer_list[i]->type, demuxer_list[i]->info); | |
528 } | |
529 } | |
530 | |
14693
37116118ab6a
avisynth demuxer patch by Gianluigi Tiesi <mplayer at netfarm.it>
faust3
parents:
14666
diff
changeset
|
531 |
16175 | 532 /** |
533 * Get demuxer type for a given demuxer name | |
534 * | |
535 * @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
|
536 * @param force will be set if demuxer should be forced. |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
537 * May be NULL. |
16175 | 538 * @return DEMUXER_TYPE_xxx, -1 if error or not found |
539 */ | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
540 int get_demuxer_type_from_name(char *demuxer_name, int *force) |
16175 | 541 { |
542 int i; | |
543 long type_int; | |
544 char *endptr; | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
545 |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
546 if (!demuxer_name || !demuxer_name[0]) |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
547 return DEMUXER_TYPE_UNKNOWN; |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
548 if (force) *force = demuxer_name[0] == '+'; |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
549 if (demuxer_name[0] == '+') |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
550 demuxer_name = &demuxer_name[1]; |
16175 | 551 for (i = 0; demuxer_list[i]; i++) { |
552 if (demuxer_list[i]->type > DEMUXER_TYPE_MAX) // Can't select special demuxers from commandline | |
553 continue; | |
554 if (strcmp(demuxer_name, demuxer_list[i]->name) == 0) | |
555 return demuxer_list[i]->type; | |
556 } | |
557 | |
558 // No match found, try to parse name as an integer (demuxer number) | |
559 type_int = strtol(demuxer_name, &endptr, 0); | |
560 if (*endptr) // Conversion failed | |
561 return -1; | |
562 if ((type_int > 0) && (type_int <= DEMUXER_TYPE_MAX)) | |
563 return (int)type_int; | |
564 | |
565 return -1; | |
566 } | |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
567 |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
568 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
|
569 |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
570 /* |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
571 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
|
572 demuxers should NEVER rely on an external var to enable them |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
573 self. If a demuxer can't do any autodection it should only use |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
574 file_format. The user can explictly set file_format with the -demuxer |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
575 option so there is really no need for another extra var. |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
576 For conivence an option can be added to set file_format directly |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
577 to the right type (ex: rawaudio,rawvideo). |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
578 Also the stream can override the file_format so a demuxer wich rely |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
579 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
|
580 (ex: tv,mf). |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
581 */ |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
582 |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
583 static demuxer_t* demux_open_stream(stream_t *stream, int file_format, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
584 int force, int audio_id, int video_id, int dvdsub_id, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
585 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
|
586 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
587 //int file_format=(*file_format_ptr); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
588 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
589 demuxer_t *demuxer=NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
590 |
16175 | 591 sh_video_t *sh_video=NULL; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
592 |
16175 | 593 demuxer_desc_t *demuxer_desc; |
594 int fformat; | |
595 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
|
596 |
1659 | 597 //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id); |
598 | |
16175 | 599 // If somebody requested a demuxer check it |
600 if (file_format) { | |
601 if ((demuxer_desc = get_demuxer_desc_from_type(file_format))) { | |
602 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename); | |
16413
a07354861027
execute the check function even when a demuxer is forced, to avoid crashes.
reimar
parents:
16412
diff
changeset
|
603 if (demuxer_desc->check_file) { |
a07354861027
execute the check function even when a demuxer is forced, to avoid crashes.
reimar
parents:
16412
diff
changeset
|
604 fformat = demuxer_desc->check_file(demuxer); |
a07354861027
execute the check function even when a demuxer is forced, to avoid crashes.
reimar
parents:
16412
diff
changeset
|
605 if (force) |
a07354861027
execute the check function even when a demuxer is forced, to avoid crashes.
reimar
parents:
16412
diff
changeset
|
606 fformat = demuxer_desc->type; |
a07354861027
execute the check function even when a demuxer is forced, to avoid crashes.
reimar
parents:
16412
diff
changeset
|
607 if (fformat != 0) { |
16175 | 608 if (fformat == demuxer_desc->type) { |
609 // Move messages to demuxer detection code? | |
610 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc); | |
611 file_format = demuxer_desc->type = fformat; | |
612 } else { | |
613 // Format changed after check, recurse | |
614 free_demuxer(demuxer); | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
615 return demux_open_stream(stream, fformat, force, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
616 audio_id, video_id, dvdsub_id, filename); |
16175 | 617 } |
618 } else { | |
619 // Check failed for forced demuxer, quit | |
620 free_demuxer(demuxer); | |
621 return NULL; | |
622 } | |
623 } | |
624 } | |
9065 | 625 } |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
626 |
16175 | 627 if (demuxer) |
628 goto dmx_open; | |
6942
6048ac6ab001
detection reordered. note: raw DV detection should be more reliable.
arpi
parents:
6925
diff
changeset
|
629 |
16175 | 630 // Test demuxers with safe file checks |
631 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
632 if (demuxer_desc->safe_check) { | |
633 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename); | |
634 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { | |
635 if (fformat == demuxer_desc->type) { | |
636 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc); | |
637 file_format = fformat; | |
638 break; | |
639 } else { | |
16326
88b9c7b0e773
Fix move playlists (control must be returned to mplayer.c, with the demuxer
reimar
parents:
16321
diff
changeset
|
640 if (fformat == DEMUXER_TYPE_PLAYLIST) |
88b9c7b0e773
Fix move playlists (control must be returned to mplayer.c, with the demuxer
reimar
parents:
16321
diff
changeset
|
641 return demuxer; // handled in mplayer.c |
16175 | 642 // Format changed after check, recurse |
643 free_demuxer(demuxer); | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
644 demuxer=demux_open_stream(stream, fformat, force, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
645 audio_id, video_id, dvdsub_id, filename); |
16175 | 646 if(demuxer) return demuxer; // done! |
647 file_format = DEMUXER_TYPE_UNKNOWN; | |
648 } | |
649 } else { | |
13520 | 650 free_demuxer(demuxer); |
651 demuxer = NULL; | |
652 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
653 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
654 } |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
655 |
16175 | 656 if (demuxer) |
657 goto dmx_open; | |
14276 | 658 |
16175 | 659 // If no forced demuxer perform file extension based detection |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
660 // Ok. We're over the stable detectable fileformats, the next ones are a bit |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
661 // fuzzy. So by default (extension_parsing==1) try extension-based detection |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
662 // first: |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
663 if(file_format==DEMUXER_TYPE_UNKNOWN && filename && extension_parsing==1){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
664 file_format=demuxer_type_by_filename(filename); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
665 if(file_format!=DEMUXER_TYPE_UNKNOWN){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
666 // we like recursion :) |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
667 demuxer=demux_open_stream(stream, file_format, force, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
668 audio_id, video_id, dvdsub_id, filename); |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
669 if(demuxer) return demuxer; // done! |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
670 file_format=DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing... |
10379
296064e1baf0
fixed mpeg-ps ext-based detection sig11 bug reporetd by Raindel Shachar
arpi
parents:
10310
diff
changeset
|
671 mp_msg(MSGT_DEMUXER,MSGL_V,"demuxer: continue fuzzy content-based format guessing...\n"); |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
672 } |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
673 } |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
674 |
16175 | 675 // Try detection for all other demuxers |
676 for (i = 0; (demuxer_desc = demuxer_list[i]); i++) { | |
677 if (!demuxer_desc->safe_check && demuxer_desc->check_file) { | |
678 demuxer = new_demuxer(stream,demuxer_desc->type,audio_id,video_id,dvdsub_id,filename); | |
679 if ((fformat = demuxer_desc->check_file(demuxer)) != 0) { | |
680 if (fformat == demuxer_desc->type) { | |
681 mp_msg(MSGT_DEMUXER, MSGL_INFO, MSGTR_Detected_XXX_FileFormat, demuxer_desc->shortdesc); | |
682 file_format = fformat; | |
683 break; | |
684 } else { | |
16326
88b9c7b0e773
Fix move playlists (control must be returned to mplayer.c, with the demuxer
reimar
parents:
16321
diff
changeset
|
685 if (fformat == DEMUXER_TYPE_PLAYLIST) |
88b9c7b0e773
Fix move playlists (control must be returned to mplayer.c, with the demuxer
reimar
parents:
16321
diff
changeset
|
686 return demuxer; // handled in mplayer.c |
16175 | 687 // Format changed after check, recurse |
688 free_demuxer(demuxer); | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
689 demuxer=demux_open_stream(stream, fformat, force, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
690 audio_id, video_id, dvdsub_id, filename); |
16175 | 691 if(demuxer) return demuxer; // done! |
692 file_format = DEMUXER_TYPE_UNKNOWN; | |
693 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
694 } else { |
4660 | 695 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
696 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
697 } |
4189 | 698 } |
699 } | |
15670 | 700 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
701 //=============== Unknown, exiting... =========================== |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
702 if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){ |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8821
diff
changeset
|
703 //mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); // will be done by mplayer.c after fallback to playlist-parsing |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
704 return NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
705 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
706 //====== File format recognized, set up these for compatibility: ========= |
16175 | 707 dmx_open: |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
708 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
709 demuxer->file_format=file_format; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
710 |
16175 | 711 if (demuxer->desc->open) |
712 if (!(demuxer = demuxer->desc->open(demuxer))) | |
713 return NULL; | |
10263 | 714 |
16477 | 715 if ((sh_video=demuxer->video->sh) && sh_video->bih){ |
716 int biComp=le2me_32(sh_video->bih->biCompression); | |
13301
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
717 mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", |
16477 | 718 (char *)&biComp, |
13301
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
719 sh_video->bih->biWidth, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
720 sh_video->bih->biHeight, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
721 sh_video->bih->biBitCount, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
722 sh_video->fps, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
723 sh_video->i_bps*0.008f, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
724 sh_video->i_bps/1024.0f ); |
16477 | 725 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
726 return demuxer; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
727 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
728 |
6623 | 729 char* audio_stream = NULL; |
7867 | 730 char* sub_stream = NULL; |
16175 | 731 int demuxer_type = 0; // used by rawaudio and rawvideo |
9709 | 732 int audio_stream_cache = 0; |
7867 | 733 |
16175 | 734 char *demuxer_name = NULL; // parameter from -demuxer |
735 char *audio_demuxer_name = NULL; // parameter from -audio-demuxer | |
736 char *sub_demuxer_name = NULL; // parameter from -sub-demuxer | |
737 | |
7867 | 738 extern int hr_mp3_seek; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
739 |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
740 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
|
741 extern float stream_cache_seek_min_percent; |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
742 |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
743 demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
744 stream_t *as = NULL,*ss = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
745 demuxer_t *vd,*ad = NULL,*sd = NULL; |
12223 | 746 int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ; |
16175 | 747 int audio_demuxer_type = 0, sub_demuxer_type = 0; |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
748 int demuxer_force = 0, audio_demuxer_force = 0, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
749 sub_demuxer_force = 0; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
750 |
14046
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
751 demux_aid_vid_mismatch = 0; |
4802041ab8e3
Output more information about vids, aids, sids, alangs and slangs with -identify. Patch by kiriuja <mplayer-patches@en-directo.net>
mosu
parents:
14034
diff
changeset
|
752 |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
753 if ((demuxer_type = get_demuxer_type_from_name(demuxer_name, &demuxer_force)) < 0) { |
16175 | 754 mp_msg(MSGT_DEMUXER,MSGL_ERR,"-demuxer %s does not exist.\n",demuxer_name); |
755 } | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
756 if ((audio_demuxer_type = get_demuxer_type_from_name(audio_demuxer_name, &audio_demuxer_force)) < 0) { |
16175 | 757 mp_msg(MSGT_DEMUXER,MSGL_ERR,"-audio-demuxer %s does not exist.\n",audio_demuxer_name); |
758 } | |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
759 if ((sub_demuxer_type = get_demuxer_type_from_name(sub_demuxer_name, &sub_demuxer_force)) < 0) { |
16175 | 760 mp_msg(MSGT_DEMUXER,MSGL_ERR,"-sub-demuxer %s does not exist.\n",sub_demuxer_name); |
761 } | |
762 | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
763 if(audio_stream) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
764 as = open_stream(audio_stream,0,&afmt); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
765 if(!as) { |
6951 | 766 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_CannotOpenAudioStream,audio_stream); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
767 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
768 } |
9709 | 769 if(audio_stream_cache) { |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
770 if(!stream_enable_cache(as,audio_stream_cache*1024,audio_stream_cache*1024*(stream_cache_min_percent / 100.0), |
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
|
771 audio_stream_cache*1024*(stream_cache_seek_min_percent / 100.0))) { |
9709 | 772 free_stream(as); |
773 mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't enable audio stream cache\n"); | |
774 return NULL; | |
775 } | |
776 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
777 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
778 if(sub_stream) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
779 ss = open_stream(sub_stream,0,&sfmt); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
780 if(!ss) { |
6951 | 781 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_CannotOpenSubtitlesStream,sub_stream); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
782 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
783 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
784 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
785 |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
786 vd = demux_open_stream(vs, demuxer_type ? demuxer_type : file_format, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
787 demuxer_force, audio_stream ? -2 : audio_id, video_id, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
788 sub_stream ? -2 : dvdsub_id, filename); |
9709 | 789 if(!vd) { |
790 if(as) free_stream(as); | |
791 if(ss) free_stream(ss); | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
792 return NULL; |
9709 | 793 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
794 if(as) { |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
795 ad = demux_open_stream(as, audio_demuxer_type ? audio_demuxer_type : afmt, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
796 audio_demuxer_force, audio_id, -2, -2, audio_stream); |
9709 | 797 if(!ad) { |
6951 | 798 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningAudioDemuxerFailed,audio_stream); |
9709 | 799 free_stream(as); |
800 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
801 else if(ad->audio->sh && ((sh_audio_t*)ad->audio->sh)->format == 0x55) // MP3 |
7867 | 802 hr_mp3_seek=1; // Enable high res seeking |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
803 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
804 if(ss) { |
16321
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
805 sd = demux_open_stream(ss, sub_demuxer_type ? sub_demuxer_type : sfmt, |
efbfac98cab1
Allow forcing of demuxers and codecs by prepending '+'
reimar
parents:
16310
diff
changeset
|
806 sub_demuxer_force, -2, -2, dvdsub_id, sub_stream); |
9709 | 807 if(!sd) { |
6951 | 808 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningSubtitlesDemuxerFailed,sub_stream); |
9709 | 809 free_stream(ss); |
810 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
811 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
812 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
813 if(ad && sd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
814 return new_demuxers_demuxer(vd,ad,sd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
815 else if(ad) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
816 return new_demuxers_demuxer(vd,ad,vd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
817 else if(sd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
818 return new_demuxers_demuxer(vd,vd,sd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
819 else |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
820 return vd; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
821 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
822 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
823 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
824 int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){ |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
825 demux_stream_t *d_audio=demuxer->audio; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
826 demux_stream_t *d_video=demuxer->video; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
827 sh_audio_t *sh_audio=d_audio->sh; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
828 sh_video_t *sh_video=d_video->sh; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
829 |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
830 if(!demuxer->seekable){ |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
831 if(demuxer->file_format==DEMUXER_TYPE_AVI) |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
832 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekRawAVI); |
2790 | 833 #ifdef USE_TV |
834 else if (demuxer->file_format==DEMUXER_TYPE_TV) | |
6951 | 835 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_TVInputNotSeekable); |
2790 | 836 #endif |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
837 else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
838 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekFile); |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
839 return 0; |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
840 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
841 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
842 // clear demux buffers: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
843 if(sh_audio){ ds_free_packs(d_audio);sh_audio->a_buffer_len=0;} |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
844 ds_free_packs(d_video); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
845 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
846 demuxer->stream->eof=0; // clear eof flag |
3542
465329581ad8
reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents:
3411
diff
changeset
|
847 demuxer->video->eof=0; |
465329581ad8
reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents:
3411
diff
changeset
|
848 demuxer->audio->eof=0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
849 |
4203 | 850 #if 0 |
3824 | 851 if(sh_audio) sh_audio->timer=sh_video->timer; |
852 #else | |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
853 if(sh_audio) sh_audio->delay=0; |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
854 if(sh_video) sh_video->timer=0; // !!!!!! |
3824 | 855 #endif |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
856 |
16175 | 857 if (demuxer->desc->seek) |
858 demuxer->desc->seek(demuxer,rel_seek_secs,flags); | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
859 |
16877
9081ae3a702c
move resync_audio_stream after seeking to demuxer.c
reimar
parents:
16572
diff
changeset
|
860 if (sh_audio) resync_audio_stream(sh_audio); |
9081ae3a702c
move resync_audio_stream after seeking to demuxer.c
reimar
parents:
16572
diff
changeset
|
861 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
862 return 1; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
863 } |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
864 |
3050 | 865 int demux_info_add(demuxer_t *demuxer, char *opt, char *param) |
866 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
867 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
868 int n = 0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
869 |
3050 | 870 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
871 for(n = 0; info && info[2*n] != NULL; n++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
872 { |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
873 if(!strcasecmp(opt,info[2*n])) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
874 { |
6951 | 875 mp_msg(MSGT_DEMUX, MSGL_WARN,MSGTR_DemuxerInfoAlreadyPresent,opt); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
876 return 0; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
877 } |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
878 } |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
879 |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
880 info = demuxer->info = (char**)realloc(info,(2*(n+2))*sizeof(char*)); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
881 info[2*n] = strdup(opt); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
882 info[2*n+1] = strdup(param); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
883 memset(&info[2*(n+1)],0,2*sizeof(char*)); |
3050 | 884 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
885 return 1; |
3050 | 886 } |
887 | |
888 int demux_info_print(demuxer_t *demuxer) | |
889 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
890 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
891 int n; |
3050 | 892 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
893 if(!info) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
894 return 0; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
895 |
6951 | 896 mp_msg(MSGT_DEMUX, MSGL_INFO,MSGTR_ClipInfo); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
897 for(n = 0; info[2*n] != NULL ; n++) |
15789
32d9c8a0a02b
adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents:
15780
diff
changeset
|
898 { |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
899 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]); |
15938
cf34ac76bd15
-identify variable names should follow [A-Z_][A-Z0-9_]* convention
ranma
parents:
15789
diff
changeset
|
900 if (identify) { |
cf34ac76bd15
-identify variable names should follow [A-Z_][A-Z0-9_]* convention
ranma
parents:
15789
diff
changeset
|
901 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, info[2*n]); |
cf34ac76bd15
-identify variable names should follow [A-Z_][A-Z0-9_]* convention
ranma
parents:
15789
diff
changeset
|
902 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, info[2*n+1]); |
cf34ac76bd15
-identify variable names should follow [A-Z_][A-Z0-9_]* convention
ranma
parents:
15789
diff
changeset
|
903 } |
15789
32d9c8a0a02b
adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM en DASH directo POUM net>
gpoirier
parents:
15780
diff
changeset
|
904 } |
15938
cf34ac76bd15
-identify variable names should follow [A-Z_][A-Z0-9_]* convention
ranma
parents:
15789
diff
changeset
|
905 if (identify) |
cf34ac76bd15
-identify variable names should follow [A-Z_][A-Z0-9_]* convention
ranma
parents:
15789
diff
changeset
|
906 mp_msg(MSGT_GLOBAL, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n); |
4189 | 907 |
908 return 0; | |
3050 | 909 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
910 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
911 char* demux_info_get(demuxer_t *demuxer, char *opt) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
912 int i; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
913 char **info = demuxer->info; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
914 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
915 for(i = 0; info && info[2*i] != NULL; i++) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
916 if(!strcasecmp(opt,info[2*i])) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
917 return info[2*i+1]; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
918 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
919 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
920 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
921 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
922 |
16175 | 923 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
|
924 |
16175 | 925 if (demuxer->desc->control) |
926 return demuxer->desc->control(demuxer,cmd,arg); | |
927 | |
928 return DEMUXER_CTRL_NOTIMPL; | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
929 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
930 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
931 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
932 |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16326
diff
changeset
|
933 double demuxer_get_time_length(demuxer_t *demuxer){ |
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16326
diff
changeset
|
934 double get_time_ans; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
935 sh_video_t *sh_video = demuxer->video->sh; |
16925 | 936 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
|
937 // <= 0 means DEMUXER_CTRL_NOTIMPL or DEMUXER_CTRL_DONTKNOW |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
938 if (demux_control(demuxer, DEMUXER_CTRL_GET_TIME_LENGTH,(void *)&get_time_ans)<=0) { |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
939 if (sh_video && sh_video->i_bps) |
16346
6ff303d2876b
Make -identify's 'ID_LENGTH=' print a float and not an integer.. The
ods15
parents:
16326
diff
changeset
|
940 get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/sh_video->i_bps; |
16925 | 941 else if (sh_audio && sh_audio->i_bps) |
942 get_time_ans = (double)(demuxer->movi_end-demuxer->movi_start)/sh_audio->i_bps; | |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
943 else |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
944 get_time_ans=0; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
945 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
946 return get_time_ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
947 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
948 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
949 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
|
950 int ans = 0; |
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
951 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
|
952 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
|
953 if (res <= 0) { |
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
954 if (len > 0) |
14197
2ae224195625
Use demuxer_get_percent_pos for the OSD position bar
reimar
parents:
14160
diff
changeset
|
955 ans = (demuxer->filepos - demuxer->movi_start) / len; |
14502
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
956 else |
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
957 ans = 0; |
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
958 } |
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
959 if (ans < 0) ans = 0; |
8769fa370f83
Move generic length and percent pos calculation to demuxer.c
reimar
parents:
14276
diff
changeset
|
960 if (ans > 100) ans = 100; |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
961 return ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
962 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
963 |
15285
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
964 int demuxer_switch_audio(demuxer_t *demuxer, int index){ |
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
965 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
|
966 if (res == DEMUXER_CTRL_NOTIMPL) |
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
967 index = demuxer->audio->id; |
39eb8a327ea9
adds a parameter to the switch_audio command to directly select a track.
reimar
parents:
15046
diff
changeset
|
968 return index; |
15046
b7aa70b05d76
Added support of audio stream switching in the MPEG demuxer using the #-key
gpoirier
parents:
14934
diff
changeset
|
969 } |