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

resampler: Drop pointless remix variable

Browse source 
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-10-29 11:56:59 +01:00
parent 6d1fd4d1aa
commit 70973d58e6
1 changed files with 0 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/pulsecore/resampler.c
View file

@ -737,7 +737,6 @@ static void setup_remap(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;
pa_strbuf *s; pa_strbuf *s;
char *t; char *t;
@ -755,16 +754,12 @@ static void setup_remap(const pa_resampler *r, pa_remap_t *m) {
memset(m->map_table_i, 0, sizeof(m->map_table_i)); memset(m->map_table_i, 0, sizeof(m->map_table_i));
memset(ic_connected, 0, sizeof(ic_connected)); memset(ic_connected, 0, sizeof(ic_connected));
remix = (r->flags & (PA_RESAMPLER_NO_REMAP | PA_RESAMPLER_NO_REMIX)) == 0;
if (r->flags & PA_RESAMPLER_NO_REMAP) { if (r->flags & PA_RESAMPLER_NO_REMAP) {
pa_assert(!remix);
for (oc = 0; oc < PA_MIN(n_ic, n_oc); oc++) for (oc = 0; oc < PA_MIN(n_ic, n_oc); oc++)
m->map_table_f[oc][oc] = 1.0f; m->map_table_f[oc][oc] = 1.0f;
} else if (r->flags & PA_RESAMPLER_NO_REMIX) { } else if (r->flags & PA_RESAMPLER_NO_REMIX) {
pa_assert(!remix);
for (oc = 0; oc < n_oc; oc++) { for (oc = 0; oc < n_oc; oc++) {
pa_channel_position_t b = r->o_cm.map[oc]; pa_channel_position_t b = r->o_cm.map[oc];
@ -849,8 +844,6 @@ static void setup_remap(const pa_resampler *r, pa_remap_t *m) {
ic_unconnected_lfe = 0; ic_unconnected_lfe = 0;
bool ic_unconnected_center_mixed_in = 0; bool ic_unconnected_center_mixed_in = 0;
pa_assert(remix);
for (ic = 0; ic < n_ic; ic++) { for (ic = 0; ic < n_ic; ic++) {
if (on_left(r->i_cm.map[ic])) if (on_left(r->i_cm.map[ic]))
ic_left++; ic_left++;