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

pcm/PcmDop: use size_t

Browse Source
This commit is contained in:
Max Kellermann 2018-03-15 20:00:14 +01:00
parent 73013a3c04
commit 37b07a5e7c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pcm/PcmDop.cxx
View File

@ -46,19 +46,19 @@ pcm_dsd_to_dop(PcmBuffer &buffer, unsigned channels,
assert(audio_valid_channel_count(channels)); assert(audio_valid_channel_count(channels));
assert(_src.size % channels == 0); assert(_src.size % channels == 0);
const unsigned num_src_samples = _src.size; const size_t num_src_samples = _src.size;
const unsigned num_src_frames = num_src_samples / channels; const size_t num_src_frames = num_src_samples / channels;
/* this rounds down and discards the last odd frame; not /* this rounds down and discards the last odd frame; not
elegant, but good enough for now */ elegant, but good enough for now */
const unsigned num_frames = num_src_frames / 2; const size_t num_frames = num_src_frames / 2;
const unsigned num_samples = num_frames * channels; const size_t num_samples = num_frames * channels;
uint32_t *const dest0 = (uint32_t *)buffer.GetT<uint32_t>(num_samples), uint32_t *const dest0 = (uint32_t *)buffer.GetT<uint32_t>(num_samples),
*dest = dest0; *dest = dest0;
auto src = _src.data; auto src = _src.data;
for (unsigned i = num_frames / 2; i > 0; --i) { for (size_t i = num_frames / 2; i > 0; --i) {
for (unsigned c = channels; c > 0; --c) { for (unsigned c = channels; c > 0; --c) {
/* each 24 bit sample has 16 DSD sample bits /* each 24 bit sample has 16 DSD sample bits
plus the magic 0x05 marker */ plus the magic 0x05 marker */