mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -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
				
			
		| 
						 | 
				
			
			@ -414,7 +414,8 @@ int pa_source_output_new(
 | 
			
		|||
                        ((data->flags & PA_SOURCE_OUTPUT_NO_REMAP) ? PA_RESAMPLER_NO_REMAP : 0) |
 | 
			
		||||
                        (core->disable_remixing || (data->flags & PA_SOURCE_OUTPUT_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;
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			@ -1755,7 +1756,8 @@ int pa_source_output_update_resampler(pa_source_output *o) {
 | 
			
		|||
                                     ((o->flags & PA_SOURCE_OUTPUT_NO_REMAP) ? PA_RESAMPLER_NO_REMAP : 0) |
 | 
			
		||||
                                     (o->core->disable_remixing || (o->flags & PA_SOURCE_OUTPUT_NO_REMIX) ? PA_RESAMPLER_NO_REMIX : 0) |
 | 
			
		||||
                                     (o->core->remixing_use_all_sink_channels ? 0 : PA_RESAMPLER_NO_FILL_SINK) |
 | 
			
		||||
                                     (o->core->disable_lfe_remixing ? PA_RESAMPLER_NO_LFE : 0));
 | 
			
		||||
                                     (o->core->remixing_produce_lfe ? PA_RESAMPLER_PRODUCE_LFE : 0) |
 | 
			
		||||
                                     (o->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