[Mplayer-cvslog] CVS: main mencoder.c,1.143,1.144 mplayer.c,1.535,1.536
Arpi of Ize
arpi at mplayerhq.hu
Fri Aug 2 19:44:18 CEST 2002
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv23934
Modified Files:
mencoder.c mplayer.c
Log Message:
count blocks by rounded-up chunksizes instead of chunks -
we need full emulation of dshow avi demuxer bugs :(
fixes silly nandub-style a-v delaying in avi with vbr mp3...
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- mencoder.c 1 Aug 2002 08:39:33 -0000 1.143
+++ mencoder.c 2 Aug 2002 17:44:15 -0000 1.144
@@ -1071,7 +1071,7 @@
if(pts_from_bps){
unsigned int samples=(sh_audio->audio.dwSampleSize)?
((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
- (d_audio->pack_no); // <- used for VBR audio
+ (d_audio->block_no); // <- used for VBR audio
// printf("samples=%d \n",samples);
a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
delay_corrected=1;
@@ -1119,7 +1119,7 @@
float len=(demuxer->movi_end-demuxer->movi_start);
float p=len>1000 ? (float)(demuxer->filepos-demuxer->movi_start) / len : 0;
if(!len && sh_audio && sh_audio->audio.dwLength>100){
- p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->pack_no)
+ p=(sh_audio->audio.dwSampleSize? ds_tell(sh_audio->ds)/sh_audio->audio.dwSampleSize : sh_audio->ds->block_no)
/ (float)(sh_audio->audio.dwLength);
}
#if 0
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.535
retrieving revision 1.536
diff -u -r1.535 -r1.536
--- mplayer.c 30 Jul 2002 11:46:29 -0000 1.535
+++ mplayer.c 2 Aug 2002 17:44:15 -0000 1.536
@@ -1769,7 +1769,7 @@
// PTS = sample_no / samplerate
unsigned int samples=(sh_audio->audio.dwSampleSize)?
((ds_tell(d_audio)-sh_audio->a_in_buffer_len)/sh_audio->audio.dwSampleSize) :
- (d_audio->pack_no); // <- used for VBR audio
+ (d_audio->block_no); // <- used for VBR audio
samples+=sh_audio->audio.dwStart; // offset
a_pts=samples*(float)sh_audio->audio.dwScale/(float)sh_audio->audio.dwRate;
delay_corrected=1;
More information about the MPlayer-cvslog
mailing list