Mercurial > mplayer.hg
annotate libmpdemux/demux_mpg.c @ 12083:9aabf1beeb4f
remote exploitable heap overflow fix by ("blexim" <blexim at hush dot com>)
author | michael |
---|---|
date | Tue, 30 Mar 2004 10:58:41 +0000 |
parents | bbf3898360e7 |
children | 1dc4d1723f88 |
rev | line source |
---|---|
1 | 1 // MPG/VOB file parser for DEMUXER v2.5 by A'rpi/ESP-team |
2 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
3 #include <stdio.h> |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
4 #include <stdlib.h> |
1430 | 5 #include <unistd.h> |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
6 |
1567 | 7 #include "config.h" |
8 #include "mp_msg.h" | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1735
diff
changeset
|
9 #include "help_mp.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
10 |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
11 #include "stream.h" |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
12 #include "demuxer.h" |
1466 | 13 #include "parse_es.h" |
2338 | 14 #include "stheader.h" |
4711 | 15 #include "mp3_hdr.h" |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
16 |
524
9105fc95636c
A fast'n'ugly hack to correct DVD VOB playback problems
lgb
parents:
501
diff
changeset
|
17 //#define MAX_PS_PACKETSIZE 2048 |
501 | 18 #define MAX_PS_PACKETSIZE (224*1024) |
19 | |
547 | 20 static int mpeg_pts_error=0; |
21 | |
1 | 22 static unsigned int read_mpeg_timestamp(stream_t *s,int c){ |
23 int d,e; | |
24 unsigned int pts; | |
25 d=stream_read_word(s); | |
26 e=stream_read_word(s); | |
547 | 27 if( ((c&1)!=1) || ((d&1)!=1) || ((e&1)!=1) ){ |
28 ++mpeg_pts_error; | |
29 return 0; // invalid pts | |
30 } | |
1 | 31 pts=(((c>>1)&7)<<30)|((d>>1)<<15)|(e>>1); |
1567 | 32 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"{%d}",pts); |
1 | 33 return pts; |
34 } | |
35 | |
36 static int demux_mpg_read_packet(demuxer_t *demux,int id){ | |
37 int d; | |
38 int len; | |
39 unsigned char c=0; | |
40 unsigned int pts=0; | |
41 unsigned int dts=0; | |
42 demux_stream_t *ds=NULL; | |
43 | |
1567 | 44 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"demux_read_packet: %X\n",id); |
1 | 45 |
536 | 46 // if(id==0x1F0){ |
47 // demux->synced=0; // force resync after 0x1F0 | |
48 // return -1; | |
49 //} | |
501 | 50 |
1 | 51 // if(id==0x1BA) packet_start_pos=stream_tell(demux->stream); |
501 | 52 if(id<0x1BC || id>=0x1F0) return -1; |
1 | 53 if(id==0x1BE) return -1; // padding stream |
54 if(id==0x1BF) return -1; // private2 | |
55 | |
56 len=stream_read_word(demux->stream); | |
1567 | 57 mp_dbg(MSGT_DEMUX,MSGL_DBG3,"PACKET len=%d",len); |
536 | 58 // if(len==62480){ demux->synced=0;return -1;} /* :) */ |
501 | 59 if(len==0 || len>MAX_PS_PACKETSIZE){ |
1567 | 60 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"Invalid PS packet len: %d\n",len); |
501 | 61 return -2; // invalid packet !!!!!! |
62 } | |
1 | 63 |
547 | 64 mpeg_pts_error=0; |
65 | |
1 | 66 while(len>0){ // Skip stuFFing bytes |
67 c=stream_read_char(demux->stream);--len; | |
68 if(c!=0xFF)break; | |
69 } | |
70 if((c>>6)==1){ // Read (skip) STD scale & size value | |
71 // printf(" STD_scale=%d",(c>>5)&1); | |
72 d=((c&0x1F)<<8)|stream_read_char(demux->stream); | |
73 len-=2; | |
74 // printf(" STD_size=%d",d); | |
75 c=stream_read_char(demux->stream); | |
76 } | |
77 // Read System-1 stream timestamps: | |
78 if((c>>4)==2){ | |
79 pts=read_mpeg_timestamp(demux->stream,c); | |
80 len-=4; | |
81 } else | |
82 if((c>>4)==3){ | |
83 pts=read_mpeg_timestamp(demux->stream,c); | |
84 c=stream_read_char(demux->stream); | |
85 if((c>>4)!=1) pts=0; //printf("{ERROR4}"); | |
86 dts=read_mpeg_timestamp(demux->stream,c); | |
87 len-=4+1+4; | |
88 } else | |
89 if((c>>6)==2){ | |
90 int pts_flags; | |
91 int hdrlen; | |
92 // System-2 (.VOB) stream: | |
492 | 93 if((c>>4)&3) { |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1735
diff
changeset
|
94 mp_msg(MSGT_DEMUX,MSGL_WARN,MSGTR_EncryptedVOB); |
492 | 95 } |
1 | 96 c=stream_read_char(demux->stream); pts_flags=c>>6; |
97 c=stream_read_char(demux->stream); hdrlen=c; | |
98 len-=2; | |
1567 | 99 mp_dbg(MSGT_DEMUX,MSGL_DBG3," hdrlen=%d (len=%d)",hdrlen,len); |
100 if(hdrlen>len){ mp_msg(MSGT_DEMUX,MSGL_V,"demux_mpg: invalid header length \n"); return -1;} | |
7671 | 101 if(pts_flags==2 && hdrlen>=5){ |
1 | 102 c=stream_read_char(demux->stream); |
103 pts=read_mpeg_timestamp(demux->stream,c); | |
104 len-=5;hdrlen-=5; | |
105 } else | |
7671 | 106 if(pts_flags==3 && hdrlen>=10){ |
1 | 107 c=stream_read_char(demux->stream); |
108 pts=read_mpeg_timestamp(demux->stream,c); | |
109 c=stream_read_char(demux->stream); | |
110 dts=read_mpeg_timestamp(demux->stream,c); | |
111 len-=10;hdrlen-=10; | |
112 } | |
113 len-=hdrlen; | |
114 if(hdrlen>0) stream_skip(demux->stream,hdrlen); // skip header bytes | |
115 | |
116 //============== DVD Audio sub-stream ====================== | |
117 if(id==0x1BD){ | |
552 | 118 int aid=stream_read_char(demux->stream);--len; |
1 | 119 if(len<3) return -1; // invalid audio packet |
552 | 120 |
121 // AID: | |
122 // 0x20..0x3F subtitle | |
123 // 0x80..0x9F AC3 audio | |
124 // 0xA0..0xBF PCM audio | |
125 | |
126 if((aid & 0xE0) == 0x20){ | |
127 // subtitle: | |
128 aid&=0x1F; | |
426 | 129 |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
130 if(!demux->s_streams[aid]){ |
1567 | 131 mp_msg(MSGT_DEMUX,MSGL_V,"==> Found subtitle: %d\n",aid); |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
132 demux->s_streams[aid]=1; |
552 | 133 } |
134 | |
135 if(demux->sub->id==aid){ | |
136 ds=demux->sub; | |
137 } | |
138 | |
3955 | 139 } else if((aid & 0xC0) == 0x80 || (aid & 0xE0) == 0x00) { |
552 | 140 |
141 // aid=128+(aid&0x7F); | |
142 // aid=0x80..0xBF | |
143 | |
1289 | 144 if(!demux->a_streams[aid]) new_sh_audio(demux,aid); |
552 | 145 if(demux->audio->id==-1) demux->audio->id=aid; |
426 | 146 |
147 if(demux->audio->id==aid){ | |
7671 | 148 int type; |
426 | 149 ds=demux->audio; |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
150 if(!ds->sh) ds->sh=demux->a_streams[aid]; |
1 | 151 // READ Packet: Skip additional audio header data: |
7671 | 152 c=stream_read_char(demux->stream);//num of frames |
153 type=stream_read_char(demux->stream);//startpos hi | |
154 type=(type<<8)|stream_read_char(demux->stream);//startpos lo | |
155 // printf("\r[%02X][%04X]",c,type); | |
1 | 156 len-=3; |
7671 | 157 if((aid&0xE0)==0xA0 && len>=3){ |
158 unsigned char* hdr; | |
159 // save audio header as codecdata! | |
160 if(!((sh_audio_t*)(ds->sh))->codecdata_len){ | |
161 ((sh_audio_t*)(ds->sh))->codecdata=malloc(3); | |
162 ((sh_audio_t*)(ds->sh))->codecdata_len=3; | |
163 } | |
164 hdr=((sh_audio_t*)(ds->sh))->codecdata; | |
165 // read LPCM header: | |
166 // emphasis[1], mute[1], rvd[1], frame number[5]: | |
167 hdr[0]=stream_read_char(demux->stream); | |
168 // printf(" [%01X:%02d]",c>>5,c&31); | |
169 // quantization[2],freq[2],rvd[1],channels[3] | |
170 hdr[1]=stream_read_char(demux->stream); | |
171 // printf("[%01X:%01X] ",c>>4,c&15); | |
172 // dynamic range control (0x80=off): | |
173 hdr[2]=stream_read_char(demux->stream); | |
174 // printf("[%02X] ",c); | |
175 len-=3; | |
176 if(len<=0) mp_msg(MSGT_DEMUX,MSGL_V,"End of packet while searching for PCM header\n"); | |
1 | 177 } |
7671 | 178 // printf(" \n"); |
552 | 179 } // if(demux->audio->id==aid) |
180 | |
1567 | 181 } else mp_msg(MSGT_DEMUX,MSGL_V,"Unknown 0x1BD substream: 0x%02X \n",aid); |
552 | 182 |
183 } //if(id==0x1BD) | |
1 | 184 |
185 } else { | |
539 | 186 if(c!=0x0f){ |
1567 | 187 mp_msg(MSGT_DEMUX,MSGL_V," {ERROR5,c=%d} \n",c); |
539 | 188 return -1; // invalid packet !!!!!! |
189 } | |
1 | 190 } |
1567 | 191 if(mpeg_pts_error) mp_msg(MSGT_DEMUX,MSGL_V," {PTS_err:%d} \n",mpeg_pts_error); |
192 mp_dbg(MSGT_DEMUX,MSGL_DBG3," => len=%d\n",len); | |
1 | 193 |
501 | 194 // if(len<=0 || len>MAX_PS_PACKETSIZE) return -1; // Invalid packet size |
195 if(len<=0 || len>MAX_PS_PACKETSIZE){ | |
1567 | 196 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"Invalid PS data len: %d\n",len); |
501 | 197 return -1; // invalid packet !!!!!! |
198 } | |
1 | 199 |
200 if(id>=0x1C0 && id<=0x1DF){ | |
201 // mpeg audio | |
202 int aid=id-0x1C0; | |
1289 | 203 if(!demux->a_streams[aid]) new_sh_audio(demux,aid); |
1 | 204 if(demux->audio->id==-1) demux->audio->id=aid; |
205 if(demux->audio->id==aid){ | |
206 ds=demux->audio; | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
207 if(!ds->sh) ds->sh=demux->a_streams[aid]; |
1 | 208 } |
209 } else | |
210 if(id>=0x1E0 && id<=0x1EF){ | |
211 // mpeg video | |
212 int aid=id-0x1E0; | |
1289 | 213 if(!demux->v_streams[aid]) new_sh_video(demux,aid); |
1 | 214 if(demux->video->id==-1) demux->video->id=aid; |
426 | 215 if(demux->video->id==aid){ |
216 ds=demux->video; | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
217 if(!ds->sh) ds->sh=demux->v_streams[aid]; |
426 | 218 } |
1 | 219 } |
220 | |
221 if(ds){ | |
1567 | 222 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_MPG: Read %d data bytes from packet %04X\n",len,id); |
1 | 223 // printf("packet start = 0x%X \n",stream_tell(demux->stream)-packet_start_pos); |
1735 | 224 ds_read_packet(ds,demux->stream,len,pts/90000.0f,demux->filepos,0); |
554 | 225 // if(ds==demux->sub) parse_dvdsub(ds->last->buffer,ds->last->len); |
1 | 226 return 1; |
227 } | |
1567 | 228 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"DEMUX_MPG: Skipping %d data bytes from packet %04X\n",len,id); |
536 | 229 if(len<=2356) stream_skip(demux->stream,len); |
1 | 230 return 0; |
231 } | |
232 | |
587
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
233 int num_elementary_packets100=0; |
8511095c5283
stage#1 completed: c files no more included from mplayer.c
arpi_esp
parents:
554
diff
changeset
|
234 int num_elementary_packets101=0; |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8254
diff
changeset
|
235 int num_elementary_packets12x=0; |
1162 | 236 int num_elementary_packets1B6=0; |
1338
345585097137
mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents:
1331
diff
changeset
|
237 int num_elementary_packetsPES=0; |
9824 | 238 int num_h264_slice=0; //combined slice |
239 int num_h264_dpa=0; //DPA Slice | |
240 int num_h264_dpb=0; //DPB Slice | |
241 int num_h264_dpc=0; //DPC Slice | |
242 int num_h264_idr=0; //IDR Slice | |
243 int num_h264_sps=0; | |
244 int num_h264_pps=0; | |
245 | |
4711 | 246 int num_mp3audio_packets=0; |
1 | 247 |
248 int demux_mpg_es_fill_buffer(demuxer_t *demux){ | |
249 // Elementary video stream | |
250 if(demux->stream->eof) return 0; | |
251 demux->filepos=stream_tell(demux->stream); | |
1735 | 252 ds_read_packet(demux->video,demux->stream,STREAM_BUFFER_SIZE,0,demux->filepos,0); |
1 | 253 return 1; |
254 } | |
255 | |
256 int demux_mpg_fill_buffer(demuxer_t *demux){ | |
257 unsigned int head=0; | |
258 int skipped=0; | |
5570
3a8d8c51355a
max_packs increased for some dvd with too many audio/sub
arpi
parents:
4711
diff
changeset
|
259 int max_packs=256; // 512kbyte |
1 | 260 int ret=0; |
261 | |
262 // System stream | |
263 do{ | |
264 demux->filepos=stream_tell(demux->stream); | |
265 head=stream_read_dword(demux->stream); | |
547 | 266 if((head&0xFFFFFF00)!=0x100){ |
267 // sync... | |
268 demux->filepos-=skipped; | |
269 while(1){ | |
536 | 270 int c=stream_read_char(demux->stream); |
271 if(c<0) break; //EOF | |
272 head<<=8; | |
273 if(head!=0x100){ | |
274 head|=c; | |
4711 | 275 if(mp_check_mp3_header(head)) ++num_mp3audio_packets; |
536 | 276 ++skipped; //++demux->filepos; |
277 continue; | |
278 } | |
279 head|=c; | |
280 break; | |
547 | 281 } |
282 demux->filepos+=skipped; | |
1 | 283 } |
284 if(stream_eof(demux->stream)) break; | |
285 // sure: head=0x000001XX | |
1567 | 286 mp_dbg(MSGT_DEMUX,MSGL_DBG4,"*** head=0x%X\n",head); |
1 | 287 if(demux->synced==0){ |
3770 | 288 if(head==0x1BA) demux->synced=1; //else |
289 // if(head==0x1BD || (head>=0x1C0 && head<=0x1EF)) demux->synced=3; // PES? | |
1 | 290 } else |
291 if(demux->synced==1){ | |
929 | 292 if(head==0x1BB || head==0x1BD || (head>=0x1C0 && head<=0x1EF)){ |
1 | 293 demux->synced=2; |
1567 | 294 mp_msg(MSGT_DEMUX,MSGL_V,"system stream synced at 0x%X (%d)!\n",demux->filepos,demux->filepos); |
536 | 295 num_elementary_packets100=0; // requires for re-sync! |
296 num_elementary_packets101=0; // requires for re-sync! | |
1 | 297 } else demux->synced=0; |
298 } // else | |
3255
ee28577dad02
combined PS/PES sync to allow .VDR playback from stdin
arpi
parents:
2555
diff
changeset
|
299 if(demux->synced>=2){ |
1 | 300 ret=demux_mpg_read_packet(demux,head); |
301 if(!ret) | |
302 if(--max_packs==0){ | |
303 demux->stream->eof=1; | |
1973
5216f108cb4f
all error/warn/info messages moved to help_mp-en.h for translation
arpi
parents:
1735
diff
changeset
|
304 mp_msg(MSGT_DEMUX,MSGL_ERR,MSGTR_DoesntContainSelectedStream); |
1 | 305 return 0; |
306 } | |
3255
ee28577dad02
combined PS/PES sync to allow .VDR playback from stdin
arpi
parents:
2555
diff
changeset
|
307 if(demux->synced==3) demux->synced=(ret==1)?2:0; // PES detect |
1 | 308 } else { |
309 if(head>=0x100 && head<0x1B0){ | |
1162 | 310 if(head==0x100) ++num_elementary_packets100; else |
9069
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8254
diff
changeset
|
311 if(head==0x101) ++num_elementary_packets101; else |
0d2b25a821c9
raw mpeg4-es support (you need to set -fps manually!)
arpi
parents:
8254
diff
changeset
|
312 if(head>=0x120 && head<=0x12F) ++num_elementary_packets12x; |
9824 | 313 |
314 if((head&~0x60) == 0x101) ++num_h264_slice; else | |
315 if((head&~0x60) == 0x102) ++num_h264_dpa; else | |
316 if((head&~0x60) == 0x103) ++num_h264_dpb; else | |
317 if((head&~0x60) == 0x104) ++num_h264_dpc; else | |
318 if((head&~0x60) == 0x105 && head != 0x105) ++num_h264_idr; else | |
319 if((head&~0x60) == 0x107 && head != 0x107) ++num_h264_sps; else | |
320 if((head&~0x60) == 0x108 && head != 0x108) ++num_h264_pps; | |
321 | |
1567 | 322 mp_msg(MSGT_DEMUX,MSGL_DBG3,"Opps... elementary video packet found: %03X\n",head); |
1162 | 323 } else |
4711 | 324 if((head>=0x1C0 && head<0x1F0) || head==0x1BD){ |
1338
345585097137
mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents:
1331
diff
changeset
|
325 ++num_elementary_packetsPES; |
1567 | 326 mp_msg(MSGT_DEMUX,MSGL_DBG3,"Opps... PES packet found: %03X\n",head); |
1338
345585097137
mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents:
1331
diff
changeset
|
327 } else |
1162 | 328 if(head==0x1B6) ++num_elementary_packets1B6; |
1 | 329 #if 1 |
1338
345585097137
mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents:
1331
diff
changeset
|
330 if( ( (num_elementary_packets100>50 && num_elementary_packets101>50) || |
345585097137
mpeg PES steram support (only 1E0 & 1C0 packets, no 1BA/1BB headers)
arpi
parents:
1331
diff
changeset
|
331 (num_elementary_packetsPES>50) ) && skipped>4000000){ |
1567 | 332 mp_msg(MSGT_DEMUX,MSGL_V,"sync_mpeg_ps: seems to be ES/PES stream...\n"); |
1 | 333 demux->stream->eof=1; |
334 break; | |
335 } | |
4711 | 336 if(num_mp3audio_packets>100 && num_elementary_packets100<10){ |
337 mp_msg(MSGT_DEMUX,MSGL_V,"sync_mpeg_ps: seems to be MP3 stream...\n"); | |
338 demux->stream->eof=1; | |
339 break; | |
340 } | |
1 | 341 #endif |
342 } | |
343 } while(ret!=1); | |
1567 | 344 mp_dbg(MSGT_DEMUX,MSGL_DBG2,"demux: %d bad bytes skipped\n",skipped); |
1 | 345 if(demux->stream->eof){ |
1567 | 346 mp_msg(MSGT_DEMUX,MSGL_V,"MPEG Stream reached EOF\n"); |
1 | 347 return 0; |
348 } | |
349 return 1; | |
350 } | |
351 | |
8123
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7671
diff
changeset
|
352 extern void resync_audio_stream(sh_audio_t *sh_audio); |
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7671
diff
changeset
|
353 extern void skip_audio_frame(sh_audio_t *sh_audio); |
9fc45fe0d444
*HUGE* set of compiler warning fixes, unused variables removal
arpi
parents:
7671
diff
changeset
|
354 |
1466 | 355 void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){ |
356 demux_stream_t *d_audio=demuxer->audio; | |
357 demux_stream_t *d_video=demuxer->video; | |
358 sh_audio_t *sh_audio=d_audio->sh; | |
359 sh_video_t *sh_video=d_video->sh; | |
360 | |
361 //================= seek in MPEG ========================== | |
1628
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
362 off_t newpos=(flags&1)?demuxer->movi_start:demuxer->filepos; |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
363 |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
364 if(flags&2){ |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
365 // float seek 0..1 |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
366 newpos+=(demuxer->movi_end-demuxer->movi_start)*rel_seek_secs; |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
367 } else { |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
368 // time seek (secs) |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
369 if(!sh_video->i_bps) // unspecified or VBR |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
370 newpos+=2324*75*rel_seek_secs; // 174.3 kbyte/sec |
1466 | 371 else |
1628
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
372 newpos+=sh_video->i_bps*rel_seek_secs; |
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
373 } |
1466 | 374 |
4391
6394c1e9e770
DVD start position handling changed (progbar/eta fix)
arpi
parents:
3975
diff
changeset
|
375 if(newpos<demuxer->movi_start){ |
6394c1e9e770
DVD start position handling changed (progbar/eta fix)
arpi
parents:
3975
diff
changeset
|
376 if(demuxer->stream->type!=STREAMTYPE_VCD) demuxer->movi_start=0; // for VCD |
6394c1e9e770
DVD start position handling changed (progbar/eta fix)
arpi
parents:
3975
diff
changeset
|
377 if(newpos<demuxer->movi_start) newpos=demuxer->movi_start; |
6394c1e9e770
DVD start position handling changed (progbar/eta fix)
arpi
parents:
3975
diff
changeset
|
378 } |
1628
bd1ef18cdf33
seeking flags implemented: 0x1=rel/abs and 0x2=time/percent
arpi
parents:
1597
diff
changeset
|
379 |
1466 | 380 #ifdef _LARGEFILE_SOURCE |
381 newpos&=~((long long)STREAM_BUFFER_SIZE-1); /* sector boundary */ | |
382 #else | |
383 newpos&=~(STREAM_BUFFER_SIZE-1); /* sector boundary */ | |
384 #endif | |
385 stream_seek(demuxer->stream,newpos); | |
386 | |
387 // re-sync video: | |
388 videobuf_code_len=0; // reset ES stream buffer | |
389 | |
390 ds_fill_buffer(d_video); | |
391 if(sh_audio){ | |
392 ds_fill_buffer(d_audio); | |
393 resync_audio_stream(sh_audio); | |
394 } | |
395 | |
396 while(1){ | |
397 int i; | |
398 if(sh_audio && !d_audio->eof && d_video->pts && d_audio->pts){ | |
399 float a_pts=d_audio->pts; | |
400 a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps; | |
401 if(d_video->pts>a_pts){ | |
402 skip_audio_frame(sh_audio); // sync audio | |
403 continue; | |
404 } | |
405 } | |
406 i=sync_video_packet(d_video); | |
407 if(i==0x1B3 || i==0x1B8) break; // found it! | |
408 if(!i || !skip_video_packet(d_video)) break; // EOF? | |
409 } | |
410 } | |
411 | |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
412 int demux_mpg_control(demuxer_t *demuxer,int cmd, void *arg){ |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8208
diff
changeset
|
413 /* demux_stream_t *d_audio=demuxer->audio;*/ |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
414 demux_stream_t *d_video=demuxer->video; |
8254
772d6d27fd66
warning patch by (Dominik Mierzejewski <dominik at rangers dot eu dot org>)
michael
parents:
8208
diff
changeset
|
415 /* sh_audio_t *sh_audio=d_audio->sh;*/ |
8208
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
416 sh_video_t *sh_video=d_video->sh; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
417 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
418 switch(cmd) { |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
419 case DEMUXER_CTRL_GET_TIME_LENGTH: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
420 if(!sh_video->i_bps) // unspecified or VBR |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
421 return DEMUXER_CTRL_DONTKNOW; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
422 *((unsigned long *)arg)=(demuxer->movi_end-demuxer->movi_start)/sh_video->i_bps; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
423 return DEMUXER_CTRL_GUESS; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
424 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
425 case DEMUXER_CTRL_GET_PERCENT_POS: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
426 if (demuxer->movi_end==demuxer->movi_start) |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
427 return DEMUXER_CTRL_DONTKNOW; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
428 *((int *)arg)=(int)((demuxer->filepos-demuxer->movi_start)/((demuxer->movi_end-demuxer->movi_start)/100)); |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
429 return DEMUXER_CTRL_OK; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
430 |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
431 default: |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
432 return DEMUXER_CTRL_NOTIMPL; |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
433 } |
ae5a2ae1c349
demuxer_control(), percent position and time length query implemented in
arpi
parents:
8123
diff
changeset
|
434 } |