mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-12 13:30:10 -05:00
Split the enable-lfe-remixing setting into two
remixing-produce-lfe controls upmixing, and remixing-consume-lfe controls downmixing. The motivation is that a user might want to synthesize LFE while playing stereo audio on his/her 5.1 speakers, but at the same time follow the industry recommendation to omit the LFE channel when producting a stereo downmix (e.g. for headphones) from 5.1 content. Or the other way round. Fixes: #753.
This commit is contained in:
parent
b94dba9daf
commit
464828faf2
12 changed files with 101 additions and 26 deletions
|
|
@ -1099,7 +1099,7 @@ static void setup_remap(const pa_resampler *r, pa_remap_t *m, bool *lfe_remixed)
|
|||
* right input channel. Something is really wrong in this
|
||||
* case anyway. */
|
||||
|
||||
} else if (on_lfe(b) && !(r->flags & PA_RESAMPLER_NO_LFE)) {
|
||||
} else if (on_lfe(b) && (r->flags & PA_RESAMPLER_PRODUCE_LFE)) {
|
||||
|
||||
/* We are not connected and an LFE. Let's average all
|
||||
* channels for LFE. */
|
||||
|
|
@ -1150,7 +1150,7 @@ static void setup_remap(const pa_resampler *r, pa_remap_t *m, bool *lfe_remixed)
|
|||
m->map_table_f[oc][ic] = (1.f/9.f) / (float) ic_unconnected_center;
|
||||
ic_unconnected_center_mixed_in = true;
|
||||
|
||||
} else if (on_lfe(a) && !(r->flags & PA_RESAMPLER_NO_LFE))
|
||||
} else if (on_lfe(a) && (r->flags & PA_RESAMPLER_CONSUME_LFE))
|
||||
m->map_table_f[oc][ic] = .375f / (float) ic_unconnected_lfe;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue