RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

stream_cdda: fix track time accuracy 

Don't use an integer division to get the time, since that would round on
second boundaries. Also round up the time by sector size. Seeking rounds
down due to alignment constraints, but if we round up the time, we can
make it land on the exact destination sector.

This fixes that the track change code printed the previous track when
seeking by chapter.
This commit is contained in:
wm4 2014-03-26 16:51:17 +01:00
parent b342b1a30e
commit 32d818f02b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stream/stream_cdda.c
View File

@ -282,9 +282,9 @@ static int control(stream_t *stream, int cmd, void *arg)
if (track > end_track) if (track > end_track)
return STREAM_ERROR; return STREAM_ERROR;
int64_t sector = p->cd->disc_toc[track].dwStartSector; int64_t sector = p->cd->disc_toc[track].dwStartSector;
int64_t pos = sector * CDIO_CD_FRAMESIZE_RAW; int64_t pos = sector * (CDIO_CD_FRAMESIZE_RAW + 1) - 1;
// Assume standard audio CD: 44.1khz, 2 channels, s16 samples // Assume standard audio CD: 44.1khz, 2 channels, s16 samples
*(double *)arg = pos / (44100 * 2 * 2); *(double *)arg = pos / (44100.0 * 2 * 2);
return STREAM_OK; return STREAM_OK;
} }
} }