Mercurial > mplayer.hg
annotate libmpdemux/demuxer.c @ 6374:b2d5aeb72f95
export subpacket-size and matrix w*h to the codec (cook)
author | arpi |
---|---|
date | Mon, 10 Jun 2002 13:55:56 +0000 |
parents | f03fe2e84efd |
children | f0b933918a22 |
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" |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
14 #include "../cfgparser.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 |
5084 | 21 #include "../libvo/fastmemcpy.h" |
22 | |
1643 | 23 void free_demuxer_stream(demux_stream_t *ds){ |
24 ds_free_packs(ds); | |
25 free(ds); | |
26 } | |
27 | |
1 | 28 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){ |
29 demux_stream_t* ds=malloc(sizeof(demux_stream_t)); | |
30 ds->buffer_pos=ds->buffer_size=0; | |
31 ds->buffer=NULL; | |
32 ds->pts=0; | |
746 | 33 ds->pts_bytes=0; |
1 | 34 ds->eof=0; |
35 ds->pos=0; | |
36 ds->dpos=0; | |
889 | 37 ds->pack_no=0; |
1 | 38 //--------------- |
39 ds->packs=0; | |
40 ds->bytes=0; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
41 ds->first=ds->last=ds->current=NULL; |
1 | 42 ds->id=id; |
43 ds->demuxer=demuxer; | |
44 //---------------- | |
45 ds->asf_seq=-1; | |
46 ds->asf_packet=NULL; | |
291 | 47 //---------------- |
2419 | 48 ds->ss_mul=ds->ss_div=1; |
49 //---------------- | |
291 | 50 ds->sh=NULL; |
1 | 51 return ds; |
52 } | |
53 | |
552 | 54 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id){ |
1 | 55 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
|
56 memset(d,0,sizeof(demuxer_t)); |
1 | 57 d->stream=stream; |
598 | 58 d->movi_start=stream->start_pos; |
59 d->movi_end=stream->end_pos; | |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
60 d->seekable=1; |
1 | 61 d->synced=0; |
62 d->filepos=0; | |
63 d->audio=new_demuxer_stream(d,a_id); | |
64 d->video=new_demuxer_stream(d,v_id); | |
552 | 65 d->sub=new_demuxer_stream(d,s_id); |
1 | 66 d->type=type; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
67 stream_reset(stream); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
68 stream_seek(stream,stream->start_pos); |
1 | 69 return d; |
70 } | |
71 | |
5084 | 72 sh_audio_t *get_sh_audio(demuxer_t *demuxer, int id) |
73 { | |
74 if(id > MAX_A_STREAMS-1 || id < 0) | |
75 { | |
76 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested audio stream id overflow (%d > %d)\n", | |
77 id, MAX_A_STREAMS); | |
78 return NULL; | |
79 } | |
80 return demuxer->a_streams[id]; | |
81 } | |
82 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
83 sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){ |
5084 | 84 if(id > MAX_A_STREAMS-1 || id < 0) |
4642 | 85 { |
86 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested audio stream id overflow (%d > %d)\n", | |
87 id, MAX_A_STREAMS); | |
88 return NULL; | |
89 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
90 if(demuxer->a_streams[id]){ |
1584 | 91 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
|
92 } else { |
1567 | 93 mp_msg(MSGT_DEMUXER,MSGL_V,"==> Found audio stream: %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
|
94 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
|
95 memset(demuxer->a_streams[id],0,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
|
96 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
97 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
|
98 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
99 |
1643 | 100 void free_sh_audio(sh_audio_t* sh){ |
5412 | 101 mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_audio at %p \n",sh); |
1643 | 102 if(sh->wf) free(sh->wf); |
103 free(sh); | |
104 } | |
105 | |
5084 | 106 sh_video_t *get_sh_video(demuxer_t *demuxer, int id) |
107 { | |
108 if(id > MAX_V_STREAMS-1 || id < 0) | |
109 { | |
110 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested video stream id overflow (%d > %d)\n", | |
111 id, MAX_V_STREAMS); | |
112 return NULL; | |
113 } | |
114 return demuxer->v_streams[id]; | |
115 } | |
116 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
117 sh_video_t* new_sh_video(demuxer_t *demuxer,int id){ |
5084 | 118 if(id > MAX_V_STREAMS-1 || id < 0) |
4642 | 119 { |
120 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested video stream id overflow (%d > %d)\n", | |
121 id, MAX_V_STREAMS); | |
122 return NULL; | |
123 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
124 if(demuxer->v_streams[id]){ |
1584 | 125 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
|
126 } else { |
1567 | 127 mp_msg(MSGT_DEMUXER,MSGL_V,"==> Found video stream: %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
|
128 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
|
129 memset(demuxer->v_streams[id],0,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
|
130 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
131 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
|
132 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
133 |
1643 | 134 void free_sh_video(sh_video_t* sh){ |
5412 | 135 mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_video at %p \n",sh); |
1657 | 136 if(sh->bih) free(sh->bih); |
1643 | 137 free(sh); |
138 } | |
139 | |
5810 | 140 extern void demux_close_vivo(demuxer_t *demuxer); |
141 extern void demux_close_real(demuxer_t *demuxer); | |
142 extern void demux_close_y4m(demuxer_t *demuxer); | |
143 extern void demux_close_mf(demuxer_t* demuxer); | |
144 extern void demux_close_roq(demuxer_t* demuxer); | |
145 extern void demux_close_film(demuxer_t* demuxer); | |
146 extern void demux_close_bmp(demuxer_t* demuxer); | |
147 extern void demux_close_fli(demuxer_t* demuxer); | |
148 extern void demux_close_nuv(demuxer_t* demuxer); | |
5812 | 149 extern void demux_close_audio(demuxer_t* demuxer); |
150 extern void demux_close_ogg(demuxer_t* demuxer); | |
151 extern void demux_close_demuxers(demuxer_t* demuxer); | |
5810 | 152 |
1643 | 153 void free_demuxer(demuxer_t *demuxer){ |
154 int i; | |
5412 | 155 mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing demuxer at %p \n",demuxer); |
5810 | 156 switch(demuxer->type) { |
157 case DEMUXER_TYPE_VIVO: | |
158 demux_close_vivo(demuxer); break; | |
159 case DEMUXER_TYPE_REAL: | |
160 demux_close_real(demuxer); break; | |
161 case DEMUXER_TYPE_Y4M: | |
162 demux_close_y4m(demuxer); break; | |
163 case DEMUXER_TYPE_MF: | |
164 demux_close_mf(demuxer); break; | |
165 case DEMUXER_TYPE_ROQ: | |
166 demux_close_roq(demuxer); break; | |
167 case DEMUXER_TYPE_FILM: | |
168 demux_close_film(demuxer); break; | |
169 case DEMUXER_TYPE_BMP: | |
170 demux_close_bmp(demuxer); break; | |
171 case DEMUXER_TYPE_FLI: | |
172 demux_close_fli(demuxer); break; | |
173 case DEMUXER_TYPE_NUV: | |
174 demux_close_nuv(demuxer); break; | |
5812 | 175 case DEMUXER_TYPE_AUDIO: |
176 demux_close_audio(demuxer); break; | |
177 case DEMUXER_TYPE_OGG: | |
178 demux_close_ogg(demuxer); break; | |
179 case DEMUXER_TYPE_DEMUXERS: | |
180 demux_close_demuxers(demuxer); return; | |
5810 | 181 } |
1643 | 182 // free streams: |
183 for(i=0;i<256;i++){ | |
184 if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]); | |
185 if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]); | |
186 } | |
187 //if(sh_audio) free_sh_audio(sh_audio); | |
188 //if(sh_video) free_sh_video(sh_video); | |
189 // free demuxers: | |
190 free_demuxer_stream(demuxer->audio); | |
191 free_demuxer_stream(demuxer->video); | |
5412 | 192 free_demuxer_stream(demuxer->sub); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
193 if(demuxer->info) { |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
194 for(i=0;demuxer->info[i] != NULL; i++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
195 free(demuxer->info[i]); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
196 free(demuxer->info); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
197 } |
1643 | 198 free(demuxer); |
199 } | |
200 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
201 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
202 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp){ |
1 | 203 // demux_packet_t* dp=new_demux_packet(len); |
204 // stream_read(stream,dp->buffer,len); | |
205 // dp->pts=pts; //(float)pts/90000.0f; | |
206 // dp->pos=pos; | |
207 // append packet to DS stream: | |
208 ++ds->packs; | |
209 ds->bytes+=dp->len; | |
210 if(ds->last){ | |
211 // next packet in stream | |
212 ds->last->next=dp; | |
213 ds->last=dp; | |
214 } else { | |
215 // first packet in stream | |
216 ds->first=ds->last=dp; | |
217 } | |
1567 | 218 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 | 219 (ds==ds->demuxer->audio)?"d_audio":"d_video", |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
220 dp->len,dp->pts,(unsigned int)dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs); |
1 | 221 } |
222 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
223 void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t pos,int flags){ |
1 | 224 demux_packet_t* dp=new_demux_packet(len); |
225 stream_read(stream,dp->buffer,len); | |
226 dp->pts=pts; //(float)pts/90000.0f; | |
227 dp->pos=pos; | |
979 | 228 dp->flags=flags; |
1 | 229 // append packet to DS stream: |
230 ds_add_packet(ds,dp); | |
231 } | |
232 | |
233 // return value: | |
234 // 0 = EOF or no stream found or invalid type | |
235 // 1 = successfully read a packet | |
4551 | 236 int demux_mf_fill_buffer( demuxer_t *demux); |
4451 | 237 int demux_roq_fill_buffer(demuxer_t *demux); |
4189 | 238 int demux_film_fill_buffer(demuxer_t *demux); |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
239 int demux_bmp_fill_buffer(demuxer_t *demux); |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
240 int demux_fli_fill_buffer(demuxer_t *demux); |
1 | 241 int demux_mpg_es_fill_buffer(demuxer_t *demux); |
242 int demux_mpg_fill_buffer(demuxer_t *demux); | |
243 int demux_avi_fill_buffer(demuxer_t *demux); | |
244 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds); | |
245 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds); | |
246 int demux_asf_fill_buffer(demuxer_t *demux); | |
2106 | 247 int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds); |
2687 | 248 int demux_vivo_fill_buffer(demuxer_t *demux); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
249 int demux_real_fill_buffer(demuxer_t *demuxer); |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
250 int demux_nuv_fill_buffer(demuxer_t *demux); |
2790 | 251 #ifdef USE_TV |
2802 | 252 #include "tv.h" |
253 extern tvi_handle_t *tv_handler; | |
2931 | 254 extern int tv_param_on; |
255 | |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5470
diff
changeset
|
256 extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds, tvi_handle_t *tvh); |
2931 | 257 extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh); |
2790 | 258 #endif |
3786
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
259 int demux_y4m_fill_buffer(demuxer_t *demux); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
260 int demux_audio_fill_buffer(demux_stream_t *ds); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
261 extern int demux_demuxers_fill_buffer(demuxer_t *demux,demux_stream_t *ds); |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
262 extern int demux_ogg_fill_buffer(demuxer_t *d); |
1 | 263 |
264 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ | |
265 // 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
|
266 // printf("demux->type=%d\n",demux->type); |
1 | 267 switch(demux->type){ |
4551 | 268 case DEMUXER_TYPE_MF: return demux_mf_fill_buffer(demux); |
4451 | 269 case DEMUXER_TYPE_ROQ: return demux_roq_fill_buffer(demux); |
4189 | 270 case DEMUXER_TYPE_FILM: return demux_film_fill_buffer(demux); |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
271 case DEMUXER_TYPE_BMP: return demux_bmp_fill_buffer(demux); |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
272 case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux); |
1 | 273 case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux); |
274 case DEMUXER_TYPE_MPEG_PS: return demux_mpg_fill_buffer(demux); | |
275 case DEMUXER_TYPE_AVI: return demux_avi_fill_buffer(demux); | |
276 case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds); | |
277 case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds); | |
278 case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux); | |
2106 | 279 case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); |
2687 | 280 case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux); |
3777 | 281 case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
282 case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux); |
2790 | 283 #ifdef USE_TV |
5572
8cd761968f35
BSD-BT848 TV update patch by Charles Henrich <henrich@sigbus.com>
arpi
parents:
5470
diff
changeset
|
284 case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds, tv_handler); |
2790 | 285 #endif |
3786
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
286 case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
287 case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
288 case DEMUXER_TYPE_DEMUXERS: return demux_demuxers_fill_buffer(demux,ds); |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
289 case DEMUXER_TYPE_OGG: return demux_ogg_fill_buffer(demux); |
1 | 290 } |
291 return 0; | |
292 } | |
293 | |
294 // return value: | |
295 // 0 = EOF | |
296 // 1 = succesfull | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
297 int ds_fill_buffer(demux_stream_t *ds){ |
1 | 298 demuxer_t *demux=ds->demuxer; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
299 if(ds->current) free_demux_packet(ds->current); |
1 | 300 if(verbose>2){ |
1567 | 301 if(ds==demux->audio) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_audio) called\n");else |
302 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
|
303 if(ds==demux->sub) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_sub) called\n");else |
1567 | 304 mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(unknown 0x%X) called\n",(unsigned int)ds); |
1 | 305 } |
306 while(1){ | |
307 if(ds->packs){ | |
308 demux_packet_t *p=ds->first; | |
309 // copy useful data: | |
310 ds->buffer=p->buffer; | |
311 ds->buffer_pos=0; | |
312 ds->buffer_size=p->len; | |
313 ds->pos=p->pos; | |
314 ds->dpos+=p->len; // !!! | |
889 | 315 ++ds->pack_no; |
746 | 316 if(p->pts){ |
317 ds->pts=p->pts; | |
318 ds->pts_bytes=0; | |
319 } | |
320 ds->pts_bytes+=p->len; // !!! | |
979 | 321 ds->flags=p->flags; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
322 // unlink packet: |
1 | 323 ds->bytes-=p->len; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
324 ds->current=p; |
1 | 325 ds->first=p->next; |
326 if(!ds->first) ds->last=NULL; | |
327 --ds->packs; | |
328 return 1; //ds->buffer_size; | |
329 } | |
330 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){ | |
1584 | 331 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes); |
332 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 333 break; |
334 } | |
335 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){ | |
1584 | 336 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes); |
337 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 338 break; |
339 } | |
1421 | 340 if(!demux_fill_buffer(demux,ds)){ |
1567 | 341 mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"ds_fill_buffer()->demux_fill_buffer() failed\n"); |
1421 | 342 break; // EOF |
343 } | |
1 | 344 } |
345 ds->buffer_pos=ds->buffer_size=0; | |
346 ds->buffer=NULL; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
347 ds->current=NULL; |
1567 | 348 mp_msg(MSGT_DEMUXER,MSGL_V,"ds_fill_buffer: EOF reached (stream: %s) \n",ds==demux->audio?"audio":"video"); |
1 | 349 ds->eof=1; |
350 return 0; | |
351 } | |
352 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
353 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len){ |
1 | 354 int x; |
355 int bytes=0; | |
356 while(len>0){ | |
357 x=ds->buffer_size-ds->buffer_pos; | |
358 if(x==0){ | |
359 if(!ds_fill_buffer(ds)) return bytes; | |
360 } else { | |
361 if(x>len) x=len; | |
362 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
363 bytes+=x;len-=x;ds->buffer_pos+=x; | |
364 } | |
365 } | |
366 return bytes; | |
367 } | |
368 | |
746 | 369 int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len){ |
370 int x; | |
371 int bytes=0; | |
372 while(len>0){ | |
373 x=ds->buffer_size-ds->buffer_pos; | |
374 if(x==0){ | |
375 if(!ds_fill_buffer(ds)) return bytes; | |
376 } else { | |
377 if(x>len) x=len; | |
378 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
379 bytes+=x;len-=x;ds->buffer_pos+=x; | |
380 return bytes; // stop at end of package! (for correct timestamping) | |
381 } | |
382 } | |
383 return bytes; | |
384 } | |
385 | |
386 | |
1 | 387 void ds_free_packs(demux_stream_t *ds){ |
388 demux_packet_t *dp=ds->first; | |
389 while(dp){ | |
390 demux_packet_t *dn=dp->next; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
391 free_demux_packet(dp); |
1 | 392 dp=dn; |
393 } | |
394 if(ds->asf_packet){ | |
395 // free unfinished .asf fragments: | |
396 free(ds->asf_packet->buffer); | |
397 free(ds->asf_packet); | |
398 ds->asf_packet=NULL; | |
399 } | |
400 ds->first=ds->last=NULL; | |
401 ds->packs=0; // !!!!! | |
402 ds->bytes=0; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
403 if(ds->current) free_demux_packet(ds->current); |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
404 ds->current=NULL; |
1 | 405 ds->buffer=NULL; |
406 ds->buffer_pos=ds->buffer_size; | |
828 | 407 ds->pts=0; ds->pts_bytes=0; |
1 | 408 } |
409 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
410 int ds_get_packet(demux_stream_t *ds,unsigned char **start){ |
1 | 411 while(1){ |
412 int len; | |
413 if(ds->buffer_pos>=ds->buffer_size){ | |
414 if(!ds_fill_buffer(ds)){ | |
415 // EOF | |
416 *start = NULL; | |
417 return -1; | |
418 } | |
419 } | |
420 len=ds->buffer_size-ds->buffer_pos; | |
421 *start = &ds->buffer[ds->buffer_pos]; | |
422 ds->buffer_pos+=len; | |
423 return len; | |
424 } | |
425 } | |
554 | 426 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
427 int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){ |
554 | 428 while(1){ |
429 int len; | |
430 if(ds->buffer_pos>=ds->buffer_size){ | |
431 *start = NULL; | |
432 if(!ds->packs) return -1; // no sub | |
433 if(!ds_fill_buffer(ds)) return -1; // EOF | |
434 } | |
435 len=ds->buffer_size-ds->buffer_pos; | |
436 *start = &ds->buffer[ds->buffer_pos]; | |
437 ds->buffer_pos+=len; | |
438 return len; | |
439 } | |
440 } | |
441 | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
442 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
|
443 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
|
444 while(!ds->first) { |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
445 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
|
446 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
|
447 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
|
448 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
449 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
450 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
|
451 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
|
452 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
|
453 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
454 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
455 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
|
456 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
457 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
458 return ds->first->pts; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
459 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
460 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
461 // ==================================================================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
462 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
463 // feed-back from demuxers: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
464 extern int num_elementary_packets100; // for MPEG-ES fileformat detection |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
465 extern int num_elementary_packets101; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
466 extern int num_elementary_packetsPES; |
1659 | 467 extern int num_elementary_packets1B6; |
4735 | 468 extern int num_mp3audio_packets; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
469 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
470 // commandline options, flags: |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
471 //extern int seek_to_byte; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
472 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
|
473 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
|
474 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
475 extern int audio_id; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
476 extern int video_id; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
477 extern int dvdsub_id; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
478 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
479 int asf_check_header(demuxer_t *demuxer); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
480 int read_asf_header(demuxer_t *demuxer); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
481 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id); |
2050 | 482 demuxer_t* demux_open_avi(demuxer_t* demuxer); |
483 int mov_check_file(demuxer_t* demuxer); | |
484 int mov_read_header(demuxer_t* demuxer); | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
485 int demux_open_fli(demuxer_t* demuxer); |
4551 | 486 int demux_open_mf(demuxer_t* demuxer); |
4189 | 487 int demux_open_film(demuxer_t* demuxer); |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
488 int demux_open_bmp(demuxer_t* demuxer); |
4451 | 489 int demux_open_roq(demuxer_t* demuxer); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
490 |
2931 | 491 extern int vivo_check_file(demuxer_t *demuxer); |
492 extern void demux_open_vivo(demuxer_t *demuxer); | |
3786
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
493 extern int y4m_check_file(demuxer_t *demuxer); |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
494 extern void demux_open_y4m(demuxer_t *demuxer); |
4451 | 495 extern int roq_check_file(demuxer_t *demuxer); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
496 |
3777 | 497 extern int real_check_file(demuxer_t *demuxer); |
498 extern void demux_open_real(demuxer_t *demuxer); | |
499 | |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
500 extern int nuv_check_file(demuxer_t *demuxer); |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
501 extern void demux_open_nuv(demuxer_t *demuxer); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
502 extern int demux_audio_open(demuxer_t* demuxer); |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
503 extern int demux_ogg_open(demuxer_t* demuxer); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
504 |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
505 extern demuxer_t* init_avi_with_ogg(demuxer_t* demuxer); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
506 |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
507 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
508 static demuxer_t* demux_open_stream(stream_t *stream,int file_format,int audio_id,int video_id,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
|
509 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
510 //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
|
511 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
512 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
|
513 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
514 demux_stream_t *d_audio=NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
515 demux_stream_t *d_video=NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
516 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
517 sh_audio_t *sh_audio=NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
518 sh_video_t *sh_video=NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
519 |
1659 | 520 //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id); |
521 | |
4551 | 522 if ( mf_support ) |
523 { | |
524 mp_msg(MSGT_DEMUXER,MSGL_INFO,"forced mf.\n"); | |
525 file_format=DEMUXER_TYPE_MF; | |
526 } | |
527 | |
2790 | 528 #ifdef USE_TV |
529 //=============== Try to open as TV-input: ================= | |
3091 | 530 if((tv_param_on == 1) && |
531 (file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV)){ | |
2790 | 532 demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id); |
3091 | 533 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected TV! ;-)\n"); |
534 file_format=DEMUXER_TYPE_TV; | |
2790 | 535 } |
536 #endif | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
537 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
538 //=============== Try to open as AVI file: ================= |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
539 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AVI){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
540 demuxer=new_demuxer(stream,DEMUXER_TYPE_AVI,audio_id,video_id,dvdsub_id); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
541 { //---- RIFF header: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
542 int id=stream_read_dword_le(demuxer->stream); // "RIFF" |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
543 if(id==mmioFOURCC('R','I','F','F')){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
544 stream_read_dword_le(demuxer->stream); //filesize |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
545 id=stream_read_dword_le(demuxer->stream); // "AVI " |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
546 if(id==formtypeAVI){ |
1584 | 547 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAVIfile); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
548 file_format=DEMUXER_TYPE_AVI; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
549 } else { |
4660 | 550 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
551 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
552 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
553 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
554 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
555 } |
3833 | 556 //=============== Try to open as Y4M file: ================= |
557 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){ | |
558 demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id); | |
559 if(y4m_check_file(demuxer)){ | |
560 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected YUV4MPEG2 file format!\n"); | |
561 file_format=DEMUXER_TYPE_Y4M; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
562 } else { |
4660 | 563 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
564 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
565 } |
3833 | 566 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
567 //=============== Try to open as ASF file: ================= |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
568 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ASF){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
569 demuxer=new_demuxer(stream,DEMUXER_TYPE_ASF,audio_id,video_id,dvdsub_id); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
570 if(asf_check_header(demuxer)){ |
1584 | 571 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedASFfile); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
572 file_format=DEMUXER_TYPE_ASF; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
573 } else { |
4660 | 574 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
575 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
576 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
577 } |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
578 //=============== Try to open as NUV file: ================= |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
579 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NUV){ |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
580 demuxer=new_demuxer(stream,DEMUXER_TYPE_NUV,audio_id,video_id,dvdsub_id); |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
581 if(nuv_check_file(demuxer)){ |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
582 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected NuppelVideo file format!\n"); |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
583 file_format=DEMUXER_TYPE_NUV; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
584 } else { |
4660 | 585 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
586 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
587 } |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
588 } |
2878 | 589 //=============== Try to open as MOV file: ================= |
590 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ | |
591 demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); | |
592 if(mov_check_file(demuxer)){ | |
593 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedQTMOVfile); | |
594 file_format=DEMUXER_TYPE_MOV; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
595 } else { |
4660 | 596 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
597 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
598 } |
2878 | 599 } |
3256 | 600 //=============== Try to open as VIVO file: ================= |
601 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ | |
602 demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); | |
603 if(vivo_check_file(demuxer)){ | |
604 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n"); | |
605 file_format=DEMUXER_TYPE_VIVO; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
606 } else { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
607 free_demuxer(demuxer); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
608 demuxer = NULL; |
3256 | 609 } |
610 } | |
3777 | 611 //=============== Try to open as REAL file: ================= |
612 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){ | |
613 demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id); | |
614 if(real_check_file(demuxer)){ | |
4451 | 615 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedREALfile); |
3777 | 616 file_format=DEMUXER_TYPE_REAL; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
617 } else { |
4660 | 618 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
619 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
620 } |
3777 | 621 } |
3256 | 622 //=============== Try to open as FLI file: ================= |
623 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){ | |
624 demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id); | |
625 { | |
4189 | 626 int id; |
627 stream_seek(demuxer->stream, 4); | |
628 id=stream_read_word_le(demuxer->stream); | |
629 // check for the FLI file magic number | |
3256 | 630 if((id==0xAF11) || (id==0xAF12)){ |
631 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile); | |
632 file_format=DEMUXER_TYPE_FLI; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
633 } else { |
4660 | 634 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
635 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
636 } |
3256 | 637 } |
638 } | |
4189 | 639 //=============== Try to open as FILM file: ================= |
640 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FILM){ | |
641 demuxer=new_demuxer(stream,DEMUXER_TYPE_FILM,audio_id,video_id,dvdsub_id); | |
642 { | |
643 int signature=stream_read_fourcc(demuxer->stream); | |
644 // check for the FLI file magic number | |
645 if(signature==mmioFOURCC('F', 'I', 'L', 'M')){ | |
646 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFILMfile); | |
647 file_format=DEMUXER_TYPE_FILM; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
648 } else { |
4660 | 649 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
650 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
651 } |
4189 | 652 } |
653 } | |
4451 | 654 //=============== Try to open as RoQ file: ================= |
655 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){ | |
656 demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id); | |
657 if(roq_check_file(demuxer)){ | |
658 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedROQfile); | |
659 file_format=DEMUXER_TYPE_ROQ; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
660 } else { |
4660 | 661 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
662 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
663 } |
4451 | 664 } |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
665 //=============== Try to open as BMP file: ================= |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
666 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_BMP){ |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
667 demuxer=new_demuxer(stream,DEMUXER_TYPE_BMP,audio_id,video_id,dvdsub_id); |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
668 if(bmp_check_file(demuxer)){ |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
669 mp_msg(MSGT_DEMUXER,MSGL_INFO,"BMP file\n"); |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
670 file_format=DEMUXER_TYPE_BMP; |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
671 } else { |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
672 free_demuxer(demuxer); |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
673 demuxer = NULL; |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
674 } |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
675 } |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
676 //=============== Try to open as Ogg file: ================= |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
677 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_OGG){ |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
678 demuxer=new_demuxer(stream,DEMUXER_TYPE_OGG,audio_id,video_id,dvdsub_id); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
679 if(demux_ogg_open(demuxer)){ |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
680 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected OGG format\n"); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
681 file_format=DEMUXER_TYPE_OGG; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
682 } else { |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
683 free_demuxer(demuxer); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
684 demuxer = NULL; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
685 } |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
686 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
687 //=============== Try to open as MPEG-PS file: ================= |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
688 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
689 int pes=1; |
3770 | 690 int tmp; |
3772 | 691 off_t tmppos; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
692 while(pes>=0){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
693 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id); |
3770 | 694 |
695 // try to pre-detect PES: | |
3772 | 696 tmppos=stream_tell(demuxer->stream); |
3770 | 697 tmp=stream_read_dword(demuxer->stream); |
698 if(tmp==0x1E0 || tmp==0x1C0){ | |
699 tmp=stream_read_word(demuxer->stream); | |
700 if(tmp>1 && tmp<=2048) pes=0; // demuxer->synced=3; // PES... | |
701 } | |
3772 | 702 stream_seek(demuxer->stream,tmppos); |
3770 | 703 |
704 if(!pes) demuxer->synced=3; // hack! | |
705 | |
1659 | 706 num_elementary_packets100=0; |
707 num_elementary_packets101=0; | |
708 num_elementary_packets1B6=0; | |
709 num_elementary_packetsPES=0; | |
4735 | 710 num_mp3audio_packets=0; |
1659 | 711 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
712 if(ds_fill_buffer(demuxer->video)){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
713 if(!pes) |
1584 | 714 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPESfile); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
715 else |
1584 | 716 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPSfile); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
717 file_format=DEMUXER_TYPE_MPEG_PS; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
718 } else { |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
719 mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d PES: %d MP3: %d \n", |
4735 | 720 num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES,num_mp3audio_packets); |
5804 | 721 //MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v) |
722 if(num_mp3audio_packets>50 && num_mp3audio_packets>2*num_elementary_packets100 | |
723 && abs(num_elementary_packets100-num_elementary_packets101)>2) | |
5068 | 724 break; // it's .MP3 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
725 // some hack to get meaningfull error messages to our unhappy users: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
726 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 && |
2881 | 727 abs(num_elementary_packets101+8-num_elementary_packets100)<16){ |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
728 if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
729 --pes;continue; // tricky... |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
730 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
731 file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
732 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
733 if(demuxer->synced==2) |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
734 mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
735 else |
1567 | 736 mp_msg(MSGT_DEMUXER,MSGL_V,"Not MPEG System Stream format... (maybe Transport Stream?)\n"); |
4660 | 737 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
738 demuxer = NULL; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
739 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
740 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
741 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
742 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
743 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
744 //=============== Try to open as MPEG-ES file: ================= |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
745 if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above! |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
746 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_ES,audio_id,video_id,dvdsub_id); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
747 if(!ds_fill_buffer(demuxer->video)){ |
1584 | 748 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_InvalidMPEGES); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
749 file_format=DEMUXER_TYPE_UNKNOWN; |
4660 | 750 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
751 demuxer = NULL; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
752 } else { |
1584 | 753 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
754 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
755 } |
4551 | 756 //=============== Try to open as multi file: ================= |
757 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MF){ | |
758 demuxer=new_demuxer(stream,DEMUXER_TYPE_MF,audio_id,video_id,dvdsub_id); | |
759 { | |
760 if ( mf_support ) | |
761 { | |
762 file_format=DEMUXER_TYPE_MF; | |
763 mp_msg( MSGT_DEMUXER,MSGL_INFO,"[demuxer] mf support.\n" ); | |
764 } | |
765 } | |
766 } | |
4696 | 767 //=============== Try to open as audio file: ================= |
768 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){ | |
769 demuxer=new_demuxer(stream,DEMUXER_TYPE_AUDIO,audio_id,video_id,dvdsub_id); | |
770 if(demux_audio_open(demuxer)){ | |
771 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected audio file\n"); | |
772 file_format=DEMUXER_TYPE_AUDIO; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
773 } else { |
4696 | 774 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
775 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
776 } |
4696 | 777 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
778 //=============== Unknown, exiting... =========================== |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
779 if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){ |
1584 | 780 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
781 return NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
782 // GUI_MSG( mplUnknowFileType ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
783 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
784 //====== File format recognized, set up these for compatibility: ========= |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
785 d_audio=demuxer->audio; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
786 d_video=demuxer->video; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
787 //d_dvdsub=demuxer->sub; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
788 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
789 demuxer->file_format=file_format; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
790 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
791 switch(file_format){ |
4551 | 792 case DEMUXER_TYPE_MF: { |
793 if (!demux_open_mf(demuxer)) return NULL; | |
794 break; | |
795 } | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
796 case DEMUXER_TYPE_FLI: { |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
797 if (!demux_open_fli(demuxer)) return NULL; |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
798 break; |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
799 } |
4189 | 800 case DEMUXER_TYPE_FILM: { |
801 if (!demux_open_film(demuxer)) return NULL; | |
802 break; | |
803 } | |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
804 case DEMUXER_TYPE_BMP: { |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
805 if (!demux_open_bmp(demuxer)) return NULL; |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
806 break; |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
807 } |
4451 | 808 case DEMUXER_TYPE_ROQ: { |
809 if (!demux_open_roq(demuxer)) return NULL; | |
810 break; | |
811 } | |
1490 | 812 case DEMUXER_TYPE_MOV: { |
2127 | 813 if(!mov_read_header(demuxer)) return NULL; |
814 // sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video; | |
815 // sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio; | |
1490 | 816 break; |
817 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
818 case DEMUXER_TYPE_AVI: { |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
819 sh_audio_t* sh_a; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
820 demuxer = (demuxer_t*) demux_open_avi(demuxer); |
5412 | 821 if(!demuxer) return NULL; // failed to open |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
822 sh_a = (sh_audio_t*)demuxer->audio->sh; |
5897
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
823 if(demuxer->audio->id != -2 && sh_a) { |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
824 if(sh_a->format == 0xFFFE) |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
825 demuxer = init_avi_with_ogg(demuxer); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
826 else if(sh_a->format == 0x674F) { |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
827 stream_t* s; |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
828 demuxer_t *od; |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
829 s = new_ds_stream(demuxer->audio); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
830 od = new_demuxer(s,DEMUXER_TYPE_OGG,-1,-2,-2); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
831 if(!demux_ogg_open(od)) { |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
832 mp_msg( MSGT_DEMUXER,MSGL_ERR,"Unable to open the ogg demuxer\n"); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
833 free_stream(s); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
834 demuxer->audio->id = -2; |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
835 } else |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
836 demuxer = new_demuxers_demuxer(demuxer,od,demuxer); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
837 } |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
838 } |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
839 return demuxer; |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
840 // break; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
841 } |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
842 case DEMUXER_TYPE_NUV: { |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
843 demux_open_nuv(demuxer); |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
844 break; |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
845 } |
2687 | 846 case DEMUXER_TYPE_VIVO: { |
847 demux_open_vivo(demuxer); | |
848 break; | |
849 } | |
3786
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
850 case DEMUXER_TYPE_Y4M: { |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
851 demux_open_y4m(demuxer); |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
852 break; |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
853 } |
3777 | 854 case DEMUXER_TYPE_REAL: { |
855 demux_open_real(demuxer); | |
856 break; | |
857 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
858 case DEMUXER_TYPE_ASF: { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
859 //---- ASF header: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
860 read_asf_header(demuxer); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
861 stream_reset(demuxer->stream); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
862 stream_seek(demuxer->stream,demuxer->movi_start); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
863 // demuxer->idx_pos=0; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
864 // demuxer->endpos=avi_header.movi_end; |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
865 if(d_video->id != -2) { |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
866 if(!ds_fill_buffer(d_video)){ |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
867 mp_msg(MSGT_DEMUXER,MSGL_WARN,"ASF: " MSGTR_MissingVideoStream); |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
868 sh_video=NULL; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
869 //printf("ASF: missing video stream!? contact the author, it may be a bug :(\n"); |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
870 //GUI_MSG( mplASFErrorMissingVideoStream ) |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
871 } else { |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
872 sh_video=d_video->sh;sh_video->ds=d_video; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
873 sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
874 mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp\n", |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
875 (char *)&sh_video->bih->biCompression, |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
876 sh_video->bih->biWidth, |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
877 sh_video->bih->biHeight, |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
878 sh_video->bih->biBitCount); |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
879 // sh_video->i_bps=10*asf_packetsize; // FIXME! |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
880 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
881 } |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
882 if(d_audio->id!=-2){ |
1567 | 883 mp_msg(MSGT_DEMUXER,MSGL_V,"ASF: Searching for audio stream (id:%d)\n",d_audio->id); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
884 if(!ds_fill_buffer(d_audio)){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
885 mp_msg(MSGT_DEMUXER,MSGL_INFO,"ASF: " MSGTR_MissingAudioStream); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
886 sh_audio=NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
887 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
888 sh_audio=d_audio->sh;sh_audio->ds=d_audio; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
889 sh_audio->format=sh_audio->wf->wFormatTag; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
890 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
891 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
892 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
893 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
894 case DEMUXER_TYPE_MPEG_ES: { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
895 sh_audio=NULL; // ES streams has no audio channel |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
896 d_video->sh=new_sh_video(demuxer,0); // create dummy video stream header, id=0 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
897 sh_video=d_video->sh;sh_video->ds=d_video; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
898 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
899 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
900 case DEMUXER_TYPE_MPEG_PS: { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
901 sh_video=d_video->sh;sh_video->ds=d_video; |
4391
6394c1e9e770
DVD start position handling changed (progbar/eta fix)
arpi
parents:
4203
diff
changeset
|
902 // if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD |
1628
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1623
diff
changeset
|
903 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
904 if(audio_id!=-2) { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
905 if(!ds_fill_buffer(d_audio)){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
906 mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
907 sh_audio=NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
908 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
909 sh_audio=d_audio->sh;sh_audio->ds=d_audio; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
910 switch(d_audio->id & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
911 case 0x00: sh_audio->format=0x50;break; // mpeg |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
912 case 0xA0: sh_audio->format=0x10001;break; // dvd pcm |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
913 case 0x80: sh_audio->format=0x2000;break; // ac3 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
914 default: sh_audio=NULL; // unknown type |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
915 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
916 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
917 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
918 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
919 } |
2790 | 920 #ifdef USE_TV |
921 case DEMUXER_TYPE_TV: { | |
2837 | 922 if (!demux_open_tv(demuxer, tv_handler)) |
923 { | |
924 tv_uninit(tv_handler); | |
925 return(NULL); | |
926 } | |
2790 | 927 break; |
928 } | |
929 #endif | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
930 } // switch(file_format) |
2590 | 931 pts_from_bps=0; // !!! |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
932 return demuxer; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
933 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
934 |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
935 static char* audio_stream = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
936 static char* sub_stream = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
937 static int demuxer_type = 0, audio_demuxer_type = 0, sub_demuxer_type = 0; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
938 extern m_config_t* mconfig; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
939 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
940 demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id){ |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
941 stream_t *as = NULL,*ss = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
942 demuxer_t *vd,*ad = NULL,*sd = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
943 int afmt = 0,sfmt = 0; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
944 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
945 if(audio_stream) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
946 as = open_stream(audio_stream,0,&afmt); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
947 if(!as) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
948 mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't open audio stream: %s\n",audio_stream); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
949 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
950 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
951 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
952 if(sub_stream) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
953 ss = open_stream(sub_stream,0,&sfmt); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
954 if(!ss) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
955 mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't open subtitles stream: %s\n",sub_stream); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
956 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
957 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
958 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
959 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
960 vd = demux_open_stream(vs,demuxer_type ? demuxer_type : file_format,audio_stream ? -2 : audio_id,video_id, sub_stream ? -2 : dvdsub_id); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
961 if(!vd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
962 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
963 if(as) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
964 ad = demux_open_stream(as,audio_demuxer_type ? audio_demuxer_type : afmt,audio_id,-2,-2); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
965 if(!ad) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
966 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Failed to open audio demuxer: %s\n",audio_stream); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
967 else if(ad->audio->sh && ((sh_audio_t*)ad->audio->sh)->format == 0x55) // MP3 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
968 m_config_set_flag(mconfig,"hr-mp3-seek",1); // Enable high res seeking |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
969 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
970 if(ss) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
971 sd = demux_open_stream(ss,sub_demuxer_type ? sub_demuxer_type : sfmt,-2,-2,dvdsub_id); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
972 if(!sd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
973 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Failed to open subtitles demuxer: %s\n",sub_stream); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
974 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
975 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
976 if(ad && sd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
977 return new_demuxers_demuxer(vd,ad,sd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
978 else if(ad) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
979 return new_demuxers_demuxer(vd,ad,vd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
980 else if(sd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
981 return new_demuxers_demuxer(vd,vd,sd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
982 else |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
983 return vd; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
984 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
985 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
986 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
987 int demux_seek_avi(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
|
988 int demux_seek_asf(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
|
989 int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags); |
3863 | 990 int demux_seek_y4m(demuxer_t *demuxer,float rel_seek_secs,int flags); |
3544 | 991 int demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags); |
5157
f67b321e1eda
FILM demuxer is leaner, meaner, and cleaner, also with proper bailout on
melanson
parents:
5152
diff
changeset
|
992 int demux_seek_film(demuxer_t *demuxer,float rel_seek_secs,int flags); |
4551 | 993 int demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags); |
4065 | 994 int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags); |
2227 | 995 void demux_seek_mov(demuxer_t *demuxer,float pts,int flags); |
5084 | 996 int demux_seek_real(demuxer_t *demuxer,float rel_seek_secs,int flags); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
997 extern void demux_audio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
998 extern void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
5754
db8764171482
mplayer was not compileable without, i tested it with and without vorbis, i hope it's ok
jaf
parents:
5732
diff
changeset
|
999 #ifdef HAVE_OGGVORBIS |
5732 | 1000 extern void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
5754
db8764171482
mplayer was not compileable without, i tested it with and without vorbis, i hope it's ok
jaf
parents:
5732
diff
changeset
|
1001 #endif |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1002 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1003 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
|
1004 demux_stream_t *d_audio=demuxer->audio; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1005 demux_stream_t *d_video=demuxer->video; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1006 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
|
1007 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
|
1008 |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1009 if(!demuxer->seekable){ |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1010 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
|
1011 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekRawAVI); |
2790 | 1012 #ifdef USE_TV |
1013 else if (demuxer->file_format==DEMUXER_TYPE_TV) | |
5107 | 1014 mp_msg(MSGT_SEEK,MSGL_WARN,"TV input isn't seekable! (probably seeking will be for changing channels ;)\n"); |
2790 | 1015 #endif |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1016 else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
1017 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekFile); |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1018 return 0; |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1019 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1020 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1021 // clear demux buffers: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1022 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
|
1023 ds_free_packs(d_video); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1024 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1025 demuxer->stream->eof=0; // clear eof flag |
3542
465329581ad8
reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents:
3411
diff
changeset
|
1026 demuxer->video->eof=0; |
465329581ad8
reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents:
3411
diff
changeset
|
1027 demuxer->audio->eof=0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1028 |
4203 | 1029 #if 0 |
3824 | 1030 if(sh_audio) sh_audio->timer=sh_video->timer; |
1031 #else | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1032 if(sh_audio) sh_audio->timer=0; |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1033 if(sh_video) sh_video->timer=0; // !!!!!! |
3824 | 1034 #endif |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1035 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1036 switch(demuxer->file_format){ |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1037 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1038 case DEMUXER_TYPE_AVI: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1039 demux_seek_avi(demuxer,rel_seek_secs,flags); break; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1040 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1041 case DEMUXER_TYPE_ASF: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1042 demux_seek_asf(demuxer,rel_seek_secs,flags); break; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1043 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1044 case DEMUXER_TYPE_MPEG_ES: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1045 case DEMUXER_TYPE_MPEG_PS: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1046 demux_seek_mpg(demuxer,rel_seek_secs,flags); break; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1047 |
2227 | 1048 case DEMUXER_TYPE_MOV: |
1049 demux_seek_mov(demuxer,rel_seek_secs,flags); break; | |
1050 | |
5084 | 1051 case DEMUXER_TYPE_REAL: |
1052 demux_seek_real(demuxer,rel_seek_secs,flags); break; | |
1053 | |
3863 | 1054 case DEMUXER_TYPE_Y4M: |
1055 demux_seek_y4m(demuxer,rel_seek_secs,flags); break; | |
1056 | |
4565 | 1057 case DEMUXER_TYPE_MF: |
1058 demux_seek_mf(demuxer,rel_seek_secs,flags); break; | |
1059 | |
3544 | 1060 case DEMUXER_TYPE_FLI: |
1061 demux_seek_fli(demuxer,rel_seek_secs,flags); break; | |
5157
f67b321e1eda
FILM demuxer is leaner, meaner, and cleaner, also with proper bailout on
melanson
parents:
5152
diff
changeset
|
1062 case DEMUXER_TYPE_FILM: |
f67b321e1eda
FILM demuxer is leaner, meaner, and cleaner, also with proper bailout on
melanson
parents:
5152
diff
changeset
|
1063 demux_seek_film(demuxer,rel_seek_secs,flags); break; |
4065 | 1064 case DEMUXER_TYPE_NUV: |
1065 demux_seek_nuv(demuxer,rel_seek_secs,flags); break; | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1066 case DEMUXER_TYPE_AUDIO: |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1067 demux_audio_seek(demuxer,rel_seek_secs,flags); break; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1068 case DEMUXER_TYPE_DEMUXERS: |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1069 demux_demuxers_seek(demuxer,rel_seek_secs,flags); break; |
5754
db8764171482
mplayer was not compileable without, i tested it with and without vorbis, i hope it's ok
jaf
parents:
5732
diff
changeset
|
1070 #ifdef HAVE_OGGVORBIS |
5732 | 1071 case DEMUXER_TYPE_OGG: |
1072 demux_ogg_seek(demuxer,rel_seek_secs,flags); break; | |
5754
db8764171482
mplayer was not compileable without, i tested it with and without vorbis, i hope it's ok
jaf
parents:
5732
diff
changeset
|
1073 #endif |
4065 | 1074 |
3544 | 1075 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1076 } // switch(demuxer->file_format) |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1077 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1078 return 1; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1079 } |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1080 |
3050 | 1081 int demux_info_add(demuxer_t *demuxer, char *opt, char *param) |
1082 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1083 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1084 int n = 0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1085 |
3050 | 1086 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1087 for(n = 0; info && info[2*n] != NULL; n++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1088 { |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1089 if(!strcasecmp(opt,info[2*n])) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1090 { |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1091 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info %s already present\n!",opt); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1092 return 0; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1093 } |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1094 } |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1095 |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1096 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
|
1097 info[2*n] = strdup(opt); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1098 info[2*n+1] = strdup(param); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1099 memset(&info[2*(n+1)],0,2*sizeof(char*)); |
3050 | 1100 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1101 return 1; |
3050 | 1102 } |
1103 | |
1104 int demux_info_print(demuxer_t *demuxer) | |
1105 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1106 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1107 int n; |
3050 | 1108 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1109 if(!info) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1110 return 0; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1111 |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1112 mp_msg(MSGT_DEMUX, MSGL_INFO, "Clip info: \n"); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1113 for(n = 0; info[2*n] != NULL ; n++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1114 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]); |
4189 | 1115 |
1116 return 0; | |
3050 | 1117 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1118 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1119 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
|
1120 int i; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1121 char **info = demuxer->info; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1122 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1123 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
|
1124 if(!strcasecmp(opt,info[2*i])) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1125 return info[2*i+1]; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1126 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1127 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1128 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1129 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1130 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1131 /******************* Options stuff **********************/ |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1132 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1133 static config_t demuxer_opts[] = { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1134 { "audiofile", &audio_stream, CONF_TYPE_STRING, 0, 0, 0, NULL }, |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1135 { "subfile", &sub_stream, CONF_TYPE_STRING, 0, 0, 0, NULL }, |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1136 { "demuxer", &demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1137 { "audio-demuxer", &audio_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1138 { "sub-demuxer", &sub_demuxer_type, CONF_TYPE_INT, CONF_RANGE, 1, DEMUXER_TYPE_MAX, NULL }, |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1139 { NULL, NULL, 0, 0, 0, 0, NULL} |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1140 }; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1141 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1142 void demuxer_register_options(m_config_t* cfg) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1143 m_config_register_options(cfg,demuxer_opts); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1144 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1145 |