annotate stream.c @ 2231:440b15b32181

quick fix for movies with a height which is not a multiple of 8
author michael
date Wed, 17 Oct 2001 02:04:16 +0000
parents 99f079ff9374
children
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>
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
10
1430
1728d249c783 missing unistd.h (requires for off_t under freebsd)
arpi
parents: 1428
diff changeset
11 #include "config.h"
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
12 #include "mp_msg.h"
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
13 #include "help_mp.h"
578
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
14
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
15 #include "stream.h"
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
16
c2377cd0069f something moved to brand new stream.h
arpi_esp
parents: 537
diff changeset
17 extern int verbose; // defined in mplayer.c
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
18
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
19 #ifdef __FreeBSD__
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
20 #include "vcd_read_fbsd.c"
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
21 #else
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
22 #include "vcd_read.c"
958
162a78d3cc08 FreeBSD support by Vladimir Kushnir vkushnir@Alfacom.net
arpi_esp
parents: 692
diff changeset
23 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
24
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
25 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
26 int dvd_read_sector(void* d,void* p2);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
27 void dvd_seek(void* d,off_t pos);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
28 #endif
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
29
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
30 //=================== STREAMER =========================
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
31
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
32 int stream_fill_buffer(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
33 int len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
34 if(s->eof){ s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
35 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
36 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
37 case STREAMTYPE_STREAM:
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
38 len=read(s->fd,s->buffer,STREAM_BUFFER_SIZE);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
39 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
40 #ifdef VCD_CACHE
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
41 len=vcd_cache_read(s->fd,s->buffer);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
42 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
43 len=vcd_read(s->fd,s->buffer);break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
44 #endif
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
45 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
46 case STREAMTYPE_DVD: {
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
47 off_t pos=dvd_read_sector(s->priv,s->buffer);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
48 if(pos>=0){
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
49 len=2048; // full sector
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
50 s->pos=2048*pos-len;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
51 } else len=-1; // error
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
52 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
53 }
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
54 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
55 default: len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
56 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
57 if(len<=0){ s->eof=1; s->buf_pos=s->buf_len=0; return 0; }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
58 s->buf_pos=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
59 s->buf_len=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
60 s->pos+=len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
61 // printf("[%d]",len);fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
62 return len;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
63 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
64
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
65 int stream_seek_long(stream_t *s,off_t pos){
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
66 off_t newpos;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
67
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
68 // if(verbose>=3) printf("seek_long to 0x%X\n",(unsigned int)pos);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
69
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
70 s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
71
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
72 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
73 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
74 case STREAMTYPE_STREAM:
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
75 #ifdef _LARGEFILE_SOURCE
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
76 newpos=pos&(~((long long)STREAM_BUFFER_SIZE-1));break;
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
77 #else
492
888a85621f50 preliminary DVD support using libcss
lgb
parents: 180
diff changeset
78 newpos=pos&(~(STREAM_BUFFER_SIZE-1));break;
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
79 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
80 case STREAMTYPE_VCD:
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
81 newpos=(pos/VCD_SECTOR_DATA)*VCD_SECTOR_DATA;break;
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
82 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
83 newpos=pos/2048; newpos*=2048; break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
84 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
85
2050
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
86 if(verbose>=3){
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
87 #ifdef _LARGEFILE_SOURCE
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
88 printf("s->pos=%llX newpos=%llX new_bufpos=%llX buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
89 (long long)s->pos,(long long)newpos,(long long)pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
90 #else
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
91 printf("s->pos=%X newpos=%X new_bufpos=%X buflen=%X \n",
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
92 (unsigned int)s->pos,newpos,pos,s->buf_len);
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
93 #endif
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
94 }
18f4dd5d568f -Wall warnings fixed
arpi
parents: 1999
diff changeset
95
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
96 pos-=newpos;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
97
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
98 if(newpos==0 || newpos!=s->pos){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
99 switch(s->type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
100 case STREAMTYPE_FILE:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
101 s->pos=newpos; // real seek
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
102 if(lseek(s->fd,s->pos,SEEK_SET)<0) s->eof=1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
103 break;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
104 case STREAMTYPE_VCD:
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
105 s->pos=newpos; // real seek
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
106 #ifdef VCD_CACHE
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
107 vcd_cache_seek(s->pos/VCD_SECTOR_DATA);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
108 #else
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
109 vcd_set_msf(s->pos/VCD_SECTOR_DATA);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
110 #endif
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
111 break;
1595
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
112 #ifdef USE_DVDREAD
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
113 case STREAMTYPE_DVD:
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
114 s->pos=newpos; // real seek
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
115 dvd_seek(s->priv,s->pos/2048);
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
116 break;
1918610d2802 seeking in DVD
arpi
parents: 1430
diff changeset
117 #endif
692
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
118 case STREAMTYPE_STREAM:
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
119 //s->pos=newpos; // real seek
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
120 if(newpos<s->pos){
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
121 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
122 return 1;
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
123 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
124 while(s->pos<newpos){
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
125 if(stream_fill_buffer(s)<=0) break; // EOF
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
126 }
14a2f35921a0 allow playing from stdin
arpi_esp
parents: 598
diff changeset
127 break;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
128 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
129 // putchar('.');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
130 //} else {
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
131 // putchar('%');fflush(stdout);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
132 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
133
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
134 stream_fill_buffer(s);
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
135 if(pos>=0 && pos<=s->buf_len){
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
136 s->buf_pos=pos; // byte position in sector
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
137 return 1;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
138 }
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
139
1999
0c45328c9f8b fixed seek to EOF pos
arpi
parents: 1973
diff changeset
140 // 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
141
1428
a90d889eb649 largefile patch by Stephen Davies <steve@daviesfam.org>
arpi
parents: 1177
diff changeset
142 #ifdef _LARGEFILE_SOURCE
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
143 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
144 #else
1973
5216f108cb4f all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents: 1642
diff changeset
145 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
146 #endif
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
147 return 0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
148 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
149
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
150
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
151 void stream_reset(stream_t *s){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
152 if(s->eof){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
153 s->pos=0; //ftell(f);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
154 // s->buf_pos=s->buf_len=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
155 s->eof=0;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
156 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
157 //stream_seek(s,0);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
158 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
159
2144
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
160 stream_t* new_memory_stream(unsigned char* data,int len){
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
161 stream_t *s=malloc(sizeof(stream_t)+len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
162 s->fd=-1;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
163 s->type=STREAMTYPE_MEMORY;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
164 s->buf_pos=0; s->buf_len=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
165 s->start_pos=0; s->end_pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
166 stream_reset(s);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
167 s->pos=len;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
168 memcpy(s->buffer,data,len);
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
169 return s;
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
170 }
99f079ff9374 new_memory_stream() added
arpi
parents: 2050
diff changeset
171
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
172 stream_t* new_stream(int fd,int type){
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
173 stream_t *s=malloc(sizeof(stream_t));
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
174 s->fd=fd;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
175 s->type=type;
180
afa2c05cfe43 terrible fatal bug fixed
arpi_esp
parents: 1
diff changeset
176 s->buf_pos=s->buf_len=0;
598
c7117e17e20b OSD seekbar fixed for mpeg/VCD
arpi_esp
parents: 578
diff changeset
177 s->start_pos=s->end_pos=0;
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
178 s->priv=NULL;
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
179 stream_reset(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
180 return s;
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
181 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
182
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
183 void free_stream(stream_t *s){
1642
78fa0713b823 free'ing priv struct
arpi
parents: 1595
diff changeset
184 if(s->priv) free(s->priv);
1
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
185 free(s);
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
186 }
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
187
3b5f5d1c5041 Initial revision
arpi_esp
parents:
diff changeset
188