mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

when doing software volume adjustments, don't use the volume value as linear factor, but pass it through pa_sw_volume_to_linear() first.

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@664 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-04-08 00:09:28 +00:00
parent 107525ce41
commit b4a547419c
1 changed files with 15 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

44
src/polypcore/sample-util.c
View file

@ -116,19 +116,15 @@ size_t pa_mix(
else { else {
v = *((int16_t*) ((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d)); v = *((int16_t*) ((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d));
if (cvolume != PA_VOLUME_NORM) { if (cvolume != PA_VOLUME_NORM)
v *= cvolume; v = (int32_t) (v * pa_sw_volume_to_linear(cvolume));
v /= PA_VOLUME_NORM;
}
} }
sum += v; sum += v;
} }
if (volume->values[channel] != PA_VOLUME_NORM) { if (volume->values[channel] != PA_VOLUME_NORM)
sum *= volume->values[channel]; sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel]));
sum /= PA_VOLUME_NORM;
}
if (sum < -0x8000) sum = -0x8000; if (sum < -0x8000) sum = -0x8000;
if (sum > 0x7FFF) sum = 0x7FFF; if (sum > 0x7FFF) sum = 0x7FFF;
@ -168,19 +164,15 @@ size_t pa_mix(
else { else {
v = (int32_t) *((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d) - 0x80; v = (int32_t) *((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d) - 0x80;
if (cvolume != PA_VOLUME_NORM) { if (cvolume != PA_VOLUME_NORM)
v *= cvolume; v = (int32_t) (v * pa_sw_volume_to_linear(cvolume));
v /= PA_VOLUME_NORM;
}
} }
sum += v; sum += v;
} }
if (volume->values[channel] != PA_VOLUME_NORM) { if (volume->values[channel] != PA_VOLUME_NORM)
sum *= volume->values[channel]; sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel]));
sum /= PA_VOLUME_NORM;
}
if (sum < -0x80) sum = -0x80; if (sum < -0x80) sum = -0x80;
if (sum > 0x7F) sum = 0x7F; if (sum > 0x7F) sum = 0x7F;
@ -220,19 +212,15 @@ size_t pa_mix(
else { else {
v = *((float*) ((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d)); v = *((float*) ((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d));
if (cvolume != PA_VOLUME_NORM) { if (cvolume != PA_VOLUME_NORM)
v *= cvolume; v *= pa_sw_volume_to_linear(cvolume);
v /= PA_VOLUME_NORM;
}
} }
sum += v; sum += v;
} }
if (volume->values[channel] != PA_VOLUME_NORM) { if (volume->values[channel] != PA_VOLUME_NORM)
sum *= volume->values[channel]; sum *= pa_sw_volume_to_linear(volume->values[channel]);
sum /= PA_VOLUME_NORM;
}
} }
*((float*) data) = sum; *((float*) data) = sum;
@ -270,8 +258,7 @@ void pa_volume_memchunk(pa_memchunk*c, const pa_sample_spec *spec, const pa_cvol
for (d = (int16_t*) ((uint8_t*) c->memblock->data+c->index), n = c->length/sizeof(int16_t); n > 0; d++, n--) { for (d = (int16_t*) ((uint8_t*) c->memblock->data+c->index), n = c->length/sizeof(int16_t); n > 0; d++, n--) {
int32_t t = (int32_t)(*d); int32_t t = (int32_t)(*d);
t *= volume->values[channel]; t = (int32_t) (t * pa_sw_volume_to_linear(volume->values[channel]));
t /= PA_VOLUME_NORM;
if (t < -0x8000) t = -0x8000; if (t < -0x8000) t = -0x8000;
if (t > 0x7FFF) t = 0x7FFF; if (t > 0x7FFF) t = 0x7FFF;
@ -292,8 +279,7 @@ void pa_volume_memchunk(pa_memchunk*c, const pa_sample_spec *spec, const pa_cvol
for (d = (uint8_t*) c->memblock->data + c->index, n = c->length; n > 0; d++, n--) { for (d = (uint8_t*) c->memblock->data + c->index, n = c->length; n > 0; d++, n--) {
int32_t t = (int32_t) *d - 0x80; int32_t t = (int32_t) *d - 0x80;
t *= volume->values[channel]; t = (int32_t) (t * pa_sw_volume_to_linear(volume->values[channel]));
t /= PA_VOLUME_NORM;
if (t < -0x80) t = -0x80; if (t < -0x80) t = -0x80;
if (t > 0x7F) t = 0x7F; if (t > 0x7F) t = 0x7F;
@ -322,7 +308,7 @@ void pa_volume_memchunk(pa_memchunk*c, const pa_sample_spec *spec, const pa_cvol
if (volume->values[channel] == PA_VOLUME_NORM) if (volume->values[channel] == PA_VOLUME_NORM)
continue; continue;
v = (float) volume->values[channel] / PA_VOLUME_NORM; v = (float) pa_sw_volume_to_linear(volume->values[channel]);
t = d + channel; t = d + channel;
oil_scalarmult_f32(t, skip, t, skip, &v, n); oil_scalarmult_f32(t, skip, t, skip, &v, n);