[xiph-cvs] r6456 - in branches/rel-1-0-branch/speex: . src

[jm at xiph.org]

Author: jm
Date: 2004-03-23 00:28:21 -0500 (Tue, 23 Mar 2004)
New Revision: 6456

Modified:
   branches/rel-1-0-branch/speex/configure.in
   branches/rel-1-0-branch/speex/src/speexenc.c
Log:
Made speexenc flush page after first header in order to be compliant
with the Ogg spec.

<p>Modified: branches/rel-1-0-branch/speex/configure.in
===================================================================
--- branches/rel-1-0-branch/speex/configure.in	2004-03-22 20:24:54 UTC (rev 6455)
+++ branches/rel-1-0-branch/speex/configure.in	2004-03-23 05:28:21 UTC (rev 6456)
@@ -4,11 +4,11 @@
 
 SPEEX_MAJOR_VERSION=1
 SPEEX_MINOR_VERSION=0
-SPEEX_MICRO_VERSION=3
-SPEEX_VERSION=1.0.3
+SPEEX_MICRO_VERSION=4
+SPEEX_VERSION=1.0.4
 
 SPEEX_LT_CURRENT=2
-SPEEX_LT_REVISION=2
+SPEEX_LT_REVISION=3
 SPEEX_LT_AGE=1
 
 AC_SUBST(SPEEX_LT_CURRENT)

Modified: branches/rel-1-0-branch/speex/src/speexenc.c
===================================================================
--- branches/rel-1-0-branch/speex/src/speexenc.c	2004-03-22 20:24:54 UTC (rev 6455)
+++ branches/rel-1-0-branch/speex/src/speexenc.c	2004-03-23 05:28:21 UTC (rev 6456)
@@ -538,7 +538,7 @@
    }
 
 
-   /*Write header (format will change)*/
+   /*Write header*/
    {
 
       op.packet = (unsigned char *)speex_header_to_packet(&header, (int*)&(op.bytes));
@@ -549,6 +549,19 @@
       ogg_stream_packetin(&os, &op);
       free(op.packet);
 
+      while((result = ogg_stream_flush(&os, &og)))
+      {
+         if(!result) break;
+         ret = oe_write_page(&og, fout);
+         if(ret != og.header_len + og.body_len)
+         {
+            fprintf (stderr,"Error: failed writing header to output stream\n");
+            exit(1);
+         }
+         else
+            bytes_written += ret;
+      }
+
       op.packet = (unsigned char *)comments;
       op.bytes = comments_length;
       op.b_o_s = 0;

--- >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.