diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-04-08 00:09:28 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-04-08 00:09:28 +0000 |
| commit | b4a547419c0815add1fc91d35d2a483c5a0e7c20 (patch) | |
| tree | bc86ed5473d11b590d25c2d2980086d7a9a775b5 /src | |
| parent | 107525ce415edf2b37f867337869c8eeebc8d054 (diff) | |
when doing software volume adjustments, don't use the volume value as linear factor, but pass it through pa_sw_volume_to_linear() first.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@664 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
| -rw-r--r-- | src/polypcore/sample-util.c | 44 |
1 files changed, 15 insertions, 29 deletions
diff --git a/src/polypcore/sample-util.c b/src/polypcore/sample-util.c index 7afb9d11..d06fa95f 100644 --- a/src/polypcore/sample-util.c +++ b/src/polypcore/sample-util.c @@ -116,19 +116,15 @@ size_t pa_mix( else { v = *((int16_t*) ((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d)); - if (cvolume != PA_VOLUME_NORM) { - v *= cvolume; - v /= PA_VOLUME_NORM; - } + if (cvolume != PA_VOLUME_NORM) + v = (int32_t) (v * pa_sw_volume_to_linear(cvolume)); } sum += v; } - if (volume->values[channel] != PA_VOLUME_NORM) { - sum *= volume->values[channel]; - sum /= PA_VOLUME_NORM; - } + if (volume->values[channel] != PA_VOLUME_NORM) + sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel])); if (sum < -0x8000) sum = -0x8000; if (sum > 0x7FFF) sum = 0x7FFF; @@ -168,19 +164,15 @@ size_t pa_mix( else { v = (int32_t) *((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d) - 0x80; - if (cvolume != PA_VOLUME_NORM) { - v *= cvolume; - v /= PA_VOLUME_NORM; - } + if (cvolume != PA_VOLUME_NORM) + v = (int32_t) (v * pa_sw_volume_to_linear(cvolume)); } sum += v; } - if (volume->values[channel] != PA_VOLUME_NORM) { - sum *= volume->values[channel]; - sum /= PA_VOLUME_NORM; - } + if (volume->values[channel] != PA_VOLUME_NORM) + sum = (int32_t) (sum * pa_sw_volume_to_linear(volume->values[channel])); if (sum < -0x80) sum = -0x80; if (sum > 0x7F) sum = 0x7F; @@ -220,19 +212,15 @@ size_t pa_mix( else { v = *((float*) ((uint8_t*) streams[i].chunk.memblock->data + streams[i].chunk.index + d)); - if (cvolume != PA_VOLUME_NORM) { - v *= cvolume; - v /= PA_VOLUME_NORM; - } + if (cvolume != PA_VOLUME_NORM) + v *= pa_sw_volume_to_linear(cvolume); } sum += v; } - if (volume->values[channel] != PA_VOLUME_NORM) { - sum *= volume->values[channel]; - sum /= PA_VOLUME_NORM; - } + if (volume->values[channel] != PA_VOLUME_NORM) + sum *= pa_sw_volume_to_linear(volume->values[channel]); } *((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--) { int32_t t = (int32_t)(*d); - t *= volume->values[channel]; - t /= PA_VOLUME_NORM; + t = (int32_t) (t * pa_sw_volume_to_linear(volume->values[channel])); if (t < -0x8000) t = -0x8000; 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--) { int32_t t = (int32_t) *d - 0x80; - t *= volume->values[channel]; - t /= PA_VOLUME_NORM; + t = (int32_t) (t * pa_sw_volume_to_linear(volume->values[channel])); if (t < -0x80) t = -0x80; 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) continue; - v = (float) volume->values[channel] / PA_VOLUME_NORM; + v = (float) pa_sw_volume_to_linear(volume->values[channel]); t = d + channel; oil_scalarmult_f32(t, skip, t, skip, &v, n); |