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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
1
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
2 #include <stdio.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
3 #include <stdlib.h>
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
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
6863033786d1 warning fixes
atmos4
parents: 6810
diff changeset
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
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
11 #include <signal.h>
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
12
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
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
6863033786d1 warning fixes
atmos4
parents: 6810
diff changeset
16 #include "../linux/shmem.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
17
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
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
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
20
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
21 extern int verbose; // defined in mplayer.c
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
23 #ifdef HAVE_VCD
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
24
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
25 #ifdef __FreeBSD__
2310
9e059416eea6 libdemuxer...
arpi
parents: 2144
diff changeset
26 #include "vcd_read_fbsd.h"
5872
02576893af2a OpenBSD, NetBSD portability patches by
arpi
parents: 5472
diff changeset
27 #elif defined(__NetBSD__)
02576893af2a OpenBSD, NetBSD portability patches by
arpi
parents: 5472
diff changeset
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
9e059416eea6 libdemuxer...
arpi
parents: 2144
diff changeset
30 #include "vcd_read.h"
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
31 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
33 #endif
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
34
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
35 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
36 int dvd_read_sector(void* d,void* p2);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
37 void dvd_seek(void* d,off_t pos);
6814
6863033786d1 warning fixes
atmos4
parents: 6810
diff changeset
38 void dvd_close(dvd_priv_t *d);
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
39 #endif
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
47 //=================== STREAMER =========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
48
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
49 int stream_fill_buffer(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
50 int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
51 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
53 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
70 #ifdef HAVE_VCD
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 len=vcd_read(s->fd,s->buffer);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
76 dvdnav_stream_read((dvdnav_priv_t*)s->priv,s->buffer,&len);
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
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
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
81 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
82 case STREAMTYPE_DVD: {
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
83 off_t pos=dvd_read_sector(s->priv,s->buffer);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
84 if(pos>=0){
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
85 len=2048; // full sector
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
86 s->pos=2048*pos-len;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
87 } else len=-1; // error
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
88 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
89 }
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
94 default: len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
95 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97 s->buf_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98 s->buf_len=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 s->pos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 // printf("[%d]",len);fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
6863033786d1 warning fixes
atmos4
parents: 6810
diff changeset
105 off_t newpos=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
107 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109 s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
112 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
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
888a85621f50 preliminary DVD support using libcss
lgb
parents: 180
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
120 newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break;
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
121 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
122 newpos=pos/2048; newpos*=2048; break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
123 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
124
2050
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
125 if(verbose>=3){
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
126 #ifdef _LARGEFILE_SOURCE
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
127 printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
128 (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
129 #else
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
130 printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
131 (unsigned int)s->pos,newpos,pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
132 #endif
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
133 }
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
134
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
135 pos-=newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137 if(newpos==0 || newpos!=s->pos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
138 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
139 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
140 s->pos=newpos; // real seek
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
141 if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142 break;
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
143 #ifdef HAVE_VCD
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144 case STREAMTYPE_VCD:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
145 s->pos=newpos; // real seek
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 vcd_set_msf(s->pos/VCD_SECTOR_DATA);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147 break;
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
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
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
156 #ifdef USE_DVDNAV
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
157 case STREAMTYPE_DVDNAV: {
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
158 if (newpos==0) {
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
159 if (dvdnav_stream_reset((dvdnav_priv_t*)s->priv))
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
160 s->pos=0;
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
161 }
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
162 if(newpos!=s->pos){
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
163 mp_msg(MSGT_STREAM,MSGL_INFO,"Cannot seek in DVDNAV streams yet!\n");
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
164 return 1;
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
165 }
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
166 break;
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
167 }
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
168 #endif
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
169 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
170 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
171 s->pos=newpos; // real seek
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
172 dvd_seek(s->priv,s->pos/2048);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
173 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
174 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
175 case STREAMTYPE_STREAM:
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
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
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
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
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
190 return 1;
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
191 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
192 while(s->pos<newpos){
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
193 if(stream_fill_buffer(s)<=0) break; // EOF
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
194 }
3044
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
195 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
196 break;
2790
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
197 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
198 case STREAMTYPE_TV:
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
199 s->pos=newpos; /* no sense */
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
200 break;
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
201 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 // putchar('.');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
204 //} else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
205 // putchar('%');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
206 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
207
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
208 stream_fill_buffer(s);
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
209 if(pos>=0 && pos<=s->buf_len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
210 s->buf_pos=pos; // byte position in sector
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
211 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
212 }
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
213
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
214 // if(pos==s->buf_len) printf("XXX Seek to last byte of file -> EOF\n");
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
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
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
224
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
225 void stream_reset(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
226 if(s->eof){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
227 s->pos=0; //ftell(f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
228 // s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
229 s->eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
230 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
231 //stream_seek(s,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
232 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
233
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
234 stream_t* new_memory_stream(unsigned char* data,int len){
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
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
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
237 s->fd=-1;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
238 s->type=STREAMTYPE_MEMORY;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
239 s->buf_pos=0; s->buf_len=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
240 s->start_pos=0; s->end_pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
241 stream_reset(s);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
242 s->pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
243 memcpy(s->buffer,data,len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
244 return s;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
245 }
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
246
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
247 stream_t* new_stream(int fd,int type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
248 stream_t *s=malloc(sizeof(stream_t));
3291
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
249 if(s==NULL) return NULL;
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
250 memset(s,0,sizeof(stream_t));
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
251
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252 s->fd=fd;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 s->type=type;
180
afa2c05cfe43 terrible fatal bug fixed
arpi_esp
parents: 1
diff changeset
254 s->buf_pos=s->buf_len=0;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 578
diff changeset
255 s->start_pos=s->end_pos=0;
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
256 s->priv=NULL;
7407
8780415baa87 stream layer cleanup - part 1
arpi
parents: 7406
diff changeset
257 s->url=NULL;
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
258 s->cache_pid=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
259 stream_reset(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 return s;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
262
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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
904cc3813582 Added waitpid in free_stream to avoid zombies
albeu
parents: 4464
diff changeset
265 if(s->cache_pid) {
5982
b61b22fbcd08 gui doesn't like exit() in forged process
arpi
parents: 5872
diff changeset
266 // kill(s->cache_pid,SIGTERM);
b61b22fbcd08 gui doesn't like exit() in forged process
arpi
parents: 5872
diff changeset
267 kill(s->cache_pid,SIGKILL);
4893
904cc3813582 Added waitpid in free_stream to avoid zombies
albeu
parents: 4464
diff changeset
268 waitpid(s->cache_pid,NULL,0);
6810
a4ed4e0464ba 10L free the cache
albeu
parents: 6479
diff changeset
269 shmem_free(s->cache_data);
4893
904cc3813582 Added waitpid in free_stream to avoid zombies
albeu
parents: 4464
diff changeset
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
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
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
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
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
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
276 break;
6384
f0b933918a22 Support for playing audio cds using cdparanoia. Include a raw audio
albeu
parents: 6300
diff changeset
277 #endif
6479
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
278 #ifdef USE_DVDREAD
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
279 case STREAMTYPE_DVD:
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
280 dvd_close(s->priv);
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
281 #endif
45ec7f24de06 Add uninit to the dvd stream.
albeu
parents: 6384
diff changeset
282 }
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
283 if(s->priv) free(s->priv);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
284 free(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
285 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
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 }