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