mirror of
				https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
				synced 2025-11-03 09:01:50 -05:00 
			
		
		
		
	don't enable prebuffering if we just call is_readable()
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/glitch-free@2341 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
		
							parent
							
								
									52e3628c3e
								
							
						
					
					
						commit
						49b1b15ef0
					
				
					 1 changed files with 11 additions and 2 deletions
				
			
		| 
						 | 
					@ -428,6 +428,15 @@ finish:
 | 
				
			||||||
pa_bool_t pa_memblockq_prebuf_active(pa_memblockq *bq) {
 | 
					pa_bool_t pa_memblockq_prebuf_active(pa_memblockq *bq) {
 | 
				
			||||||
    pa_assert(bq);
 | 
					    pa_assert(bq);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    if (bq->in_prebuf)
 | 
				
			||||||
 | 
					        return pa_memblockq_get_length(bq) < bq->prebuf;
 | 
				
			||||||
 | 
					    else
 | 
				
			||||||
 | 
					        return bq->prebuf > 0 && bq->read_index >= bq->write_index;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					static pa_bool_t update_prebuf(pa_memblockq *bq) {
 | 
				
			||||||
 | 
					    pa_assert(bq);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (bq->in_prebuf) {
 | 
					    if (bq->in_prebuf) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (pa_memblockq_get_length(bq) < bq->prebuf)
 | 
					        if (pa_memblockq_get_length(bq) < bq->prebuf)
 | 
				
			||||||
| 
						 | 
					@ -452,7 +461,7 @@ int pa_memblockq_peek(pa_memblockq* bq, pa_memchunk *chunk) {
 | 
				
			||||||
    pa_assert(chunk);
 | 
					    pa_assert(chunk);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    /* We need to pre-buffer */
 | 
					    /* We need to pre-buffer */
 | 
				
			||||||
    if (pa_memblockq_prebuf_active(bq))
 | 
					    if (update_prebuf(bq))
 | 
				
			||||||
        return -1;
 | 
					        return -1;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    fix_current_read(bq);
 | 
					    fix_current_read(bq);
 | 
				
			||||||
| 
						 | 
					@ -515,7 +524,7 @@ void pa_memblockq_drop(pa_memblockq *bq, size_t length) {
 | 
				
			||||||
    while (length > 0) {
 | 
					    while (length > 0) {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* Do not drop any data when we are in prebuffering mode */
 | 
					        /* Do not drop any data when we are in prebuffering mode */
 | 
				
			||||||
        if (pa_memblockq_prebuf_active(bq))
 | 
					        if (update_prebuf(bq))
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        fix_current_read(bq);
 | 
					        fix_current_read(bq);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue