mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	filter-graph: improve output port number calculations
When no output ports are given, use the number of graph outputs, which needs to take into account the number of times we duplicated the graph.
This commit is contained in:
		
							parent
							
								
									3b27ff0c71
								
							
						
					
					
						commit
						3b51dbba1c
					
				
					 1 changed files with 7 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -1608,12 +1608,14 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
 | 
			
		|||
 | 
			
		||||
	if (impl->info.n_inputs == 0)
 | 
			
		||||
		impl->info.n_inputs = n_input;
 | 
			
		||||
	if (impl->info.n_outputs == 0)
 | 
			
		||||
		impl->info.n_outputs = n_output;
 | 
			
		||||
 | 
			
		||||
	/* compare to the requested number of inputs and duplicate the
 | 
			
		||||
	 * graph n_hndl times when needed. */
 | 
			
		||||
	n_hndl = impl->info.n_inputs / n_input;
 | 
			
		||||
 | 
			
		||||
	if (impl->info.n_outputs == 0)
 | 
			
		||||
		impl->info.n_outputs = n_output * n_hndl;
 | 
			
		||||
 | 
			
		||||
	if (n_hndl != impl->info.n_outputs / n_output) {
 | 
			
		||||
		spa_log_error(impl->log, "invalid ports. The input stream has %1$d ports and "
 | 
			
		||||
				"the filter has %2$d inputs. The output stream has %3$d ports "
 | 
			
		||||
| 
						 | 
				
			
			@ -1638,6 +1640,9 @@ static int setup_graph(struct graph *graph, struct spa_json *inputs, struct spa_
 | 
			
		|||
				"unconnected..",
 | 
			
		||||
				impl->info.n_inputs, n_input,
 | 
			
		||||
				impl->info.n_outputs, n_output);
 | 
			
		||||
 | 
			
		||||
		if (impl->info.n_outputs == 0)
 | 
			
		||||
			impl->info.n_outputs = n_output * n_hndl;
 | 
			
		||||
	}
 | 
			
		||||
	spa_log_info(impl->log, "using %d instances %d %d", n_hndl, n_input, n_output);
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue