mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-09 13:29:59 -05:00
prefix by order macros with PA_
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1884 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
668340099c
commit
c6b43bf119
8 changed files with 96 additions and 93 deletions
|
|
@ -208,7 +208,7 @@ size_t pa_mix(
|
|||
if (cvolume == PA_VOLUME_MUTED)
|
||||
v = 0;
|
||||
else {
|
||||
v = INT16_SWAP(*((int16_t*) ((uint8_t*) streams[i].internal + streams[i].chunk.index + d)));
|
||||
v = PA_INT16_SWAP(*((int16_t*) ((uint8_t*) streams[i].internal + streams[i].chunk.index + d)));
|
||||
|
||||
if (cvolume != PA_VOLUME_NORM)
|
||||
v = (int32_t) (v * pa_sw_volume_to_linear(cvolume));
|
||||
|
|
@ -223,7 +223,7 @@ size_t pa_mix(
|
|||
sum = CLAMP(sum, -0x8000, 0x7FFF);
|
||||
}
|
||||
|
||||
*((int16_t*) data) = INT16_SWAP((int16_t) sum);
|
||||
*((int16_t*) data) = PA_INT16_SWAP((int16_t) sum);
|
||||
data = (uint8_t*) data + sizeof(int16_t);
|
||||
|
||||
if (++channel >= spec->channels)
|
||||
|
|
@ -398,10 +398,10 @@ void pa_volume_memchunk(
|
|||
for (channel = 0, d = (int16_t*) ((uint8_t*) ptr + c->index), n = c->length/sizeof(int16_t); n > 0; d++, n--) {
|
||||
int32_t t;
|
||||
|
||||
t = (int32_t)(INT16_SWAP(*d));
|
||||
t = (int32_t)(PA_INT16_SWAP(*d));
|
||||
t = (t * linear[channel]) / 0x10000;
|
||||
t = CLAMP(t, -0x8000, 0x7FFF);
|
||||
*d = INT16_SWAP((int16_t) t);
|
||||
*d = PA_INT16_SWAP((int16_t) t);
|
||||
|
||||
if (++channel >= spec->channels)
|
||||
channel = 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue