Mercurial > mplayer.hg
annotate libmpdemux/demuxer.c @ 3101:637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
author | melanson |
---|---|
date | Sat, 24 Nov 2001 23:58:12 +0000 |
parents | a98d486508db |
children | 8dae87740d33 |
rev | line source |
---|---|
1 | 1 //=================== DEMUXER v2.5 ========================= |
2 | |
1430 | 3 #include <stdio.h> |
4 #include <stdlib.h> | |
5 #include <unistd.h> | |
6 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
7 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
8 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
9 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
10 #include "config.h" |
1567 | 11 #include "mp_msg.h" |
1584 | 12 #include "help_mp.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
13 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
14 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
15 #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
|
16 #include "stheader.h" |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
17 |
1643 | 18 void free_demuxer_stream(demux_stream_t *ds){ |
19 ds_free_packs(ds); | |
20 free(ds); | |
21 } | |
22 | |
1 | 23 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){ |
24 demux_stream_t* ds=malloc(sizeof(demux_stream_t)); | |
25 ds->buffer_pos=ds->buffer_size=0; | |
26 ds->buffer=NULL; | |
27 ds->pts=0; | |
746 | 28 ds->pts_bytes=0; |
1 | 29 ds->eof=0; |
30 ds->pos=0; | |
31 ds->dpos=0; | |
889 | 32 ds->pack_no=0; |
1 | 33 //--------------- |
34 ds->packs=0; | |
35 ds->bytes=0; | |
36 ds->first=ds->last=NULL; | |
37 ds->id=id; | |
38 ds->demuxer=demuxer; | |
39 //---------------- | |
40 ds->asf_seq=-1; | |
41 ds->asf_packet=NULL; | |
291 | 42 //---------------- |
2419 | 43 ds->ss_mul=ds->ss_div=1; |
44 //---------------- | |
291 | 45 ds->sh=NULL; |
1 | 46 return ds; |
47 } | |
48 | |
552 | 49 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id){ |
1 | 50 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
|
51 memset(d,0,sizeof(demuxer_t)); |
1 | 52 d->stream=stream; |
598 | 53 d->movi_start=stream->start_pos; |
54 d->movi_end=stream->end_pos; | |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
55 d->seekable=1; |
1 | 56 d->synced=0; |
57 d->filepos=0; | |
58 d->audio=new_demuxer_stream(d,a_id); | |
59 d->video=new_demuxer_stream(d,v_id); | |
552 | 60 d->sub=new_demuxer_stream(d,s_id); |
1 | 61 d->type=type; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
62 stream_reset(stream); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
63 stream_seek(stream,stream->start_pos); |
1 | 64 return d; |
65 } | |
66 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
67 sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
68 if(demuxer->a_streams[id]){ |
1584 | 69 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
|
70 } else { |
1567 | 71 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
|
72 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
|
73 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
|
74 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
75 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
|
76 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
77 |
1643 | 78 void free_sh_audio(sh_audio_t* sh){ |
79 if(sh->a_in_buffer) free(sh->a_in_buffer); | |
80 if(sh->a_buffer) free(sh->a_buffer); | |
81 if(sh->wf) free(sh->wf); | |
82 free(sh); | |
83 } | |
84 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
85 sh_video_t* new_sh_video(demuxer_t *demuxer,int id){ |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
86 if(demuxer->v_streams[id]){ |
1584 | 87 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
|
88 } else { |
1567 | 89 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
|
90 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
|
91 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
|
92 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
93 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
|
94 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
95 |
1643 | 96 void free_sh_video(sh_video_t* sh){ |
1657 | 97 if(sh->our_out_buffer) free(sh->our_out_buffer); |
98 if(sh->bih) free(sh->bih); | |
1643 | 99 free(sh); |
100 } | |
101 | |
102 void free_demuxer(demuxer_t *demuxer){ | |
103 int i; | |
104 // free streams: | |
105 for(i=0;i<256;i++){ | |
106 if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]); | |
107 if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]); | |
108 } | |
109 //if(sh_audio) free_sh_audio(sh_audio); | |
110 //if(sh_video) free_sh_video(sh_video); | |
111 // free demuxers: | |
112 free_demuxer_stream(demuxer->audio); | |
113 free_demuxer_stream(demuxer->video); | |
114 free(demuxer); | |
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 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
118 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp){ |
1 | 119 // demux_packet_t* dp=new_demux_packet(len); |
120 // stream_read(stream,dp->buffer,len); | |
121 // dp->pts=pts; //(float)pts/90000.0f; | |
122 // dp->pos=pos; | |
123 // append packet to DS stream: | |
124 ++ds->packs; | |
125 ds->bytes+=dp->len; | |
126 if(ds->last){ | |
127 // next packet in stream | |
128 ds->last->next=dp; | |
129 ds->last=dp; | |
130 } else { | |
131 // first packet in stream | |
132 ds->first=ds->last=dp; | |
133 } | |
1567 | 134 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 | 135 (ds==ds->demuxer->audio)?"d_audio":"d_video", |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
136 dp->len,dp->pts,(unsigned int)dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs); |
1 | 137 } |
138 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
139 void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t pos,int flags){ |
1 | 140 demux_packet_t* dp=new_demux_packet(len); |
141 stream_read(stream,dp->buffer,len); | |
142 dp->pts=pts; //(float)pts/90000.0f; | |
143 dp->pos=pos; | |
979 | 144 dp->flags=flags; |
1 | 145 // append packet to DS stream: |
146 ds_add_packet(ds,dp); | |
147 } | |
148 | |
149 // return value: | |
150 // 0 = EOF or no stream found or invalid type | |
151 // 1 = successfully read a packet | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
152 int demux_fli_fill_buffer(demuxer_t *demux); |
1 | 153 int demux_mpg_es_fill_buffer(demuxer_t *demux); |
154 int demux_mpg_fill_buffer(demuxer_t *demux); | |
155 int demux_avi_fill_buffer(demuxer_t *demux); | |
156 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds); | |
157 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds); | |
158 int demux_asf_fill_buffer(demuxer_t *demux); | |
2106 | 159 int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds); |
2687 | 160 int demux_vivo_fill_buffer(demuxer_t *demux); |
2790 | 161 #ifdef USE_TV |
2802 | 162 #include "tv.h" |
163 extern tvi_handle_t *tv_handler; | |
2931 | 164 extern int tv_param_on; |
165 | |
166 extern int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh); | |
167 extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh); | |
2790 | 168 #endif |
1 | 169 |
170 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ | |
171 // 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
|
172 // printf("demux->type=%d\n",demux->type); |
1 | 173 switch(demux->type){ |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
174 case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux); |
1 | 175 case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux); |
176 case DEMUXER_TYPE_MPEG_PS: return demux_mpg_fill_buffer(demux); | |
177 case DEMUXER_TYPE_AVI: return demux_avi_fill_buffer(demux); | |
178 case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds); | |
179 case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds); | |
180 case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux); | |
2106 | 181 case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); |
2687 | 182 case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux); |
2790 | 183 #ifdef USE_TV |
2802 | 184 case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, tv_handler); |
2790 | 185 #endif |
1 | 186 } |
187 return 0; | |
188 } | |
189 | |
190 // return value: | |
191 // 0 = EOF | |
192 // 1 = succesfull | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
193 int ds_fill_buffer(demux_stream_t *ds){ |
1 | 194 demuxer_t *demux=ds->demuxer; |
195 if(ds->buffer) free(ds->buffer); | |
196 if(verbose>2){ | |
1567 | 197 if(ds==demux->audio) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_audio) called\n");else |
198 if(ds==demux->video) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_video) called\n");else | |
199 mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(unknown 0x%X) called\n",(unsigned int)ds); | |
1 | 200 } |
201 while(1){ | |
202 if(ds->packs){ | |
203 demux_packet_t *p=ds->first; | |
204 // copy useful data: | |
205 ds->buffer=p->buffer; | |
206 ds->buffer_pos=0; | |
207 ds->buffer_size=p->len; | |
208 ds->pos=p->pos; | |
209 ds->dpos+=p->len; // !!! | |
889 | 210 ++ds->pack_no; |
746 | 211 if(p->pts){ |
212 ds->pts=p->pts; | |
213 ds->pts_bytes=0; | |
214 } | |
215 ds->pts_bytes+=p->len; // !!! | |
979 | 216 ds->flags=p->flags; |
1 | 217 // free packet: |
218 ds->bytes-=p->len; | |
219 ds->first=p->next; | |
220 if(!ds->first) ds->last=NULL; | |
221 free(p); | |
222 --ds->packs; | |
223 return 1; //ds->buffer_size; | |
224 } | |
225 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){ | |
1584 | 226 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes); |
227 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 228 break; |
229 } | |
230 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){ | |
1584 | 231 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes); |
232 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 233 break; |
234 } | |
1421 | 235 if(!demux_fill_buffer(demux,ds)){ |
1567 | 236 mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"ds_fill_buffer()->demux_fill_buffer() failed\n"); |
1421 | 237 break; // EOF |
238 } | |
1 | 239 } |
240 ds->buffer_pos=ds->buffer_size=0; | |
241 ds->buffer=NULL; | |
1567 | 242 mp_msg(MSGT_DEMUXER,MSGL_V,"ds_fill_buffer: EOF reached (stream: %s) \n",ds==demux->audio?"audio":"video"); |
1 | 243 ds->eof=1; |
244 return 0; | |
245 } | |
246 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
247 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len){ |
1 | 248 int x; |
249 int bytes=0; | |
250 while(len>0){ | |
251 x=ds->buffer_size-ds->buffer_pos; | |
252 if(x==0){ | |
253 if(!ds_fill_buffer(ds)) return bytes; | |
254 } else { | |
255 if(x>len) x=len; | |
256 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
257 bytes+=x;len-=x;ds->buffer_pos+=x; | |
258 } | |
259 } | |
260 return bytes; | |
261 } | |
262 | |
746 | 263 int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len){ |
264 int x; | |
265 int bytes=0; | |
266 while(len>0){ | |
267 x=ds->buffer_size-ds->buffer_pos; | |
268 if(x==0){ | |
269 if(!ds_fill_buffer(ds)) return bytes; | |
270 } else { | |
271 if(x>len) x=len; | |
272 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
273 bytes+=x;len-=x;ds->buffer_pos+=x; | |
274 return bytes; // stop at end of package! (for correct timestamping) | |
275 } | |
276 } | |
277 return bytes; | |
278 } | |
279 | |
280 | |
1 | 281 void ds_free_packs(demux_stream_t *ds){ |
282 demux_packet_t *dp=ds->first; | |
283 while(dp){ | |
284 demux_packet_t *dn=dp->next; | |
285 free(dp->buffer); | |
286 free(dp); | |
287 dp=dn; | |
288 } | |
289 if(ds->asf_packet){ | |
290 // free unfinished .asf fragments: | |
291 free(ds->asf_packet->buffer); | |
292 free(ds->asf_packet); | |
293 ds->asf_packet=NULL; | |
294 } | |
295 ds->first=ds->last=NULL; | |
296 ds->packs=0; // !!!!! | |
297 ds->bytes=0; | |
298 if(ds->buffer) free(ds->buffer); | |
299 ds->buffer=NULL; | |
300 ds->buffer_pos=ds->buffer_size; | |
828 | 301 ds->pts=0; ds->pts_bytes=0; |
1 | 302 } |
303 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
304 int ds_get_packet(demux_stream_t *ds,unsigned char **start){ |
1 | 305 while(1){ |
306 int len; | |
307 if(ds->buffer_pos>=ds->buffer_size){ | |
308 if(!ds_fill_buffer(ds)){ | |
309 // EOF | |
310 *start = NULL; | |
311 return -1; | |
312 } | |
313 } | |
314 len=ds->buffer_size-ds->buffer_pos; | |
315 *start = &ds->buffer[ds->buffer_pos]; | |
316 ds->buffer_pos+=len; | |
317 return len; | |
318 } | |
319 } | |
554 | 320 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
321 int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){ |
554 | 322 while(1){ |
323 int len; | |
324 if(ds->buffer_pos>=ds->buffer_size){ | |
325 *start = NULL; | |
326 if(!ds->packs) return -1; // no sub | |
327 if(!ds_fill_buffer(ds)) return -1; // EOF | |
328 } | |
329 len=ds->buffer_size-ds->buffer_pos; | |
330 *start = &ds->buffer[ds->buffer_pos]; | |
331 ds->buffer_pos+=len; | |
332 return len; | |
333 } | |
334 } | |
335 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
336 // ==================================================================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
337 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
338 // 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
|
339 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
|
340 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
|
341 extern int num_elementary_packetsPES; |
1659 | 342 extern int num_elementary_packets1B6; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
343 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
344 // commandline options, flags: |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
345 //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
|
346 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
|
347 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
|
348 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
349 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
|
350 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
|
351 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
|
352 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
353 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
|
354 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
|
355 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id); |
2050 | 356 demuxer_t* demux_open_avi(demuxer_t* demuxer); |
357 int mov_check_file(demuxer_t* demuxer); | |
358 int mov_read_header(demuxer_t* demuxer); | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
359 int demux_open_fli(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
|
360 |
2931 | 361 extern int vivo_check_file(demuxer_t *demuxer); |
362 extern void demux_open_vivo(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
|
363 |
1496 | 364 demuxer_t* demux_open(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
|
365 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
366 //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
|
367 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
368 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
|
369 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
370 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
|
371 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
|
372 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
373 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
|
374 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
|
375 |
1659 | 376 //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id); |
377 | |
2790 | 378 #ifdef USE_TV |
379 //=============== Try to open as TV-input: ================= | |
3091 | 380 if((tv_param_on == 1) && |
381 (file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV)){ | |
2790 | 382 demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id); |
3091 | 383 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected TV! ;-)\n"); |
384 file_format=DEMUXER_TYPE_TV; | |
2790 | 385 } |
386 #endif | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
387 //=============== Try to open as FLI file: ================= |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
388 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){ |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
389 demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id); |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
390 { |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
391 int size=stream_read_dword_le(demuxer->stream); |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
392 int id=stream_read_word_le(demuxer->stream); |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
393 // chech for the FLI file magic number |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
394 if((id==0xAF11) || (id==0xAF12)){ |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
395 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile); |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
396 file_format=DEMUXER_TYPE_FLI; |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
397 } |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
398 } |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
399 } |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
400 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
401 //=============== 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
|
402 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
|
403 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
|
404 { //---- RIFF header: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
405 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
|
406 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
|
407 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
|
408 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
|
409 if(id==formtypeAVI){ |
1584 | 410 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
|
411 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
|
412 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
413 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
414 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
415 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
416 //=============== 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
|
417 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
|
418 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
|
419 if(asf_check_header(demuxer)){ |
1584 | 420 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
|
421 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
|
422 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
423 } |
2878 | 424 //=============== Try to open as MOV file: ================= |
425 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ | |
426 demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); | |
427 if(mov_check_file(demuxer)){ | |
428 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedQTMOVfile); | |
429 file_format=DEMUXER_TYPE_MOV; | |
430 } | |
431 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
432 //=============== 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
|
433 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
|
434 int pes=1; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
435 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
|
436 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,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
|
437 if(!pes) demuxer->synced=1; // hack! |
1659 | 438 num_elementary_packets100=0; |
439 num_elementary_packets101=0; | |
440 num_elementary_packets1B6=0; | |
441 num_elementary_packetsPES=0; | |
442 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
443 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
|
444 if(!pes) |
1584 | 445 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
|
446 else |
1584 | 447 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
|
448 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
|
449 } else { |
2881 | 450 printf("MPEG packet stats: p100: %d p101: %d PES: %d \n", |
451 num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES); | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
452 // 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
|
453 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 && |
2881 | 454 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
|
455 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
|
456 --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
|
457 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
458 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
|
459 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
460 if(demuxer->synced==2) |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
461 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
|
462 else |
1567 | 463 mp_msg(MSGT_DEMUXER,MSGL_V,"Not MPEG System Stream format... (maybe Transport Stream?)\n"); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
464 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
465 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
466 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
467 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
468 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
469 //=============== 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
|
470 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
|
471 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
|
472 if(!ds_fill_buffer(demuxer->video)){ |
1584 | 473 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
|
474 file_format=DEMUXER_TYPE_UNKNOWN; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
475 } else { |
1584 | 476 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
|
477 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
478 } |
2687 | 479 //=============== Try to open as VIVO file: ================= |
480 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ | |
481 demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); | |
482 if(vivo_check_file(demuxer)){ | |
483 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n"); | |
484 file_format=DEMUXER_TYPE_VIVO; | |
485 } | |
486 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
487 //=============== Unknown, exiting... =========================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
488 if(file_format==DEMUXER_TYPE_UNKNOWN){ |
1584 | 489 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
|
490 return NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
491 // 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
|
492 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
493 //====== 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
|
494 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
|
495 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
|
496 //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
|
497 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
498 demuxer->file_format=file_format; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
499 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
500 switch(file_format){ |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
501 case DEMUXER_TYPE_FLI: { |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
502 if (!demux_open_fli(demuxer)) return NULL; |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
503 break; |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
504 } |
1490 | 505 case DEMUXER_TYPE_MOV: { |
2127 | 506 if(!mov_read_header(demuxer)) return NULL; |
507 // sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video; | |
508 // sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio; | |
1490 | 509 break; |
510 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
511 case DEMUXER_TYPE_AVI: { |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
512 return (demuxer_t*) demux_open_avi(demuxer); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
513 // break; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
514 } |
2687 | 515 case DEMUXER_TYPE_VIVO: { |
516 demux_open_vivo(demuxer); | |
517 break; | |
518 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
519 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
|
520 //---- ASF header: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
521 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
|
522 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
|
523 stream_seek(demuxer->stream,demuxer->movi_start); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
524 // 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
|
525 // demuxer->endpos=avi_header.movi_end; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
526 if(!ds_fill_buffer(d_video)){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
527 mp_msg(MSGT_DEMUXER,MSGL_WARN,"ASF: " MSGTR_MissingVideoStream); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
528 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
|
529 //printf("ASF: missing video stream!? contact the author, it may be a bug :(\n"); |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
530 //GUI_MSG( mplASFErrorMissingVideoStream ) |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
531 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
532 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
|
533 sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms |
1567 | 534 mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp\n", |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
535 (char *)&sh_video->bih->biCompression, |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
536 sh_video->bih->biWidth, |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
537 sh_video->bih->biHeight, |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
538 sh_video->bih->biBitCount); |
1401 | 539 // sh_video->i_bps=10*asf_packetsize; // FIXME! |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
540 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
541 if(audio_id!=-2){ |
1567 | 542 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
|
543 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
|
544 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
|
545 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
|
546 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
547 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
|
548 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
|
549 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
550 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
551 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
552 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
553 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
|
554 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
|
555 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
|
556 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
|
557 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
558 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
559 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
|
560 sh_video=d_video->sh;sh_video->ds=d_video; |
1628
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1623
diff
changeset
|
561 if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1623
diff
changeset
|
562 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
563 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
|
564 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
|
565 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
|
566 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
|
567 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
568 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
|
569 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
|
570 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
|
571 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
|
572 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
|
573 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
|
574 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
575 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
576 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
577 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
578 } |
2790 | 579 #ifdef USE_TV |
580 case DEMUXER_TYPE_TV: { | |
2837 | 581 if (!demux_open_tv(demuxer, tv_handler)) |
582 { | |
583 tv_uninit(tv_handler); | |
584 return(NULL); | |
585 } | |
2790 | 586 break; |
587 } | |
588 #endif | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
589 } // switch(file_format) |
2590 | 590 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
|
591 return demuxer; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
592 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
593 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
594 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
|
595 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
|
596 int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags); |
2227 | 597 void demux_seek_mov(demuxer_t *demuxer,float pts,int flags); |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
598 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
599 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
|
600 demux_stream_t *d_audio=demuxer->audio; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
601 demux_stream_t *d_video=demuxer->video; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
602 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
|
603 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
|
604 |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
605 if(!demuxer->seekable){ |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
606 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
|
607 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekRawAVI); |
2790 | 608 #ifdef USE_TV |
609 else if (demuxer->file_format==DEMUXER_TYPE_TV) | |
610 mp_msg(MSGT_SEEK,MSGL_WARN,"TV input isn't seekable! (probarly seeking will be for changing channels ;)\n"); | |
611 #endif | |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
612 else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
613 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekFile); |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
614 return 0; |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
615 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
616 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
617 // clear demux buffers: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
618 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
|
619 ds_free_packs(d_video); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
620 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
621 demuxer->stream->eof=0; // clear eof flag |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
622 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
623 if(sh_audio) sh_audio->timer=0; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
624 sh_video->timer=0; // !!!!!! |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
625 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
626 switch(demuxer->file_format){ |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
627 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
628 case DEMUXER_TYPE_AVI: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
629 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
|
630 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
631 case DEMUXER_TYPE_ASF: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
632 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
|
633 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
634 case DEMUXER_TYPE_MPEG_ES: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
635 case DEMUXER_TYPE_MPEG_PS: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
636 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
|
637 |
2227 | 638 case DEMUXER_TYPE_MOV: |
639 demux_seek_mov(demuxer,rel_seek_secs,flags); break; | |
640 | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
641 } // switch(demuxer->file_format) |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
642 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
643 return 1; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
644 } |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
645 |
3050 | 646 int demux_info_add(demuxer_t *demuxer, char *opt, char *param) |
647 { | |
648 demuxer_info_t *info = &demuxer->info; | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
649 |
3067
1207bd5de2b2
it wanted to be strcasecmp not strncmp and i dunno why it compiled for me with strncmp :(
alex
parents:
3058
diff
changeset
|
650 if (!strcasecmp(opt, "name")) |
3050 | 651 { |
652 if (info->name) | |
653 { | |
654 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->name already present\n!"); | |
655 return(0); | |
656 } | |
657 info->name = malloc(strlen(param)); | |
658 strcpy(info->name, param); | |
659 return(1); | |
660 } | |
661 | |
3067
1207bd5de2b2
it wanted to be strcasecmp not strncmp and i dunno why it compiled for me with strncmp :(
alex
parents:
3058
diff
changeset
|
662 if (!strcasecmp(opt, "author")) |
3050 | 663 { |
664 if (info->author) | |
665 { | |
666 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->author already present\n!"); | |
667 return(0); | |
668 } | |
669 info->author = malloc(strlen(param)); | |
670 strcpy(info->author, param); | |
671 return(1); | |
672 } | |
673 | |
3071 | 674 if (!strcasecmp(opt, "encoder") || !strcasecmp(opt, "software")) |
3050 | 675 { |
676 if (info->encoder) | |
677 { | |
678 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->encoder already present\n!"); | |
679 return(0); | |
680 } | |
681 info->encoder = malloc(strlen(param)); | |
682 strcpy(info->encoder, param); | |
683 return(1); | |
684 } | |
685 | |
3071 | 686 if (!strcasecmp(opt, "comment") || !strcasecmp(opt, "comments")) |
3050 | 687 { |
688 if (info->comments) | |
689 { | |
690 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->comments already present\n!"); | |
691 return(0); | |
692 } | |
693 info->comments = malloc(strlen(param)); | |
694 strcpy(info->comments, param); | |
695 return(1); | |
696 } | |
697 | |
3071 | 698 if (!strcasecmp(opt, "copyright")) |
699 { | |
700 if (info->copyright) | |
701 { | |
702 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->copyright already present\n!"); | |
703 return(0); | |
704 } | |
705 info->copyright = malloc(strlen(param)); | |
706 strcpy(info->copyright, param); | |
707 return(1); | |
708 } | |
709 | |
710 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Unknown demuxer info->%s (=%s)!\n", | |
3050 | 711 opt, param); |
712 return(1); | |
713 } | |
714 | |
715 int demux_info_print(demuxer_t *demuxer) | |
716 { | |
717 demuxer_info_t *info = &demuxer->info; | |
718 | |
3071 | 719 if (info->name || info->author || info->encoder || info->comments || info->copyright) |
3050 | 720 { |
721 mp_msg(MSGT_DEMUX, MSGL_INFO, "Clip info: \n"); | |
722 if (info->name) | |
723 mp_msg(MSGT_DEMUX, MSGL_INFO, " Name: %s\n", info->name); | |
724 if (info->author) | |
725 mp_msg(MSGT_DEMUX, MSGL_INFO, " Author: %s\n", info->author); | |
3071 | 726 if (info->comments) |
727 mp_msg(MSGT_DEMUX, MSGL_INFO, " Copyright: %s\n", info->comments); | |
728 if (info->comments) | |
729 mp_msg(MSGT_DEMUX, MSGL_INFO, " Comments: %s\n", info->comments); | |
3050 | 730 if (info->encoder) |
731 mp_msg(MSGT_DEMUX, MSGL_INFO, " Encoder: %s\n", info->encoder); | |
732 } | |
733 } |