Mercurial > mplayer.hg
annotate libmpdemux/stream.c @ 6648:55e3129208fc
fixed doublebuffering and moved messages to various verbose level
author | alex |
---|---|
date | Fri, 05 Jul 2002 15:29:12 +0000 |
parents | 45ec7f24de06 |
children | a4ed4e0464ba |
rev | line source |
---|---|
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
1 |
1430 | 2 #include <stdio.h> |
3 #include <stdlib.h> | |
4 #include <unistd.h> | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
5 |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
6 #include <sys/types.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
7 #include <sys/stat.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
8 #include <sys/ioctl.h> |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
9 #include <fcntl.h> |
2322 | 10 #include <signal.h> |
578 | 11 |
1430 | 12 #include "config.h" |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
13 #include "mp_msg.h" |
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
14 #include "help_mp.h" |
578 | 15 |
16 #include "stream.h" | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
17 #include "demuxer.h" |
578 | 18 |
19 extern int verbose; // defined in mplayer.c | |
1 | 20 |
3261 | 21 #ifdef HAVE_VCD |
22 | |
958
162a78d3cc08
FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents:
692
diff
changeset
|
23 #ifdef __FreeBSD__ |
2310 | 24 #include "vcd_read_fbsd.h" |
5872 | 25 #elif defined(__NetBSD__) |
26 #include "vcd_read_nbsd.h" | |
958
162a78d3cc08
FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents:
692
diff
changeset
|
27 #else |
2310 | 28 #include "vcd_read.h" |
958
162a78d3cc08
FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents:
692
diff
changeset
|
29 #endif |
1 | 30 |
3261 | 31 #endif |
32 | |
1595 | 33 #ifdef USE_DVDREAD |
34 int dvd_read_sector(void* d,void* p2); | |
35 void dvd_seek(void* d,off_t pos); | |
36 #endif | |
37 | |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
38 #ifdef HAVE_CDDA |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
39 int read_cdda(stream_t* s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
40 void seek_cdda(stream_t* s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
41 void close_cdda(stream_t* s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
42 #endif |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
43 |
1 | 44 //=================== STREAMER ========================= |
45 | |
46 int stream_fill_buffer(stream_t *s){ | |
47 int len; | |
48 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; } | |
49 switch(s->type){ | |
50 case STREAMTYPE_FILE: | |
692 | 51 case STREAMTYPE_STREAM: |
4042
d651a7b5d213
STREAMTYPE_PLAYLIST introduced. similar to STREAMTYPE_STREAM but used for playlists. patch by Alban Bedel <albeu@free.fr>
arpi
parents:
3291
diff
changeset
|
52 case STREAMTYPE_PLAYLIST: |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
53 #ifdef STREAMING |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
54 if( s->streaming_ctrl!=NULL ) { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
55 len=s->streaming_ctrl->streaming_read(s->fd,s->buffer,STREAM_BUFFER_SIZE, s->streaming_ctrl);break; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
56 } else { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
57 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
58 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
59 #else |
1 | 60 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break; |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
61 #endif |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
62 #ifdef HAVE_CDDA |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
63 case STREAMTYPE_CDDA: |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
64 len = read_cdda(s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
65 break; |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
66 #endif |
3261 | 67 #ifdef HAVE_VCD |
1 | 68 case STREAMTYPE_VCD: |
69 #ifdef VCD_CACHE | |
70 len=vcd_cache_read(s->fd,s->buffer);break; | |
71 #else | |
72 len=vcd_read(s->fd,s->buffer);break; | |
73 #endif | |
3261 | 74 #endif |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
75 #ifdef USE_DVDNAV |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
76 case STREAMTYPE_DVDNAV: { |
5472 | 77 dvdnav_stream_read((dvdnav_priv_t*)s->priv,s->buffer,&len); |
78 if (len==0) return 0; // this was an event, so repeat the read | |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
79 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
80 } |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
81 #endif |
1595 | 82 #ifdef USE_DVDREAD |
83 case STREAMTYPE_DVD: { | |
84 off_t pos=dvd_read_sector(s->priv,s->buffer); | |
85 if(pos>=0){ | |
86 len=2048; // full sector | |
87 s->pos=2048*pos-len; | |
88 } else len=-1; // error | |
89 break; | |
90 } | |
91 #endif | |
2790 | 92 #ifdef USE_TV |
93 case STREAMTYPE_TV: | |
94 { | |
95 len = 0; | |
96 break; | |
97 } | |
98 #endif | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
99 case STREAMTYPE_DS: |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
100 len = demux_read_data((demux_stream_t*)s->priv,s->buffer,STREAM_BUFFER_SIZE); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
101 break; |
1 | 102 default: len=0; |
103 } | |
104 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } | |
105 s->buf_pos=0; | |
106 s->buf_len=len; | |
107 s->pos+=len; | |
108 // printf("[%d]",len);fflush(stdout); | |
109 return len; | |
110 } | |
111 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
112 int stream_seek_long(stream_t *s,off_t pos){ |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
113 off_t newpos; |
1 | 114 |
2144 | 115 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos); |
1 | 116 |
117 s->buf_pos=s->buf_len=0; | |
118 | |
119 switch(s->type){ | |
120 case STREAMTYPE_FILE: | |
692 | 121 case STREAMTYPE_STREAM: |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
122 #ifdef _LARGEFILE_SOURCE |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
123 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break; |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
124 #else |
492 | 125 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break; |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
126 #endif |
1 | 127 case STREAMTYPE_VCD: |
128 newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break; | |
1595 | 129 case STREAMTYPE_DVD: |
130 newpos=pos/2048; newpos*=2048; break; | |
1 | 131 } |
132 | |
2050 | 133 if(verbose>=3){ |
134 #ifdef _LARGEFILE_SOURCE | |
135 printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n", | |
136 (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len); | |
137 #else | |
138 printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n", | |
139 (unsigned int)s->pos,newpos,pos,s->buf_len); | |
140 #endif | |
141 } | |
142 | |
1 | 143 pos-=newpos; |
144 | |
145 if(newpos==0 || newpos!=s->pos){ | |
146 switch(s->type){ | |
147 case STREAMTYPE_FILE: | |
692 | 148 s->pos=newpos; // real seek |
1 | 149 if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1; |
150 break; | |
3261 | 151 #ifdef HAVE_VCD |
1 | 152 case STREAMTYPE_VCD: |
692 | 153 s->pos=newpos; // real seek |
1 | 154 #ifdef VCD_CACHE |
155 vcd_cache_seek(s->pos/VCD_SECTOR_DATA); | |
156 #else | |
157 vcd_set_msf(s->pos/VCD_SECTOR_DATA); | |
158 #endif | |
159 break; | |
3261 | 160 #endif |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
161 #ifdef HAVE_CDDA |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
162 case STREAMTYPE_CDDA: { |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
163 s->pos=newpos; |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
164 seek_cdda(s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
165 break; |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
166 } |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
167 #endif |
5472 | 168 #ifdef USE_DVDNAV |
169 case STREAMTYPE_DVDNAV: { | |
170 if (newpos==0) { | |
171 if (dvdnav_stream_reset((dvdnav_priv_t*)s->priv)) | |
172 s->pos=0; | |
173 } | |
174 if(newpos!=s->pos){ | |
175 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek in DVDNAV streams yet!\n"); | |
176 return 1; | |
177 } | |
178 break; | |
179 } | |
180 #endif | |
1595 | 181 #ifdef USE_DVDREAD |
182 case STREAMTYPE_DVD: | |
183 s->pos=newpos; // real seek | |
184 dvd_seek(s->priv,s->pos/2048); | |
185 break; | |
186 #endif | |
692 | 187 case STREAMTYPE_STREAM: |
188 //s->pos=newpos; // real seek | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
189 // Some streaming protocol allow to seek backward and forward |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
190 // A function call that return -1 can tell that the protocol |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
191 // doesn't support seeking. |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
192 #ifdef STREAMING |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
193 if( s->streaming_ctrl!=NULL ) { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
194 if( s->streaming_ctrl->streaming_seek( s->fd, pos, s->streaming_ctrl )<0 ) { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
195 mp_msg(MSGT_STREAM,MSGL_INFO,"Stream not seekable!\n"); |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
196 return 1; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
197 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
198 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
199 #else |
692 | 200 if(newpos<s->pos){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
201 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); |
692 | 202 return 1; |
203 } | |
204 while(s->pos<newpos){ | |
205 if(stream_fill_buffer(s)<=0) break; // EOF | |
206 } | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
207 #endif |
692 | 208 break; |
2790 | 209 #ifdef USE_TV |
210 case STREAMTYPE_TV: | |
211 s->pos=newpos; /* no sense */ | |
212 break; | |
213 #endif | |
1 | 214 } |
215 // putchar('.');fflush(stdout); | |
216 //} else { | |
217 // putchar('%');fflush(stdout); | |
218 } | |
219 | |
220 stream_fill_buffer(s); | |
1999 | 221 if(pos>=0 && pos<=s->buf_len){ |
1 | 222 s->buf_pos=pos; // byte position in sector |
223 return 1; | |
224 } | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
225 |
1999 | 226 // if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n"); |
227 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
228 #ifdef _LARGEFILE_SOURCE |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
229 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%llX !\n",(long long)(pos+newpos)); |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
230 #else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
231 mp_msg(MSGT_STREAM,MSGL_V,"stream_seek: WARNING! Can't seek to 0x%X !\n",(pos+newpos)); |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
232 #endif |
1 | 233 return 0; |
234 } | |
235 | |
236 | |
237 void stream_reset(stream_t *s){ | |
238 if(s->eof){ | |
239 s->pos=0; //ftell(f); | |
240 // s->buf_pos=s->buf_len=0; | |
241 s->eof=0; | |
242 } | |
243 //stream_seek(s,0); | |
244 } | |
245 | |
2144 | 246 stream_t* new_memory_stream(unsigned char* data,int len){ |
247 stream_t *s=malloc(sizeof(stream_t)+len); | |
248 s->fd=-1; | |
249 s->type=STREAMTYPE_MEMORY; | |
250 s->buf_pos=0; s->buf_len=len; | |
251 s->start_pos=0; s->end_pos=len; | |
252 stream_reset(s); | |
253 s->pos=len; | |
254 memcpy(s->buffer,data,len); | |
255 return s; | |
256 } | |
257 | |
1 | 258 stream_t* new_stream(int fd,int type){ |
259 stream_t *s=malloc(sizeof(stream_t)); | |
3291 | 260 if(s==NULL) return NULL; |
261 memset(s,0,sizeof(stream_t)); | |
262 | |
1 | 263 s->fd=fd; |
264 s->type=type; | |
180 | 265 s->buf_pos=s->buf_len=0; |
598 | 266 s->start_pos=s->end_pos=0; |
1642 | 267 s->priv=NULL; |
2322 | 268 s->cache_pid=0; |
1 | 269 stream_reset(s); |
270 return s; | |
271 } | |
272 | |
273 void free_stream(stream_t *s){ | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
5982
diff
changeset
|
274 // printf("\n*** free_stream() called ***\n"); |
4893 | 275 if(s->cache_pid) { |
5982 | 276 // kill(s->cache_pid,SIGTERM); |
277 kill(s->cache_pid,SIGKILL); | |
4893 | 278 waitpid(s->cache_pid,NULL,0); |
279 } | |
6300
c31d15532695
file descriptor leak - found by Marc Espie <espie@nerim.net>
arpi
parents:
6138
diff
changeset
|
280 if(s->fd>0) close(s->fd); |
6479 | 281 switch(s->type) { |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
282 #ifdef HAVE_CDDA |
6479 | 283 case STREAMTYPE_CDDA: |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
284 close_cdda(s); |
6479 | 285 break; |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
286 #endif |
6479 | 287 #ifdef USE_DVDREAD |
288 case STREAMTYPE_DVD: | |
289 dvd_close(s->priv); | |
290 #endif | |
291 } | |
1642 | 292 if(s->priv) free(s->priv); |
1 | 293 free(s); |
294 } | |
295 | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
296 stream_t* new_ds_stream(demux_stream_t *ds) { |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
297 stream_t* s = new_stream(-1,STREAMTYPE_DS); |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
298 s->priv = ds; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
299 return s; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
300 } |