mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-11 13:30:02 -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
|
|
@ -476,7 +476,8 @@ int pa_sink_input_new(
|
|||
((data->flags & PA_SINK_INPUT_NO_REMAP) ? PA_RESAMPLER_NO_REMAP : 0) |
|
||||
(core->disable_remixing || (data->flags & PA_SINK_INPUT_NO_REMIX) ? PA_RESAMPLER_NO_REMIX : 0) |
|
||||
(core->remixing_use_all_sink_channels ? 0 : PA_RESAMPLER_NO_FILL_SINK) |
|
||||
(core->disable_lfe_remixing ? PA_RESAMPLER_NO_LFE : 0)))) {
|
||||
(core->remixing_produce_lfe ? PA_RESAMPLER_PRODUCE_LFE : 0) |
|
||||
(core->remixing_consume_lfe ? PA_RESAMPLER_CONSUME_LFE : 0)))) {
|
||||
pa_log_warn("Unsupported resampling operation.");
|
||||
return -PA_ERR_NOTSUPPORTED;
|
||||
}
|
||||
|
|
@ -2313,7 +2314,8 @@ int pa_sink_input_update_resampler(pa_sink_input *i) {
|
|||
((i->flags & PA_SINK_INPUT_NO_REMAP) ? PA_RESAMPLER_NO_REMAP : 0) |
|
||||
(i->core->disable_remixing || (i->flags & PA_SINK_INPUT_NO_REMIX) ? PA_RESAMPLER_NO_REMIX : 0) |
|
||||
(i->core->remixing_use_all_sink_channels ? 0 : PA_RESAMPLER_NO_FILL_SINK) |
|
||||
(i->core->disable_lfe_remixing ? PA_RESAMPLER_NO_LFE : 0));
|
||||
(i->core->remixing_produce_lfe ? PA_RESAMPLER_PRODUCE_LFE : 0) |
|
||||
(i->core->remixing_consume_lfe ? PA_RESAMPLER_CONSUME_LFE : 0));
|
||||
|
||||
if (!new_resampler) {
|
||||
pa_log_warn("Unsupported resampling operation.");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue