Mercurial > mplayer.hg
annotate libmpdemux/stream.c @ 9388:d6a1ab009794
update of links regarding tech/ dir
author | nicolas |
---|---|
date | Mon, 10 Feb 2003 18:56:03 +0000 |
parents | edfe34c5405d |
children | 76c6d8f1ebf5 |
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" |
9380 | 16 #include "../osdep/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 |
8812 | 23 #include "cue_read.h" |
24 | |
3261 | 25 #ifdef HAVE_VCD |
26 | |
958
162a78d3cc08
FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents:
692
diff
changeset
|
27 #ifdef __FreeBSD__ |
2310 | 28 #include "vcd_read_fbsd.h" |
5872 | 29 #elif defined(__NetBSD__) |
30 #include "vcd_read_nbsd.h" | |
958
162a78d3cc08
FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents:
692
diff
changeset
|
31 #else |
2310 | 32 #include "vcd_read.h" |
958
162a78d3cc08
FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents:
692
diff
changeset
|
33 #endif |
1 | 34 |
3261 | 35 #endif |
36 | |
8812 | 37 //#include "vcd_read_bincue.h" |
8782
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
38 |
1595 | 39 #ifdef USE_DVDREAD |
8344 | 40 int dvd_read_sector(dvd_priv_t *d,unsigned char* data); |
41 void dvd_seek(dvd_priv_t *d,int pos); | |
6814 | 42 void dvd_close(dvd_priv_t *d); |
1595 | 43 #endif |
44 | |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
45 #ifdef HAVE_CDDA |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
46 int read_cdda(stream_t* s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
47 void seek_cdda(stream_t* s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
48 void close_cdda(stream_t* s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
49 #endif |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
50 |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
51 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
52 #include "libsmbclient.h" |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
53 #endif |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
54 |
1 | 55 //=================== STREAMER ========================= |
56 | |
57 int stream_fill_buffer(stream_t *s){ | |
58 int len; | |
59 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; } | |
60 switch(s->type){ | |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
61 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
62 case STREAMTYPE_SMB: |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
63 len=smbc_read(s->fd,s->buffer,STREAM_BUFFER_SIZE); |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
64 break; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
65 #endif |
1 | 66 case STREAMTYPE_FILE: |
692 | 67 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
|
68 case STREAMTYPE_PLAYLIST: |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
69 #ifdef STREAMING |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
70 if( s->streaming_ctrl!=NULL ) { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
71 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
|
72 } else { |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
73 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
|
74 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
75 #else |
1 | 76 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
|
77 #endif |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
78 #ifdef HAVE_CDDA |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
79 case STREAMTYPE_CDDA: |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
80 len = read_cdda(s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
81 break; |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
82 #endif |
3261 | 83 #ifdef HAVE_VCD |
1 | 84 case STREAMTYPE_VCD: |
85 len=vcd_read(s->fd,s->buffer);break; | |
86 #endif | |
8782
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
87 case STREAMTYPE_VCDBINCUE: |
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
88 len=cue_vcd_read(s->buffer);break; |
5380
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
89 #ifdef USE_DVDNAV |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
90 case STREAMTYPE_DVDNAV: { |
5472 | 91 dvdnav_stream_read((dvdnav_priv_t*)s->priv,s->buffer,&len); |
92 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
|
93 break; |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
94 } |
8a01cde9cf39
DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents:
5133
diff
changeset
|
95 #endif |
1595 | 96 #ifdef USE_DVDREAD |
97 case STREAMTYPE_DVD: { | |
98 off_t pos=dvd_read_sector(s->priv,s->buffer); | |
99 if(pos>=0){ | |
100 len=2048; // full sector | |
101 s->pos=2048*pos-len; | |
102 } else len=-1; // error | |
103 break; | |
104 } | |
105 #endif | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
106 case STREAMTYPE_DS: |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
107 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
|
108 break; |
1 | 109 default: len=0; |
110 } | |
111 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; } | |
112 s->buf_pos=0; | |
113 s->buf_len=len; | |
114 s->pos+=len; | |
115 // printf("[%d]",len);fflush(stdout); | |
116 return len; | |
117 } | |
118 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
119 int stream_seek_long(stream_t *s,off_t pos){ |
6814 | 120 off_t newpos=0; |
1 | 121 |
2144 | 122 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos); |
1 | 123 |
124 s->buf_pos=s->buf_len=0; | |
125 | |
126 switch(s->type){ | |
127 case STREAMTYPE_FILE: | |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
128 case STREAMTYPE_SMB: |
692 | 129 case STREAMTYPE_STREAM: |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
130 #ifdef _LARGEFILE_SOURCE |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
131 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break; |
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
132 #else |
492 | 133 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break; |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
134 #endif |
1 | 135 case STREAMTYPE_VCD: |
136 newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break; | |
8782
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
137 case STREAMTYPE_VCDBINCUE: |
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
138 newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break; |
1595 | 139 case STREAMTYPE_DVD: |
140 newpos=pos/2048; newpos*=2048; break; | |
8524 | 141 #ifdef HAVE_CDDA |
142 case STREAMTYPE_CDDA: | |
143 newpos=(pos/VCD_SECTOR_SIZE)*VCD_SECTOR_SIZE;break; | |
144 #endif | |
1 | 145 } |
146 | |
2050 | 147 if(verbose>=3){ |
148 #ifdef _LARGEFILE_SOURCE | |
149 printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n", | |
150 (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len); | |
151 #else | |
152 printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n", | |
153 (unsigned int)s->pos,newpos,pos,s->buf_len); | |
154 #endif | |
155 } | |
156 | |
1 | 157 pos-=newpos; |
158 | |
159 if(newpos==0 || newpos!=s->pos){ | |
160 switch(s->type){ | |
161 case STREAMTYPE_FILE: | |
692 | 162 s->pos=newpos; // real seek |
1 | 163 if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1; |
164 break; | |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
165 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
166 case STREAMTYPE_SMB: |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
167 s->pos=newpos; // real seek |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
168 if(smbc_lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
169 break; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
170 #endif |
3261 | 171 #ifdef HAVE_VCD |
1 | 172 case STREAMTYPE_VCD: |
692 | 173 s->pos=newpos; // real seek |
1 | 174 vcd_set_msf(s->pos/VCD_SECTOR_DATA); |
175 break; | |
3261 | 176 #endif |
8782
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
177 case STREAMTYPE_VCDBINCUE: |
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
178 s->pos=newpos; // real seek |
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
179 cue_set_msf(s->pos/VCD_SECTOR_DATA); |
6af7a6595cc9
cdrwin-style bin/cue VCD image support (-vcd <track> -cuefile file.cue)
arpi
parents:
8524
diff
changeset
|
180 break; |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
181 #ifdef HAVE_CDDA |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
182 case STREAMTYPE_CDDA: { |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
183 s->pos=newpos; |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
184 seek_cdda(s); |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
185 break; |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
186 } |
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
187 #endif |
5472 | 188 #ifdef USE_DVDNAV |
189 case STREAMTYPE_DVDNAV: { | |
190 if (newpos==0) { | |
191 if (dvdnav_stream_reset((dvdnav_priv_t*)s->priv)) | |
192 s->pos=0; | |
193 } | |
194 if(newpos!=s->pos){ | |
195 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek in DVDNAV streams yet!\n"); | |
196 return 1; | |
197 } | |
198 break; | |
199 } | |
200 #endif | |
1595 | 201 #ifdef USE_DVDREAD |
202 case STREAMTYPE_DVD: | |
203 s->pos=newpos; // real seek | |
204 dvd_seek(s->priv,s->pos/2048); | |
205 break; | |
206 #endif | |
692 | 207 case STREAMTYPE_STREAM: |
208 //s->pos=newpos; // real seek | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
209 // 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
|
210 // 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
|
211 // doesn't support seeking. |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
212 #ifdef STREAMING |
8929
c5ca1ae42555
check if seeking supported, otherwise fallback to null reading
arpi
parents:
8812
diff
changeset
|
213 if( s->streaming_ctrl!=NULL && s->streaming_ctrl->streaming_seek ) { |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
214 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
|
215 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
|
216 return 1; |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
217 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
218 } |
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
219 #else |
692 | 220 if(newpos<s->pos){ |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
221 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek backward in linear streams!\n"); |
692 | 222 return 1; |
223 } | |
224 while(s->pos<newpos){ | |
225 if(stream_fill_buffer(s)<=0) break; // EOF | |
226 } | |
3044
606bb6943ae9
Added a network read function call and a seek network function call.
bertrand
parents:
2790
diff
changeset
|
227 #endif |
692 | 228 break; |
7408 | 229 default: |
230 return 0; | |
1 | 231 } |
232 // putchar('.');fflush(stdout); | |
233 //} else { | |
234 // putchar('%');fflush(stdout); | |
235 } | |
236 | |
237 stream_fill_buffer(s); | |
1999 | 238 if(pos>=0 && pos<=s->buf_len){ |
1 | 239 s->buf_pos=pos; // byte position in sector |
240 return 1; | |
241 } | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
242 |
1999 | 243 // if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n"); |
244 | |
1428
a90d889eb649
largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents:
1177
diff
changeset
|
245 #ifdef _LARGEFILE_SOURCE |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
246 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
|
247 #else |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1642
diff
changeset
|
248 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
|
249 #endif |
1 | 250 return 0; |
251 } | |
252 | |
253 | |
254 void stream_reset(stream_t *s){ | |
255 if(s->eof){ | |
256 s->pos=0; //ftell(f); | |
257 // s->buf_pos=s->buf_len=0; | |
258 s->eof=0; | |
259 } | |
260 //stream_seek(s,0); | |
261 } | |
262 | |
2144 | 263 stream_t* new_memory_stream(unsigned char* data,int len){ |
264 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
|
265 memset(s,0,sizeof(stream_t)); |
2144 | 266 s->fd=-1; |
267 s->type=STREAMTYPE_MEMORY; | |
268 s->buf_pos=0; s->buf_len=len; | |
269 s->start_pos=0; s->end_pos=len; | |
270 stream_reset(s); | |
271 s->pos=len; | |
272 memcpy(s->buffer,data,len); | |
273 return s; | |
274 } | |
275 | |
1 | 276 stream_t* new_stream(int fd,int type){ |
277 stream_t *s=malloc(sizeof(stream_t)); | |
3291 | 278 if(s==NULL) return NULL; |
279 memset(s,0,sizeof(stream_t)); | |
280 | |
1 | 281 s->fd=fd; |
282 s->type=type; | |
180 | 283 s->buf_pos=s->buf_len=0; |
598 | 284 s->start_pos=s->end_pos=0; |
1642 | 285 s->priv=NULL; |
7407 | 286 s->url=NULL; |
2322 | 287 s->cache_pid=0; |
1 | 288 stream_reset(s); |
289 return s; | |
290 } | |
291 | |
292 void free_stream(stream_t *s){ | |
6138
523014df7d32
big cosmetics patch, cleanup of messages printed by mplayer and libs.
arpi
parents:
5982
diff
changeset
|
293 // printf("\n*** free_stream() called ***\n"); |
4893 | 294 if(s->cache_pid) { |
5982 | 295 // kill(s->cache_pid,SIGTERM); |
296 kill(s->cache_pid,SIGKILL); | |
4893 | 297 waitpid(s->cache_pid,NULL,0); |
6810 | 298 shmem_free(s->cache_data); |
4893 | 299 } |
6300
c31d15532695
file descriptor leak - found by Marc Espie <espie@nerim.net>
arpi
parents:
6138
diff
changeset
|
300 if(s->fd>0) close(s->fd); |
6479 | 301 switch(s->type) { |
7630
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
302 #ifdef LIBSMBCLIENT |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
303 case STREAMTYPE_SMB: |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
304 smbc_close(s->fd); |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
305 break; |
4c51ce16c4a2
smb:// (samba client) support by Vladimir Moushkov <vlindos_mpdev@abv.bg>
arpi
parents:
7408
diff
changeset
|
306 #endif |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
307 #ifdef HAVE_CDDA |
6479 | 308 case STREAMTYPE_CDDA: |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
309 close_cdda(s); |
6479 | 310 break; |
6384
f0b933918a22
Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents:
6300
diff
changeset
|
311 #endif |
6479 | 312 #ifdef USE_DVDREAD |
313 case STREAMTYPE_DVD: | |
314 dvd_close(s->priv); | |
315 #endif | |
316 } | |
1642 | 317 if(s->priv) free(s->priv); |
1 | 318 free(s); |
319 } | |
320 | |
5133
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
321 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
|
322 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
|
323 s->priv = ds; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
324 return s; |
9841a86d66f9
Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents:
4893
diff
changeset
|
325 } |