annotate libmpdemux/stream.c @ 5627:a05efac12472

dvdnav hotfix
author arpi
date Mon, 15 Apr 2002 01:50:00 +0000
parents 4bd766a5632b
children 02576893af2a
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>
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
9 #include <fcntl.h>
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
10 #include <signal.h>
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
11
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
12 #include "config.h"
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
13 #include "mp_msg.h"
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
14 #include "help_mp.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
15
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
16 #include "stream.h"
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
17 #include "demuxer.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
18
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
19 extern int verbose; // defined in mplayer.c
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
20
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
21 #ifdef HAVE_VCD
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
22
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
23 #ifdef __FreeBSD__
2310
9e059416eea6 libdemuxer...
arpi
parents: 2144
diff changeset
24 #include "vcd_read_fbsd.h"
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
25 #else
2310
9e059416eea6 libdemuxer...
arpi
parents: 2144
diff changeset
26 #include "vcd_read.h"
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
27 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
28
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
29 #endif
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
30
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
31 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
32 int dvd_read_sector(void* d,void* p2);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
33 void dvd_seek(void* d,off_t pos);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
34 #endif
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
35
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36 //=================== STREAMER =========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
37
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
38 int stream_fill_buffer(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39 int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
43 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
44 case STREAMTYPE_PLAYLIST:
3044
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
45 #ifdef STREAMING
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
46 if( s->streaming_ctrl!=NULL ) {
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
47 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
48 } else {
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
49 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
50 }
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
51 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
52 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
53 #endif
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
54 #ifdef HAVE_VCD
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 #ifdef VCD_CACHE
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 len=vcd_cache_read(s->fd,s->buffer);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 len=vcd_read(s->fd,s->buffer);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 #endif
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
61 #endif
5380
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5133
diff changeset
62 #ifdef USE_DVDNAV
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5133
diff changeset
63 case STREAMTYPE_DVDNAV: {
5472
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
64 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
65 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
66 break;
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5133
diff changeset
67 }
8a01cde9cf39 DVDnav support patch by David Holm and Kees Cook <mplayer@outflux.net>
arpi
parents: 5133
diff changeset
68 #endif
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
69 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
70 case STREAMTYPE_DVD: {
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
71 off_t pos=dvd_read_sector(s->priv,s->buffer);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
72 if(pos>=0){
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
73 len=2048; // full sector
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
74 s->pos=2048*pos-len;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
75 } else len=-1; // error
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
76 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
77 }
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
78 #endif
2790
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
79 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
80 case STREAMTYPE_TV:
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
81 {
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
82 len = 0;
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
83 break;
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
84 }
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
85 #endif
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
86 case STREAMTYPE_DS:
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
87 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
88 break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
89 default: len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
90 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
91 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
92 s->buf_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
93 s->buf_len=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
94 s->pos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
95 // printf("[%d]",len);fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
99 int stream_seek_long(stream_t *s,off_t pos){
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
100 off_t newpos;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
101
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
102 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
105
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
108 case STREAMTYPE_STREAM:
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
109 #ifdef _LARGEFILE_SOURCE
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
110 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break;
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
111 #else
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 180
diff changeset
112 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break;
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
113 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
114 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
115 newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break;
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
116 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
117 newpos=pos/2048; newpos*=2048; break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
118 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
119
2050
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
120 if(verbose>=3){
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
121 #ifdef _LARGEFILE_SOURCE
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
122 printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
123 (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
124 #else
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
125 printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
126 (unsigned int)s->pos,newpos,pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
127 #endif
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
128 }
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
129
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130 pos-=newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132 if(newpos==0 || newpos!=s->pos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
135 s->pos=newpos; // real seek
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136 if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137 break;
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
138 #ifdef HAVE_VCD
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
139 case STREAMTYPE_VCD:
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 #ifdef VCD_CACHE
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
142 vcd_cache_seek(s->pos/VCD_SECTOR_DATA);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
143 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
144 vcd_set_msf(s->pos/VCD_SECTOR_DATA);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
145 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
146 break;
3261
caac174877b7 using #ifdef HAVE_VCD
arpi
parents: 3044
diff changeset
147 #endif
5472
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
148 #ifdef USE_DVDNAV
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
149 case STREAMTYPE_DVDNAV: {
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
150 if (newpos==0) {
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
151 if (dvdnav_stream_reset((dvdnav_priv_t*)s->priv))
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
152 s->pos=0;
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
153 }
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
154 if(newpos!=s->pos){
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
155 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
156 return 1;
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
157 }
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
158 break;
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
159 }
4bd766a5632b dvdnav functions moved out to dvdnav_steram.c
arpi
parents: 5382
diff changeset
160 #endif
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
161 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
162 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
163 s->pos=newpos; // real seek
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
164 dvd_seek(s->priv,s->pos/2048);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
165 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
166 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
167 case STREAMTYPE_STREAM:
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
168 //s->pos=newpos; // real seek
3044
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
169 // 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
170 // 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
171 // doesn't support seeking.
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
172 #ifdef STREAMING
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
173 if( s->streaming_ctrl!=NULL ) {
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
174 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
175 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
176 return 1;
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
177 }
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
178 }
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
179 #else
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
180 if(newpos<s->pos){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
181 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
182 return 1;
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
183 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
184 while(s->pos<newpos){
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
185 if(stream_fill_buffer(s)<=0) break; // EOF
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
186 }
3044
606bb6943ae9 Added a network read function call and a seek network function call.
bertrand
parents: 2790
diff changeset
187 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
188 break;
2790
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
189 #ifdef USE_TV
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
190 case STREAMTYPE_TV:
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
191 s->pos=newpos; /* no sense */
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
192 break;
98769cea155c added tv subsystem
alex
parents: 2322
diff changeset
193 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
194 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
195 // putchar('.');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
196 //} else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
197 // putchar('%');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
198 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
199
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
200 stream_fill_buffer(s);
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
201 if(pos>=0 && pos<=s->buf_len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
202 s->buf_pos=pos; // byte position in sector
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
203 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
204 }
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
205
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
206 // 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
207
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
208 #ifdef _LARGEFILE_SOURCE
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_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
210 #else
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
211 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
212 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
213 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
214 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
215
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
216
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
217 void stream_reset(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
218 if(s->eof){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
219 s->pos=0; //ftell(f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
220 // s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
221 s->eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
222 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
223 //stream_seek(s,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
224 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
225
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
226 stream_t* new_memory_stream(unsigned char* data,int len){
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
227 stream_t *s=malloc(sizeof(stream_t)+len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
228 s->fd=-1;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
229 s->type=STREAMTYPE_MEMORY;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
230 s->buf_pos=0; s->buf_len=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
231 s->start_pos=0; s->end_pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
232 stream_reset(s);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
233 s->pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
234 memcpy(s->buffer,data,len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
235 return s;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
236 }
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
237
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
238 stream_t* new_stream(int fd,int type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
239 stream_t *s=malloc(sizeof(stream_t));
3291
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
240 if(s==NULL) return NULL;
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
241 memset(s,0,sizeof(stream_t));
2122a13b5a29 fixed startup crash
iive
parents: 3261
diff changeset
242
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
243 s->fd=fd;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
244 s->type=type;
180
afa2c05cfe43 terrible fatal bug fixed
arpi_esp
parents: 1
diff changeset
245 s->buf_pos=s->buf_len=0;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 578
diff changeset
246 s->start_pos=s->end_pos=0;
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
247 s->priv=NULL;
2322
e22ec6fce385 cache2 support
arpi
parents: 2310
diff changeset
248 s->cache_pid=0;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
249 stream_reset(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
250 return s;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
251 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
252
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
253 void free_stream(stream_t *s){
4464
89369725b561 overwrite old info
nexus
parents: 4042
diff changeset
254 printf("\n*** free_stream() called ***\n");
4893
904cc3813582 Added waitpid in free_stream to avoid zombies
albeu
parents: 4464
diff changeset
255 if(s->cache_pid) {
904cc3813582 Added waitpid in free_stream to avoid zombies
albeu
parents: 4464
diff changeset
256 kill(s->cache_pid,SIGTERM);
904cc3813582 Added waitpid in free_stream to avoid zombies
albeu
parents: 4464
diff changeset
257 waitpid(s->cache_pid,NULL,0);
904cc3813582 Added waitpid in free_stream to avoid zombies
albeu
parents: 4464
diff changeset
258 }
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
259 if(s->priv) free(s->priv);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
260 free(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
261 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
262
5133
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
263 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
264 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
265 s->priv = ds;
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
266 return s;
9841a86d66f9 Initial ogg demuxer. No seeking, a/v sync is broken. Support avi
albeu
parents: 4893
diff changeset
267 }