annotate libmpdemux/demuxer.c @ 4642:e534c7dc0cc0

check for overflow in new_sh_video and new_sh_audio
author alex
date Sun, 10 Feb 2002 18:09:20 +0000
parents 886bf5274992
children 25b2a036aee7
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"
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
14
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
15 #include "stream.h"
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
16 #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
17 #include "stheader.h"
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
18 #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
19
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
20 void free_demuxer_stream(demux_stream_t *ds){
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
21 ds_free_packs(ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
22 free(ds);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
23 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
24
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
25 demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
26 demux_stream_t* ds=malloc(sizeof(demux_stream_t));
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
27 ds->buffer_pos=ds->buffer_size=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28 ds->buffer=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
29 ds->pts=0;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
30 ds->pts_bytes=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31 ds->eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32 ds->pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 ds->dpos=0;
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 828
diff changeset
34 ds->pack_no=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 //---------------
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36 ds->packs=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37 ds->bytes=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
38 ds->first=ds->last=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39 ds->id=id;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 ds->demuxer=demuxer;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 //----------------
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 ds->asf_seq=-1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 ds->asf_packet=NULL;
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 1
diff changeset
44 //----------------
2419
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2338
diff changeset
45 ds->ss_mul=ds->ss_div=1;
24ba3dfb8e89 compressed mov audio fixed
arpi
parents: 2338
diff changeset
46 //----------------
291
da98e96499bb sh_audio/sh_video added, general codec cleanup
arpi_esp
parents: 1
diff changeset
47 ds->sh=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48 return ds;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 291
diff changeset
51 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
52 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
53 memset(d,0,sizeof(demuxer_t));
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
54 d->stream=stream;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 587
diff changeset
55 d->movi_start=stream->start_pos;
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 587
diff changeset
56 d->movi_end=stream->end_pos;
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1584
diff changeset
57 d->seekable=1;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 d->synced=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 d->filepos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 d->audio=new_demuxer_stream(d,a_id);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 d->video=new_demuxer_stream(d,v_id);
552
c2a449f90087 dvd sub support reading
arpi_esp
parents: 291
diff changeset
62 d->sub=new_demuxer_stream(d,s_id);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 d->type=type;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
64 stream_reset(stream);
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
65 stream_seek(stream,stream->start_pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
66 return d;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
68
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
69 sh_audio_t* new_sh_audio(demuxer_t *demuxer,int id){
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
70 if(id > MAX_A_STREAMS-1)
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
71 {
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
72 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
73 id, MAX_A_STREAMS);
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
74 return NULL;
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
75 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
76 if(demuxer->a_streams[id]){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
77 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
78 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
79 mp_msg(MSGT_DEMUXER,MSGL_V,"==> Found audio stream: %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
80 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
81 memset(demuxer->a_streams[id],0,sizeof(sh_audio_t));
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
82 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
83 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
84 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
85
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
86 void free_sh_audio(sh_audio_t* sh){
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
87 if(sh->a_in_buffer) free(sh->a_in_buffer);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
88 if(sh->a_buffer) free(sh->a_buffer);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
89 if(sh->wf) free(sh->wf);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
90 free(sh);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
91 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
92
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
93 sh_video_t* new_sh_video(demuxer_t *demuxer,int id){
4642
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
94 if(id > MAX_V_STREAMS-1)
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
95 {
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
96 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
97 id, MAX_V_STREAMS);
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
98 return NULL;
e534c7dc0cc0 check for overflow in new_sh_video and new_sh_audio
alex
parents: 4587
diff changeset
99 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
100 if(demuxer->v_streams[id]){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
101 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
102 } else {
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
103 mp_msg(MSGT_DEMUXER,MSGL_V,"==> Found video stream: %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
104 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
105 memset(demuxer->v_streams[id],0,sizeof(sh_video_t));
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
106 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
107 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
108 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
109
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
110 void free_sh_video(sh_video_t* sh){
1657
f6d3c1287748 freeing video buffer
arpi
parents: 1643
diff changeset
111 if(sh->our_out_buffer) free(sh->our_out_buffer);
f6d3c1287748 freeing video buffer
arpi
parents: 1643
diff changeset
112 if(sh->bih) free(sh->bih);
1643
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
113 free(sh);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
114 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
115
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
116 void free_demuxer(demuxer_t *demuxer){
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
117 int i;
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
118 // free streams:
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
119 for(i=0;i<256;i++){
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
120 if(demuxer->a_streams[i]) free_sh_audio(demuxer->a_streams[i]);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
121 if(demuxer->v_streams[i]) free_sh_video(demuxer->v_streams[i]);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
122 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
123 //if(sh_audio) free_sh_audio(sh_audio);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
124 //if(sh_video) free_sh_video(sh_video);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
125 // free demuxers:
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
126 free_demuxer_stream(demuxer->audio);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
127 free_demuxer_stream(demuxer->video);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
128 free(demuxer);
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
129 }
76835bed88ca free demux/ds/sh
arpi
parents: 1631
diff changeset
130
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
131
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
132 void ds_add_packet(demux_stream_t *ds,demux_packet_t* dp){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133 // demux_packet_t* dp=new_demux_packet(len);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134 // stream_read(stream,dp->buffer,len);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 // dp->pts=pts; //(float)pts/90000.0f;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136 // dp->pos=pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137 // append packet to DS stream:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
138 ++ds->packs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
139 ds->bytes+=dp->len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
140 if(ds->last){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141 // next packet in stream
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142 ds->last->next=dp;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
143 ds->last=dp;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
145 // first packet in stream
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 ds->first=ds->last=dp;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147 }
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
148 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
149 (ds==ds->demuxer->audio)?"d_audio":"d_video",
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
150 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
151 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1421
diff changeset
153 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
154 demux_packet_t* dp=new_demux_packet(len);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155 stream_read(stream,dp->buffer,len);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 dp->pts=pts; //(float)pts/90000.0f;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157 dp->pos=pos;
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
158 dp->flags=flags;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159 // append packet to DS stream:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
160 ds_add_packet(ds,dp);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
161 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
162
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
163 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
164 // 0 = EOF or no stream found or invalid type
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
165 // 1 = successfully read a packet
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
166 int demux_mf_fill_buffer( demuxer_t *demux);
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
167 int demux_roq_fill_buffer(demuxer_t *demux);
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
168 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
169 int demux_fli_fill_buffer(demuxer_t *demux);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
170 int demux_mpg_es_fill_buffer(demuxer_t *demux);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
171 int demux_mpg_fill_buffer(demuxer_t *demux);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
172 int demux_avi_fill_buffer(demuxer_t *demux);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173 int demux_avi_fill_buffer_ni(demuxer_t *demux,demux_stream_t *ds);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
174 int demux_avi_fill_buffer_nini(demuxer_t *demux,demux_stream_t *ds);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
175 int demux_asf_fill_buffer(demuxer_t *demux);
2106
0ad08f8e49b9 ehh. 10l. required for MOV
arpi
parents: 2050
diff changeset
176 int demux_mov_fill_buffer(demuxer_t *demux,demux_stream_t* ds);
2687
8c75a9a639c1 vivo demuxer
arpi
parents: 2590
diff changeset
177 int demux_vivo_fill_buffer(demuxer_t *demux);
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
178 int demux_real_fill_buffer(demuxer_t *demuxer);
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
179 int demux_nuv_fill_buffer(demuxer_t *demux);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
180 #ifdef USE_TV
2802
09d5c9834580 tv update
alex
parents: 2790
diff changeset
181 #include "tv.h"
09d5c9834580 tv update
alex
parents: 2790
diff changeset
182 extern tvi_handle_t *tv_handler;
2931
bce9c945b29c tv interface update
alex
parents: 2881
diff changeset
183 extern int tv_param_on;
bce9c945b29c tv interface update
alex
parents: 2881
diff changeset
184
bce9c945b29c tv interface update
alex
parents: 2881
diff changeset
185 extern int demux_tv_fill_buffer(demuxer_t *demux, tvi_handle_t *tvh);
bce9c945b29c tv interface update
alex
parents: 2881
diff changeset
186 extern int demux_open_tv(demuxer_t *demuxer, tvi_handle_t *tvh);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
187 #endif
3786
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
188 int demux_y4m_fill_buffer(demuxer_t *demux);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
189
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
190 int demux_fill_buffer(demuxer_t *demux,demux_stream_t *ds){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
191 // 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
192 // printf("demux->type=%d\n",demux->type);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
193 switch(demux->type){
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
194 case DEMUXER_TYPE_MF: return demux_mf_fill_buffer(demux);
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
195 case DEMUXER_TYPE_ROQ: return demux_roq_fill_buffer(demux);
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
196 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
197 case DEMUXER_TYPE_FLI: return demux_fli_fill_buffer(demux);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 case DEMUXER_TYPE_MPEG_ES: return demux_mpg_es_fill_buffer(demux);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199 case DEMUXER_TYPE_MPEG_PS: return demux_mpg_fill_buffer(demux);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
200 case DEMUXER_TYPE_AVI: return demux_avi_fill_buffer(demux);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
201 case DEMUXER_TYPE_AVI_NI: return demux_avi_fill_buffer_ni(demux,ds);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 case DEMUXER_TYPE_AVI_NINI: return demux_avi_fill_buffer_nini(demux,ds);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 case DEMUXER_TYPE_ASF: return demux_asf_fill_buffer(demux);
2106
0ad08f8e49b9 ehh. 10l. required for MOV
arpi
parents: 2050
diff changeset
204 case DEMUXER_TYPE_MOV: return demux_mov_fill_buffer(demux,ds);
2687
8c75a9a639c1 vivo demuxer
arpi
parents: 2590
diff changeset
205 case DEMUXER_TYPE_VIVO: return demux_vivo_fill_buffer(demux);
3777
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
206 case DEMUXER_TYPE_REAL: return demux_real_fill_buffer(demux);
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
207 case DEMUXER_TYPE_NUV: return demux_nuv_fill_buffer(demux);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
208 #ifdef USE_TV
2802
09d5c9834580 tv update
alex
parents: 2790
diff changeset
209 case DEMUXER_TYPE_TV: return demux_tv_fill_buffer(demux, tv_handler);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
210 #endif
3786
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
211 case DEMUXER_TYPE_Y4M: return demux_y4m_fill_buffer(demux);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
212 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
213 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
214 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
215
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
216 // return value:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
217 // 0 = EOF
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
218 // 1 = succesfull
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
219 int ds_fill_buffer(demux_stream_t *ds){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
220 demuxer_t *demux=ds->demuxer;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221 if(ds->buffer) free(ds->buffer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 if(verbose>2){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
223 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
224 if(ds==demux->video) mp_dbg(MSGT_DEMUXER,MSGL_DBG3,"ds_fill_buffer(d_video) called\n");else
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
225 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
226 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227 while(1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228 if(ds->packs){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
229 demux_packet_t *p=ds->first;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
230 // copy useful data:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
231 ds->buffer=p->buffer;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232 ds->buffer_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
233 ds->buffer_size=p->len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
234 ds->pos=p->pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
235 ds->dpos+=p->len; // !!!
889
1b905517c684 AVI -bps desync problem solved
arpi_esp
parents: 828
diff changeset
236 ++ds->pack_no;
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
237 if(p->pts){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
238 ds->pts=p->pts;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
239 ds->pts_bytes=0;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
240 }
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
241 ds->pts_bytes+=p->len; // !!!
979
3bcc435cd5a2 keyframe flag added
arpi_esp
parents: 889
diff changeset
242 ds->flags=p->flags;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 // free packet:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 ds->bytes-=p->len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
245 ds->first=p->next;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
246 if(!ds->first) ds->last=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 free(p);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 --ds->packs;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249 return 1; //ds->buffer_size;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
250 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251 if(demux->audio->packs>=MAX_PACKS || demux->audio->bytes>=MAX_PACK_BYTES){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
252 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyAudioInBuffer,demux->audio->packs,demux->audio->bytes);
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
253 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
254 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
255 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
256 if(demux->video->packs>=MAX_PACKS || demux->video->bytes>=MAX_PACK_BYTES){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
257 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_TooManyVideoInBuffer,demux->video->packs,demux->video->bytes);
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
258 mp_msg(MSGT_DEMUXER,MSGL_HINT,MSGTR_MaybeNI);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 }
1421
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1401
diff changeset
261 if(!demux_fill_buffer(demux,ds)){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
262 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
263 break; // EOF
ea0a0b9e6fbc nosound avi seeking fixed
arpi
parents: 1401
diff changeset
264 }
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
265 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
266 ds->buffer_pos=ds->buffer_size=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
267 ds->buffer=NULL;
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
268 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
269 ds->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
270 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
271 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
272
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
273 int demux_read_data(demux_stream_t *ds,unsigned char* mem,int len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
274 int x;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
275 int bytes=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
276 while(len>0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
277 x=ds->buffer_size-ds->buffer_pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
278 if(x==0){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
279 if(!ds_fill_buffer(ds)) return bytes;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
280 } else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
281 if(x>len) x=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
282 if(mem) memcpy(mem+bytes,&ds->buffer[ds->buffer_pos],x);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
283 bytes+=x;len-=x;ds->buffer_pos+=x;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
284 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
285 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
286 return bytes;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
287 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
288
746
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
289 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
290 int x;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
291 int bytes=0;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
292 while(len>0){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
293 x=ds->buffer_size-ds->buffer_pos;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
294 if(x==0){
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
295 if(!ds_fill_buffer(ds)) return bytes;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
296 } else {
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
297 if(x>len) x=len;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
298 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
299 bytes+=x;len-=x;ds->buffer_pos+=x;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
300 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
301 }
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
302 }
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
303 return bytes;
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
304 }
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
305
cd1f0d4de0b8 new audio playback and A-V sync code
arpi_esp
parents: 598
diff changeset
306
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
307 void ds_free_packs(demux_stream_t *ds){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
308 demux_packet_t *dp=ds->first;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
309 while(dp){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
310 demux_packet_t *dn=dp->next;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
311 free(dp->buffer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
312 free(dp);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
313 dp=dn;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
314 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
315 if(ds->asf_packet){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
316 // free unfinished .asf fragments:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
317 free(ds->asf_packet->buffer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
318 free(ds->asf_packet);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
319 ds->asf_packet=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
320 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
321 ds->first=ds->last=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
322 ds->packs=0; // !!!!!
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
323 ds->bytes=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
324 if(ds->buffer) free(ds->buffer);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
325 ds->buffer=NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
326 ds->buffer_pos=ds->buffer_size;
828
c71695c30006 added pts_bytes=0 to ds_free_packs
arpi_esp
parents: 746
diff changeset
327 ds->pts=0; ds->pts_bytes=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
328 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
329
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
330 int ds_get_packet(demux_stream_t *ds,unsigned char **start){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
331 while(1){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
332 int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
333 if(ds->buffer_pos>=ds->buffer_size){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
334 if(!ds_fill_buffer(ds)){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
335 // EOF
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
336 *start = NULL;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
337 return -1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
338 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
339 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
340 len=ds->buffer_size-ds->buffer_pos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
341 *start = &ds->buffer[ds->buffer_pos];
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
342 ds->buffer_pos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
343 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
344 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
345 }
554
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
346
587
8511095c5283 stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents: 554
diff changeset
347 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
348 while(1){
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
349 int len;
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
350 if(ds->buffer_pos>=ds->buffer_size){
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
351 *start = NULL;
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
352 if(!ds->packs) return -1; // no sub
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
353 if(!ds_fill_buffer(ds)) return -1; // EOF
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
354 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
355 len=ds->buffer_size-ds->buffer_pos;
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
356 *start = &ds->buffer[ds->buffer_pos];
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
357 ds->buffer_pos+=len;
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
358 return len;
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
359 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
360 }
d8b3c80604e3 dvd sub parser move dto mplayer.c
arpi_esp
parents: 552
diff changeset
361
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
362 // ====================================================================
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
363
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
364 // feed-back from demuxers:
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
365 extern int num_elementary_packets100; // for MPEG-ES fileformat detection
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
366 extern int num_elementary_packets101;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
367 extern int num_elementary_packetsPES;
1659
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
368 extern int num_elementary_packets1B6;
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
369
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
370 // commandline options, flags:
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
371 //extern int seek_to_byte;
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
372 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
373 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
374
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
375 extern int audio_id;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
376 extern int video_id;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
377 extern int dvdsub_id;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
378
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
379 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
380 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
381 demux_stream_t* demux_avi_select_stream(demuxer_t *demux,unsigned int id);
2050
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1973
diff changeset
382 demuxer_t* demux_open_avi(demuxer_t* demuxer);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1973
diff changeset
383 int mov_check_file(demuxer_t* demuxer);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1973
diff changeset
384 int mov_read_header(demuxer_t* demuxer);
3101
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3091
diff changeset
385 int demux_open_fli(demuxer_t* demuxer);
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
386 int demux_open_mf(demuxer_t* demuxer);
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
387 int demux_open_film(demuxer_t* demuxer);
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
388 int demux_open_roq(demuxer_t* demuxer);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
389
2931
bce9c945b29c tv interface update
alex
parents: 2881
diff changeset
390 extern int vivo_check_file(demuxer_t *demuxer);
bce9c945b29c tv interface update
alex
parents: 2881
diff changeset
391 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
392 extern int y4m_check_file(demuxer_t *demuxer);
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
393 extern void demux_open_y4m(demuxer_t *demuxer);
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
394 extern int roq_check_file(demuxer_t *demuxer);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
395
3777
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
396 extern int real_check_file(demuxer_t *demuxer);
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
397 extern void demux_open_real(demuxer_t *demuxer);
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
398
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
399 extern int nuv_check_file(demuxer_t *demuxer);
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
400 extern void demux_open_nuv(demuxer_t *demuxer);
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
401
1496
8c3e93ef116d cleanup...
arpi
parents: 1490
diff changeset
402 demuxer_t* demux_open(stream_t *stream,int file_format,int audio_id,int video_id,int dvdsub_id){
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
403
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
404 //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
405
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
406 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
407
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
408 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
409 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
410
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
411 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
412 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
413
1659
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
414 //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
415
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
416 if ( mf_support )
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
417 {
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
418 mp_msg(MSGT_DEMUXER,MSGL_INFO,"forced mf.\n");
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
419 file_format=DEMUXER_TYPE_MF;
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
420 }
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
421
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
422 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
423 //=============== Try to open as TV-input: =================
3091
a98d486508db fixed tv detection in demux_open
alex
parents: 3071
diff changeset
424 if((tv_param_on == 1) &&
a98d486508db fixed tv detection in demux_open
alex
parents: 3071
diff changeset
425 (file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_TV)){
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
426 demuxer=new_demuxer(stream,DEMUXER_TYPE_TV,audio_id,video_id,dvdsub_id);
3091
a98d486508db fixed tv detection in demux_open
alex
parents: 3071
diff changeset
427 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected TV! ;-)\n");
a98d486508db fixed tv detection in demux_open
alex
parents: 3071
diff changeset
428 file_format=DEMUXER_TYPE_TV;
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
429 }
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
430 #endif
3101
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3091
diff changeset
431
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
432 //=============== 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
433 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
434 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
435 { //---- RIFF header:
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
436 int id=stream_read_dword_le(demuxer->stream); // "RIFF"
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
437 if(id==mmioFOURCC('R','I','F','F')){
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
438 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
439 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
440 if(id==formtypeAVI){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
441 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedAVIfile);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
442 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
443 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
444 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
445 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
446 }
3833
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
447 //=============== Try to open as Y4M file: =================
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
448 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_Y4M){
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
449 demuxer=new_demuxer(stream,DEMUXER_TYPE_Y4M,audio_id,video_id,dvdsub_id);
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
450 if(y4m_check_file(demuxer)){
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
451 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected YUV4MPEG2 file format!\n");
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
452 file_format=DEMUXER_TYPE_Y4M;
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
453 }
dd5ae1d5ea42 asf<->y4m detection swapped
arpi
parents: 3824
diff changeset
454 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
455 //=============== 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
456 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
457 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
458 if(asf_check_header(demuxer)){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
459 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedASFfile);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
460 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
461 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
462 }
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
463 //=============== Try to open as NUV file: =================
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
464 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
465 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
466 if(nuv_check_file(demuxer)){
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
467 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected NuppelVideo file format!\n");
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
468 file_format=DEMUXER_TYPE_NUV;
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
469 }
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
470 }
2878
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
471 //=============== Try to open as MOV file: =================
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
472 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MOV){
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
473 demuxer=new_demuxer(stream,DEMUXER_TYPE_MOV,audio_id,video_id,dvdsub_id);
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
474 if(mov_check_file(demuxer)){
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
475 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedQTMOVfile);
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
476 file_format=DEMUXER_TYPE_MOV;
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
477 }
1ca86a8dc530 qt/mov detection first
arpi
parents: 2837
diff changeset
478 }
3256
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
479 //=============== Try to open as VIVO file: =================
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
480 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
481 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
482 if(vivo_check_file(demuxer)){
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
483 mp_msg(MSGT_DEMUXER,MSGL_INFO,"Detected VIVO file format!\n");
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
484 file_format=DEMUXER_TYPE_VIVO;
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
485 }
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
486 }
3777
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
487 //=============== Try to open as REAL file: =================
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
488 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_REAL){
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
489 demuxer=new_demuxer(stream,DEMUXER_TYPE_REAL,audio_id,video_id,dvdsub_id);
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
490 if(real_check_file(demuxer)){
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
491 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedREALfile);
3777
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
492 file_format=DEMUXER_TYPE_REAL;
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
493 }
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
494 }
3256
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
495 //=============== Try to open as FLI file: =================
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
496 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
497 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
498 {
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
499 int id;
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
500 stream_seek(demuxer->stream, 4);
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
501 id=stream_read_word_le(demuxer->stream);
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
502 // check for the FLI file magic number
3256
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
503 if((id==0xAF11) || (id==0xAF12)){
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
504 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFLIfile);
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
505 file_format=DEMUXER_TYPE_FLI;
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
506 }
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
507 }
c42e6759c82b file format detection reordered to get better hits
arpi
parents: 3150
diff changeset
508 }
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
509 //=============== Try to open as FILM file: =================
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
510 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_FILM){
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
511 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
512 {
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
513 int signature=stream_read_fourcc(demuxer->stream);
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
514 // check for the FLI file magic number
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
515 if(signature==mmioFOURCC('F', 'I', 'L', 'M')){
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
516 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedFILMfile);
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
517 file_format=DEMUXER_TYPE_FILM;
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
518 }
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
519 }
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
520 }
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
521 //=============== Try to open as RoQ file: =================
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
522 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_ROQ){
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
523 demuxer=new_demuxer(stream,DEMUXER_TYPE_ROQ,audio_id,video_id,dvdsub_id);
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
524 if(roq_check_file(demuxer)){
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
525 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedROQfile);
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
526 file_format=DEMUXER_TYPE_ROQ;
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
527 }
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
528 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
529 //=============== Try to open as MPEG-PS file: =================
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
530 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MPEG_PS){
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
531 int pes=1;
3770
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
532 int tmp;
3772
f9d9f6ab79f4 mpeg startpos (-ss, -chapter) fixed
arpi
parents: 3770
diff changeset
533 off_t tmppos;
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
534 while(pes>=0){
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
535 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_PS,audio_id,video_id,dvdsub_id);
3770
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
536
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
537 // try to pre-detect PES:
3772
f9d9f6ab79f4 mpeg startpos (-ss, -chapter) fixed
arpi
parents: 3770
diff changeset
538 tmppos=stream_tell(demuxer->stream);
3770
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
539 tmp=stream_read_dword(demuxer->stream);
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
540 if(tmp==0x1E0 || tmp==0x1C0){
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
541 tmp=stream_read_word(demuxer->stream);
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
542 if(tmp>1 && tmp<=2048) pes=0; // demuxer->synced=3; // PES...
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
543 }
3772
f9d9f6ab79f4 mpeg startpos (-ss, -chapter) fixed
arpi
parents: 3770
diff changeset
544 stream_seek(demuxer->stream,tmppos);
3770
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
545
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
546 if(!pes) demuxer->synced=3; // hack!
4f1a99fb9d9a mpeg VDR vs. BIN fixed?
arpi
parents: 3544
diff changeset
547
1659
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
548 num_elementary_packets100=0;
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
549 num_elementary_packets101=0;
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
550 num_elementary_packets1B6=0;
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
551 num_elementary_packetsPES=0;
6b71bbf515e4 num_elementary_packets1xx reset
arpi
parents: 1657
diff changeset
552
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
553 if(ds_fill_buffer(demuxer->video)){
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
554 if(!pes)
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
555 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPESfile);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
556 else
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
557 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGPSfile);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
558 file_format=DEMUXER_TYPE_MPEG_PS;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
559 } else {
2881
79142edcad77 001.vdr fix
arpi
parents: 2878
diff changeset
560 printf("MPEG packet stats: p100: %d p101: %d PES: %d \n",
79142edcad77 001.vdr fix
arpi
parents: 2878
diff changeset
561 num_elementary_packets100,num_elementary_packets101,num_elementary_packetsPES);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
562 // some hack to get meaningfull error messages to our unhappy users:
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
563 if(num_elementary_packets100>=2 && num_elementary_packets101>=2 &&
2881
79142edcad77 001.vdr fix
arpi
parents: 2878
diff changeset
564 abs(num_elementary_packets101+8-num_elementary_packets100)<16){
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
565 if(num_elementary_packetsPES>=4 && num_elementary_packetsPES>=num_elementary_packets100-4){
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
566 --pes;continue; // tricky...
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
567 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
568 file_format=DEMUXER_TYPE_MPEG_ES; // <-- hack is here :)
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
569 } else {
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
570 if(demuxer->synced==2)
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1659
diff changeset
571 mp_msg(MSGT_DEMUXER,MSGL_ERR,"MPEG: " MSGTR_MissingVideoStreamBug);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
572 else
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
573 mp_msg(MSGT_DEMUXER,MSGL_V,"Not MPEG System Stream format... (maybe Transport Stream?)\n");
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
574 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
575 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
576 break;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
577 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
578 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
579 //=============== Try to open as MPEG-ES file: =================
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
580 if(file_format==DEMUXER_TYPE_MPEG_ES){ // little hack, see above!
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
581 demuxer=new_demuxer(stream,DEMUXER_TYPE_MPEG_ES,audio_id,video_id,dvdsub_id);
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
582 if(!ds_fill_buffer(demuxer->video)){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
583 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
584 file_format=DEMUXER_TYPE_UNKNOWN;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
585 } else {
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
586 mp_msg(MSGT_DEMUXER,MSGL_INFO,MSGTR_DetectedMPEGESfile);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
587 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
588 }
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
589 //=============== Try to open as multi file: =================
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
590 if(file_format==DEMUXER_TYPE_UNKNOWN || file_format==DEMUXER_TYPE_MF){
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
591 demuxer=new_demuxer(stream,DEMUXER_TYPE_MF,audio_id,video_id,dvdsub_id);
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
592 {
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
593 if ( mf_support )
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
594 {
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
595 file_format=DEMUXER_TYPE_MF;
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
596 mp_msg( MSGT_DEMUXER,MSGL_INFO,"[demuxer] mf support.\n" );
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
597 }
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
598 }
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
599 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
600 //=============== Unknown, exiting... ===========================
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
601 if(file_format==DEMUXER_TYPE_UNKNOWN){
1584
e49b3927c793 more messages for translator :)
arpi
parents: 1567
diff changeset
602 mp_msg(MSGT_DEMUXER,MSGL_ERR,MSGTR_FormatNotRecognized);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
603 return NULL;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
604 // GUI_MSG( mplUnknowFileType )
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
605 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
606 //====== 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
607 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
608 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
609 //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
610
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
611 demuxer->file_format=file_format;
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
612
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
613 switch(file_format){
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
614 case DEMUXER_TYPE_MF: {
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
615 if (!demux_open_mf(demuxer)) return NULL;
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
616 break;
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
617 }
3101
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3091
diff changeset
618 case DEMUXER_TYPE_FLI: {
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3091
diff changeset
619 if (!demux_open_fli(demuxer)) return NULL;
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3091
diff changeset
620 break;
637e540831b9 mostly complete support for loading and decoding FLI/FLC animations
melanson
parents: 3091
diff changeset
621 }
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
622 case DEMUXER_TYPE_FILM: {
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
623 if (!demux_open_film(demuxer)) return NULL;
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
624 break;
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
625 }
4451
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
626 case DEMUXER_TYPE_ROQ: {
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
627 if (!demux_open_roq(demuxer)) return NULL;
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
628 break;
5627d5b58083 implemented RoQ file demuxing
melanson
parents: 4391
diff changeset
629 }
1490
71424eb2b282 MOV file support - not works yet
arpi
parents: 1485
diff changeset
630 case DEMUXER_TYPE_MOV: {
2127
e6ce221dee06 .mov support can be disabled
arpi
parents: 2106
diff changeset
631 if(!mov_read_header(demuxer)) return NULL;
e6ce221dee06 .mov support can be disabled
arpi
parents: 2106
diff changeset
632 // sh_video=d_video->sh;if(sh_video) sh_video->ds=d_video;
e6ce221dee06 .mov support can be disabled
arpi
parents: 2106
diff changeset
633 // 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
634 break;
71424eb2b282 MOV file support - not works yet
arpi
parents: 1485
diff changeset
635 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
636 case DEMUXER_TYPE_AVI: {
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1584
diff changeset
637 return (demuxer_t*) demux_open_avi(demuxer);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
638 // break;
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
639 }
3801
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
640 case DEMUXER_TYPE_NUV: {
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
641 demux_open_nuv(demuxer);
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
642 break;
3cea69dda1b3 added NuppelVideo demuxer, based on Panagiotis Issaris' patch
alex
parents: 3786
diff changeset
643 }
2687
8c75a9a639c1 vivo demuxer
arpi
parents: 2590
diff changeset
644 case DEMUXER_TYPE_VIVO: {
8c75a9a639c1 vivo demuxer
arpi
parents: 2590
diff changeset
645 demux_open_vivo(demuxer);
8c75a9a639c1 vivo demuxer
arpi
parents: 2590
diff changeset
646 break;
8c75a9a639c1 vivo demuxer
arpi
parents: 2590
diff changeset
647 }
3786
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
648 case DEMUXER_TYPE_Y4M: {
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
649 demux_open_y4m(demuxer);
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
650 break;
7ebf504c92d6 yuv4mpeg2 (mjpegtools) support by Rik Snel <rsnel@cube.dyndns.org>
arpi
parents: 3777
diff changeset
651 }
3777
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
652 case DEMUXER_TYPE_REAL: {
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
653 demux_open_real(demuxer);
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
654 break;
026ccd3dc489 added real demuxer
alex
parents: 3772
diff changeset
655 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
656 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
657 //---- ASF header:
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
658 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
659 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
660 stream_seek(demuxer->stream,demuxer->movi_start);
1485
b895f95e7657 AVI demuxer cleanups, fileformat-dependent stuff moved to priv_t
arpi
parents: 1456
diff changeset
661 // 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
662 // demuxer->endpos=avi_header.movi_end;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
663 if(d_video->id != -2) {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
664 if(!ds_fill_buffer(d_video)){
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
665 mp_msg(MSGT_DEMUXER,MSGL_WARN,"ASF: " MSGTR_MissingVideoStream);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
666 sh_video=NULL;
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
667 //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
668 //GUI_MSG( mplASFErrorMissingVideoStream )
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
669 } else {
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
670 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
671 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
672 mp_msg(MSGT_DEMUXER,MSGL_INFO,"VIDEO: [%.4s] %ldx%ld %dbpp\n",
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
673 (char *)&sh_video->bih->biCompression,
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
674 sh_video->bih->biWidth,
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
675 sh_video->bih->biHeight,
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
676 sh_video->bih->biBitCount);
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
677 // 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
678 }
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
679 }
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
680 if(d_audio->id!=-2){
1567
5c7760aa4f94 printf->mp_msg/mp_dbg
arpi
parents: 1497
diff changeset
681 mp_msg(MSGT_DEMUXER,MSGL_V,"ASF: Searching for audio stream (id:%d)\n",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
682 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
683 mp_msg(MSGT_DEMUXER,MSGL_INFO,"ASF: " MSGTR_MissingAudioStream);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
684 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
685 } else {
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
686 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
687 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
688 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
689 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
690 break;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
691 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
692 case DEMUXER_TYPE_MPEG_ES: {
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
693 sh_audio=NULL; // ES streams has no audio channel
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
694 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
695 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
696 break;
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 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
699 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
700 // 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
701
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
702 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
703 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
704 mp_msg(MSGT_DEMUXER,MSGL_INFO,"MPEG: " MSGTR_MissingAudioStream);
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
705 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
706 } else {
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
707 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
708 switch(d_audio->id & 0xE0){ // 1110 0000 b (high 3 bit: type low 5: id)
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
709 case 0x00: sh_audio->format=0x50;break; // mpeg
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
710 case 0xA0: sh_audio->format=0x10001;break; // dvd pcm
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
711 case 0x80: sh_audio->format=0x2000;break; // ac3
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
712 default: sh_audio=NULL; // unknown type
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
713 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
714 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
715 }
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
716 break;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
717 }
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
718 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
719 case DEMUXER_TYPE_TV: {
2837
c63562f5f56f tuning worx (can set frequency)
alex
parents: 2802
diff changeset
720 if (!demux_open_tv(demuxer, tv_handler))
c63562f5f56f tuning worx (can set frequency)
alex
parents: 2802
diff changeset
721 {
c63562f5f56f tuning worx (can set frequency)
alex
parents: 2802
diff changeset
722 tv_uninit(tv_handler);
c63562f5f56f tuning worx (can set frequency)
alex
parents: 2802
diff changeset
723 return(NULL);
c63562f5f56f tuning worx (can set frequency)
alex
parents: 2802
diff changeset
724 }
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
725 break;
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
726 }
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
727 #endif
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
728 } // switch(file_format)
2590
b1e6f5aa1815 pts_from_bps fix
arpi
parents: 2419
diff changeset
729 pts_from_bps=0; // !!!
1375
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
730 return demuxer;
dbcb5b5e1fae file-format detection stuff moved out from mplayer.c to demuxer.c and dec_video.c
arpi
parents: 1331
diff changeset
731 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
732
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
733 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
734 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
735 int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags);
3863
64f5c5749bad Applied Rik Snel's seeking patch
alex
parents: 3833
diff changeset
736 int demux_seek_y4m(demuxer_t *demuxer,float rel_seek_secs,int flags);
3544
61b89c10e4e8 fli seeking implemented
arpi
parents: 3542
diff changeset
737 int demux_seek_fli(demuxer_t *demuxer,float rel_seek_secs,int flags);
4551
716b00618bfc add mfi support
pontscho
parents: 4451
diff changeset
738 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
739 int demux_seek_nuv(demuxer_t *demuxer,float rel_seek_secs,int flags);
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2127
diff changeset
740 void demux_seek_mov(demuxer_t *demuxer,float pts,int flags);
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
741
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
742 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
743 demux_stream_t *d_audio=demuxer->audio;
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
744 demux_stream_t *d_video=demuxer->video;
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
745 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
746 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
747
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1584
diff changeset
748 if(!demuxer->seekable){
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1584
diff changeset
749 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
750 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekRawAVI);
2790
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
751 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
752 else if (demuxer->file_format==DEMUXER_TYPE_TV)
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
753 mp_msg(MSGT_SEEK,MSGL_WARN,"TV input isn't seekable! (probarly seeking will be for changing channels ;)\n");
98769cea155c added tv subsystem
alex
parents: 2687
diff changeset
754 #endif
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1584
diff changeset
755 else
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1659
diff changeset
756 mp_msg(MSGT_SEEK,MSGL_WARN,MSGTR_CantSeekFile);
1623
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1584
diff changeset
757 return 0;
5908dd344067 added demuxer->seekable flag to generalize seeking ability test
arpi
parents: 1584
diff changeset
758 }
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
759
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
760 // clear demux buffers:
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
761 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
762 ds_free_packs(d_video);
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
763
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
764 demuxer->stream->eof=0; // clear eof flag
3542
465329581ad8 reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents: 3411
diff changeset
765 demuxer->video->eof=0;
465329581ad8 reset ds eof flags at seeking - requires for mpeg -loop
arpi
parents: 3411
diff changeset
766 demuxer->audio->eof=0;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
767
4203
7cfa69df9e0b reverted old seeking method - ask Holm why...
arpi
parents: 4189
diff changeset
768 #if 0
3824
be5e58955f57 don't reset timer at seek - req. for dxr3
arpi
parents: 3801
diff changeset
769 if(sh_audio) sh_audio->timer=sh_video->timer;
be5e58955f57 don't reset timer at seek - req. for dxr3
arpi
parents: 3801
diff changeset
770 #else
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
771 if(sh_audio) sh_audio->timer=0;
4587
886bf5274992 Audio only support. Include a fix in the asf demuxer opening.
albeu
parents: 4565
diff changeset
772 if(sh_video) sh_video->timer=0; // !!!!!!
3824
be5e58955f57 don't reset timer at seek - req. for dxr3
arpi
parents: 3801
diff changeset
773 #endif
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
774
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
775 switch(demuxer->file_format){
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
776
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
777 case DEMUXER_TYPE_AVI:
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
778 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
779
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
780 case DEMUXER_TYPE_ASF:
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
781 demux_seek_asf(demuxer,rel_seek_secs,flags); break;
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
782
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
783 case DEMUXER_TYPE_MPEG_ES:
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
784 case DEMUXER_TYPE_MPEG_PS:
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
785 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
786
2227
10b279d72a8f mov seeking implemented
arpi
parents: 2127
diff changeset
787 case DEMUXER_TYPE_MOV:
10b279d72a8f mov seeking implemented
arpi
parents: 2127
diff changeset
788 demux_seek_mov(demuxer,rel_seek_secs,flags); break;
10b279d72a8f mov seeking implemented
arpi
parents: 2127
diff changeset
789
3863
64f5c5749bad Applied Rik Snel's seeking patch
alex
parents: 3833
diff changeset
790 case DEMUXER_TYPE_Y4M:
64f5c5749bad Applied Rik Snel's seeking patch
alex
parents: 3833
diff changeset
791 demux_seek_y4m(demuxer,rel_seek_secs,flags); break;
64f5c5749bad Applied Rik Snel's seeking patch
alex
parents: 3833
diff changeset
792
4565
be1562b2c2d0 finalize mfi support.
pontscho
parents: 4551
diff changeset
793 case DEMUXER_TYPE_MF:
be1562b2c2d0 finalize mfi support.
pontscho
parents: 4551
diff changeset
794 demux_seek_mf(demuxer,rel_seek_secs,flags); break;
be1562b2c2d0 finalize mfi support.
pontscho
parents: 4551
diff changeset
795
3544
61b89c10e4e8 fli seeking implemented
arpi
parents: 3542
diff changeset
796 case DEMUXER_TYPE_FLI:
61b89c10e4e8 fli seeking implemented
arpi
parents: 3542
diff changeset
797 demux_seek_fli(demuxer,rel_seek_secs,flags); break;
4065
763a0e7e0521 seek patch by Panagoitis Issaris
alex
parents: 3863
diff changeset
798 case DEMUXER_TYPE_NUV:
763a0e7e0521 seek patch by Panagoitis Issaris
alex
parents: 3863
diff changeset
799 demux_seek_nuv(demuxer,rel_seek_secs,flags); break;
763a0e7e0521 seek patch by Panagoitis Issaris
alex
parents: 3863
diff changeset
800
3544
61b89c10e4e8 fli seeking implemented
arpi
parents: 3542
diff changeset
801
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
802 } // switch(demuxer->file_format)
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
803
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
804 return 1;
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
805 }
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
806
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
807 int demux_info_add(demuxer_t *demuxer, char *opt, char *param)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
808 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
809 demuxer_info_t *info = &demuxer->info;
1497
ad4d402b3d29 seek.c moved to demuxer.c, stream_reset in new_demuxer()
arpi
parents: 1496
diff changeset
810
3067
1207bd5de2b2 it wanted to be strcasecmp not strncmp and i dunno why it compiled for me with strncmp :(
alex
parents: 3058
diff changeset
811 if (!strcasecmp(opt, "name"))
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
812 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
813 if (info->name)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
814 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
815 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->name already present\n!");
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
816 return(0);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
817 }
3150
8dae87740d33 bad malloc+strcpy => strdup
arpi
parents: 3101
diff changeset
818 info->name = strdup(param);
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
819 return(1);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
820 }
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
821
3067
1207bd5de2b2 it wanted to be strcasecmp not strncmp and i dunno why it compiled for me with strncmp :(
alex
parents: 3058
diff changeset
822 if (!strcasecmp(opt, "author"))
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
823 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
824 if (info->author)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
825 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
826 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->author already present\n!");
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
827 return(0);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
828 }
3150
8dae87740d33 bad malloc+strcpy => strdup
arpi
parents: 3101
diff changeset
829 info->author = strdup(param);
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
830 return(1);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
831 }
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
832
3071
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
833 if (!strcasecmp(opt, "encoder") || !strcasecmp(opt, "software"))
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
834 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
835 if (info->encoder)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
836 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
837 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->encoder already present\n!");
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
838 return(0);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
839 }
3150
8dae87740d33 bad malloc+strcpy => strdup
arpi
parents: 3101
diff changeset
840 info->encoder = strdup(param);
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
841 return(1);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
842 }
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
843
3071
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
844 if (!strcasecmp(opt, "comment") || !strcasecmp(opt, "comments"))
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
845 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
846 if (info->comments)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
847 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
848 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->comments already present\n!");
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
849 return(0);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
850 }
3150
8dae87740d33 bad malloc+strcpy => strdup
arpi
parents: 3101
diff changeset
851 info->comments = strdup(param);
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
852 return(1);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
853 }
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
854
3071
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
855 if (!strcasecmp(opt, "copyright"))
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
856 {
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
857 if (info->copyright)
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
858 {
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
859 mp_msg(MSGT_DEMUX, MSGL_WARN, "Demuxer info->copyright already present\n!");
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
860 return(0);
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
861 }
3150
8dae87740d33 bad malloc+strcpy => strdup
arpi
parents: 3101
diff changeset
862 info->copyright = strdup(param);
3071
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
863 return(1);
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
864 }
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
865
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
866 mp_msg(MSGT_DEMUX, MSGL_DBG2, "Unknown demuxer info->%s (=%s)!\n",
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
867 opt, param);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
868 return(1);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
869 }
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
870
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
871 int demux_info_print(demuxer_t *demuxer)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
872 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
873 demuxer_info_t *info = &demuxer->info;
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
874
3071
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
875 if (info->name || info->author || info->encoder || info->comments || info->copyright)
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
876 {
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
877 mp_msg(MSGT_DEMUX, MSGL_INFO, "Clip info: \n");
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
878 if (info->name)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
879 mp_msg(MSGT_DEMUX, MSGL_INFO, " Name: %s\n", info->name);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
880 if (info->author)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
881 mp_msg(MSGT_DEMUX, MSGL_INFO, " Author: %s\n", info->author);
3411
alex
parents: 3256
diff changeset
882 if (info->copyright)
alex
parents: 3256
diff changeset
883 mp_msg(MSGT_DEMUX, MSGL_INFO, " Copyright: %s\n", info->copyright);
3071
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
884 if (info->comments)
a5f378f982cc added demux_info
alex
parents: 3067
diff changeset
885 mp_msg(MSGT_DEMUX, MSGL_INFO, " Comments: %s\n", info->comments);
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
886 if (info->encoder)
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
887 mp_msg(MSGT_DEMUX, MSGL_INFO, " Encoder: %s\n", info->encoder);
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
888 }
4189
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
889
6871d97e4261 initial support for FILM file demuxing
melanson
parents: 4065
diff changeset
890 return 0;
3050
9ed968c05954 added demuxer_info
alex
parents: 2931
diff changeset
891 }