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