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

remap: Refactor channel remap table computation calc_map_table()

Browse source 
Make the resampler argument const, and pass explicit remap
structure argument

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-04-16 10:48:21 +02:00 • committed by Peter Meerwald
parent c7190b5fd4
commit 937b4175c2
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/pulsecore/resampler.c
View file

@ -114,7 +114,7 @@ static int peaks_init(pa_resampler*r);
static int libsamplerate_init(pa_resampler*r); static int libsamplerate_init(pa_resampler*r);
#endif #endif
static void calc_map_table(pa_resampler *r); static void calc_map_table(const pa_resampler *r, pa_remap_t *m);
static int (* const init_table[])(pa_resampler*r) = { static int (* const init_table[])(pa_resampler*r) = {
#ifdef HAVE_LIBSAMPLERATE #ifdef HAVE_LIBSAMPLERATE
@ -396,7 +396,10 @@ pa_resampler* pa_resampler_new(
r->i_fz = pa_frame_size(a); r->i_fz = pa_frame_size(a);
r->o_fz = pa_frame_size(b); r->o_fz = pa_frame_size(b);
calc_map_table(r); /* compute channel remap table if needed */
if ((r->map_required = (r->i_ss.channels != r->o_ss.channels || (!(r->flags & PA_RESAMPLER_NO_REMAP) &&
!pa_channel_map_equal(&r->i_cm, &r->o_cm)))))
calc_map_table(r, &r->remap);
r->work_format = pa_resampler_choose_work_format(method, a->format, b->format, r->map_required); r->work_format = pa_resampler_choose_work_format(method, a->format, b->format, r->map_required);
r->w_sz = pa_sample_size_of_format(r->work_format); r->w_sz = pa_sample_size_of_format(r->work_format);
@ -785,21 +788,16 @@ static int front_rear_side(pa_channel_position_t p) {
return ON_OTHER; return ON_OTHER;
} }
static void calc_map_table(pa_resampler *r) { static void calc_map_table(const pa_resampler *r, pa_remap_t *m) {
unsigned oc, ic; unsigned oc, ic;
unsigned n_oc, n_ic; unsigned n_oc, n_ic;
bool ic_connected[PA_CHANNELS_MAX]; bool ic_connected[PA_CHANNELS_MAX];
bool remix; bool remix;
pa_strbuf *s; pa_strbuf *s;
char *t; char *t;
pa_remap_t *m;
pa_assert(r); pa_assert(r);
pa_assert(m);
if (!(r->map_required = (r->i_ss.channels != r->o_ss.channels || (!(r->flags & PA_RESAMPLER_NO_REMAP) && !pa_channel_map_equal(&r->i_cm, &r->o_cm)))))
return;
m = &r->remap;
n_oc = r->o_ss.channels; n_oc = r->o_ss.channels;
n_ic = r->i_ss.channels; n_ic = r->i_ss.channels;