mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	pulse: limit get_writable_size()
Try to limit the amount of data we can write. Fixes chrome playback.
This commit is contained in:
		
							parent
							
								
									81ca70af9b
								
							
						
					
					
						commit
						62ef0145c3
					
				
					 1 changed files with 10 additions and 9 deletions
				
			
		| 
						 | 
					@ -493,8 +493,7 @@ static void stream_process(void *data)
 | 
				
			||||||
				s, queued, target, wanted, required);
 | 
									s, queued, target, wanted, required);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (s->write_callback && s->state == PA_STREAM_READY &&
 | 
							if (s->write_callback && s->state == PA_STREAM_READY &&
 | 
				
			||||||
				queued < wanted &&
 | 
									queued < wanted && wanted >= required)
 | 
				
			||||||
				wanted >= required)
 | 
					 | 
				
			||||||
			s->write_callback(s, wanted, s->write_userdata);
 | 
								s->write_callback(s, wanted, s->write_userdata);
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
	else {
 | 
						else {
 | 
				
			||||||
| 
						 | 
					@ -1283,7 +1282,7 @@ SPA_EXPORT
 | 
				
			||||||
size_t pa_stream_writable_size(PA_CONST pa_stream *s)
 | 
					size_t pa_stream_writable_size(PA_CONST pa_stream *s)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
	const pa_timing_info *i;
 | 
						const pa_timing_info *i;
 | 
				
			||||||
	uint64_t now, then, queued, writable, elapsed, required;
 | 
						uint64_t now, then, queued, target, wanted, elapsed, required;
 | 
				
			||||||
	struct timespec ts;
 | 
						struct timespec ts;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	spa_assert(s);
 | 
						spa_assert(s);
 | 
				
			||||||
| 
						 | 
					@ -1306,16 +1305,18 @@ size_t pa_stream_writable_size(PA_CONST pa_stream *s)
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	queued = queued_size(s, elapsed);
 | 
						queued = queued_size(s, elapsed);
 | 
				
			||||||
	writable = writable_size(s, queued);
 | 
						target = target_queue(s);
 | 
				
			||||||
 | 
						wanted = wanted_size(s, queued, target);
 | 
				
			||||||
	required = required_size(s);
 | 
						required = required_size(s);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	pw_log_debug("stream %p: writable:%"PRIu64" queued:%"PRIu64" required:%"PRIu64, s,
 | 
						pw_log_debug("stream %p: queued:%"PRIu64" target:%"PRIu64
 | 
				
			||||||
			writable, queued, required);
 | 
								" wanted:%"PRIu64" required:%"PRIu64, s,
 | 
				
			||||||
 | 
								queued, target, wanted, required);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	if (writable < required)
 | 
						if (queued >= wanted || wanted < required)
 | 
				
			||||||
		writable = 0;
 | 
							wanted = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	return writable;
 | 
						return wanted;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SPA_EXPORT
 | 
					SPA_EXPORT
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue