mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	splitter: disable passthrough in more cases
Also disable passthrough when we first negotiate output format/buffers and passthrough is not possible because the output buffer does not have the dynamic data flag set..
This commit is contained in:
		
							parent
							
								
									d8f39a7c02
								
							
						
					
					
						commit
						cd779a1c93
					
				
					 1 changed files with 5 additions and 3 deletions
				
			
		| 
						 | 
					@ -279,6 +279,7 @@ static int impl_node_set_param(struct spa_node *node, uint32_t id, uint32_t flag
 | 
				
			||||||
					SPA_DIRECTION_OUTPUT, i, NULL);
 | 
										SPA_DIRECTION_OUTPUT, i, NULL);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		this->have_profile = true;
 | 
							this->have_profile = true;
 | 
				
			||||||
 | 
							this->is_passthrough = true;
 | 
				
			||||||
		port->have_format = true;
 | 
							port->have_format = true;
 | 
				
			||||||
		port->format = info;
 | 
							port->format = info;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -561,7 +562,7 @@ static int setup_convert(struct impl *this)
 | 
				
			||||||
	spa_log_info(this->log, NAME " %p: got converter features %08x:%08x", this,
 | 
						spa_log_info(this->log, NAME " %p: got converter features %08x:%08x", this,
 | 
				
			||||||
			this->cpu_flags, this->conv.cpu_flags);
 | 
								this->cpu_flags, this->conv.cpu_flags);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	this->is_passthrough = this->conv.is_passthrough;
 | 
						this->is_passthrough &= this->conv.is_passthrough;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return 0;
 | 
						return 0;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					@ -926,8 +927,9 @@ static int impl_node_process(struct spa_node *node)
 | 
				
			||||||
		res |= SPA_STATUS_HAVE_BUFFER;
 | 
							res |= SPA_STATUS_HAVE_BUFFER;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	spa_log_trace_fp(this->log, NAME " %p: %d %d %d %d %d", this,
 | 
						spa_log_trace_fp(this->log, NAME " %p: %d %d %d %d %d %d", this,
 | 
				
			||||||
			n_src_datas, n_dst_datas, n_samples, maxsize, inport->stride);
 | 
								n_src_datas, n_dst_datas, n_samples, maxsize, inport->stride,
 | 
				
			||||||
 | 
								this->is_passthrough);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (!this->is_passthrough)
 | 
						if (!this->is_passthrough)
 | 
				
			||||||
		convert_process(&this->conv, dst_datas, src_datas, n_samples);
 | 
							convert_process(&this->conv, dst_datas, src_datas, n_samples);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue