[Mplayer-cvslog] CVS: main demux_asf.c,1.12,1.13 demux_avi.c,1.13,1.14 demux_mpg.c,1.25,1.26 mplayer.c,1.207,1.208 seek.c,1.7,1.8
Arpi of Ize
arpi at mplayer.dev.hu
Wed Aug 8 21:37:47 CEST 2001
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv26453
Modified Files:
demux_asf.c demux_avi.c demux_mpg.c mplayer.c seek.c
Log Message:
format-specific seeking code moved to demuxer_ stuff
Index: demux_asf.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_asf.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- demux_asf.c 1 Aug 2001 09:14:02 -0000 1.12
+++ demux_asf.c 8 Aug 2001 19:37:45 -0000 1.13
@@ -312,3 +312,59 @@
printf("%08X: UNKNOWN TYPE %02X %02X %02X %02X %02X...\n",demux->filepos,asf_packet[0],asf_packet[1],asf_packet[2],asf_packet[3],asf_packet[4]);
return 0;
}
+
+
+#include "wine/mmreg.h"
+#include "wine/avifmt.h"
+#include "wine/vfw.h"
+
+#include "codec-cfg.h"
+#include "stheader.h"
+
+
+void demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags){
+ demux_stream_t *d_audio=demuxer->audio;
+ demux_stream_t *d_video=demuxer->video;
+ sh_audio_t *sh_audio=d_audio->sh;
+// sh_video_t *sh_video=d_video->sh;
+
+ //FIXME: OFF_T - didn't test ASF case yet (don't have a large asf...)
+ //FIXME: reports good or bad to steve at daviesfam.org please
+
+ //================= seek in ASF ==========================
+ float p_rate=10; // packets / sec
+ off_t rel_seek_packs=rel_seek_secs*p_rate; // FIXME: int may be enough?
+ off_t rel_seek_bytes=rel_seek_packs*asf_packetsize;
+ off_t newpos;
+ //printf("ASF: packs: %d duration: %d \n",(int)fileh.packets,*((int*)&fileh.duration));
+// printf("ASF_seek: %d secs -> %d packs -> %d bytes \n",
+// rel_seek_secs,rel_seek_packs,rel_seek_bytes);
+ newpos=demuxer->filepos+rel_seek_bytes;
+ if(newpos<0 || newpos<demuxer->movi_start) newpos=demuxer->movi_start;
+// printf("\r -- asf: newpos=%d -- \n",newpos);
+ stream_seek(demuxer->stream,newpos);
+
+ ds_fill_buffer(d_video);
+ if(sh_audio){
+ ds_fill_buffer(d_audio);
+ resync_audio_stream(sh_audio);
+ }
+
+ while(1){
+ if(sh_audio && !d_audio->eof){
+ float a_pts=d_audio->pts;
+ a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ // sync audio:
+ if (d_video->pts > a_pts){
+ skip_audio_frame(sh_audio);
+// if(!ds_fill_buffer(d_audio)) sh_audio=NULL; // skip audio. EOF?
+ continue;
+ }
+ }
+ if(d_video->flags&1) break; // found a keyframe!
+ if(!ds_fill_buffer(d_video)) break; // skip frame. EOF?
+ }
+
+
+}
+
Index: demux_avi.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_avi.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- demux_avi.c 8 Aug 2001 15:20:40 -0000 1.13
+++ demux_avi.c 8 Aug 2001 19:37:45 -0000 1.14
@@ -355,4 +355,146 @@
return 1;
}
+extern float initial_pts_delay;
+
+void demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags){
+ demux_stream_t *d_audio=demuxer->audio;
+ demux_stream_t *d_video=demuxer->video;
+ sh_audio_t *sh_audio=d_audio->sh;
+ sh_video_t *sh_video=d_video->sh;
+ float skip_audio_secs=0;
+
+ //FIXME: OFF_T - Didn't check AVI case yet (avi files can't be >2G anyway?)
+ //================= seek in AVI ==========================
+ int rel_seek_frames=rel_seek_secs*sh_video->fps;
+ int curr_audio_pos=0;
+ int audio_chunk_pos=-1;
+ int video_chunk_pos=d_video->pos;
+ int i;
+
+ skip_video_frames=0;
+ avi_audio_pts=0;
+
+ // find nearest video keyframe chunk pos:
+ if(rel_seek_frames>0){
+ // seek forward
+ while(video_chunk_pos<demuxer->idx_size){
+ int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
+ if(avi_stream_id(id)==d_video->id){ // video frame
+ if((--rel_seek_frames)<0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
+// ++skip_audio_bytes;
+ }
+ ++video_chunk_pos;
+ }
+ } else {
+ // seek backward
+ while(video_chunk_pos>=0){
+ int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
+ if(avi_stream_id(id)==d_video->id){ // video frame
+ if((++rel_seek_frames)>0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
+// --skip_audio_bytes;
+ }
+ --video_chunk_pos;
+ }
+ }
+ demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=video_chunk_pos;
+// printf("%d frames skipped\n",skip_audio_bytes);
+
+ // re-calc video pts:
+ d_video->pack_no=0;
+ for(i=0;i<video_chunk_pos;i++){
+ int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
+ if(avi_stream_id(id)==d_video->id) ++d_video->pack_no;
+ }
+ sh_video->num_frames=d_video->pack_no;
+ avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
+
+ if(sh_audio){
+ int i;
+ int apos=0;
+ int last=0;
+ int len=0;
+ int skip_audio_bytes=0;
+
+ // calc new audio position in audio stream: (using avg.bps value)
+ curr_audio_pos=(avi_video_pts) * sh_audio->wf->nAvgBytesPerSec;
+ if(curr_audio_pos<0)curr_audio_pos=0;
+#if 1
+ curr_audio_pos&=~15; // requires for PCM formats!!!
+#else
+ curr_audio_pos/=sh_audio->wf->nBlockAlign;
+ curr_audio_pos*=sh_audio->wf->nBlockAlign;
+ demuxer->audio_seekable=1;
+#endif
+
+ // find audio chunk pos:
+ for(i=0;i<video_chunk_pos;i++){
+ int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
+ if(avi_stream_id(id)==d_audio->id){
+ len=((AVIINDEXENTRY *)demuxer->idx)[i].dwChunkLength;
+ last=i;
+ if(apos<=curr_audio_pos && curr_audio_pos<(apos+len)){
+ if(verbose)printf("break;\n");
+ break;
+ }
+ apos+=len;
+ }
+ }
+ if(verbose)printf("XXX i=%d last=%d apos=%d curr_audio_pos=%d \n",
+ i,last,apos,curr_audio_pos);
+// audio_chunk_pos=last; // maybe wrong (if not break; )
+ audio_chunk_pos=i; // maybe wrong (if not break; )
+ skip_audio_bytes=curr_audio_pos-apos;
+
+ // update stream position:
+ d_audio->pos=audio_chunk_pos;
+ d_audio->dpos=apos;
+ d_audio->pts=initial_pts_delay+(float)apos/(float)sh_audio->wf->nAvgBytesPerSec;
+ demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=audio_chunk_pos;
+
+ if(!(sh_audio->codec->flags&CODECS_FLAG_SEEKABLE)){
+#if 0
+// curr_audio_pos=apos; // selected audio codec can't seek in chunk
+ skip_audio_secs=(float)skip_audio_bytes/(float)sh_audio->wf->nAvgBytesPerSec;
+ //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",skip_audio_bytes,skip_audio_secs);
+ skip_audio_bytes=0;
+#else
+ int d=skip_audio_bytes % sh_audio->wf->nBlockAlign;
+ skip_audio_bytes-=d;
+// curr_audio_pos-=d;
+ skip_audio_secs=(float)d/(float)sh_audio->wf->nAvgBytesPerSec;
+ //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",d,skip_audio_secs);
+#endif
+ }
+ // now: audio_chunk_pos=pos in index
+ // skip_audio_bytes=bytes to skip from that chunk
+ // skip_audio_secs=time to play audio before video (if can't skip)
+
+ // calc skip_video_frames & adjust video pts counter:
+// i=last;
+ for(i=demuxer->idx_pos;i<video_chunk_pos;i++){
+ int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
+ if(avi_stream_id(id)==d_video->id) ++skip_video_frames;
+ }
+ // requires for correct audio pts calculation (demuxer):
+ avi_video_pts-=skip_video_frames*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
+
+ if(verbose) printf("SEEK: idx=%d (a:%d v:%d) v.skip=%d a.skip=%d/%4.3f \n",
+ demuxer->idx_pos,audio_chunk_pos,video_chunk_pos,
+ skip_video_frames,skip_audio_bytes,skip_audio_secs);
+
+ if(skip_audio_bytes){
+ demux_read_data(d_audio,NULL,skip_audio_bytes);
+ //d_audio->pts=0; // PTS is outdated because of the raw data skipping
+ }
+ resync_audio_stream(sh_audio);
+
+ sh_audio->timer=-skip_audio_secs;
+
+ }
+
+
+}
+
+
Index: demux_mpg.c
===================================================================
RCS file: /cvsroot/mplayer/main/demux_mpg.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- demux_mpg.c 1 Aug 2001 09:14:02 -0000 1.25
+++ demux_mpg.c 8 Aug 2001 19:37:45 -0000 1.26
@@ -10,6 +10,7 @@
#include "dvdauth.h"
#include "stream.h"
#include "demuxer.h"
+#include "parse_es.h"
//#define MAX_PS_PACKETSIZE 2048
#define MAX_PS_PACKETSIZE (224*1024)
@@ -32,8 +33,14 @@
//static unsigned int packet_start_pos=0;
-extern void *new_sh_audio(demuxer_t *demux,int id);
-extern void *new_sh_video(demuxer_t *demux,int id);
+//extern void *new_sh_audio(demuxer_t *demux,int id);
+//extern void *new_sh_video(demuxer_t *demux,int id);
+#include "wine/mmreg.h"
+#include "wine/avifmt.h"
+#include "wine/vfw.h"
+
+#include "codec-cfg.h"
+#include "stheader.h"
static int demux_mpg_read_packet(demuxer_t *demux,int id){
int d;
@@ -332,5 +339,55 @@
return 0;
}
return 1;
+}
+
+extern off_t seek_to_byte;
+
+void demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags){
+ demux_stream_t *d_audio=demuxer->audio;
+ demux_stream_t *d_video=demuxer->video;
+ sh_audio_t *sh_audio=d_audio->sh;
+ sh_video_t *sh_video=d_video->sh;
+
+ //================= seek in MPEG ==========================
+ off_t newpos;
+ if(!sh_video->i_bps) // unspecified?
+ newpos=demuxer->filepos+2324*75*rel_seek_secs; // 174.3 kbyte/sec
+ else
+ newpos=demuxer->filepos+(sh_video->i_bps)*rel_seek_secs;
+
+ if(newpos<seek_to_byte) newpos=seek_to_byte; // for VCD
+#ifdef _LARGEFILE_SOURCE
+ newpos&=~((long long)STREAM_BUFFER_SIZE-1); /* sector boundary */
+#else
+ newpos&=~(STREAM_BUFFER_SIZE-1); /* sector boundary */
+#endif
+ stream_seek(demuxer->stream,newpos);
+
+ // re-sync video:
+ videobuf_code_len=0; // reset ES stream buffer
+
+ ds_fill_buffer(d_video);
+ if(sh_audio){
+ ds_fill_buffer(d_audio);
+ resync_audio_stream(sh_audio);
+ }
+
+ while(1){
+ int i;
+ if(sh_audio && !d_audio->eof && d_video->pts && d_audio->pts){
+ float a_pts=d_audio->pts;
+ a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
+ if(d_video->pts>a_pts){
+ skip_audio_frame(sh_audio); // sync audio
+ continue;
+ }
+ }
+ i=sync_video_packet(d_video);
+ if(i==0x1B3 || i==0x1B8) break; // found it!
+ if(!i || !skip_video_packet(d_video)) break; // EOF?
+ }
+
+
}
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -r1.207 -r1.208
--- mplayer.c 8 Aug 2001 13:34:08 -0000 1.207
+++ mplayer.c 8 Aug 2001 19:37:45 -0000 1.208
@@ -1145,13 +1145,13 @@
float x=(float)(sh_audio->audio.dwInitialFrames-sh_video->video.dwInitialFrames)*sh_video->frametime;
// audio_delay-=x;
if(verbose) printf("AVI Initial frame delay: %5.3f\n",x);
+ delay_corrected=0; // has to correct PTS diffs
}
if(verbose){
// printf("v: audio_delay=%5.3f buffer_delay=%5.3f a_pts=%5.3f sh_audio->timer=%5.3f\n",
// audio_delay,audio_buffer_delay,a_pts,sh_audio->timer);
printf("START: a_pts=%5.3f v_pts=%5.3f \n",d_audio->pts,d_video->pts);
}
- delay_corrected=0; // has to correct PTS diffs
d_video->pts=0;d_audio->pts=0; // PTS is outdated now!
} else {
pts_from_bps=0; // it must be 0 for mpeg/asf !
@@ -1439,7 +1439,7 @@
// PTS = (audio position)/(bytes per sec)
// a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
a_pts=(ds_tell(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->wf->nAvgBytesPerSec;
- delay_corrected=1; // hack
+// delay_corrected=1; // hack
v_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
if(verbose)printf("%5.3f|",v_pts-d_video->pts);
} else {
@@ -1759,7 +1759,8 @@
seek_to_sec = NULL;
}
- if(rel_seek_secs)
+if(rel_seek_secs){
+ current_module="seek";
if(demux_seek(demuxer,rel_seek_secs,0)){
// success:
@@ -1776,9 +1777,8 @@
fflush(stdout);
if(sh_audio){
- current_module="audio_reset";
+ current_module="seek_audio_reset";
audio_out->reset(); // stop audio, throwing away buffered data
- current_module=NULL;
}
#ifdef USE_OSD
@@ -1801,7 +1801,9 @@
}
rel_seek_secs=0;
-
+ current_module=NULL;
+}
+
//================= Update OSD ====================
#ifdef USE_OSD
if(osd_level>=2){
Index: seek.c
===================================================================
RCS file: /cvsroot/mplayer/main/seek.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- seek.c 7 Aug 2001 20:53:13 -0000 1.7
+++ seek.c 8 Aug 2001 19:37:45 -0000 1.8
@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <unistd.h>
-extern int verbose; // defined in mplayer.c
+//extern int verbose; // defined in mplayer.c
#include "config.h"
@@ -17,266 +17,65 @@
#include "codec-cfg.h"
#include "stheader.h"
-extern void resync_audio_stream(sh_audio_t *sh_audio);
-extern void skip_audio_frame(sh_audio_t *sh_audio);
+//extern void resync_audio_stream(sh_audio_t *sh_audio);
+//extern void skip_audio_frame(sh_audio_t *sh_audio);
-extern int asf_packetsize; // for seeking
+//extern int asf_packetsize; // for seeking
-extern float avi_audio_pts;
-extern float avi_video_pts;
+//extern float avi_audio_pts;
+//extern float avi_video_pts;
//extern float avi_video_ftime;
-extern int skip_video_frames;
-extern float initial_pts_delay;
-extern int seek_to_byte;
-extern char* current_module; // for debugging
+//extern int skip_video_frames;
+//extern int seek_to_byte;
+//extern char* current_module; // for debugging
// flags:
// 0x1 - absolute/relative
// 0x2 - keyframe/hard
+int demux_seek_avi(demuxer_t *demuxer,float rel_seek_secs,int flags);
+int demux_seek_asf(demuxer_t *demuxer,float rel_seek_secs,int flags);
+int demux_seek_mpg(demuxer_t *demuxer,float rel_seek_secs,int flags);
+
int demux_seek(demuxer_t *demuxer,float rel_seek_secs,int flags){
demux_stream_t *d_audio=demuxer->audio;
demux_stream_t *d_video=demuxer->video;
sh_audio_t *sh_audio=d_audio->sh;
sh_video_t *sh_video=d_video->sh;
- float skip_audio_secs=0;
+// float skip_audio_secs=0;
if(demuxer->file_format==DEMUXER_TYPE_AVI && demuxer->idx_size<=0){
printf("Can't seek in raw .AVI streams! (index required, try with the -idx switch!) \n");
return 0;
}
- current_module="seek";
+// current_module="seek";
// clear demux buffers:
if(sh_audio){ ds_free_packs(d_audio);sh_audio->a_buffer_len=0;}
ds_free_packs(d_video);
demuxer->stream->eof=0; // clear eof flag
+
+ if(sh_audio) sh_audio->timer=0;
+ sh_video->timer=0; // !!!!!!
// printf("sh_audio->a_buffer_len=%d \n",sh_audio->a_buffer_len);
switch(demuxer->file_format){
- //FIXME: OFF_T - Didn't check AVI case yet (avi files can't be >2G anyway?)
- case DEMUXER_TYPE_AVI: {
- //================= seek in AVI ==========================
- int rel_seek_frames=rel_seek_secs*sh_video->fps;
- int curr_audio_pos=0;
- int audio_chunk_pos=-1;
- int video_chunk_pos=d_video->pos;
- int i;
-
- skip_video_frames=0;
- avi_audio_pts=0;
+ case DEMUXER_TYPE_AVI:
+ demux_seek_avi(demuxer,rel_seek_secs,flags); break;
- // find nearest video keyframe chunk pos:
- if(rel_seek_frames>0){
- // seek forward
- while(video_chunk_pos<demuxer->idx_size){
- int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
- if(avi_stream_id(id)==d_video->id){ // video frame
- if((--rel_seek_frames)<0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
-// ++skip_audio_bytes;
- }
- ++video_chunk_pos;
- }
- } else {
- // seek backward
- while(video_chunk_pos>=0){
- int id=((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].ckid;
- if(avi_stream_id(id)==d_video->id){ // video frame
- if((++rel_seek_frames)>0 && ((AVIINDEXENTRY *)demuxer->idx)[video_chunk_pos].dwFlags&AVIIF_KEYFRAME) break;
-// --skip_audio_bytes;
- }
- --video_chunk_pos;
- }
- }
- demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=video_chunk_pos;
-// printf("%d frames skipped\n",skip_audio_bytes);
-
- // re-calc video pts:
- d_video->pack_no=0;
- for(i=0;i<video_chunk_pos;i++){
- int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
- if(avi_stream_id(id)==d_video->id) ++d_video->pack_no;
- }
- sh_video->num_frames=d_video->pack_no;
- avi_video_pts=d_video->pack_no*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
-
- if(sh_audio){
- int i;
- int apos=0;
- int last=0;
- int len=0;
- int skip_audio_bytes=0;
-
- // calc new audio position in audio stream: (using avg.bps value)
- curr_audio_pos=(avi_video_pts) * sh_audio->wf->nAvgBytesPerSec;
- if(curr_audio_pos<0)curr_audio_pos=0;
-#if 1
- curr_audio_pos&=~15; // requires for PCM formats!!!
-#else
- curr_audio_pos/=sh_audio->wf->nBlockAlign;
- curr_audio_pos*=sh_audio->wf->nBlockAlign;
- demuxer->audio_seekable=1;
-#endif
-
- // find audio chunk pos:
- for(i=0;i<video_chunk_pos;i++){
- int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
- if(avi_stream_id(id)==d_audio->id){
- len=((AVIINDEXENTRY *)demuxer->idx)[i].dwChunkLength;
- last=i;
- if(apos<=curr_audio_pos && curr_audio_pos<(apos+len)){
- if(verbose)printf("break;\n");
- break;
- }
- apos+=len;
- }
- }
- if(verbose)printf("XXX i=%d last=%d apos=%d curr_audio_pos=%d \n",
- i,last,apos,curr_audio_pos);
-// audio_chunk_pos=last; // maybe wrong (if not break; )
- audio_chunk_pos=i; // maybe wrong (if not break; )
- skip_audio_bytes=curr_audio_pos-apos;
-
- // update stream position:
- d_audio->pos=audio_chunk_pos;
- d_audio->dpos=apos;
- d_audio->pts=initial_pts_delay+(float)apos/(float)sh_audio->wf->nAvgBytesPerSec;
- demuxer->idx_pos_a=demuxer->idx_pos_v=demuxer->idx_pos=audio_chunk_pos;
-
- if(!(sh_audio->codec->flags&CODECS_FLAG_SEEKABLE)){
-#if 0
-// curr_audio_pos=apos; // selected audio codec can't seek in chunk
- skip_audio_secs=(float)skip_audio_bytes/(float)sh_audio->wf->nAvgBytesPerSec;
- //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",skip_audio_bytes,skip_audio_secs);
- skip_audio_bytes=0;
-#else
- int d=skip_audio_bytes % sh_audio->wf->nBlockAlign;
- skip_audio_bytes-=d;
-// curr_audio_pos-=d;
- skip_audio_secs=(float)d/(float)sh_audio->wf->nAvgBytesPerSec;
- //printf("Seek_AUDIO: %d bytes --> %5.3f secs\n",d,skip_audio_secs);
-#endif
- }
- // now: audio_chunk_pos=pos in index
- // skip_audio_bytes=bytes to skip from that chunk
- // skip_audio_secs=time to play audio before video (if can't skip)
-
- // calc skip_video_frames & adjust video pts counter:
-// i=last;
- for(i=demuxer->idx_pos;i<video_chunk_pos;i++){
- int id=((AVIINDEXENTRY *)demuxer->idx)[i].ckid;
- if(avi_stream_id(id)==d_video->id) ++skip_video_frames;
- }
- // requires for correct audio pts calculation (demuxer):
- avi_video_pts-=skip_video_frames*(float)sh_video->video.dwScale/(float)sh_video->video.dwRate;
-
- if(verbose) printf("SEEK: idx=%d (a:%d v:%d) v.skip=%d a.skip=%d/%4.3f \n",
- demuxer->idx_pos,audio_chunk_pos,video_chunk_pos,
- skip_video_frames,skip_audio_bytes,skip_audio_secs);
-
- if(skip_audio_bytes){
- demux_read_data(d_audio,NULL,skip_audio_bytes);
- //d_audio->pts=0; // PTS is outdated because of the raw data skipping
- }
- resync_audio_stream(sh_audio);
- }
-
- }
- break;
-
- //FIXME: OFF_T - didn't test ASF case yet (don't have a large asf...)
- //FIXME: reports good or bad to steve at daviesfam.org please
- case DEMUXER_TYPE_ASF: {
- //================= seek in ASF ==========================
- float p_rate=10; // packets / sec
- off_t rel_seek_packs=rel_seek_secs*p_rate; // FIXME: int may be enough?
- off_t rel_seek_bytes=rel_seek_packs*asf_packetsize;
- off_t newpos;
- //printf("ASF: packs: %d duration: %d \n",(int)fileh.packets,*((int*)&fileh.duration));
-// printf("ASF_seek: %d secs -> %d packs -> %d bytes \n",
-// rel_seek_secs,rel_seek_packs,rel_seek_bytes);
- newpos=demuxer->filepos+rel_seek_bytes;
- if(newpos<0 || newpos<demuxer->movi_start) newpos=demuxer->movi_start;
-// printf("\r -- asf: newpos=%d -- \n",newpos);
- stream_seek(demuxer->stream,newpos);
-
- ds_fill_buffer(d_video);
- if(sh_audio){
- ds_fill_buffer(d_audio);
- resync_audio_stream(sh_audio);
- }
-
- while(1){
- if(sh_audio && !d_audio->eof){
- float a_pts=d_audio->pts;
- a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
- // sync audio:
- if (d_video->pts > a_pts){
- skip_audio_frame(sh_audio);
-// if(!ds_fill_buffer(d_audio)) sh_audio=NULL; // skip audio. EOF?
- continue;
- }
- }
- if(d_video->flags&1) break; // found a keyframe!
- if(!ds_fill_buffer(d_video)) break; // skip frame. EOF?
- }
-
- }
- break;
+ case DEMUXER_TYPE_ASF:
+ demux_seek_asf(demuxer,rel_seek_secs,flags); break;
case DEMUXER_TYPE_MPEG_ES:
- case DEMUXER_TYPE_MPEG_PS: {
- //================= seek in MPEG ==========================
- off_t newpos;
- if(!sh_video->i_bps) // unspecified?
- newpos=demuxer->filepos+2324*75*rel_seek_secs; // 174.3 kbyte/sec
- else
- newpos=demuxer->filepos+(sh_video->i_bps)*rel_seek_secs;
-
- if(newpos<seek_to_byte) newpos=seek_to_byte;
-#ifdef _LARGEFILE_SOURCE
- newpos&=~((long long)STREAM_BUFFER_SIZE-1); /* sector boundary */
-#else
- newpos&=~(STREAM_BUFFER_SIZE-1); /* sector boundary */
-#endif
- stream_seek(demuxer->stream,newpos);
-
- // re-sync video:
- videobuf_code_len=0; // reset ES stream buffer
-
- ds_fill_buffer(d_video);
- if(sh_audio){
- ds_fill_buffer(d_audio);
- resync_audio_stream(sh_audio);
- }
-
- while(1){
- int i;
- if(sh_audio && !d_audio->eof && d_video->pts && d_audio->pts){
- float a_pts=d_audio->pts;
- a_pts+=(ds_tell_pts(d_audio)-sh_audio->a_in_buffer_len)/(float)sh_audio->i_bps;
- if(d_video->pts>a_pts){
- skip_audio_frame(sh_audio); // sync audio
- continue;
- }
- }
- i=sync_video_packet(d_video);
- if(i==0x1B3 || i==0x1B8) break; // found it!
- if(!i || !skip_video_packet(d_video)) break; // EOF?
- }
-
- }
- break;
+ case DEMUXER_TYPE_MPEG_PS:
+ demux_seek_mpg(demuxer,rel_seek_secs,flags); break;
} // switch(demuxer->file_format)
-
- if(sh_audio) sh_audio->timer=-skip_audio_secs;
- sh_video->timer=0; // !!!!!!
return 1;
}
More information about the MPlayer-cvslog
mailing list