oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

input/CdioParanoia: use integer modulo to calculate "diff"

Browse Source
This commit is contained in:
Max Kellermann
2022-07-08 16:03:32 +02:00
parent 3613407ac5
commit 666e5d7904
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/input/plugins/CdioParanoiaInputPlugin.cxx
View File

@@ -296,6 +296,8 @@ CdioParanoiaInputStream::Read(std::unique_lock<Mutex> &,
const int16_t *rbuf; const int16_t *rbuf;
const lsn_t lsn_relofs = offset / CDIO_CD_FRAMESIZE_RAW; const lsn_t lsn_relofs = offset / CDIO_CD_FRAMESIZE_RAW;
const std::size_t diff = offset % CDIO_CD_FRAMESIZE_RAW;
if (lsn_relofs != buffer_lsn) { if (lsn_relofs != buffer_lsn) {
const ScopeUnlock unlock(mutex); const ScopeUnlock unlock(mutex);
@@ -320,11 +322,6 @@ CdioParanoiaInputStream::Read(std::unique_lock<Mutex> &,
rbuf = (const int16_t *)buffer; rbuf = (const int16_t *)buffer;
} }
//correct offset
const int diff = offset - lsn_relofs * CDIO_CD_FRAMESIZE_RAW;
assert(diff >= 0 && diff < CDIO_CD_FRAMESIZE_RAW);
const size_t maxwrite = CDIO_CD_FRAMESIZE_RAW - diff; //# of bytes pending in current buffer const size_t maxwrite = CDIO_CD_FRAMESIZE_RAW - diff; //# of bytes pending in current buffer
const std::size_t nbytes = std::min(length, maxwrite); const std::size_t nbytes = std::min(length, maxwrite);