mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	channelmix: enable upmixing by default, disable normalization
This commit is contained in:
		
							parent
							
								
									5a55e1a47a
								
							
						
					
					
						commit
						d25bb89cc0
					
				
					 5 changed files with 29 additions and 26 deletions
				
			
		| 
						 | 
					@ -1627,9 +1627,12 @@ impl_init(const struct spa_handle_factory *factory,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	props_reset(&this->props);
 | 
						props_reset(&this->props);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	this->mix.options = CHANNELMIX_OPTION_NORMALIZE;
 | 
						this->mix.options = CHANNELMIX_OPTION_UPMIX;
 | 
				
			||||||
	this->mix.log = this->log;
 | 
						this->mix.log = this->log;
 | 
				
			||||||
 | 
						this->mix.lfe_cutoff = 120.0f;
 | 
				
			||||||
 | 
						this->mix.fc_cutoff = 6000.0f;
 | 
				
			||||||
	this->mix.rear_delay = 12.0f;
 | 
						this->mix.rear_delay = 12.0f;
 | 
				
			||||||
 | 
						this->mix.widen = 0.1f;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for (i = 0; info && i < info->n_items; i++) {
 | 
						for (i = 0; info && i < info->n_items; i++) {
 | 
				
			||||||
		const char *k = info->items[i].key;
 | 
							const char *k = info->items[i].key;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -81,12 +81,12 @@ stream.properties = {
 | 
				
			||||||
    #node.latency          = 1024/48000
 | 
					    #node.latency          = 1024/48000
 | 
				
			||||||
    #node.autoconnect      = true
 | 
					    #node.autoconnect      = true
 | 
				
			||||||
    #resample.quality      = 4
 | 
					    #resample.quality      = 4
 | 
				
			||||||
    #channelmix.normalize  = true
 | 
					    #channelmix.normalize  = false
 | 
				
			||||||
    #channelmix.mix-lfe    = true
 | 
					    #channelmix.mix-lfe    = true
 | 
				
			||||||
    #channelmix.upmix      = false
 | 
					    #channelmix.upmix      = true
 | 
				
			||||||
    #channelmix.lfe-cutoff = 0
 | 
					    #channelmix.lfe-cutoff = 120
 | 
				
			||||||
    #channelmix.fc-cutoff  = 0
 | 
					    #channelmix.fc-cutoff  = 6000
 | 
				
			||||||
    #channelmix.rear-delay = 12.0
 | 
					    #channelmix.rear-delay = 12.0
 | 
				
			||||||
    #channelmix.stereo-widen = 0.0
 | 
					    #channelmix.stereo-widen = 0.1
 | 
				
			||||||
    #channelmix.hilbert-taps = 0
 | 
					    #channelmix.hilbert-taps = 0
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -71,12 +71,12 @@ stream.properties = {
 | 
				
			||||||
    #node.latency          = 1024/48000
 | 
					    #node.latency          = 1024/48000
 | 
				
			||||||
    #node.autoconnect      = true
 | 
					    #node.autoconnect      = true
 | 
				
			||||||
    #resample.quality      = 4
 | 
					    #resample.quality      = 4
 | 
				
			||||||
    #channelmix.normalize  = true
 | 
					    #channelmix.normalize  = false
 | 
				
			||||||
    #channelmix.mix-lfe    = false
 | 
					    #channelmix.mix-lfe    = false
 | 
				
			||||||
    #channelmix.upmix      = false
 | 
					    #channelmix.upmix      = true
 | 
				
			||||||
    #channelmix.lfe-cutoff = 0
 | 
					    #channelmix.lfe-cutoff = 120
 | 
				
			||||||
    #channelmix.fc-cutoff  = 0
 | 
					    #channelmix.fc-cutoff  = 6000
 | 
				
			||||||
    #channelmix.rear-delay = 12.0
 | 
					    #channelmix.rear-delay = 12.0
 | 
				
			||||||
    #channelmix.stereo-widen = 0.0
 | 
					    #channelmix.stereo-widen = 0.1
 | 
				
			||||||
    #channelmix.hilbert-taps = 0
 | 
					    #channelmix.hilbert-taps = 0
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -202,13 +202,13 @@ context.objects = [
 | 
				
			||||||
            #resample.quality       = 4
 | 
					            #resample.quality       = 4
 | 
				
			||||||
            resample.disable       = true
 | 
					            resample.disable       = true
 | 
				
			||||||
            #monitor.channel-volumes = false
 | 
					            #monitor.channel-volumes = false
 | 
				
			||||||
            #channelmix.normalize   = true
 | 
					            #channelmix.normalize   = false
 | 
				
			||||||
            #channelmix.mix-lfe     = false
 | 
					            #channelmix.mix-lfe     = false
 | 
				
			||||||
            #channelmix.upmix       = false
 | 
					            #channelmix.upmix       = true
 | 
				
			||||||
            #channelmix.lfe-cutoff  = 0
 | 
					            #channelmix.lfe-cutoff  = 120
 | 
				
			||||||
            #channelmix.fc-cutoff  = 0
 | 
					            #channelmix.fc-cutoff   = 6000
 | 
				
			||||||
            #channelmix.rear-delay  = 12.0
 | 
					            #channelmix.rear-delay  = 12.0
 | 
				
			||||||
            #channelmix.stereo-widen = 0.0
 | 
					            #channelmix.stereo-widen = 0.1
 | 
				
			||||||
            #channelmix.hilbert-taps = 0
 | 
					            #channelmix.hilbert-taps = 0
 | 
				
			||||||
            channelmix.disable     = true
 | 
					            channelmix.disable     = true
 | 
				
			||||||
            #node.param.Props      = {
 | 
					            #node.param.Props      = {
 | 
				
			||||||
| 
						 | 
					@ -261,13 +261,13 @@ context.objects = [
 | 
				
			||||||
            #audio.position         = "FL,FR"
 | 
					            #audio.position         = "FL,FR"
 | 
				
			||||||
            #resample.quality      = 4
 | 
					            #resample.quality      = 4
 | 
				
			||||||
            resample.disable      = true
 | 
					            resample.disable      = true
 | 
				
			||||||
            #channelmix.normalize  = true
 | 
					            #channelmix.normalize  = false
 | 
				
			||||||
            #channelmix.mix-lfe    = false
 | 
					            #channelmix.mix-lfe    = false
 | 
				
			||||||
            #channelmix.upmix      = false
 | 
					            #channelmix.upmix      = true
 | 
				
			||||||
            #channelmix.lfe-cutoff = 0
 | 
					            #channelmix.lfe-cutoff = 120
 | 
				
			||||||
            #channelmix.fc-cutoff  = 0
 | 
					            #channelmix.fc-cutoff  = 6000
 | 
				
			||||||
            #channelmix.rear-delay = 12.0
 | 
					            #channelmix.rear-delay = 12.0
 | 
				
			||||||
            #channelmix.stereo-widen = 0.0
 | 
					            #channelmix.stereo-widen = 0.1
 | 
				
			||||||
            #channelmix.hilbert-taps = 0
 | 
					            #channelmix.hilbert-taps = 0
 | 
				
			||||||
            channelmix.disable     = true
 | 
					            channelmix.disable     = true
 | 
				
			||||||
            #node.param.Props      = {
 | 
					            #node.param.Props      = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -57,13 +57,13 @@ stream.properties = {
 | 
				
			||||||
    #node.latency          = 1024/48000
 | 
					    #node.latency          = 1024/48000
 | 
				
			||||||
    #node.autoconnect      = true
 | 
					    #node.autoconnect      = true
 | 
				
			||||||
    #resample.quality      = 4
 | 
					    #resample.quality      = 4
 | 
				
			||||||
    #channelmix.normalize  = true
 | 
					    #channelmix.normalize  = false
 | 
				
			||||||
    #channelmix.mix-lfe    = false
 | 
					    #channelmix.mix-lfe    = false
 | 
				
			||||||
    #channelmix.upmix      = false
 | 
					    #channelmix.upmix      = true
 | 
				
			||||||
    #channelmix.lfe-cutoff = 0
 | 
					    #channelmix.lfe-cutoff = 120
 | 
				
			||||||
    #channelmix.fc-cutoff  = 0
 | 
					    #channelmix.fc-cutoff  = 6000
 | 
				
			||||||
    #channelmix.rear-delay = 12.0
 | 
					    #channelmix.rear-delay = 12.0
 | 
				
			||||||
    #channelmix.stereo-widen = 0.0
 | 
					    #channelmix.stereo-widen = 0.1
 | 
				
			||||||
    #channelmix.hilbert-taps = 0
 | 
					    #channelmix.hilbert-taps = 0
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue