diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-05-17 21:28:06 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2004-05-17 21:28:06 +0000 |
| commit | 41f95c85f4e4259d50214956cc6abfd46263c736 (patch) | |
| tree | 4ae7d61aae2444d83bcc3d8705c6459124f44498 | |
| parent | a8d5b82eef699ff6c6aa745143b13a13d7201058 (diff) | |
| download | xine-lib-41f95c85f4e4259d50214956cc6abfd46263c736.tar.gz xine-lib-41f95c85f4e4259d50214956cc6abfd46263c736.tar.bz2 | |
Fix noises appearing when seeking and using the upmix plugin.
CVS patchset: 6561
CVS date: 2004/05/17 21:28:06
| -rw-r--r-- | src/post/audio/upmix.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/audio_out.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/post/audio/upmix.c b/src/post/audio/upmix.c index 0a3dba3f1..1d17bbf63 100644 --- a/src/post/audio/upmix.c +++ b/src/post/audio/upmix.c @@ -23,7 +23,7 @@ * It simply creates output channels to match the speaker arrangement. * E.g. Converts Stereo into Surround 5.1 * - * $Id: upmix.c,v 1.9 2004/05/17 16:19:05 jcdutton Exp $ + * $Id: upmix.c,v 1.10 2004/05/17 21:28:06 jcdutton Exp $ * */ @@ -325,7 +325,7 @@ static void upmix_port_put_buffer (xine_audio_port_t *port_gen, int num_frames; int num_frames_done; int num_frames_processed=0; - + if ((this->channels==2) && (this->channels_out==6)) { while (num_frames_processed < buf->num_frames) { this->buf = port->original_port->get_buffer(port->original_port); diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c index e8630bf1c..f0b541c80 100644 --- a/src/xine-engine/audio_out.c +++ b/src/xine-engine/audio_out.c @@ -17,7 +17,7 @@ * along with self program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: audio_out.c,v 1.175 2004/05/16 21:39:55 jcdutton Exp $ + * $Id: audio_out.c,v 1.176 2004/05/17 21:28:06 jcdutton Exp $ * * 22-8-2001 James imported some useful AC3 sections from the previous alsa driver. * (c) 2001 Andy Lo A Foe <andy@alsaplayer.org> @@ -1873,7 +1873,7 @@ xine_audio_port_t *_x_ao_new_port (xine_t *xine, ao_driver_t *driver, this->grab_only = grab_only; this->flush_audio_driver = 0; this->discard_buffers = 0; - this->zero_space = xine_xmalloc (ZERO_BUF_SIZE * 2 * 6); + this->zero_space = xine_xmalloc (ZERO_BUF_SIZE * 4 * 6); /* MAX as 32bit, 6 channels. */ pthread_mutex_init( &this->flush_audio_driver_lock, NULL ); pthread_cond_init( &this->flush_audio_driver_reached, NULL ); |