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