actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Seek sync fixes.

Browse Source
This commit is contained in:
Glenn Maynard
2003-10-02 05:58:01 +00:00
parent 036fd2beb9
commit 43505fb17b
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSoundReader_MP3.cpp
+17 -7
View File
@@ -498,12 +498,15 @@ int RageSoundReader_MP3::resync()
/* Seek backwards up to 4k. */
int origpos = mad->inbuf_filepos;
int seekpos = origpos - 1024*4;
if(seekpos < 0) seekpos = 0;
seek_stream_to_byte( seekpos );
if( seekpos < 0 )
seekpos = 0;
seek_stream_to_byte( seekpos );
/* We're already synced if we're at the beginning. */
if( mad->inbuf_filepos == 0 )
return 1;
/* ... but we need to resync anyway; even if seekpos < 0, origpos might
* not have been. */
// if( mad->inbuf_filepos == 0 )
// return 1;
/* Agh. This is annoying. We want to decode enough so that the next frame
* read will be the first frame after the current file pointer. If we just
@@ -825,15 +828,22 @@ int RageSoundReader_MP3::SetPosition_hard( int ms )
mad->outleft = 0;
synth_output();
/* Skip (mad->Timer - desired) worth of frames in the output to line up. */
mad_timer_t skip = mad->Timer;
mad_timer_sub( &skip, desired );
/* mad->Timer is the timestamp of the next frame. Subtract the frame length
* to find out the timestamp of the frame we just synthed. */
mad_timer_t ts = mad->Timer;
mad_timer_sub( &ts, mad->framelength );
/* We just synthed data starting at ts, containing desired offset.
* Skip (desired - ts) worth of frames in the output to line up. */
mad_timer_t skip = desired;
mad_timer_sub( &skip, ts );
int samples = mad_timer_count( skip, (mad_units) SampleRate );
/* Skip 'samples' samples; each sample is 2 * channels bytes, since
* we're currently always using AUDIO_S16SYS. */
mad->outpos = samples * 2 * this->Channels;
mad->outleft -= samples * 2 * this->Channels;
return ms;
}