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