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

PcmUtils: remove pcm_range(), use PcmClamp() instead

Browse Source
This commit is contained in:
Max Kellermann 2013-02-01 13:50:10 +01:00
parent 0ac06d77f1
commit ef99d6ce3d
3 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/PcmMix.cxx
View File

@ -37,7 +37,7 @@ pcm_add_vol_8(int8_t *buffer1, const int8_t *buffer2,
pcm_volume_dither() + PCM_VOLUME_1 / 2) pcm_volume_dither() + PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
*buffer1++ = pcm_range(sample1, 8); *buffer1++ = PcmClamp<int8_t, int32_t, 8>(sample1);
--num_samples; --num_samples;
} }
} }
@ -54,7 +54,7 @@ pcm_add_vol_16(int16_t *buffer1, const int16_t *buffer2,
pcm_volume_dither() + PCM_VOLUME_1 / 2) pcm_volume_dither() + PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
*buffer1++ = pcm_range(sample1, 16); *buffer1++ = PcmClamp<int16_t, int32_t, 16>(sample1);
--num_samples; --num_samples;
} }
} }
@ -71,7 +71,7 @@ pcm_add_vol_24(int32_t *buffer1, const int32_t *buffer2,
pcm_volume_dither() + PCM_VOLUME_1 / 2) pcm_volume_dither() + PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
*buffer1++ = pcm_range(sample1, 24); *buffer1++ = PcmClamp<int32_t, int64_t, 24>(sample1);
--num_samples; --num_samples;
} }
} }
@ -88,7 +88,7 @@ pcm_add_vol_32(int32_t *buffer1, const int32_t *buffer2,
pcm_volume_dither() + PCM_VOLUME_1 / 2) pcm_volume_dither() + PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
*buffer1++ = pcm_range_64(sample1, 32); *buffer1++ = PcmClamp<int32_t, int64_t, 32>(sample1);
--num_samples; --num_samples;
} }
} }
@ -160,7 +160,7 @@ pcm_add_8(int8_t *buffer1, const int8_t *buffer2, unsigned num_samples)
sample1 += sample2; sample1 += sample2;
*buffer1++ = pcm_range(sample1, 8); *buffer1++ = PcmClamp<int8_t, int32_t, 8>(sample1);
--num_samples; --num_samples;
} }
} }
@ -174,7 +174,7 @@ pcm_add_16(int16_t *buffer1, const int16_t *buffer2, unsigned num_samples)
sample1 += sample2; sample1 += sample2;
*buffer1++ = pcm_range(sample1, 16); *buffer1++ = PcmClamp<int16_t, int32_t, 16>(sample1);
--num_samples; --num_samples;
} }
} }
@ -188,7 +188,7 @@ pcm_add_24(int32_t *buffer1, const int32_t *buffer2, unsigned num_samples)
sample1 += sample2; sample1 += sample2;
*buffer1++ = pcm_range(sample1, 24); *buffer1++ = PcmClamp<int32_t, int64_t, 24>(sample1);
--num_samples; --num_samples;
} }
} }
@ -202,7 +202,7 @@ pcm_add_32(int32_t *buffer1, const int32_t *buffer2, unsigned num_samples)
sample1 += sample2; sample1 += sample2;
*buffer1++ = pcm_range_64(sample1, 32); *buffer1++ = PcmClamp<int32_t, int64_t, 32>(sample1);
--num_samples; --num_samples;
} }
} }

24
src/PcmUtils.hxx
View File

@ -42,30 +42,6 @@ pcm_end_pointer(const T *p, size_t size)
* Check if the value is within the range of the provided bit size, * Check if the value is within the range of the provided bit size,
* and caps it if necessary. * and caps it if necessary.
*/ */
static inline int32_t
pcm_range(int32_t sample, unsigned bits)
{
if (gcc_unlikely(sample < (-1 << (bits - 1))))
return -1 << (bits - 1);
if (gcc_unlikely(sample >= (1 << (bits - 1))))
return (1 << (bits - 1)) - 1;
return sample;
}
/**
* Check if the value is within the range of the provided bit size,
* and caps it if necessary.
*/
static inline int64_t
pcm_range_64(int64_t sample, unsigned bits)
{
if (gcc_unlikely(sample < ((int64_t)-1 << (bits - 1))))
return (int64_t)-1 << (bits - 1);
if (gcc_unlikely(sample >= ((int64_t)1 << (bits - 1))))
return ((int64_t)1 << (bits - 1)) - 1;
return sample;
}
template<typename T, typename U, unsigned bits> template<typename T, typename U, unsigned bits>
gcc_const gcc_const
static inline T static inline T

8
src/PcmVolume.cxx
View File

@ -40,7 +40,7 @@ pcm_volume_change_8(int8_t *buffer, const int8_t *end, int volume)
PCM_VOLUME_1 / 2) PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
*buffer++ = pcm_range(sample, 8); *buffer++ = PcmClamp<int8_t, int16_t, 8>(sample);
} }
} }
@ -54,7 +54,7 @@ pcm_volume_change_16(int16_t *buffer, const int16_t *end, int volume)
PCM_VOLUME_1 / 2) PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
*buffer++ = pcm_range(sample, 16); *buffer++ = PcmClamp<int16_t, int32_t, 16>(sample);
} }
} }
@ -107,7 +107,7 @@ pcm_volume_change_24(int32_t *buffer, const int32_t *end, int volume)
PCM_VOLUME_1 / 2) PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
#endif #endif
*buffer++ = pcm_range(sample, 24); *buffer++ = PcmClamp<int32_t, int32_t, 24>(sample);
} }
} }
@ -127,7 +127,7 @@ pcm_volume_change_32(int32_t *buffer, const int32_t *end, int volume)
sample = (sample * volume + pcm_volume_dither() + sample = (sample * volume + pcm_volume_dither() +
PCM_VOLUME_1 / 2) PCM_VOLUME_1 / 2)
/ PCM_VOLUME_1; / PCM_VOLUME_1;
*buffer++ = pcm_range_64(sample, 32); *buffer++ = PcmClamp<int32_t, int64_t, 32>(sample);
#endif #endif
} }
} }