diff options
| author | roman.artiukhin <bahusdrive@gmail.com> | 2023-08-21 12:57:27 +0300 |
|---|---|---|
| committer | Solomon Peachy <pizza@shaftnet.org> | 2023-08-28 14:04:56 -0400 |
| commit | 3883c978abdcb443ac6ca2b4a57d941c418e8b74 (patch) | |
| tree | 805cdb77bc69146b883617035121569a09d51665 | |
| parent | 8a22660770d3c0c713247ab8f2b7c08777affd9f (diff) | |
| download | rockbox-3883c978ab.tar.gz rockbox-3883c978ab.zip | |
Fix MP3 VBR seek jumps in wrong direction for long files
Fix jumps in the wrong direction by seeking relative to the current position
Change-Id: I5ca3d5bcb256dd8fb1cd17e6149878190571d359
| -rw-r--r-- | lib/rbcodec/codecs/mpa.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/rbcodec/codecs/mpa.c b/lib/rbcodec/codecs/mpa.c index bafed3970c..c5d47a6791 100644 --- a/lib/rbcodec/codecs/mpa.c +++ b/lib/rbcodec/codecs/mpa.c @@ -192,12 +192,20 @@ static int get_file_pos(int newtime) pos = cur_toc * toc_sizestep; /* Interpolate between this TOC mark and the next TOC mark */ - newtime -= percent * pct_timestep; - pos += (uint64_t)plength * newtime / pct_timestep; + int newtime_toc = newtime - percent * pct_timestep; + pos += (uint64_t)plength * newtime_toc / pct_timestep; } else { /* No TOC exists, estimate the new position */ pos = (uint64_t)newtime * id3->filesize / id3->length; } + // VBR seek might be very inaccurate in long files + // So make sure that seeking actually happened in the intended direction + // Fix jumps in the wrong direction by seeking relative to the current position + long delta = id3->elapsed - newtime; + if ((delta >= 0 && pos > ci->curpos) || (delta < 0 && pos < ci->curpos)) + { + pos = ci->curpos - delta * id3->filesize / id3->length; + } } else if (id3->bitrate) { pos = newtime * (id3->bitrate / 8); } else { |