[xiph-cvs] cvs commit: ices/src stream_shared.c

[Karl Heyes]

karl        03/04/04 11:32:16

  Modified:    src      stream_shared.c
  Log:
  Fix for when PCM-based metadata updates occur and resampling is in use. This
  had shown up as an assert error, causing a termination of ices.

Revision  Changes    Path
1.16      +4 -1      ices/src/stream_shared.c

Index: stream_shared.c
===================================================================
RCS file: /usr/local/cvsroot/ices/src/stream_shared.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- stream_shared.c	22 Mar 2003 02:27:55 -0000	1.15
+++ stream_shared.c	4 Apr 2003 16:32:16 -0000	1.16
@@ -1,7 +1,7 @@
 /* stream_shared.c
  * - Stream utility functions.
  *
- * $Id: stream_shared.c,v 1.15 2003/03/22 02:27:55 karl Exp $
+ * $Id: stream_shared.c,v 1.16 2003/04/04 16:32:16 karl Exp $
  *
  * Copyright (c) 2001 Michael Smith <msmith at labyrinth.net.au>
  *
@@ -146,6 +146,9 @@
                 resample_finish(sdsc->resamp);
                 encode_data_float(sdsc->enc, sdsc->resamp->buffers,
                         sdsc->resamp->buffill);
+                resample_clear(sdsc->resamp);
+                sdsc->resamp = resample_initialise (sdsc->stream->channels,
+                        sdsc->stream->resampleinrate, sdsc->stream->resampleoutrate);
             }
             encode_finish(sdsc->enc);
             while(encode_flush(sdsc->enc, &og) != 0)

<p><p>--- >8 ----
List archives:  http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body.  No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.