mirror of
				https://gitlab.freedesktop.org/pipewire/pipewire.git
				synced 2025-11-03 09:01:54 -05:00 
			
		
		
		
	Revert "pulse-server: Handle clients that send more than requested"
This reverts commit a79b5c86ea.
			
			
This commit is contained in:
		
							parent
							
								
									903f831b2d
								
							
						
					
					
						commit
						d5bc6aa2cb
					
				
					 3 changed files with 0 additions and 7 deletions
				
			
		| 
						 | 
					@ -172,10 +172,6 @@ static int handle_memblock(struct client *client, struct message *msg)
 | 
				
			||||||
	} else if (filled + msg->length > stream->attr.maxlength) {
 | 
						} else if (filled + msg->length > stream->attr.maxlength) {
 | 
				
			||||||
		/* overrun */
 | 
							/* overrun */
 | 
				
			||||||
		stream_send_overflow(stream);
 | 
							stream_send_overflow(stream);
 | 
				
			||||||
	} else if (filled + msg->length > stream->attr.tlength) {
 | 
					 | 
				
			||||||
		stream->extra_tlength = filled + msg->length - stream->attr.tlength;
 | 
					 | 
				
			||||||
		pw_log_info("client %p [%s]: received %u more than asked for channel %d",
 | 
					 | 
				
			||||||
			    client, client->name, stream->extra_tlength, channel);
 | 
					 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	/* always write data to ringbuffer, we expect the other side
 | 
						/* always write data to ringbuffer, we expect the other side
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -163,7 +163,6 @@ void stream_flush(struct stream *stream)
 | 
				
			||||||
		if (stream->attr.prebuf > 0)
 | 
							if (stream->attr.prebuf > 0)
 | 
				
			||||||
			stream->in_prebuf = true;
 | 
								stream->in_prebuf = true;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		stream->extra_tlength = 0;
 | 
					 | 
				
			||||||
		stream->playing_for = 0;
 | 
							stream->playing_for = 0;
 | 
				
			||||||
		stream->underrun_for = -1;
 | 
							stream->underrun_for = -1;
 | 
				
			||||||
		stream->is_underrun = true;
 | 
							stream->is_underrun = true;
 | 
				
			||||||
| 
						 | 
					@ -194,7 +193,6 @@ uint32_t stream_pop_missing(struct stream *stream)
 | 
				
			||||||
	avail = stream->write_index - stream->read_index;
 | 
						avail = stream->write_index - stream->read_index;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	missing = stream->attr.tlength;
 | 
						missing = stream->attr.tlength;
 | 
				
			||||||
	missing += stream->extra_tlength;
 | 
					 | 
				
			||||||
	missing -= stream->requested;
 | 
						missing -= stream->requested;
 | 
				
			||||||
	missing -= avail;
 | 
						missing -= avail;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -97,7 +97,6 @@ struct stream {
 | 
				
			||||||
	struct sample_spec ss;
 | 
						struct sample_spec ss;
 | 
				
			||||||
	struct channel_map map;
 | 
						struct channel_map map;
 | 
				
			||||||
	struct buffer_attr attr;
 | 
						struct buffer_attr attr;
 | 
				
			||||||
	uint32_t extra_tlength;
 | 
					 | 
				
			||||||
	uint32_t frame_size;
 | 
						uint32_t frame_size;
 | 
				
			||||||
	uint32_t rate;
 | 
						uint32_t rate;
 | 
				
			||||||
	uint64_t lat_usec;
 | 
						uint64_t lat_usec;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue