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

remap: Make resampler's remap structure more self-contained

Browse source 
Initialization of the remap structure now happens in one place

Rename calc_map_table() to setup_remap(), copy sample format and
channel specs; the remap structure is initialized when we know the
work sample format of the resampler

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-04-16 11:25:58 +02:00 • committed by Peter Meerwald
parent 937b4175c2
commit 9362bdc8a1
6 changed files with 32 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pulsecore/resampler.c
View file

@ -114,7 +114,7 @@ static int peaks_init(pa_resampler*r);
static int libsamplerate_init(pa_resampler*r);
#endif
static void calc_map_table(const pa_resampler *r, pa_remap_t *m);
static void setup_remap(const pa_resampler *r, pa_remap_t *m);
static int (* const init_table[])(pa_resampler*r) = {
#ifdef HAVE_LIBSAMPLERATE
@ -378,11 +378,6 @@ pa_resampler* pa_resampler_new(
r->i_ss = *a;
r->o_ss = *b;
/* set up the remap structure */
r->remap.i_ss = &r->i_ss;
r->remap.o_ss = &r->o_ss;
r->remap.format = &r->work_format;
if (am)
r->i_cm = *am;
else if (!pa_channel_map_init_auto(&r->i_cm, r->i_ss.channels, PA_CHANNEL_MAP_DEFAULT))
@ -396,10 +391,8 @@ pa_resampler* pa_resampler_new(
r->i_fz = pa_frame_size(a);
r->o_fz = pa_frame_size(b);
/* 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->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)));
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);
@ -451,6 +444,10 @@ pa_resampler* pa_resampler_new(
pa_sample_format_to_string(b->format), pa_sample_format_to_string(r->work_format));
pa_log_debug(" channels %d -> %d (resampling %d)", a->channels, b->channels, r->work_channels);
/* set up the remap structure */
if (r->map_required)
setup_remap(r, &r->remap);
/* initialize implementation */
if (init_table[method](r) < 0)
goto fail;
@ -788,7 +785,7 @@ static int front_rear_side(pa_channel_position_t p) {
return ON_OTHER;
}
static void calc_map_table(const pa_resampler *r, pa_remap_t *m) {
static void setup_remap(const pa_resampler *r, pa_remap_t *m) {
unsigned oc, ic;
unsigned n_oc, n_ic;
bool ic_connected[PA_CHANNELS_MAX];
@ -802,6 +799,10 @@ static void calc_map_table(const pa_resampler *r, pa_remap_t *m) {
n_oc = r->o_ss.channels;
n_ic = r->i_ss.channels;
m->format = r->work_format;
m->i_ss = r->i_ss;
m->o_ss = r->o_ss;
memset(m->map_table_f, 0, sizeof(m->map_table_f));
memset(m->map_table_i, 0, sizeof(m->map_table_i));