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