Mercurial > mplayer.hg
annotate libmpdemux/demuxer.c @ 13393:74fa728e6fc2
100l typo
author | michael |
---|---|
date | Sun, 19 Sep 2004 22:15:57 +0000 |
parents | c605df89ca9f |
children | 043571569005 |
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" |
9709 | 14 #include "../m_config.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
15 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
16 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
17 #include "demuxer.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
18 #include "stheader.h" |
4551 | 19 #include "mf.h" |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
20 |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
21 #include "../libao2/afmt.h" |
5084 | 22 #include "../libvo/fastmemcpy.h" |
23 | |
1643 | 24 void free_demuxer_stream(demux_stream_t *ds){ |
25 ds_free_packs(ds); | |
26 free(ds); | |
27 } | |
28 | |
1 | 29 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){ |
30 demux_stream_t* ds=malloc(sizeof(demux_stream_t)); | |
31 ds->buffer_pos=ds->buffer_size=0; | |
32 ds->buffer=NULL; | |
33 ds->pts=0; | |
746 | 34 ds->pts_bytes=0; |
1 | 35 ds->eof=0; |
36 ds->pos=0; | |
37 ds->dpos=0; | |
889 | 38 ds->pack_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 //---------------- |
7754 | 49 ds->ss_mul=ds->ss_div=0; |
2419 | 50 //---------------- |
291 | 51 ds->sh=NULL; |
1 | 52 return ds; |
53 } | |
54 | |
552 | 55 demuxer_t* new_demuxer(stream_t *stream,int type,int a_id,int v_id,int s_id){ |
1 | 56 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
|
57 memset(d,0,sizeof(demuxer_t)); |
1 | 58 d->stream=stream; |
598 | 59 d->movi_start=stream->start_pos; |
60 d->movi_end=stream->end_pos; | |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
61 d->seekable=1; |
1 | 62 d->synced=0; |
63 d->filepos=0; | |
64 d->audio=new_demuxer_stream(d,a_id); | |
65 d->video=new_demuxer_stream(d,v_id); | |
552 | 66 d->sub=new_demuxer_stream(d,s_id); |
1 | 67 d->type=type; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
68 stream_reset(stream); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
69 stream_seek(stream,stream->start_pos); |
1 | 70 return d; |
71 } | |
72 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
73 sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){ |
5084 | 74 if(id > MAX_A_STREAMS-1 || id < 0) |
4642 | 75 { |
76 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested audio stream id overflow (%d > %d)\n", | |
77 id, MAX_A_STREAMS); | |
78 return NULL; | |
79 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
80 if(demuxer->a_streams[id]){ |
1584 | 81 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
|
82 } else { |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
83 sh_audio_t *sh; |
6951 | 84 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
|
85 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
|
86 memset(demuxer->a_streams[id],0,sizeof(sh_audio_t)); |
13357
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
87 sh = demuxer->a_streams[id]; |
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
88 // set some defaults |
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
89 sh->samplesize=2; |
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
90 sh->sample_format=AFMT_S16_NE; |
c605df89ca9f
moved sh_audio initialization from dec_audio to demuxer.c to fix
reimar
parents:
13301
diff
changeset
|
91 sh->audio_out_minsize=8192;/* default size, maybe not enough for Win32/ACM*/ |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
92 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
93 return demuxer->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
|
94 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
95 |
1643 | 96 void free_sh_audio(sh_audio_t* sh){ |
5412 | 97 mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_audio at %p \n",sh); |
1643 | 98 if(sh->wf) free(sh->wf); |
99 free(sh); | |
100 } | |
101 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
102 sh_video_t* new_sh_video(demuxer_t *demuxer,int id){ |
5084 | 103 if(id > MAX_V_STREAMS-1 || id < 0) |
4642 | 104 { |
105 mp_msg(MSGT_DEMUXER,MSGL_WARN,"Requested video stream id overflow (%d > %d)\n", | |
106 id, MAX_V_STREAMS); | |
107 return NULL; | |
108 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
109 if(demuxer->v_streams[id]){ |
1584 | 110 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
|
111 } else { |
6951 | 112 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
|
113 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
|
114 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
|
115 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
116 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
|
117 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
118 |
1643 | 119 void free_sh_video(sh_video_t* sh){ |
5412 | 120 mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing sh_video at %p \n",sh); |
1657 | 121 if(sh->bih) free(sh->bih); |
1643 | 122 free(sh); |
123 } | |
124 | |
5810 | 125 extern void demux_close_vivo(demuxer_t *demuxer); |
126 extern void demux_close_real(demuxer_t *demuxer); | |
127 extern void demux_close_y4m(demuxer_t *demuxer); | |
128 extern void demux_close_mf(demuxer_t* demuxer); | |
129 extern void demux_close_roq(demuxer_t* demuxer); | |
130 extern void demux_close_film(demuxer_t* demuxer); | |
131 extern void demux_close_bmp(demuxer_t* demuxer); | |
132 extern void demux_close_fli(demuxer_t* demuxer); | |
12175 | 133 extern void demux_close_nsv(demuxer_t* demuxer); |
5810 | 134 extern void demux_close_nuv(demuxer_t* demuxer); |
5812 | 135 extern void demux_close_audio(demuxer_t* demuxer); |
136 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
|
137 extern void demux_close_rtp(demuxer_t* demuxer); |
5812 | 138 extern void demux_close_demuxers(demuxer_t* demuxer); |
6816 | 139 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
|
140 extern void demux_close_rawdv(demuxer_t* demuxer); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
141 extern void demux_close_pva(demuxer_t* demuxer); |
7382 | 142 extern void demux_close_smjpeg(demuxer_t* demuxer); |
8528 | 143 extern void demux_close_xmms(demuxer_t* demuxer); |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
144 extern void demux_close_gif(demuxer_t* demuxer); |
11590 | 145 extern void demux_close_lmlm4(demuxer_t* demuxer); |
9610 | 146 extern void demux_close_ts(demuxer_t* demuxer); |
10024 | 147 extern void demux_close_mkv(demuxer_t* demuxer); |
10033 | 148 extern void demux_close_ra(demuxer_t* demuxer); |
10263 | 149 extern void demux_close_ty(demuxer_t* demuxer); |
12164 | 150 extern void demux_close_lavf(demuxer_t* demuxer); |
10263 | 151 |
5810 | 152 |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
153 #ifdef USE_TV |
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
154 #include "tv.h" |
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
155 extern int tv_param_on; |
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
156 |
7329
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7058
diff
changeset
|
157 extern int demux_tv_fill_buffer(demuxer_t *demux, demux_stream_t *ds); |
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7058
diff
changeset
|
158 extern int demux_open_tv(demuxer_t *demuxer); |
10538 | 159 #if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)) |
7329
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7058
diff
changeset
|
160 extern void demux_close_tv(demuxer_t *demuxer); |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
161 #endif |
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
162 #endif |
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
163 |
1643 | 164 void free_demuxer(demuxer_t *demuxer){ |
165 int i; | |
5412 | 166 mp_msg(MSGT_DEMUXER,MSGL_V,"DEMUXER: freeing demuxer at %p \n",demuxer); |
5810 | 167 switch(demuxer->type) { |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
168 case DEMUXER_TYPE_PVA: |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
169 demux_close_pva(demuxer); break; |
5810 | 170 case DEMUXER_TYPE_VIVO: |
171 demux_close_vivo(demuxer); break; | |
172 case DEMUXER_TYPE_REAL: | |
173 demux_close_real(demuxer); break; | |
174 case DEMUXER_TYPE_Y4M: | |
175 demux_close_y4m(demuxer); break; | |
176 case DEMUXER_TYPE_MF: | |
177 demux_close_mf(demuxer); break; | |
178 case DEMUXER_TYPE_ROQ: | |
179 demux_close_roq(demuxer); break; | |
180 case DEMUXER_TYPE_FILM: | |
181 demux_close_film(demuxer); break; | |
182 case DEMUXER_TYPE_BMP: | |
183 demux_close_bmp(demuxer); break; | |
184 case DEMUXER_TYPE_FLI: | |
185 demux_close_fli(demuxer); break; | |
12175 | 186 case DEMUXER_TYPE_NSV: |
187 demux_close_nsv(demuxer); break; | |
5810 | 188 case DEMUXER_TYPE_NUV: |
189 demux_close_nuv(demuxer); break; | |
10263 | 190 case DEMUXER_TYPE_MPEG_TY: |
191 demux_close_ty(demuxer); break; | |
10538 | 192 #if defined(USE_TV) && (defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)) |
7058
2e5c07262861
new v4l capture patch by Jindrich Makovicka <makovick@kmlinux.fjfi.cvut.cz>:
arpi
parents:
7007
diff
changeset
|
193 case DEMUXER_TYPE_TV: |
7329
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7058
diff
changeset
|
194 demux_close_tv(demuxer); break; |
7058
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; | |
7413 | 202 #ifdef HAVE_OGGVORBIS |
5812 | 203 case DEMUXER_TYPE_OGG: |
204 demux_close_ogg(demuxer); break; | |
7413 | 205 #endif |
10024 | 206 #ifdef HAVE_MATROSKA |
207 case DEMUXER_TYPE_MATROSKA: | |
208 demux_close_mkv(demuxer); break; | |
209 #endif | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6871
diff
changeset
|
210 #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
|
211 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
|
212 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
|
213 #endif |
7382 | 214 case DEMUXER_TYPE_SMJPEG: |
215 demux_close_smjpeg(demuxer); return; | |
5812 | 216 case DEMUXER_TYPE_DEMUXERS: |
217 demux_close_demuxers(demuxer); return; | |
6816 | 218 case DEMUXER_TYPE_AVI: |
219 case DEMUXER_TYPE_AVI_NI: | |
220 case DEMUXER_TYPE_AVI_NINI: | |
221 demux_close_avi(demuxer); return; | |
8528 | 222 #ifdef HAVE_XMMS |
223 case DEMUXER_TYPE_XMMS: | |
224 demux_close_xmms(demuxer); break; | |
225 #endif | |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
226 #ifdef HAVE_GIF |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
227 case DEMUXER_TYPE_GIF: |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
228 demux_close_gif(demuxer); break; |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
229 #endif |
11590 | 230 case DEMUXER_TYPE_LMLM4: |
231 demux_close_lmlm4(demuxer); break; | |
9610 | 232 case DEMUXER_TYPE_MPEG_TS: |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
233 case DEMUXER_TYPE_MPEG4_IN_TS: |
9610 | 234 demux_close_ts(demuxer); break; |
10033 | 235 case DEMUXER_TYPE_REALAUDIO: |
236 demux_close_ra(demuxer); break; | |
12164 | 237 #ifdef USE_LIBAVFORMAT |
238 case DEMUXER_TYPE_LAVF: | |
239 demux_close_lavf(demuxer); break; | |
240 #endif | |
5810 | 241 } |
1643 | 242 // free streams: |
243 for(i=0;i<256;i++){ | |
244 if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]); | |
245 if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]); | |
246 } | |
247 //if(sh_audio) free_sh_audio(sh_audio); | |
248 //if(sh_video) free_sh_video(sh_video); | |
249 // free demuxers: | |
250 free_demuxer_stream(demuxer->audio); | |
251 free_demuxer_stream(demuxer->video); | |
5412 | 252 free_demuxer_stream(demuxer->sub); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
253 if(demuxer->info) { |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
254 for(i=0;demuxer->info[i] != NULL; i++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
255 free(demuxer->info[i]); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
256 free(demuxer->info); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
257 } |
1643 | 258 free(demuxer); |
259 } | |
260 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
261 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
262 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp){ |
1 | 263 // demux_packet_t* dp=new_demux_packet(len); |
264 // stream_read(stream,dp->buffer,len); | |
265 // dp->pts=pts; //(float)pts/90000.0f; | |
266 // dp->pos=pos; | |
267 // append packet to DS stream: | |
268 ++ds->packs; | |
269 ds->bytes+=dp->len; | |
270 if(ds->last){ | |
271 // next packet in stream | |
272 ds->last->next=dp; | |
273 ds->last=dp; | |
274 } else { | |
275 // first packet in stream | |
276 ds->first=ds->last=dp; | |
277 } | |
1567 | 278 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 | 279 (ds==ds->demuxer->audio)?"d_audio":"d_video", |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
280 dp->len,dp->pts,(unsigned int)dp->pos,ds->demuxer->audio->packs,ds->demuxer->video->packs); |
1 | 281 } |
282 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1421
diff
changeset
|
283 void ds_read_packet(demux_stream_t *ds,stream_t *stream,int len,float pts,off_t pos,int flags){ |
1 | 284 demux_packet_t* dp=new_demux_packet(len); |
10891
65ed62e138fa
Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents:
10882
diff
changeset
|
285 len = stream_read(stream,dp->buffer,len); |
65ed62e138fa
Fixed 'reading after EOF'. demuxers didn't check, how many they've read!
lumag
parents:
10882
diff
changeset
|
286 resize_demux_packet(dp, len); |
1 | 287 dp->pts=pts; //(float)pts/90000.0f; |
288 dp->pos=pos; | |
979 | 289 dp->flags=flags; |
1 | 290 // append packet to DS stream: |
291 ds_add_packet(ds,dp); | |
292 } | |
293 | |
294 // return value: | |
295 // 0 = EOF or no stream found or invalid type | |
296 // 1 = successfully read a packet | |
4551 | 297 int demux_mf_fill_buffer( demuxer_t *demux); |
4451 | 298 int demux_roq_fill_buffer(demuxer_t *demux); |
4189 | 299 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
|
300 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
|
301 int demux_fli_fill_buffer(demuxer_t *demux); |
1 | 302 int demux_mpg_es_fill_buffer(demuxer_t *demux); |
303 int demux_mpg_fill_buffer(demuxer_t *demux); | |
10263 | 304 int demux_ty_fill_buffer(demuxer_t *demux); |
1 | 305 int demux_avi_fill_buffer(demuxer_t *demux); |
306 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds); | |
307 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds); | |
308 int demux_asf_fill_buffer(demuxer_t *demux); | |
2106 | 309 int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds); |
2687 | 310 int demux_vivo_fill_buffer(demuxer_t *demux); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
311 int demux_real_fill_buffer(demuxer_t *demuxer); |
12175 | 312 int demux_nsv_fill_buffer(demuxer_t *demux); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
313 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
|
314 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
|
315 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
|
316 int demux_y4m_fill_buffer(demuxer_t *demux); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
317 int demux_audio_fill_buffer(demux_stream_t *ds); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
318 int demux_pva_fill_buffer(demuxer_t *demux); |
8528 | 319 int demux_xmms_fill_buffer(demuxer_t *demux,demux_stream_t *ds); |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
320 int demux_gif_fill_buffer(demuxer_t *demux); |
9610 | 321 int demux_ts_fill_buffer(demuxer_t *demux); |
10033 | 322 int demux_ra_fill_buffer(demuxer_t *demux); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
323 |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
324 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
|
325 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
|
326 extern int demux_rawaudio_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds); |
9065 | 327 extern int demux_rawvideo_fill_buffer(demuxer_t* demuxer, demux_stream_t *ds); |
7382 | 328 extern int demux_smjpeg_fill_buffer(demuxer_t* demux); |
11590 | 329 extern int demux_lmlm4_fill_buffer(demuxer_t* demux); |
10024 | 330 extern int demux_mkv_fill_buffer(demuxer_t *d); |
12164 | 331 extern int demux_lavf_fill_buffer(demuxer_t *d); |
1 | 332 |
333 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){ | |
334 // 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
|
335 // printf("demux->type=%d\n",demux->type); |
1 | 336 switch(demux->type){ |
4551 | 337 case DEMUXER_TYPE_MF: return demux_mf_fill_buffer(demux); |
4451 | 338 case DEMUXER_TYPE_ROQ: return demux_roq_fill_buffer(demux); |
4189 | 339 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
|
340 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
|
341 case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux); |
10263 | 342 case DEMUXER_TYPE_MPEG_TY: return demux_ty_fill_buffer( demux ); |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
343 case DEMUXER_TYPE_MPEG4_ES: |
9824 | 344 case DEMUXER_TYPE_H264_ES: |
1 | 345 case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux); |
346 case DEMUXER_TYPE_MPEG_PS: return demux_mpg_fill_buffer(demux); | |
347 case DEMUXER_TYPE_AVI: return demux_avi_fill_buffer(demux); | |
348 case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds); | |
349 case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds); | |
350 case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux); | |
2106 | 351 case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds); |
2687 | 352 case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
353 case DEMUXER_TYPE_PVA: return demux_pva_fill_buffer(demux); |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
354 #ifdef HAVE_LIBDV095 |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
355 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
|
356 #endif |
3777 | 357 case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux); |
12175 | 358 case DEMUXER_TYPE_NSV: return demux_nsv_fill_buffer(demux); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
359 case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux); |
2790 | 360 #ifdef USE_TV |
7329
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7058
diff
changeset
|
361 case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, ds); |
2790 | 362 #endif |
3786
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
363 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
|
364 case DEMUXER_TYPE_AUDIO: return demux_audio_fill_buffer(ds); |
8528 | 365 #ifdef HAVE_XMMS |
366 case DEMUXER_TYPE_XMMS: return demux_xmms_fill_buffer(demux,ds); | |
367 #endif | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
368 case DEMUXER_TYPE_DEMUXERS: return demux_demuxers_fill_buffer(demux,ds); |
7413 | 369 #ifdef HAVE_OGGVORBIS |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
370 case DEMUXER_TYPE_OGG: return demux_ogg_fill_buffer(demux); |
7413 | 371 #endif |
10024 | 372 #ifdef HAVE_MATROSKA |
373 case DEMUXER_TYPE_MATROSKA: return demux_mkv_fill_buffer(demux); | |
374 #endif | |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
375 case DEMUXER_TYPE_RAWAUDIO: return demux_rawaudio_fill_buffer(demux,ds); |
9065 | 376 case DEMUXER_TYPE_RAWVIDEO: return demux_rawvideo_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
|
377 #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
|
378 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
|
379 #endif |
7382 | 380 case DEMUXER_TYPE_SMJPEG: return demux_smjpeg_fill_buffer(demux); |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
381 #ifdef HAVE_GIF |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
382 case DEMUXER_TYPE_GIF: return demux_gif_fill_buffer(demux); |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
383 #endif |
11590 | 384 case DEMUXER_TYPE_LMLM4: return demux_lmlm4_fill_buffer(demux); |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
385 case DEMUXER_TYPE_MPEG_TS: |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
386 case DEMUXER_TYPE_MPEG4_IN_TS: |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
387 return demux_ts_fill_buffer(demux); |
10033 | 388 case DEMUXER_TYPE_REALAUDIO: return demux_ra_fill_buffer(demux); |
12164 | 389 #ifdef USE_LIBAVFORMAT |
390 case DEMUXER_TYPE_LAVF: return demux_lavf_fill_buffer(demux); | |
391 #endif | |
1 | 392 } |
393 return 0; | |
394 } | |
395 | |
396 // return value: | |
397 // 0 = EOF | |
398 // 1 = succesfull | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
399 int ds_fill_buffer(demux_stream_t *ds){ |
1 | 400 demuxer_t *demux=ds->demuxer; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
401 if(ds->current) free_demux_packet(ds->current); |
1 | 402 if(verbose>2){ |
1567 | 403 if(ds==demux->audio) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_audio) called\n");else |
404 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
|
405 if(ds==demux->sub) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_sub) called\n");else |
1567 | 406 mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(unknown 0x%X) called\n",(unsigned int)ds); |
1 | 407 } |
408 while(1){ | |
409 if(ds->packs){ | |
410 demux_packet_t *p=ds->first; | |
411 // copy useful data: | |
412 ds->buffer=p->buffer; | |
413 ds->buffer_pos=0; | |
414 ds->buffer_size=p->len; | |
415 ds->pos=p->pos; | |
416 ds->dpos+=p->len; // !!! | |
889 | 417 ++ds->pack_no; |
746 | 418 if(p->pts){ |
419 ds->pts=p->pts; | |
420 ds->pts_bytes=0; | |
421 } | |
422 ds->pts_bytes+=p->len; // !!! | |
979 | 423 ds->flags=p->flags; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
424 // unlink packet: |
1 | 425 ds->bytes-=p->len; |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
426 ds->current=p; |
1 | 427 ds->first=p->next; |
428 if(!ds->first) ds->last=NULL; | |
429 --ds->packs; | |
430 return 1; //ds->buffer_size; | |
431 } | |
432 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){ | |
1584 | 433 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes); |
434 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 435 break; |
436 } | |
437 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){ | |
1584 | 438 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes); |
439 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI); | |
1 | 440 break; |
441 } | |
1421 | 442 if(!demux_fill_buffer(demux,ds)){ |
1567 | 443 mp_dbg(MSGT_DEMUXER,MSGL_DBG2,"ds_fill_buffer()->demux_fill_buffer() failed\n"); |
1421 | 444 break; // EOF |
445 } | |
1 | 446 } |
447 ds->buffer_pos=ds->buffer_size=0; | |
448 ds->buffer=NULL; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
449 ds->current=NULL; |
1567 | 450 mp_msg(MSGT_DEMUXER,MSGL_V,"ds_fill_buffer: EOF reached (stream: %s) \n",ds==demux->audio?"audio":"video"); |
1 | 451 ds->eof=1; |
452 return 0; | |
453 } | |
454 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
455 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len){ |
1 | 456 int x; |
457 int bytes=0; | |
458 while(len>0){ | |
459 x=ds->buffer_size-ds->buffer_pos; | |
460 if(x==0){ | |
461 if(!ds_fill_buffer(ds)) return bytes; | |
462 } else { | |
463 if(x>len) x=len; | |
464 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
465 bytes+=x;len-=x;ds->buffer_pos+=x; | |
466 } | |
467 } | |
468 return bytes; | |
469 } | |
470 | |
746 | 471 int demux_read_data_pack(demux_stream_t *ds,unsigned char* mem,int len){ |
472 int x; | |
473 int bytes=0; | |
474 while(len>0){ | |
475 x=ds->buffer_size-ds->buffer_pos; | |
476 if(x==0){ | |
477 if(!ds_fill_buffer(ds)) return bytes; | |
478 } else { | |
479 if(x>len) x=len; | |
480 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x); | |
481 bytes+=x;len-=x;ds->buffer_pos+=x; | |
482 return bytes; // stop at end of package! (for correct timestamping) | |
483 } | |
484 } | |
485 return bytes; | |
486 } | |
487 | |
488 | |
1 | 489 void ds_free_packs(demux_stream_t *ds){ |
490 demux_packet_t *dp=ds->first; | |
491 while(dp){ | |
492 demux_packet_t *dn=dp->next; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
493 free_demux_packet(dp); |
1 | 494 dp=dn; |
495 } | |
496 if(ds->asf_packet){ | |
497 // free unfinished .asf fragments: | |
498 free(ds->asf_packet->buffer); | |
499 free(ds->asf_packet); | |
500 ds->asf_packet=NULL; | |
501 } | |
502 ds->first=ds->last=NULL; | |
503 ds->packs=0; // !!!!! | |
504 ds->bytes=0; | |
6192
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
505 if(ds->current) free_demux_packet(ds->current); |
f03fe2e84efd
clone_demux_packet(), using refcounting to avoid memcpy()
arpi
parents:
5930
diff
changeset
|
506 ds->current=NULL; |
1 | 507 ds->buffer=NULL; |
508 ds->buffer_pos=ds->buffer_size; | |
828 | 509 ds->pts=0; ds->pts_bytes=0; |
1 | 510 } |
511 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
512 int ds_get_packet(demux_stream_t *ds,unsigned char **start){ |
1 | 513 while(1){ |
514 int len; | |
515 if(ds->buffer_pos>=ds->buffer_size){ | |
516 if(!ds_fill_buffer(ds)){ | |
517 // EOF | |
518 *start = NULL; | |
519 return -1; | |
520 } | |
521 } | |
522 len=ds->buffer_size-ds->buffer_pos; | |
523 *start = &ds->buffer[ds->buffer_pos]; | |
524 ds->buffer_pos+=len; | |
525 return len; | |
526 } | |
527 } | |
554 | 528 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
529 int ds_get_packet_sub(demux_stream_t *ds,unsigned char **start){ |
554 | 530 while(1){ |
531 int len; | |
532 if(ds->buffer_pos>=ds->buffer_size){ | |
533 *start = NULL; | |
534 if(!ds->packs) return -1; // no sub | |
535 if(!ds_fill_buffer(ds)) return -1; // EOF | |
536 } | |
537 len=ds->buffer_size-ds->buffer_pos; | |
538 *start = &ds->buffer[ds->buffer_pos]; | |
539 ds->buffer_pos+=len; | |
540 return len; | |
541 } | |
542 } | |
543 | |
5930
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
544 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
|
545 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
|
546 while(!ds->first) { |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
547 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
|
548 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
|
549 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
|
550 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
551 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
552 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
|
553 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
|
554 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
|
555 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
556 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
557 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
|
558 return -1; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
559 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
560 return ds->first->pts; |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
561 } |
68cac7ecaf05
Fix frame_time for variable fps movies as it was the last frame duration.
albeu
parents:
5897
diff
changeset
|
562 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
563 // ==================================================================== |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
564 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
565 // 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
|
566 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
|
567 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
|
568 extern int num_elementary_packetsPES; |
1659 | 569 extern int num_elementary_packets1B6; |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
570 extern int num_elementary_packets12x; |
9824 | 571 extern int num_h264_slice; //combined slice |
572 extern int num_h264_dpa; //DPA Slice | |
573 extern int num_h264_dpb; //DPB Slice | |
574 extern int num_h264_dpc; //DPC Slice | |
575 extern int num_h264_idr; //IDR Slice | |
576 extern int num_h264_sps; | |
577 extern int num_h264_pps; | |
4735 | 578 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
|
579 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
580 // commandline options, flags: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
581 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
|
582 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
|
583 |
7559
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7482
diff
changeset
|
584 //extern int audio_id; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7482
diff
changeset
|
585 //extern int video_id; |
b645204ea527
some cleanup - made private vars/funcs static, removed obsolete externs
arpi
parents:
7482
diff
changeset
|
586 //extern int dvdsub_id; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
587 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
588 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
|
589 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
|
590 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id); |
2050 | 591 demuxer_t* demux_open_avi(demuxer_t* demuxer); |
592 int mov_check_file(demuxer_t* demuxer); | |
593 int mov_read_header(demuxer_t* demuxer); | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
594 int demux_open_fli(demuxer_t* demuxer); |
4551 | 595 int demux_open_mf(demuxer_t* demuxer); |
4189 | 596 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
|
597 int demux_open_bmp(demuxer_t* demuxer); |
4451 | 598 int demux_open_roq(demuxer_t* demuxer); |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
599 #ifdef HAVE_LIBDV095 |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
600 int demux_open_rawdv(demuxer_t* demuxer); |
7594
a715a0960762
This just corrects a function name to match the other demuxer's
arpi
parents:
7559
diff
changeset
|
601 extern int rawdv_check_file(demuxer_t *demuxer); |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
602 #endif |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
603 |
2931 | 604 extern int vivo_check_file(demuxer_t *demuxer); |
605 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
|
606 extern int y4m_check_file(demuxer_t *demuxer); |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
607 extern void demux_open_y4m(demuxer_t *demuxer); |
4451 | 608 extern int roq_check_file(demuxer_t *demuxer); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
609 extern int pva_check_file(demuxer_t * demuxer); |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8056
diff
changeset
|
610 extern demuxer_t * demux_open_pva(demuxer_t * demuxer); |
3777 | 611 extern int real_check_file(demuxer_t *demuxer); |
612 extern void demux_open_real(demuxer_t *demuxer); | |
12175 | 613 extern int nsv_check_file(demuxer_t *demuxer); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
614 extern int nuv_check_file(demuxer_t *demuxer); |
12175 | 615 extern void demux_open_nsv(demuxer_t *demuxer); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
616 extern void demux_open_nuv(demuxer_t *demuxer); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
617 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
|
618 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
|
619 extern int demux_rawaudio_open(demuxer_t* demuxer); |
9065 | 620 extern int demux_rawvideo_open(demuxer_t* demuxer); |
7382 | 621 extern int smjpeg_check_file(demuxer_t *demuxer); |
622 extern int demux_open_smjpeg(demuxer_t* demuxer); | |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
8056
diff
changeset
|
623 extern int bmp_check_file(demuxer_t *demuxer); |
8528 | 624 extern int demux_xmms_open(demuxer_t* demuxer); |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
625 extern int gif_check_file(demuxer_t *demuxer); |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
626 extern int demux_open_gif(demuxer_t* demuxer); |
11590 | 627 extern int lmlm4_check_file(demuxer_t* demuxer); |
628 extern int demux_open_lmlm4(demuxer_t* demuxer); | |
9610 | 629 extern int ts_check_file(demuxer_t * demuxer); |
10221
75c4595b0ffd
warning fixes Raindel Shachar <raindel@techunix.technion.ac.il>
alex
parents:
10164
diff
changeset
|
630 extern int demux_open_ts(demuxer_t *demuxer); |
10024 | 631 extern int demux_open_mkv(demuxer_t *demuxer); |
10033 | 632 extern int ra_check_file(demuxer_t *demuxer); |
633 extern int demux_open_ra(demuxer_t* demuxer); | |
11576 | 634 #ifdef HAVE_MATROSKA |
635 extern int demux_mkv_open(demuxer_t *demuxer); | |
636 #endif | |
12164 | 637 extern int lavf_check_file(demuxer_t *demuxer); |
638 extern int demux_open_lavf(demuxer_t* demuxer); | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
639 |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
640 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
|
641 |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
642 int extension_parsing=1; // 0=off 1=mixed (used only for unstable formats) |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
643 |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
644 /* |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
645 NOTE : Several demuxers may be opened at the same time so |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
646 demuxers should NEVER rely on an external var to enable them |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
647 self. If a demuxer can't do any autodection it should only use |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
648 file_format. The user can explictly set file_format with the -demuxer |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
649 option so there is really no need for another extra var. |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
650 For conivence an option can be added to set file_format directly |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
651 to the right type (ex: rawaudio,rawvideo). |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
652 Also the stream can override the file_format so a demuxer wich rely |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
653 on a special stream type can set file_format at the stream level |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
654 (ex: tv,mf). |
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
655 */ |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
656 |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
657 static demuxer_t* demux_open_stream(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
658 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
659 //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
|
660 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
661 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
|
662 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
663 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
|
664 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
|
665 |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
666 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
|
667 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
|
668 |
1659 | 669 //printf("demux_open(%p,%d,%d,%d,%d) \n",stream,file_format,audio_id,video_id,dvdsub_id); |
670 | |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
671 if(file_format == DEMUXER_TYPE_RAWAUDIO) { |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
672 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
|
673 } |
9709 | 674 if(file_format == DEMUXER_TYPE_RAWVIDEO) { |
9065 | 675 demuxer = new_demuxer(stream,DEMUXER_TYPE_RAWVIDEO,audio_id,video_id,dvdsub_id); |
676 } | |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
677 |
2790 | 678 #ifdef USE_TV |
679 //=============== Try to open as TV-input: ================= | |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
680 if(file_format==DEMUXER_TYPE_TV){ |
2790 | 681 demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id); |
6951 | 682 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedTV); |
2790 | 683 } |
684 #endif | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
685 |
6942
6048ac6ab001
detection reordered. note: raw DV detection should be more reliable.
arpi
parents:
6925
diff
changeset
|
686 //=============== Try to open as multi file: ================= |
9751
00c97b0891e3
Fix all demuxers wich where using a global var to enable themself.
albeu
parents:
9709
diff
changeset
|
687 if(file_format==DEMUXER_TYPE_MF){ |
6942
6048ac6ab001
detection reordered. note: raw DV detection should be more reliable.
arpi
parents:
6925
diff
changeset
|
688 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
|
689 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
|
690 } |
6048ac6ab001
detection reordered. note: raw DV detection should be more reliable.
arpi
parents:
6925
diff
changeset
|
691 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
692 //=============== 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
|
693 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
|
694 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
|
695 { //---- RIFF header: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
696 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
|
697 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
|
698 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
|
699 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
|
700 if(id==formtypeAVI){ |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
701 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"AVI"); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
702 file_format=DEMUXER_TYPE_AVI; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
703 } else { |
4660 | 704 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
705 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
706 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
707 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
708 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
709 } |
3833 | 710 //=============== Try to open as Y4M file: ================= |
711 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){ | |
712 demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id); | |
713 if(y4m_check_file(demuxer)){ | |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
714 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"YUV4MPEG2"); |
3833 | 715 file_format=DEMUXER_TYPE_Y4M; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
716 } else { |
4660 | 717 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
718 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
719 } |
3833 | 720 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
721 //=============== 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
|
722 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
|
723 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
|
724 if(asf_check_header(demuxer)){ |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
725 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ASF"); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
726 file_format=DEMUXER_TYPE_ASF; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
727 } else { |
4660 | 728 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
729 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
730 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
731 } |
12175 | 732 //=============== Try to open as NSV file: ================= |
733 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_NSV){ | |
734 demuxer=new_demuxer(stream,DEMUXER_TYPE_NSV,audio_id,video_id,dvdsub_id); | |
735 if(file_format==DEMUXER_TYPE_NSV||nsv_check_file(demuxer)){ | |
736 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"Nullsoft Streaming Video"); | |
737 file_format=DEMUXER_TYPE_NSV; | |
738 } else { | |
739 free_demuxer(demuxer); | |
740 demuxer = NULL; | |
741 } | |
742 } | |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
743 //=============== Try to open as NUV file: ================= |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
744 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
|
745 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
|
746 if(nuv_check_file(demuxer)){ |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
747 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"NuppelVideo"); |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
748 file_format=DEMUXER_TYPE_NUV; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
749 } else { |
4660 | 750 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
751 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
752 } |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
753 } |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
754 //=============== Try to open as REAL file: ================= |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
755 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
756 demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
757 if(real_check_file(demuxer)){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
758 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"REAL"); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
759 file_format=DEMUXER_TYPE_REAL; |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
760 } else { |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
761 free_demuxer(demuxer); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
762 demuxer = NULL; |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
763 } |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
764 } |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
765 //=============== Try to open as SMJPEG file: ================= |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
766 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_SMJPEG){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
767 demuxer=new_demuxer(stream,DEMUXER_TYPE_SMJPEG,audio_id,video_id,dvdsub_id); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
768 if(smjpeg_check_file(demuxer)){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
769 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"SMJPEG"); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
770 file_format=DEMUXER_TYPE_SMJPEG; |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
771 } else { |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
772 free_demuxer(demuxer); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
773 demuxer = NULL; |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
774 } |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
775 } |
10024 | 776 #ifdef HAVE_MATROSKA |
777 //=============== Try to open as Matroska file: ================= | |
778 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MATROSKA){ | |
779 demuxer=new_demuxer(stream,DEMUXER_TYPE_MATROSKA,audio_id,video_id,dvdsub_id); | |
780 if(demux_mkv_open(demuxer)){ | |
781 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"Matroska"); | |
782 file_format=DEMUXER_TYPE_MATROSKA; | |
783 } else { | |
784 free_demuxer(demuxer); | |
785 demuxer = NULL; | |
786 } | |
787 } | |
788 #endif | |
10033 | 789 //=============== Try to open as REALAUDIO file: ================= |
790 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REALAUDIO){ | |
791 demuxer=new_demuxer(stream,DEMUXER_TYPE_REALAUDIO,audio_id,video_id,dvdsub_id); | |
792 if(ra_check_file(demuxer)){ | |
793 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"REALAUDIO"); | |
794 file_format=DEMUXER_TYPE_REALAUDIO; | |
795 } else { | |
796 free_demuxer(demuxer); | |
797 demuxer = NULL; | |
798 } | |
799 } | |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
800 |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
801 //=============== Try based on filename EXTENSION: ================= |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
802 // Ok. We're over the stable detectable fileformats, the next ones are a bit |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
803 // fuzzy. So by default (extension_parsing==1) try extension-based detection |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
804 // first: |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
805 if(file_format==DEMUXER_TYPE_UNKNOWN && filename && extension_parsing==1){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
806 file_format=demuxer_type_by_filename(filename); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
807 if(file_format!=DEMUXER_TYPE_UNKNOWN){ |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
808 // we like recursion :) |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
809 demuxer=demux_open_stream(stream,file_format,audio_id,video_id,dvdsub_id,NULL); |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
810 if(demuxer) return demuxer; // done! |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
811 file_format=DEMUXER_TYPE_UNKNOWN; // continue fuzzy guessing... |
10379
296064e1baf0
fixed mpeg-ps ext-based detection sig11 bug reporetd by Raindel Shachar
arpi
parents:
10310
diff
changeset
|
812 mp_msg(MSGT_DEMUXER,MSGL_V,"demuxer: continue fuzzy content-based format guessing...\n"); |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
813 } |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
814 } |
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
815 |
2878 | 816 //=============== Try to open as MOV file: ================= |
817 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){ | |
818 demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id); | |
819 if(mov_check_file(demuxer)){ | |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
820 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"QuickTime/MOV"); |
8937 | 821 file_format=demuxer->type; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
822 } else { |
4660 | 823 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
824 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
825 } |
2878 | 826 } |
3256 | 827 //=============== Try to open as VIVO file: ================= |
828 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_VIVO){ | |
829 demuxer=new_demuxer(stream,DEMUXER_TYPE_VIVO,audio_id,video_id,dvdsub_id); | |
830 if(vivo_check_file(demuxer)){ | |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
831 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat, "VIVO"); |
3256 | 832 file_format=DEMUXER_TYPE_VIVO; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
833 } else { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
834 free_demuxer(demuxer); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
835 demuxer = NULL; |
3256 | 836 } |
837 } | |
838 //=============== Try to open as FLI file: ================= | |
839 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FLI){ | |
840 demuxer=new_demuxer(stream,DEMUXER_TYPE_FLI,audio_id,video_id,dvdsub_id); | |
841 { | |
4189 | 842 int id; |
843 stream_seek(demuxer->stream, 4); | |
844 id=stream_read_word_le(demuxer->stream); | |
845 // check for the FLI file magic number | |
3256 | 846 if((id==0xAF11) || (id==0xAF12)){ |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
847 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FLI"); |
3256 | 848 file_format=DEMUXER_TYPE_FLI; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
849 } else { |
4660 | 850 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
851 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
852 } |
3256 | 853 } |
854 } | |
4189 | 855 //=============== Try to open as FILM file: ================= |
856 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FILM){ | |
857 demuxer=new_demuxer(stream,DEMUXER_TYPE_FILM,audio_id,video_id,dvdsub_id); | |
858 { | |
859 int signature=stream_read_fourcc(demuxer->stream); | |
860 // check for the FLI file magic number | |
861 if(signature==mmioFOURCC('F', 'I', 'L', 'M')){ | |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
862 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"FILM"); |
4189 | 863 file_format=DEMUXER_TYPE_FILM; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
864 } else { |
4660 | 865 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
866 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
867 } |
4189 | 868 } |
869 } | |
4451 | 870 //=============== Try to open as RoQ file: ================= |
871 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){ | |
872 demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id); | |
873 if(roq_check_file(demuxer)){ | |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
874 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"ROQ"); |
4451 | 875 file_format=DEMUXER_TYPE_ROQ; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
876 } else { |
4660 | 877 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
878 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
879 } |
4451 | 880 } |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
881 #ifdef HAVE_GIF |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
882 //=============== Try to open as GIF file: ================= |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
883 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_GIF){ |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
884 demuxer=new_demuxer(stream,DEMUXER_TYPE_GIF,audio_id,video_id,dvdsub_id); |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
885 if(gif_check_file(demuxer)){ |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
886 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"GIF"); |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
887 file_format=DEMUXER_TYPE_GIF; |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
888 } else { |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
889 free_demuxer(demuxer); |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
890 demuxer = NULL; |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
891 } |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
892 } |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
893 #endif |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
894 //=============== 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
|
895 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
|
896 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
|
897 if(bmp_check_file(demuxer)){ |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
898 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"BMP"); |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
899 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
|
900 } else { |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
901 free_demuxer(demuxer); |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
902 demuxer = NULL; |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
903 } |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
904 } |
7413 | 905 #ifdef HAVE_OGGVORBIS |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
906 //=============== Try to open as Ogg file: ================= |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
907 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
|
908 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
|
909 if(demux_ogg_open(demuxer)){ |
12434
aa7216363fd4
Cosmetics. Shortened the "displaying subtitle..." message. Replaced "OGG" with "Ogg" as it is a name, not an abbreviation/acronym.
mosu
parents:
12223
diff
changeset
|
910 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"Ogg"); |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
911 file_format=DEMUXER_TYPE_OGG; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
912 } else { |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
913 free_demuxer(demuxer); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
914 demuxer = NULL; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
915 } |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
916 } |
7413 | 917 #endif |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
918 //=============== Try to open as PVA file: ================= |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
919 if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_PVA){ |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
920 demuxer=new_demuxer(stream,DEMUXER_TYPE_PVA,audio_id,video_id,dvdsub_id); |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
921 if(pva_check_file(demuxer)) { |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
922 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"PVA"); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
923 file_format=DEMUXER_TYPE_PVA; |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
924 } else { |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
925 free_demuxer(demuxer); |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
926 demuxer=NULL; |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
927 } |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
928 } |
9610 | 929 //=============== Try to open as MPEG-TS file: ================= |
930 if(file_format == DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TS){ | |
931 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_TS,audio_id,video_id,dvdsub_id); | |
932 if(ts_check_file(demuxer)) { | |
933 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"TS"); | |
934 file_format=DEMUXER_TYPE_MPEG_TS; | |
935 } else { | |
936 free_demuxer(demuxer); | |
937 demuxer=NULL; | |
938 } | |
939 } | |
11590 | 940 //=============== Try to open as LMLM4 file: ================= |
941 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_LMLM4){ | |
942 demuxer=new_demuxer(stream,DEMUXER_TYPE_LMLM4,audio_id,video_id,dvdsub_id); | |
943 if(lmlm4_check_file(demuxer)){ | |
944 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"RAW LMLM4"); | |
945 file_format=DEMUXER_TYPE_LMLM4; | |
946 } else { | |
947 free_demuxer(demuxer); | |
948 demuxer = NULL; | |
949 } | |
950 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
951 //=============== 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
|
952 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
|
953 int pes=1; |
3770 | 954 int tmp; |
3772 | 955 off_t tmppos; |
10379
296064e1baf0
fixed mpeg-ps ext-based detection sig11 bug reporetd by Raindel Shachar
arpi
parents:
10310
diff
changeset
|
956 file_format=DEMUXER_TYPE_UNKNOWN; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
957 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
|
958 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id); |
3770 | 959 |
960 // try to pre-detect PES: | |
3772 | 961 tmppos=stream_tell(demuxer->stream); |
3770 | 962 tmp=stream_read_dword(demuxer->stream); |
963 if(tmp==0x1E0 || tmp==0x1C0){ | |
964 tmp=stream_read_word(demuxer->stream); | |
965 if(tmp>1 && tmp<=2048) pes=0; // demuxer->synced=3; // PES... | |
966 } | |
3772 | 967 stream_seek(demuxer->stream,tmppos); |
3770 | 968 |
969 if(!pes) demuxer->synced=3; // hack! | |
970 | |
1659 | 971 num_elementary_packets100=0; |
972 num_elementary_packets101=0; | |
973 num_elementary_packets1B6=0; | |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
974 num_elementary_packets12x=0; |
1659 | 975 num_elementary_packetsPES=0; |
9824 | 976 num_h264_slice=0; //combined slice |
977 num_h264_dpa=0; //DPA Slice | |
978 num_h264_dpb=0; //DPB Slice | |
979 num_h264_dpc=0; //DPC Slice | |
980 num_h264_idr=0; //IDR Slice | |
981 num_h264_sps=0; | |
982 num_h264_pps=0; | |
4735 | 983 num_mp3audio_packets=0; |
1659 | 984 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
985 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
|
986 if(!pes) |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
987 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PES"); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
988 else |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
989 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"MPEG-PS"); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
990 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
|
991 } else { |
9824 | 992 mp_msg(MSGT_DEMUX,MSGL_V,"MPEG packet stats: p100: %d p101: %d p1B6: %d p12x: %d sli: %d a: %d b: %d c: %d idr: %d sps: %d pps: %d PES: %d MP3: %d \n", |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
993 num_elementary_packets100,num_elementary_packets101, |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
994 num_elementary_packets1B6,num_elementary_packets12x, |
9824 | 995 num_h264_slice, num_h264_dpa, |
996 num_h264_dpb, num_h264_dpc=0, | |
997 num_h264_idr, num_h264_sps=0, | |
998 num_h264_pps, | |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
999 num_elementary_packetsPES,num_mp3audio_packets); |
5804 | 1000 //MPEG packet stats: p100: 458 p101: 458 PES: 0 MP3: 1103 (.m2v) |
1001 if(num_mp3audio_packets>50 && num_mp3audio_packets>2*num_elementary_packets100 | |
1002 && abs(num_elementary_packets100-num_elementary_packets101)>2) | |
5068 | 1003 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
|
1004 // 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
|
1005 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 && |
2881 | 1006 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
|
1007 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
|
1008 --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
|
1009 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1010 file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :) |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1011 } else |
9446
29a9b69033f1
enabling mpeg4-es autodetection (if we dont enable it, then we will never know if it works ...)
michael
parents:
9129
diff
changeset
|
1012 #if 1 |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1013 // fuzzy mpeg4-es detection. do NOT enable without heavy testing of mpeg formats detection! |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1014 if(num_elementary_packets1B6>3 && num_elementary_packets12x>=1 && |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1015 num_elementary_packetsPES==0 && num_elementary_packets100<=num_elementary_packets12x && |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1016 demuxer->synced<2){ |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1017 file_format=DEMUXER_TYPE_MPEG4_ES; |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1018 } else |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1019 #endif |
9824 | 1020 #if 1 |
1021 // fuzzy h264-es detection. do NOT enable without heavy testing of mpeg formats detection! | |
9918 | 1022 if((num_h264_slice>3 || (num_h264_dpa>3 && num_h264_dpb>3 && num_h264_dpc>3)) && |
1023 /* FIXME num_h264_sps>=1 && */ num_h264_pps>=1 && num_h264_idr>=1 && | |
9824 | 1024 num_elementary_packets1B6==0 && num_elementary_packetsPES==0 && |
1025 demuxer->synced<2){ | |
1026 file_format=DEMUXER_TYPE_H264_ES; | |
1027 } else | |
1028 #endif | |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1029 { |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1030 if(demuxer->synced==2) |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
1031 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
|
1032 else |
6951 | 1033 mp_msg(MSGT_DEMUXER,MSGL_V,MSGTR_NotSystemStream); |
4660 | 1034 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1035 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
|
1036 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1037 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1038 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1039 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1040 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1041 //=============== Try to open as MPEG-ES file: ================= |
9824 | 1042 if(file_format==DEMUXER_TYPE_MPEG_ES || file_format==DEMUXER_TYPE_MPEG4_ES || file_format==DEMUXER_TYPE_H264_ES){ // little hack, see above! |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1043 demuxer=new_demuxer(stream,file_format,audio_id,video_id,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
|
1044 if(!ds_fill_buffer(demuxer->video)){ |
1584 | 1045 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
|
1046 file_format=DEMUXER_TYPE_UNKNOWN; |
4660 | 1047 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1048 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
|
1049 } else { |
9824 | 1050 switch(file_format){ |
1051 case DEMUXER_TYPE_MPEG_ES: | |
1052 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat, "MPEG-ES"); break; | |
1053 case DEMUXER_TYPE_MPEG4_ES: | |
1054 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat, "MPEG4-ES"); break; | |
1055 case DEMUXER_TYPE_H264_ES: | |
1056 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat, "H264-ES"); break; | |
1057 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1058 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1059 } |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1060 #ifdef HAVE_LIBDV095 |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1061 //=============== 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
|
1062 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
|
1063 { |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1064 demuxer=new_demuxer(stream,DEMUXER_TYPE_RAWDV,audio_id,video_id,dvdsub_id); |
7594
a715a0960762
This just corrects a function name to match the other demuxer's
arpi
parents:
7559
diff
changeset
|
1065 if(rawdv_check_file(demuxer)) |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1066 { |
7482
1056d2dc4f3a
changed 'detected fileformat' messages to a message with %s
jaf
parents:
7469
diff
changeset
|
1067 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"RAWDV"); |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1068 file_format=DEMUXER_TYPE_RAWDV; |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1069 } |
8821 | 1070 else { |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1071 free_demuxer(demuxer); |
8821 | 1072 demuxer=NULL; |
1073 } | |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1074 } |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1075 #endif |
4696 | 1076 //=============== Try to open as audio file: ================= |
1077 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_AUDIO){ | |
1078 demuxer=new_demuxer(stream,DEMUXER_TYPE_AUDIO,audio_id,video_id,dvdsub_id); | |
1079 if(demux_audio_open(demuxer)){ | |
6951 | 1080 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAudiofile); |
4696 | 1081 file_format=DEMUXER_TYPE_AUDIO; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1082 } else { |
4696 | 1083 free_demuxer(demuxer); |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1084 demuxer = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1085 } |
4696 | 1086 } |
8528 | 1087 #ifdef HAVE_XMMS |
1088 //=============== Try to open as XMMS file: ================= | |
10164 | 1089 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_XMMS){ |
8528 | 1090 demuxer=new_demuxer(stream,DEMUXER_TYPE_XMMS,audio_id,video_id,dvdsub_id); |
1091 if(demux_xmms_open(demuxer)){ | |
1092 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAudiofile); | |
1093 file_format=DEMUXER_TYPE_XMMS; | |
1094 } else { | |
1095 free_demuxer(demuxer); | |
1096 demuxer = NULL; | |
1097 } | |
1098 } | |
1099 #endif | |
10274
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1100 //=============== Try to open as MPEG-TY file: ================= |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1101 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_TY) |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1102 { |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1103 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_TY,audio_id,video_id,dvdsub_id); |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1104 if(ds_fill_buffer(demuxer->video)){ |
10442 | 1105 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"TiVo"); |
10274
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1106 file_format=DEMUXER_TYPE_MPEG_TY; |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1107 } else { |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1108 free_demuxer(demuxer); |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1109 demuxer = NULL; |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1110 } |
cd8909001845
tivo demuxer moved down, its fileformat detection is unstable (misdetects mpeg-ps)
arpi
parents:
10263
diff
changeset
|
1111 } |
7007 | 1112 //=============== 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
|
1113 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
|
1114 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
|
1115 } |
12164 | 1116 //=============== Try to open with LAVF: ================= |
1117 #ifdef USE_LIBAVFORMAT | |
1118 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_LAVF){ | |
1119 demuxer=new_demuxer(stream,DEMUXER_TYPE_LAVF,audio_id,video_id,dvdsub_id); | |
1120 if(lavf_check_file(demuxer)){ | |
1121 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_Detected_XXX_FileFormat,"libavformat"); //FIXME print format | |
1122 file_format=DEMUXER_TYPE_LAVF; | |
1123 } else { | |
1124 free_demuxer(demuxer); | |
1125 demuxer = NULL; | |
1126 } | |
1127 } | |
1128 #endif | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1129 //=============== Unknown, exiting... =========================== |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1130 if(file_format==DEMUXER_TYPE_UNKNOWN || demuxer == NULL){ |
8925
5c15777f1c07
this patch adds an fallback to playlist (any but the plaintext-list format)
arpi
parents:
8821
diff
changeset
|
1131 //mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized); // will be done by mplayer.c after fallback to playlist-parsing |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1132 return NULL; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1133 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1134 //====== 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
|
1135 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
|
1136 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
|
1137 //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
|
1138 |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
1139 demuxer->file_format=file_format; |
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
1140 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1141 switch(file_format){ |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1142 #ifdef HAVE_LIBDV095 |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1143 case DEMUXER_TYPE_RAWDV: |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1144 { |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1145 if (!demux_open_rawdv(demuxer)) return NULL; |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1146 break; |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1147 } |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1148 #endif |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
1149 case DEMUXER_TYPE_RAWAUDIO: { |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
1150 demux_rawaudio_open(demuxer); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
1151 break; |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
1152 } |
9065 | 1153 case DEMUXER_TYPE_RAWVIDEO: { |
1154 demux_rawvideo_open(demuxer); | |
1155 break; | |
1156 } | |
4551 | 1157 case DEMUXER_TYPE_MF: { |
1158 if (!demux_open_mf(demuxer)) return NULL; | |
1159 break; | |
1160 } | |
3101
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
1161 case DEMUXER_TYPE_FLI: { |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
1162 if (!demux_open_fli(demuxer)) return NULL; |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
1163 break; |
637e540831b9
mostly complete support for loading and decoding FLI/FLC animations
melanson
parents:
3091
diff
changeset
|
1164 } |
4189 | 1165 case DEMUXER_TYPE_FILM: { |
1166 if (!demux_open_film(demuxer)) return NULL; | |
1167 break; | |
1168 } | |
9129
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
1169 #ifdef HAVE_GIF |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
1170 case DEMUXER_TYPE_GIF: { |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
1171 if (!demux_open_gif(demuxer)) return NULL; |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
1172 break; |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
1173 } |
6ecc0b5c08cb
libgif/libungif based demuxer support for libmpdemux.
arpi
parents:
9069
diff
changeset
|
1174 #endif |
5214
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
1175 case DEMUXER_TYPE_BMP: { |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
1176 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
|
1177 break; |
dd79075bbd98
added a BMP file demuxer...yeah, that's right, a static image BMP file
melanson
parents:
5157
diff
changeset
|
1178 } |
4451 | 1179 case DEMUXER_TYPE_ROQ: { |
1180 if (!demux_open_roq(demuxer)) return NULL; | |
1181 break; | |
1182 } | |
7382 | 1183 case DEMUXER_TYPE_SMJPEG: { |
1184 if (!demux_open_smjpeg(demuxer)) return NULL; | |
1185 break; | |
1186 } | |
1490 | 1187 case DEMUXER_TYPE_MOV: { |
2127 | 1188 if(!mov_read_header(demuxer)) return NULL; |
1189 // sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video; | |
1190 // sh_audio=d_audio->sh;if(sh_audio) sh_audio->ds=d_audio; | |
1490 | 1191 break; |
1192 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1193 case DEMUXER_TYPE_AVI: { |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
1194 sh_audio_t* sh_a; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
1195 demuxer = (demuxer_t*) demux_open_avi(demuxer); |
5412 | 1196 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
|
1197 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
|
1198 if(demuxer->audio->id != -2 && sh_a) { |
7413 | 1199 #ifdef HAVE_OGGVORBIS |
1200 // support for Ogg-in-AVI: | |
5897
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1201 if(sh_a->format == 0xFFFE) |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1202 demuxer = init_avi_with_ogg(demuxer); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1203 else if(sh_a->format == 0x674F) { |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1204 stream_t* s; |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1205 demuxer_t *od; |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1206 s = new_ds_stream(demuxer->audio); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1207 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
|
1208 if(!demux_ogg_open(od)) { |
6951 | 1209 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
|
1210 free_stream(s); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1211 demuxer->audio->id = -2; |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1212 } else |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1213 demuxer = new_demuxers_demuxer(demuxer,od,demuxer); |
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1214 } |
7413 | 1215 #endif |
5897
5f25f1f06c95
Add support for another AVI with ogg/vorbis audio (0x674F)
albeu
parents:
5812
diff
changeset
|
1216 } |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
5107
diff
changeset
|
1217 return demuxer; |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
1218 // break; |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1219 } |
12175 | 1220 case DEMUXER_TYPE_NSV: { |
1221 demux_open_nsv(demuxer); | |
1222 break; | |
1223 } | |
3801
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
1224 case DEMUXER_TYPE_NUV: { |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
1225 demux_open_nuv(demuxer); |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
1226 break; |
3cea69dda1b3
added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents:
3786
diff
changeset
|
1227 } |
2687 | 1228 case DEMUXER_TYPE_VIVO: { |
1229 demux_open_vivo(demuxer); | |
1230 break; | |
1231 } | |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1232 case DEMUXER_TYPE_PVA: { |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1233 demux_open_pva(demuxer); |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1234 break; |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1235 } |
3786
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
1236 case DEMUXER_TYPE_Y4M: { |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
1237 demux_open_y4m(demuxer); |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
1238 break; |
7ebf504c92d6
yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents:
3777
diff
changeset
|
1239 } |
11590 | 1240 case DEMUXER_TYPE_LMLM4: { |
1241 demux_open_lmlm4(demuxer); | |
1242 if(!ds_fill_buffer(d_video)){ | |
1243 mp_msg(MSGT_DEMUXER,MSGL_INFO,"LMLM4: " MSGTR_MissingVideoStream); | |
1244 sh_video=NULL; | |
1245 } else { | |
1246 sh_video=d_video->sh;sh_video->ds=d_video; | |
1247 } | |
1248 if(audio_id!=-2) { | |
1249 if(!ds_fill_buffer(d_audio)){ | |
1250 mp_msg(MSGT_DEMUXER,MSGL_INFO,"LMLM4: " MSGTR_MissingAudioStream); | |
1251 sh_audio=NULL; | |
1252 } else { | |
1253 sh_audio=d_audio->sh;sh_audio->ds=d_audio; | |
1254 } | |
1255 } | |
1256 break; | |
1257 } | |
3777 | 1258 case DEMUXER_TYPE_REAL: { |
1259 demux_open_real(demuxer); | |
1260 break; | |
1261 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1262 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
|
1263 //---- ASF header: |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1264 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
|
1265 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
|
1266 stream_seek(demuxer->stream,demuxer->movi_start); |
1485
b895f95e7657
AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents:
1456
diff
changeset
|
1267 // 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
|
1268 // demuxer->endpos=avi_header.movi_end; |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1269 if(d_video->id != -2) { |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1270 if(!ds_fill_buffer(d_video)){ |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1271 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
|
1272 sh_video=NULL; |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1273 //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
|
1274 } else { |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1275 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
|
1276 sh_video->fps=1000.0f; sh_video->frametime=0.001f; // 1ms |
11576 | 1277 mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO: [%.4s] %dx%d %dbpp\n", |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1278 (char *)&sh_video->bih->biCompression, |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1279 sh_video->bih->biWidth, |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1280 sh_video->bih->biHeight, |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1281 sh_video->bih->biBitCount); |
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1282 // 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
|
1283 } |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1284 } |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1285 if(d_audio->id!=-2){ |
6951 | 1286 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
|
1287 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
|
1288 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
|
1289 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
|
1290 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1291 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
|
1292 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
|
1293 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1294 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1295 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1296 } |
9824 | 1297 case DEMUXER_TYPE_H264_ES: |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1298 case DEMUXER_TYPE_MPEG4_ES: |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1299 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
|
1300 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
|
1301 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
|
1302 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
|
1303 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1304 } |
10263 | 1305 |
1306 case DEMUXER_TYPE_MPEG_TY: { | |
1307 sh_video=d_video->sh;sh_video->ds=d_video; | |
1308 | |
1309 if(audio_id!=-2) { | |
1310 if(!ds_fill_buffer(d_audio)){ | |
1311 mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream); | |
1312 sh_audio=NULL; | |
1313 } else { | |
1314 sh_audio=d_audio->sh;sh_audio->ds=d_audio; | |
1315 switch(d_audio->id & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id) | |
1316 case 0x00: sh_audio->format=0x50;break; // mpeg | |
1317 case 0xA0: sh_audio->format=0x10001;break; // dvd pcm | |
13006 | 1318 case 0x80: if((d_audio->id & 0xF8) == 0x88) sh_audio->format=0x2001;//dts |
1319 else sh_audio->format=0x2000;break; // ac3 | |
10263 | 1320 default: sh_audio=NULL; // unknown type |
1321 } | |
1322 } | |
1323 } | |
1324 break; | |
1325 } | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1326 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
|
1327 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
|
1328 // 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
|
1329 |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1330 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
|
1331 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
|
1332 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
|
1333 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
|
1334 } else { |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1335 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
|
1336 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
|
1337 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
|
1338 case 0xA0: sh_audio->format=0x10001;break; // dvd pcm |
13006 | 1339 case 0x80: if((d_audio->id & 0xF8) == 0x88) sh_audio->format=0x2001;//dts |
1340 else sh_audio->format=0x2000;break; // ac3 | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1341 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
|
1342 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1343 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1344 } |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1345 break; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1346 } |
2790 | 1347 #ifdef USE_TV |
1348 case DEMUXER_TYPE_TV: { | |
7329
9129781e5939
removed messy global 'tv_handle', use stream->priv for that purpose
arpi
parents:
7058
diff
changeset
|
1349 if (!demux_open_tv(demuxer)) return(NULL); |
2790 | 1350 break; |
1351 } | |
1352 #endif | |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6871
diff
changeset
|
1353 #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
|
1354 case DEMUXER_TYPE_RTP: { |
11985
c43d654a1f45
Added support for multiplexed (audio+video) RTP streams.
rsf
parents:
11590
diff
changeset
|
1355 demuxer = demux_open_rtp(demuxer); |
6910
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6871
diff
changeset
|
1356 break; |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6871
diff
changeset
|
1357 } |
1a747aee653b
applied live.com streaming patch (-sdp and rtsp:// support) by Ross Finlayson <finlayson@live.com>
arpi
parents:
6871
diff
changeset
|
1358 #endif |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
1359 case DEMUXER_TYPE_MPEG_TS: |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
1360 case DEMUXER_TYPE_MPEG4_IN_TS: { |
9610 | 1361 demux_open_ts(demuxer); |
1362 break; | |
1363 } | |
10033 | 1364 case DEMUXER_TYPE_REALAUDIO: { |
1365 if (!demux_open_ra(demuxer)) return NULL; | |
1366 break; | |
1367 } | |
12164 | 1368 #ifdef USE_LIBAVFORMAT |
1369 case DEMUXER_TYPE_LAVF: { | |
1370 if (!demux_open_lavf(demuxer)) return NULL; | |
1371 break; | |
1372 } | |
1373 #endif | |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1374 } // switch(file_format) |
2590 | 1375 pts_from_bps=0; // !!! |
13301
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1376 if ((sh_video=demuxer->video->sh) && sh_video->bih) |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1377 mp_msg(MSGT_DEMUX,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp %5.3f fps %5.1f kbps (%4.1f kbyte/s)\n", |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1378 (char *)&sh_video->bih->biCompression, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1379 sh_video->bih->biWidth, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1380 sh_video->bih->biHeight, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1381 sh_video->bih->biBitCount, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1382 sh_video->fps, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1383 sh_video->i_bps*0.008f, |
638673d1f83a
show video format for all demuxers, not just avi (move this somewhere else if you prefer)
rfelker
parents:
13006
diff
changeset
|
1384 sh_video->i_bps/1024.0f ); |
1375
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1385 return demuxer; |
dbcb5b5e1fae
file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents:
1331
diff
changeset
|
1386 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1387 |
6623 | 1388 char* audio_stream = NULL; |
7867 | 1389 char* sub_stream = NULL; |
1390 int demuxer_type = 0, audio_demuxer_type = 0, sub_demuxer_type = 0; | |
9709 | 1391 int audio_stream_cache = 0; |
7867 | 1392 |
1393 extern int hr_mp3_seek; | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1394 |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
1395 extern float stream_cache_min_percent; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
1396 extern float stream_cache_prefill_percent; |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
1397 |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
1398 demuxer_t* demux_open(stream_t *vs,int file_format,int audio_id,int video_id,int dvdsub_id,char* filename){ |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1399 stream_t *as = NULL,*ss = NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1400 demuxer_t *vd,*ad = NULL,*sd = NULL; |
12223 | 1401 int afmt =DEMUXER_TYPE_UNKNOWN,sfmt = DEMUXER_TYPE_UNKNOWN ; |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1402 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1403 if(audio_stream) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1404 as = open_stream(audio_stream,0,&afmt); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1405 if(!as) { |
6951 | 1406 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
|
1407 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1408 } |
9709 | 1409 if(audio_stream_cache) { |
12835
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
1410 if(!stream_enable_cache(as,audio_stream_cache*1024,audio_stream_cache*1024*(stream_cache_min_percent / 100.0), |
4235ae5a2d60
cache min fill adjustment, based on patch by Jeremy Huddleston
iive
parents:
12434
diff
changeset
|
1411 audio_stream_cache*1024*(stream_cache_prefill_percent / 100.0))) { |
9709 | 1412 free_stream(as); |
1413 mp_msg(MSGT_DEMUXER,MSGL_ERR,"Can't enable audio stream cache\n"); | |
1414 return NULL; | |
1415 } | |
1416 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1417 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1418 if(sub_stream) { |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1419 ss = open_stream(sub_stream,0,&sfmt); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1420 if(!ss) { |
6951 | 1421 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
|
1422 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1423 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1424 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1425 |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
1426 vd = demux_open_stream(vs,demuxer_type ? demuxer_type : file_format,audio_stream ? -2 : audio_id,video_id, sub_stream ? -2 : dvdsub_id, filename); |
9709 | 1427 if(!vd) { |
1428 if(as) free_stream(as); | |
1429 if(ss) free_stream(ss); | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1430 return NULL; |
9709 | 1431 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1432 if(as) { |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
1433 ad = demux_open_stream(as,audio_demuxer_type ? audio_demuxer_type : afmt,audio_id,-2,-2, audio_stream); |
9709 | 1434 if(!ad) { |
6951 | 1435 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningAudioDemuxerFailed,audio_stream); |
9709 | 1436 free_stream(as); |
1437 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1438 else if(ad->audio->sh && ((sh_audio_t*)ad->audio->sh)->format == 0x55) // MP3 |
7867 | 1439 hr_mp3_seek=1; // Enable high res seeking |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1440 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1441 if(ss) { |
9006
d00997f12257
extension-based filetype detection for headerless files (mp3 vs mpeg, etc)
arpi
parents:
8937
diff
changeset
|
1442 sd = demux_open_stream(ss,sub_demuxer_type ? sub_demuxer_type : sfmt,-2,-2,dvdsub_id, sub_stream); |
9709 | 1443 if(!sd) { |
6951 | 1444 mp_msg(MSGT_DEMUXER,MSGL_WARN,MSGTR_OpeningSubtitlesDemuxerFailed,sub_stream); |
9709 | 1445 free_stream(ss); |
1446 } | |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1447 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1448 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1449 if(ad && sd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1450 return new_demuxers_demuxer(vd,ad,sd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1451 else if(ad) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1452 return new_demuxers_demuxer(vd,ad,vd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1453 else if(sd) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1454 return new_demuxers_demuxer(vd,vd,sd); |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1455 else |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1456 return vd; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1457 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1458 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1459 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
|
1460 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
|
1461 int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags); |
10263 | 1462 int demux_seek_ty(demuxer_t *demuxer,float rel_seek_secs,int flags); |
3863 | 1463 int demux_seek_y4m(demuxer_t *demuxer,float rel_seek_secs,int flags); |
3544 | 1464 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
|
1465 int demux_seek_film(demuxer_t *demuxer,float rel_seek_secs,int flags); |
4551 | 1466 int demux_seek_mf(demuxer_t *demuxer,float rel_seek_secs,int flags); |
4065 | 1467 int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags); |
2227 | 1468 void demux_seek_mov(demuxer_t *demuxer,float pts,int flags); |
5084 | 1469 int demux_seek_real(demuxer_t *demuxer,float rel_seek_secs,int flags); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1470 int demux_seek_pva(demuxer_t *demuxer,float rel_seek_secs,int flags); |
9610 | 1471 int demux_seek_ts(demuxer_t *demuxer,float rel_seek_secs,int flags); |
12164 | 1472 int demux_seek_lavf(demuxer_t *demuxer,float rel_seek_secs,int flags); |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1473 |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1474 #ifdef HAVE_LIBDV095 |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1475 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
|
1476 #endif |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1477 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1478 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
|
1479 extern void demux_demuxers_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
5732 | 1480 extern void demux_ogg_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
1481 extern void demux_rawaudio_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
9065 | 1482 extern void demux_rawvideo_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
8528 | 1483 extern void demux_xmms_seek(demuxer_t *demuxer,float rel_seek_secs,int flags); |
10024 | 1484 extern void demux_mkv_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
|
1485 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1486 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
|
1487 demux_stream_t *d_audio=demuxer->audio; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1488 demux_stream_t *d_video=demuxer->video; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1489 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
|
1490 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
|
1491 |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1492 if(!demuxer->seekable){ |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1493 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
|
1494 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekRawAVI); |
2790 | 1495 #ifdef USE_TV |
1496 else if (demuxer->file_format==DEMUXER_TYPE_TV) | |
6951 | 1497 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_TVInputNotSeekable); |
2790 | 1498 #endif |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1499 else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1659
diff
changeset
|
1500 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekFile); |
1623
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1501 return 0; |
5908dd344067
added demuxer->seekable flag to generalize seeking ability test
arpi
parents:
1584
diff
changeset
|
1502 } |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1503 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1504 // clear demux buffers: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1505 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
|
1506 ds_free_packs(d_video); |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1507 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1508 demuxer->stream->eof=0; // clear eof flag |
3542
465329581ad8
reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents:
3411
diff
changeset
|
1509 demuxer->video->eof=0; |
465329581ad8
reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents:
3411
diff
changeset
|
1510 demuxer->audio->eof=0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1511 |
4203 | 1512 #if 0 |
3824 | 1513 if(sh_audio) sh_audio->timer=sh_video->timer; |
1514 #else | |
8056
324b6e5387be
A-V sync cleanup: sh_audio->timer replaced by sh_audio->delay, it contains
arpi
parents:
8030
diff
changeset
|
1515 if(sh_audio) sh_audio->delay=0; |
4587
886bf5274992
Audio only support. Include a fix in the asf demuxer opening.
albeu
parents:
4565
diff
changeset
|
1516 if(sh_video) sh_video->timer=0; // !!!!!! |
3824 | 1517 #endif |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1518 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1519 switch(demuxer->file_format){ |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1520 |
6925
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1521 #ifdef HAVE_LIBDV095 |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1522 case DEMUXER_TYPE_RAWDV: |
cc46462d0015
raw .dv stream demuxer by Alexander Neundorf <neundorf@kde.org>
arpi
parents:
6910
diff
changeset
|
1523 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
|
1524 #endif |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1525 case DEMUXER_TYPE_AVI: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1526 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
|
1527 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1528 case DEMUXER_TYPE_ASF: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1529 demux_seek_asf(demuxer,rel_seek_secs,flags); break; |
10263 | 1530 |
1531 case DEMUXER_TYPE_MPEG_TY: | |
1532 demux_seek_ty(demuxer,rel_seek_secs,flags); break; | |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1533 |
9824 | 1534 case DEMUXER_TYPE_H264_ES: |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1535 case DEMUXER_TYPE_MPEG4_ES: |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1536 case DEMUXER_TYPE_MPEG_ES: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1537 case DEMUXER_TYPE_MPEG_PS: |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1538 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
|
1539 |
2227 | 1540 case DEMUXER_TYPE_MOV: |
1541 demux_seek_mov(demuxer,rel_seek_secs,flags); break; | |
1542 | |
5084 | 1543 case DEMUXER_TYPE_REAL: |
1544 demux_seek_real(demuxer,rel_seek_secs,flags); break; | |
1545 | |
3863 | 1546 case DEMUXER_TYPE_Y4M: |
1547 demux_seek_y4m(demuxer,rel_seek_secs,flags); break; | |
1548 | |
4565 | 1549 case DEMUXER_TYPE_MF: |
1550 demux_seek_mf(demuxer,rel_seek_secs,flags); break; | |
7364
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1551 |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1552 case DEMUXER_TYPE_PVA: |
b2445802532c
.PVA (mpeg-like fileformat used by MultiDec && WinTV) demuxer
arpi
parents:
7329
diff
changeset
|
1553 demux_seek_pva(demuxer,rel_seek_secs,flags); break; |
4565 | 1554 |
3544 | 1555 case DEMUXER_TYPE_FLI: |
1556 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
|
1557 case DEMUXER_TYPE_FILM: |
f67b321e1eda
FILM demuxer is leaner, meaner, and cleaner, also with proper bailout on
melanson
parents:
5152
diff
changeset
|
1558 demux_seek_film(demuxer,rel_seek_secs,flags); break; |
4065 | 1559 case DEMUXER_TYPE_NUV: |
1560 demux_seek_nuv(demuxer,rel_seek_secs,flags); break; | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1561 case DEMUXER_TYPE_AUDIO: |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1562 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
|
1563 case DEMUXER_TYPE_DEMUXERS: |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1564 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
|
1565 #ifdef HAVE_OGGVORBIS |
5732 | 1566 case DEMUXER_TYPE_OGG: |
1567 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
|
1568 #endif |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
1569 case DEMUXER_TYPE_RAWAUDIO: |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6192
diff
changeset
|
1570 demux_rawaudio_seek(demuxer,rel_seek_secs,flags); break; |
9065 | 1571 case DEMUXER_TYPE_RAWVIDEO: |
1572 demux_rawvideo_seek(demuxer,rel_seek_secs,flags); break; | |
8528 | 1573 #ifdef HAVE_XMMS |
1574 case DEMUXER_TYPE_XMMS: | |
1575 demux_xmms_seek(demuxer,rel_seek_secs,flags); break; | |
1576 #endif | |
10024 | 1577 #ifdef HAVE_MATROSKA |
1578 case DEMUXER_TYPE_MATROSKA: | |
1579 demux_mkv_seek(demuxer,rel_seek_secs,flags); break; | |
1580 #endif | |
9610 | 1581 case DEMUXER_TYPE_MPEG_TS: |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
1582 case DEMUXER_TYPE_MPEG4_IN_TS: |
9610 | 1583 demux_seek_ts(demuxer,rel_seek_secs,flags); break; |
12164 | 1584 #ifdef USE_LIBAVFORMAT |
1585 case DEMUXER_TYPE_LAVF: | |
1586 demux_seek_lavf(demuxer,rel_seek_secs,flags); break; | |
1587 #endif | |
3544 | 1588 |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1589 } // switch(demuxer->file_format) |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1590 |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1591 return 1; |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1592 } |
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1593 |
3050 | 1594 int demux_info_add(demuxer_t *demuxer, char *opt, char *param) |
1595 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1596 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1597 int n = 0; |
1497
ad4d402b3d29
seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents:
1496
diff
changeset
|
1598 |
3050 | 1599 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1600 for(n = 0; info && info[2*n] != NULL; n++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1601 { |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1602 if(!strcasecmp(opt,info[2*n])) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1603 { |
6951 | 1604 mp_msg(MSGT_DEMUX, MSGL_WARN,MSGTR_DemuxerInfoAlreadyPresent,opt); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1605 return 0; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1606 } |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1607 } |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1608 |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1609 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
|
1610 info[2*n] = strdup(opt); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1611 info[2*n+1] = strdup(param); |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1612 memset(&info[2*(n+1)],0,2*sizeof(char*)); |
3050 | 1613 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1614 return 1; |
3050 | 1615 } |
1616 | |
1617 int demux_info_print(demuxer_t *demuxer) | |
1618 { | |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1619 char **info = demuxer->info; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1620 int n; |
3050 | 1621 |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1622 if(!info) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1623 return 0; |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1624 |
6951 | 1625 mp_msg(MSGT_DEMUX, MSGL_INFO,MSGTR_ClipInfo); |
4694
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1626 for(n = 0; info[2*n] != NULL ; n++) |
a21735031d6a
Audio file demuxer. Extended version for demuxer info.
albeu
parents:
4660
diff
changeset
|
1627 mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n",info[2*n],info[2*n+1]); |
4189 | 1628 |
1629 return 0; | |
3050 | 1630 } |
4765
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1631 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1632 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
|
1633 int i; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1634 char **info = demuxer->info; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1635 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1636 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
|
1637 if(!strcasecmp(opt,info[2*i])) |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1638 return info[2*i+1]; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1639 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1640 |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1641 return NULL; |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1642 } |
d0c2c8af46b4
Demuxers demuxer support for using external audiofile (or muxed subtitles).
albeu
parents:
4735
diff
changeset
|
1643 |
10310
68e714ed669f
fix one missing #include, one missing extern and one 10l error.
rathann
parents:
10274
diff
changeset
|
1644 extern int demux_ty_control(demuxer_t *demuxer, int cmd, void *arg); |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1645 extern int demux_mpg_control(demuxer_t *demuxer, int cmd, void *arg); |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1646 extern int demux_asf_control(demuxer_t *demuxer, int cmd, void *arg); |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1647 extern int demux_avi_control(demuxer_t *demuxer, int cmd, void *arg); |
8528 | 1648 extern int demux_xmms_control(demuxer_t *demuxer, int cmd, void *arg); |
10024 | 1649 extern int demux_mkv_control(demuxer_t *demuxer, int cmd, void *arg); |
10882
e46e5a6c53b8
get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents:
10687
diff
changeset
|
1650 extern int demux_audio_control(demuxer_t *demuxer, int cmd, void *arg); |
11575
0ac7fe8f3af8
Get the total length for Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>.
mosu
parents:
11466
diff
changeset
|
1651 extern int demux_ogg_control(demuxer_t *demuxer, int cmd, void *arg); |
11466 | 1652 extern int demux_real_control(demuxer_t *demuxer, int cmd, void *arg); |
12164 | 1653 extern int demux_lavf_control(demuxer_t *demuxer, int cmd, void *arg); |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1654 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1655 int demux_control(demuxer_t *demuxer, int cmd, void *arg) { |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1656 switch(demuxer->type) { |
10263 | 1657 case DEMUXER_TYPE_MPEG_TY: |
1658 return demux_ty_control(demuxer,cmd,arg); | |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
9065
diff
changeset
|
1659 case DEMUXER_TYPE_MPEG4_ES: |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1660 case DEMUXER_TYPE_MPEG_ES: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1661 case DEMUXER_TYPE_MPEG_PS: |
10687
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
1662 case DEMUXER_TYPE_MPEG_TS: |
f8d6f7d59ceb
- initial support for MPEG4 in TS (M4V is working, but not AAC yet)
arpi
parents:
10538
diff
changeset
|
1663 case DEMUXER_TYPE_MPEG4_IN_TS: |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1664 return demux_mpg_control(demuxer,cmd,arg); |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1665 case DEMUXER_TYPE_ASF: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1666 return demux_asf_control(demuxer,cmd,arg); |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1667 case DEMUXER_TYPE_AVI: |
8425 | 1668 case DEMUXER_TYPE_AVI_NI: |
1669 case DEMUXER_TYPE_AVI_NINI: | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1670 return demux_avi_control(demuxer,cmd,arg); |
10882
e46e5a6c53b8
get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents:
10687
diff
changeset
|
1671 case DEMUXER_TYPE_AUDIO: |
e46e5a6c53b8
get_percent_pos support in demux_audio, patch by ROSEN Jeremy <jeremy.rosen at c-s.fr>
faust3
parents:
10687
diff
changeset
|
1672 return demux_audio_control(demuxer,cmd,arg); |
11575
0ac7fe8f3af8
Get the total length for Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>.
mosu
parents:
11466
diff
changeset
|
1673 #ifdef HAVE_OGGVORBIS |
0ac7fe8f3af8
Get the total length for Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>.
mosu
parents:
11466
diff
changeset
|
1674 case DEMUXER_TYPE_OGG: |
0ac7fe8f3af8
Get the total length for Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>.
mosu
parents:
11466
diff
changeset
|
1675 return demux_ogg_control(demuxer,cmd,arg); |
0ac7fe8f3af8
Get the total length for Ogg files. Patch by Michael Behrisch <behrisch@informatik.hu-berlin.de>.
mosu
parents:
11466
diff
changeset
|
1676 #endif |
8528 | 1677 #ifdef HAVE_XMMS |
1678 case DEMUXER_TYPE_XMMS: | |
1679 return demux_xmms_control(demuxer,cmd,arg); | |
1680 #endif | |
10024 | 1681 #ifdef HAVE_MATROSKA |
1682 case DEMUXER_TYPE_MATROSKA: | |
1683 return demux_mkv_control(demuxer,cmd,arg); | |
1684 #endif | |
11441 | 1685 case DEMUXER_TYPE_REAL: |
1686 return demux_real_control(demuxer, cmd, arg); | |
12164 | 1687 #ifdef USE_LIBAVFORMAT |
1688 case DEMUXER_TYPE_LAVF: | |
1689 return demux_lavf_control(demuxer, cmd, arg); | |
1690 #endif | |
11441 | 1691 |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1692 default: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1693 return DEMUXER_CTRL_NOTIMPL; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1694 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1695 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1696 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1697 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1698 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1699 unsigned long demuxer_get_time_length(demuxer_t *demuxer){ |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1700 unsigned long get_time_ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1701 if (demux_control(demuxer, DEMUXER_CTRL_GET_TIME_LENGTH,(void *)&get_time_ans)<=0) { |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1702 get_time_ans=0; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1703 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1704 return get_time_ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1705 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1706 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1707 int demuxer_get_percent_pos(demuxer_t *demuxer){ |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1708 int ans; |
8387 | 1709 if (demux_control(demuxer, DEMUXER_CTRL_GET_PERCENT_POS, &ans)<=0) { |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1710 ans=0; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1711 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1712 if (ans>100 || ans<0) ans=0; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1713 return ans; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1714 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
1715 |