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

pcm/Volume: use number of samples instead of end pointer

Browse Source
This commit is contained in:
Max Kellermann 2014-01-07 00:42:02 +01:00
parent c75339edcc
commit 7eda72d440
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/pcm/Volume.cxx
View File

@ -48,57 +48,52 @@ static void
pcm_volume_change(PcmDither &dither, pcm_volume_change(PcmDither &dither,
typename Traits::pointer_type dest, typename Traits::pointer_type dest,
typename Traits::const_pointer_type src, typename Traits::const_pointer_type src,
typename Traits::const_pointer_type end, size_t n,
int volume) int volume)
{ {
while (src < end) { for (size_t i = 0; i != n; ++i)
const auto sample = *src++; dest[i] = pcm_volume_sample<F, Traits>(dither, src[i], volume);
*dest++ = pcm_volume_sample<F, Traits>(dither, sample, volume);
}
} }
static void static void
pcm_volume_change_8(PcmDither &dither, pcm_volume_change_8(PcmDither &dither,
int8_t *dest, const int8_t *src, const int8_t *end, int8_t *dest, const int8_t *src, size_t n,
int volume) int volume)
{ {
pcm_volume_change<SampleFormat::S8>(dither, dest, src, end, volume); pcm_volume_change<SampleFormat::S8>(dither, dest, src, n, volume);
} }
static void static void
pcm_volume_change_16(PcmDither &dither, pcm_volume_change_16(PcmDither &dither,
int16_t *dest, const int16_t *src, const int16_t *end, int16_t *dest, const int16_t *src, size_t n,
int volume) int volume)
{ {
pcm_volume_change<SampleFormat::S16>(dither, dest, src, end, volume); pcm_volume_change<SampleFormat::S16>(dither, dest, src, n, volume);
} }
static void static void
pcm_volume_change_24(PcmDither &dither, pcm_volume_change_24(PcmDither &dither,
int32_t *dest, const int32_t *src, const int32_t *end, int32_t *dest, const int32_t *src, size_t n,
int volume) int volume)
{ {
pcm_volume_change<SampleFormat::S24_P32>(dither, dest, src, end, pcm_volume_change<SampleFormat::S24_P32>(dither, dest, src, n,
volume); volume);
} }
static void static void
pcm_volume_change_32(PcmDither &dither, pcm_volume_change_32(PcmDither &dither,
int32_t *dest, const int32_t *src, const int32_t *end, int32_t *dest, const int32_t *src, size_t n,
int volume) int volume)
{ {
pcm_volume_change<SampleFormat::S32>(dither, dest, src, end, volume); pcm_volume_change<SampleFormat::S32>(dither, dest, src, n, volume);
} }
static void static void
pcm_volume_change_float(float *dest, const float *src, const float *end, pcm_volume_change_float(float *dest, const float *src, size_t n,
float volume) float volume)
{ {
while (src < end) { for (size_t i = 0; i != n; ++i)
float sample = *src++; dest[i] = src[i] * volume;
sample *= volume;
*dest++ = sample;
}
} }
bool bool
@ -142,7 +137,6 @@ PcmVolume::Apply(ConstBuffer<void> src)
return { data, src.size }; return { data, src.size };
} }
const void *end = pcm_end_pointer(src.data, src.size);
switch (format) { switch (format) {
case SampleFormat::UNDEFINED: case SampleFormat::UNDEFINED:
case SampleFormat::DSD: case SampleFormat::DSD:
@ -152,35 +146,35 @@ PcmVolume::Apply(ConstBuffer<void> src)
case SampleFormat::S8: case SampleFormat::S8:
pcm_volume_change_8(dither, (int8_t *)data, pcm_volume_change_8(dither, (int8_t *)data,
(const int8_t *)src.data, (const int8_t *)src.data,
(const int8_t *)end, src.size / sizeof(int8_t),
volume); volume);
break; break;
case SampleFormat::S16: case SampleFormat::S16:
pcm_volume_change_16(dither, (int16_t *)data, pcm_volume_change_16(dither, (int16_t *)data,
(const int16_t *)src.data, (const int16_t *)src.data,
(const int16_t *)end, src.size / sizeof(int16_t),
volume); volume);
break; break;
case SampleFormat::S24_P32: case SampleFormat::S24_P32:
pcm_volume_change_24(dither, (int32_t *)data, pcm_volume_change_24(dither, (int32_t *)data,
(const int32_t *)src.data, (const int32_t *)src.data,
(const int32_t *)end, src.size / sizeof(int32_t),
volume); volume);
break; break;
case SampleFormat::S32: case SampleFormat::S32:
pcm_volume_change_32(dither, (int32_t *)data, pcm_volume_change_32(dither, (int32_t *)data,
(const int32_t *)src.data, (const int32_t *)src.data,
(const int32_t *)end, src.size / sizeof(int32_t),
volume); volume);
break; break;
case SampleFormat::FLOAT: case SampleFormat::FLOAT:
pcm_volume_change_float((float *)data, pcm_volume_change_float((float *)data,
(const float *)src.data, (const float *)src.data,
(const float *)end, src.size / sizeof(float),
pcm_volume_to_float(volume)); pcm_volume_to_float(volume));
break; break;
} }