diff options
author | Arun Raghavan <arun@arunraghavan.net> | 2017-12-27 11:35:54 +0530 |
---|---|---|
committer | Arun Raghavan <arun@arunraghavan.net> | 2017-12-27 11:35:54 +0530 |
commit | 4b0fdaec32b4cd6c40b29d0bab065deffdc98717 (patch) | |
tree | 7f1f59f549bd87ab20d0aca81bb699407c8534de | |
parent | bdf4ca7e073d4b8228fb24e29b9cae845b938ac0 (diff) |
mix: Rename the no_mapping volume functions for clarityvolume-ramping
-rw-r--r-- | src/pulsecore/mix.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c index d2959aee2..081f33cf4 100644 --- a/src/pulsecore/mix.c +++ b/src/pulsecore/mix.c @@ -725,7 +725,7 @@ void pa_volume_memchunk( pa_memblock_release(c->memblock); } -static void calc_linear_integer_volume_no_mapping(int32_t linear[], float volume[], unsigned nchannels) { +static void calc_integer_volume_no_mapping(int32_t linear[], float volume[], unsigned nchannels) { unsigned channel, padding; pa_assert(linear); @@ -738,7 +738,7 @@ static void calc_linear_integer_volume_no_mapping(int32_t linear[], float volume linear[channel] = linear[padding]; } -static void calc_linear_float_volume_no_mapping(float linear[], float volume[], unsigned nchannels) { +static void calc_float_volume_no_mapping(float linear[], float volume[], unsigned nchannels) { unsigned channel, padding; pa_assert(linear); @@ -754,19 +754,19 @@ static void calc_linear_float_volume_no_mapping(float linear[], float volume[], typedef void (*pa_calc_volume_no_mapping_func_t) (void *volumes, float *volume, int channels); static const pa_calc_volume_no_mapping_func_t calc_volume_table_no_mapping[] = { - [PA_SAMPLE_U8] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_ALAW] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_ULAW] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_S16LE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_S16BE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_FLOAT32LE] = (pa_calc_volume_no_mapping_func_t) calc_linear_float_volume_no_mapping, - [PA_SAMPLE_FLOAT32BE] = (pa_calc_volume_no_mapping_func_t) calc_linear_float_volume_no_mapping, - [PA_SAMPLE_S32LE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_S32BE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_S24LE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_S24BE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_S24_32LE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping, - [PA_SAMPLE_S24_32BE] = (pa_calc_volume_no_mapping_func_t) calc_linear_integer_volume_no_mapping + [PA_SAMPLE_U8] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_ALAW] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_ULAW] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_S16LE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_S16BE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_FLOAT32LE] = (pa_calc_volume_no_mapping_func_t) calc_float_volume_no_mapping, + [PA_SAMPLE_FLOAT32BE] = (pa_calc_volume_no_mapping_func_t) calc_float_volume_no_mapping, + [PA_SAMPLE_S32LE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_S32BE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_S24LE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_S24BE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_S24_32LE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping, + [PA_SAMPLE_S24_32BE] = (pa_calc_volume_no_mapping_func_t) calc_integer_volume_no_mapping }; static float calc_volume_ramp_linear(pa_volume_ramp_int *ramp) { @@ -853,7 +853,7 @@ void pa_volume_ramp_memchunk( pa_cvolume_ramp_int *ramp) { void *ptr; - volume_val linear[PA_CHANNELS_MAX + VOLUME_PADDING]; + volume_val volumes[PA_CHANNELS_MAX + VOLUME_PADDING]; float vol[PA_CHANNELS_MAX + VOLUME_PADDING]; pa_do_volume_func_t do_volume; long length_in_frames; @@ -884,10 +884,10 @@ void pa_volume_ramp_memchunk( ptr = (uint8_t*) pa_memblock_acquire(c->memblock) + c->index; for (i = 0; i < length_in_frames; i++) { - calc_volume_table_no_mapping[spec->format] ((void *)linear, vol, spec->channels); + calc_volume_table_no_mapping[spec->format] ((void *)volumes, vol, spec->channels); /* we only process one frame per iteration */ - do_volume(ptr, (void *)linear, spec->channels, pa_sample_size_of_format(spec->format) * spec->channels); + do_volume(ptr, (void *)volumes, spec->channels, pa_sample_size_of_format(spec->format) * spec->channels); /* pa_log_debug("1: %d 2: %d", linear[0], linear[1]); */ |