annotate libmpdemux/demuxer.c @ 16152:10a69a812eff

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