From: Andre Noll <maan@systemlinux.org>
Date: Wed, 9 Apr 2014 18:07:07 +0000 (+0200)
Subject: Merge branch 't/oggdec_latency_improvements'
X-Git-Tag: v0.5.2~1
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f76ab46a9216133332cb7e17d38d392caeca22cb;hp=-c

Merge branch 't/oggdec_latency_improvements'

A single commit which was cooking since 2014-03-11.

* t/oggdec_latency_improvements:
  oggdec: Decode only OGGDEC_OUTPUT_CHUNK_SIZE many bytes per iteration.
---

f76ab46a9216133332cb7e17d38d392caeca22cb
diff --combined NEWS
index ab53a176,cc9b67ad..77431a2f
--- a/NEWS
+++ b/NEWS
@@@ -5,25 -5,8 +5,26 @@@ NEW
  0.5.2 (to be announced) "orthogonal interior"
  ---------------------------------------------
  
 -	- The new sync synchronizes playback between multiple clients.
 +The new sync filter, the AES_CTR128 stream cipher and the overhauled
 +network code are the highlights of this release. It also includes a
 +fair number of smaller fixes and improvements not mentioned here.
 +
 +	- The new sync filter synchronizes playback between multiple
 +	  clients.
 +	- Connections between para_server and para_client are now
 +	  encrypted by means of AES rather than RC4 if both sides
 +	  support it. RC4 is still available as a fallback. This
 +	  feature is fully transparent, i.e. no command line options
 +	  are necessary, and a client linked against openssl can
 +	  speak with a server linked against libgcrypt and vice versa.
  	- Major cleanup of the networking subsystem.
 +	- Improvements to para_fade: the new set mode, multi-channel
 +	  initial volumes, better error logging.
 +	- The man pages of para_audiod, para_filter, para_recv, and
 +	  para_write contain the relevant options for receivers, filters,
 +	  writers. This broke in 0.5.0.
++	- ogg/vorbis latency improvements.
 +	- Improved user manual.
  	- Minor fixes to avoid clang warnings.
  
  ------------------------------------------
@@@ -49,9 -32,6 +50,9 @@@ of the build system
  	- Many small bugs in the build system have been identified
  	  and fixed.
  
 +Downloads: ./releases/paraslash-0.5.1.tar.bz2 (tarball),
 +./releases/paraslash-0.5.1.tar.bz2.asc (signature)
 +
  ----------------------------------------
  0.5.0 (2013-08-23) "invertible validity"
  ----------------------------------------
diff --combined oggdec_filter.c
index 1eaa7930,fd06cd16..cec9c6c3
--- a/oggdec_filter.c
+++ b/oggdec_filter.c
@@@ -1,5 -1,5 +1,5 @@@
  /*
 - * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
 + * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
   *
   * Licensed under the GPL v2. For licencing details see COPYING.
   */
@@@ -236,13 -236,8 +236,8 @@@ static int ogg_post_select(__a_unused s
  			break;
  		fn->min_iqs = 0;
  		have += ret;
- 		if (have < OGGDEC_OUTPUT_CHUNK_SIZE)
- 			continue;
- 		if (btr_get_output_queue_size(btrn) > OGGDEC_MAX_OUTPUT_SIZE)
+ 		if (have >= OGGDEC_OUTPUT_CHUNK_SIZE)
  			break;
- 		btr_add_output(buf, have, btrn);
- 		buf = para_malloc(OGGDEC_OUTPUT_CHUNK_SIZE);
- 		have = 0;
  	}
  	pod->have_more = (ret > 0);
  	if (have > 0) {