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