fix _WIN32 check to exclude Symbian emulator builds
[platform/upstream/libvorbis.git] / lib / info.c
index 32447bf..5e57feb 100644 (file)
 /********************************************************************
  *                                                                  *
- * THIS FILE IS PART OF THE Ogg Vorbis SOFTWARE CODEC SOURCE CODE.  *
- * USE, DISTRIBUTION AND REPRODUCTION OF THIS SOURCE IS GOVERNED BY *
- * THE GNU PUBLIC LICENSE 2, WHICH IS INCLUDED WITH THIS SOURCE.    *
- * PLEASE READ THESE TERMS DISTRIBUTING.                            *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
  *                                                                  *
- * THE OggSQUISH SOURCE CODE IS (C) COPYRIGHT 1994-2000             *
- * by Monty <monty@xiph.org> and The XIPHOPHORUS Company            *
- * http://www.xiph.org/                                             *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2003             *
+ * by the XIPHOPHORUS Company http://www.xiph.org/                  *
  *                                                                  *
  ********************************************************************
 
  function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.11 1999/12/30 07:26:39 xiphmont Exp $
+ last mod: $Id: info.c,v 1.63 2003/12/30 11:02:22 xiphmont Exp $
 
  ********************************************************************/
 
-/* This fills in a vorbis_info structure with settings from a few
-   pre-defined encoding modes.  Also handles choosing/blowing in the
-   codebook */
+/* general handling of the header and the vorbis_info structure (and
+   substructures) */
 
 #include <stdlib.h>
 #include <string.h>
-#include "modes.h"
-#include "bitwise.h"
-
+#include <ctype.h>
+#include <ogg/ogg.h>
+#include "vorbis/codec.h"
+#include "codec_internal.h"
+#include "codebook.h"
+#include "registry.h"
+#include "window.h"
+#include "psy.h"
+#include "misc.h"
+#include "os.h"
+
+/* helpers */
 static int ilog2(unsigned int v){
   int ret=0;
-  while(v>1){
+  if(v)--v;
+  while(v){
     ret++;
     v>>=1;
   }
   return(ret);
 }
+
+static void _v_writestring(oggpack_buffer *o,char *s, int bytes){
+
+  while(bytes--){
+    oggpack_write(o,*s++,8);
+  }
+}
+
+static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
+  while(bytes--){
+    *buf++=oggpack_read(o,8);
+  }
+}
+
+void vorbis_comment_init(vorbis_comment *vc){
+  memset(vc,0,sizeof(*vc));
+}
+
+void vorbis_comment_add(vorbis_comment *vc,char *comment){
+  vc->user_comments=_ogg_realloc(vc->user_comments,
+                           (vc->comments+2)*sizeof(*vc->user_comments));
+  vc->comment_lengths=_ogg_realloc(vc->comment_lengths,
+                           (vc->comments+2)*sizeof(*vc->comment_lengths));
+  vc->comment_lengths[vc->comments]=strlen(comment);
+  vc->user_comments[vc->comments]=_ogg_malloc(vc->comment_lengths[vc->comments]+1);
+  strcpy(vc->user_comments[vc->comments], comment);
+  vc->comments++;
+  vc->user_comments[vc->comments]=NULL;
+}
+
+void vorbis_comment_add_tag(vorbis_comment *vc, char *tag, char *contents){
+  char *comment=alloca(strlen(tag)+strlen(contents)+2); /* +2 for = and \0 */
+  strcpy(comment, tag);
+  strcat(comment, "=");
+  strcat(comment, contents);
+  vorbis_comment_add(vc, comment);
+}
+
+/* This is more or less the same as strncasecmp - but that doesn't exist
+ * everywhere, and this is a fairly trivial function, so we include it */
+static int tagcompare(const char *s1, const char *s2, int n){
+  int c=0;
+  while(c < n){
+    if(toupper(s1[c]) != toupper(s2[c]))
+      return !0;
+    c++;
+  }
+  return 0;
+}
+
+char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count){
+  long i;
+  int found = 0;
+  int taglen = strlen(tag)+1; /* +1 for the = we append */
+  char *fulltag = alloca(taglen+ 1);
+
+  strcpy(fulltag, tag);
+  strcat(fulltag, "=");
   
+  for(i=0;i<vc->comments;i++){
+    if(!tagcompare(vc->user_comments[i], fulltag, taglen)){
+      if(count == found)
+       /* We return a pointer to the data, not a copy */
+       return vc->user_comments[i] + taglen;
+      else
+       found++;
+    }
+  }
+  return NULL; /* didn't find anything */
+}
+
+int vorbis_comment_query_count(vorbis_comment *vc, char *tag){
+  int i,count=0;
+  int taglen = strlen(tag)+1; /* +1 for the = we append */
+  char *fulltag = alloca(taglen+1);
+  strcpy(fulltag,tag);
+  strcat(fulltag, "=");
+
+  for(i=0;i<vc->comments;i++){
+    if(!tagcompare(vc->user_comments[i], fulltag, taglen))
+      count++;
+  }
+
+  return count;
+}
+
+void vorbis_comment_clear(vorbis_comment *vc){
+  if(vc){
+    long i;
+    for(i=0;i<vc->comments;i++)
+      if(vc->user_comments[i])_ogg_free(vc->user_comments[i]);
+    if(vc->user_comments)_ogg_free(vc->user_comments);
+       if(vc->comment_lengths)_ogg_free(vc->comment_lengths);
+    if(vc->vendor)_ogg_free(vc->vendor);
+  }
+  memset(vc,0,sizeof(*vc));
+}
+
+/* blocksize 0 is guaranteed to be short, 1 is guarantted to be long.
+   They may be equal, but short will never ge greater than long */
+int vorbis_info_blocksize(vorbis_info *vi,int zo){
+  codec_setup_info *ci = vi->codec_setup;
+  return ci ? ci->blocksizes[zo] : -1;
+}
+
+/* used by synthesis, which has a full, alloced vi */
 void vorbis_info_init(vorbis_info *vi){
-  memset(vi,0,sizeof(vorbis_info));
+  memset(vi,0,sizeof(*vi));
+  vi->codec_setup=_ogg_calloc(1,sizeof(codec_setup_info));
 }
 
-/* one test mode for now; temporary of course */
-int vorbis_info_modeset(vorbis_info *vi, int mode){
-  if(mode<0 || mode>predef_mode_max)return(-1);
+void vorbis_info_clear(vorbis_info *vi){
+  codec_setup_info     *ci=vi->codec_setup;
+  int i;
 
-  /* handle the flat settings first */
-  memcpy(vi,&(predef_modes[mode]),sizeof(vorbis_info));
-  vi->threshhold_points=threshhold_points;
-  vi->user_comments=calloc(1,sizeof(char *));
-  vi->vendor=strdup("Xiphophorus libVorbis I 19991104");
+  if(ci){
+
+    for(i=0;i<ci->modes;i++)
+      if(ci->mode_param[i])_ogg_free(ci->mode_param[i]);
+
+    for(i=0;i<ci->maps;i++) /* unpack does the range checking */
+      _mapping_P[ci->map_type[i]]->free_info(ci->map_param[i]);
+
+    for(i=0;i<ci->floors;i++) /* unpack does the range checking */
+      _floor_P[ci->floor_type[i]]->free_info(ci->floor_param[i]);
+    
+    for(i=0;i<ci->residues;i++) /* unpack does the range checking */
+      _residue_P[ci->residue_type[i]]->free_info(ci->residue_param[i]);
+
+    for(i=0;i<ci->books;i++){
+      if(ci->book_param[i]){
+       /* knows if the book was not alloced */
+       vorbis_staticbook_destroy(ci->book_param[i]);
+      }
+      if(ci->fullbooks)
+       vorbis_book_clear(ci->fullbooks+i);
+    }
+    if(ci->fullbooks)
+       _ogg_free(ci->fullbooks);
+    
+    for(i=0;i<ci->psys;i++)
+      _vi_psy_free(ci->psy_param[i]);
+
+    _ogg_free(ci);
+  }
+
+  memset(vi,0,sizeof(*vi));
+}
+
+/* Header packing/unpacking ********************************************/
+
+static int _vorbis_unpack_info(vorbis_info *vi,oggpack_buffer *opb){
+  codec_setup_info     *ci=vi->codec_setup;
+  if(!ci)return(OV_EFAULT);
+
+  vi->version=oggpack_read(opb,32);
+  if(vi->version!=0)return(OV_EVERSION);
+
+  vi->channels=oggpack_read(opb,8);
+  vi->rate=oggpack_read(opb,32);
+
+  vi->bitrate_upper=oggpack_read(opb,32);
+  vi->bitrate_nominal=oggpack_read(opb,32);
+  vi->bitrate_lower=oggpack_read(opb,32);
+
+  ci->blocksizes[0]=1<<oggpack_read(opb,4);
+  ci->blocksizes[1]=1<<oggpack_read(opb,4);
+  
+  if(vi->rate<1)goto err_out;
+  if(vi->channels<1)goto err_out;
+  if(ci->blocksizes[0]<8)goto err_out; 
+  if(ci->blocksizes[1]<ci->blocksizes[0])goto err_out;
+  
+  if(oggpack_read(opb,1)!=1)goto err_out; /* EOP check */
 
   return(0);
+ err_out:
+  vorbis_info_clear(vi);
+  return(OV_EBADHEADER);
 }
 
-/* convenience function */
-int vorbis_info_addcomment(vorbis_info *vi,char *comment){
-  vi->user_comments=realloc(vi->user_comments,
-                           (vi->comments+2)*sizeof(char *));
-  vi->user_comments[vi->comments]=strdup(comment);
-  vi->comments++;
-  vi->user_comments[vi->comments]=NULL;
+static int _vorbis_unpack_comment(vorbis_comment *vc,oggpack_buffer *opb){
+  int i;
+  int vendorlen=oggpack_read(opb,32);
+  if(vendorlen<0)goto err_out;
+  vc->vendor=_ogg_calloc(vendorlen+1,1);
+  _v_readstring(opb,vc->vendor,vendorlen);
+  vc->comments=oggpack_read(opb,32);
+  if(vc->comments<0)goto err_out;
+  vc->user_comments=_ogg_calloc(vc->comments+1,sizeof(*vc->user_comments));
+  vc->comment_lengths=_ogg_calloc(vc->comments+1, sizeof(*vc->comment_lengths));
+           
+  for(i=0;i<vc->comments;i++){
+    int len=oggpack_read(opb,32);
+    if(len<0)goto err_out;
+       vc->comment_lengths[i]=len;
+    vc->user_comments[i]=_ogg_calloc(len+1,1);
+    _v_readstring(opb,vc->user_comments[i],len);
+  }      
+  if(oggpack_read(opb,1)!=1)goto err_out; /* EOP check */
+
   return(0);
+ err_out:
+  vorbis_comment_clear(vc);
+  return(OV_EBADHEADER);
 }
 
-static void _v_writestring(oggpack_buffer *o,char *s){
-  while(*s){
-    _oggpack_write(o,*s++,8);
+/* all of the real encoding details are here.  The modes, books,
+   everything */
+static int _vorbis_unpack_books(vorbis_info *vi,oggpack_buffer *opb){
+  codec_setup_info     *ci=vi->codec_setup;
+  int i;
+  if(!ci)return(OV_EFAULT);
+
+  /* codebooks */
+  ci->books=oggpack_read(opb,8)+1;
+  /*ci->book_param=_ogg_calloc(ci->books,sizeof(*ci->book_param));*/
+  for(i=0;i<ci->books;i++){
+    ci->book_param[i]=_ogg_calloc(1,sizeof(*ci->book_param[i]));
+    if(vorbis_staticbook_unpack(opb,ci->book_param[i]))goto err_out;
   }
-}
 
-static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
-  while(bytes--){
-    *buf++=_oggpack_read(o,8);
+  /* time backend settings; hooks are unused */
+  {
+    int times=oggpack_read(opb,6)+1;
+    for(i=0;i<times;i++){
+      int test=oggpack_read(opb,16);
+      if(test<0 || test>=VI_TIMEB)goto err_out;
+    }
+  }
+
+  /* floor backend settings */
+  ci->floors=oggpack_read(opb,6)+1;
+  /*ci->floor_type=_ogg_malloc(ci->floors*sizeof(*ci->floor_type));*/
+  /*ci->floor_param=_ogg_calloc(ci->floors,sizeof(void *));*/
+  for(i=0;i<ci->floors;i++){
+    ci->floor_type[i]=oggpack_read(opb,16);
+    if(ci->floor_type[i]<0 || ci->floor_type[i]>=VI_FLOORB)goto err_out;
+    ci->floor_param[i]=_floor_P[ci->floor_type[i]]->unpack(vi,opb);
+    if(!ci->floor_param[i])goto err_out;
+  }
+
+  /* residue backend settings */
+  ci->residues=oggpack_read(opb,6)+1;
+  /*ci->residue_type=_ogg_malloc(ci->residues*sizeof(*ci->residue_type));*/
+  /*ci->residue_param=_ogg_calloc(ci->residues,sizeof(void *));*/
+  for(i=0;i<ci->residues;i++){
+    ci->residue_type[i]=oggpack_read(opb,16);
+    if(ci->residue_type[i]<0 || ci->residue_type[i]>=VI_RESB)goto err_out;
+    ci->residue_param[i]=_residue_P[ci->residue_type[i]]->unpack(vi,opb);
+    if(!ci->residue_param[i])goto err_out;
+  }
+
+  /* map backend settings */
+  ci->maps=oggpack_read(opb,6)+1;
+  /*ci->map_type=_ogg_malloc(ci->maps*sizeof(*ci->map_type));*/
+  /*ci->map_param=_ogg_calloc(ci->maps,sizeof(void *));*/
+  for(i=0;i<ci->maps;i++){
+    ci->map_type[i]=oggpack_read(opb,16);
+    if(ci->map_type[i]<0 || ci->map_type[i]>=VI_MAPB)goto err_out;
+    ci->map_param[i]=_mapping_P[ci->map_type[i]]->unpack(vi,opb);
+    if(!ci->map_param[i])goto err_out;
+  }
+  
+  /* mode settings */
+  ci->modes=oggpack_read(opb,6)+1;
+  /*vi->mode_param=_ogg_calloc(vi->modes,sizeof(void *));*/
+  for(i=0;i<ci->modes;i++){
+    ci->mode_param[i]=_ogg_calloc(1,sizeof(*ci->mode_param[i]));
+    ci->mode_param[i]->blockflag=oggpack_read(opb,1);
+    ci->mode_param[i]->windowtype=oggpack_read(opb,16);
+    ci->mode_param[i]->transformtype=oggpack_read(opb,16);
+    ci->mode_param[i]->mapping=oggpack_read(opb,8);
+
+    if(ci->mode_param[i]->windowtype>=VI_WINDOWB)goto err_out;
+    if(ci->mode_param[i]->transformtype>=VI_WINDOWB)goto err_out;
+    if(ci->mode_param[i]->mapping>=ci->maps)goto err_out;
   }
+  
+  if(oggpack_read(opb,1)!=1)goto err_out; /* top level EOP check */
+
+  return(0);
+ err_out:
+  vorbis_info_clear(vi);
+  return(OV_EBADHEADER);
 }
 
 /* The Vorbis header is in three packets; the initial small packet in
@@ -78,243 +333,271 @@ static void _v_readstring(oggpack_buffer *o,char *buf,int bytes){
    with bitstream comments and a third packet that holds the
    codebook. */
 
-int vorbis_info_headerin(vorbis_info *vi,ogg_packet *op){
-
+int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,ogg_packet *op){
   oggpack_buffer opb;
   
   if(op){
-    _oggpack_readinit(&opb,op->packet,op->bytes);
+    oggpack_readinit(&opb,op->packet,op->bytes);
 
     /* Which of the three types of header is this? */
     /* Also verify header-ness, vorbis */
     {
       char buffer[6];
+      int packtype=oggpack_read(&opb,8);
       memset(buffer,0,6);
       _v_readstring(&opb,buffer,6);
       if(memcmp(buffer,"vorbis",6)){
        /* not a vorbis header */
-       return(-1);
+       return(OV_ENOTVORBIS);
       }
-      switch(_oggpack_read(&opb,8)){
-      case 0x80:
+      switch(packtype){
+      case 0x01: /* least significant *bit* is read first */
        if(!op->b_o_s){
          /* Not the initial packet */
-         return(-1);
+         return(OV_EBADHEADER);
        }
        if(vi->rate!=0){
          /* previously initialized info header */
-         return(-1);
+         return(OV_EBADHEADER);
        }
 
-       if(_oggpack_read(&opb,32)!=0){
-         return(-1);
-       }
-       vi->channels=_oggpack_read(&opb,8);
-       vi->rate=_oggpack_read(&opb,32);
-
-       vi->bitrate_upper=_oggpack_read(&opb,32);
-       vi->bitrate_nominal=_oggpack_read(&opb,32);
-       vi->bitrate_lower=_oggpack_read(&opb,32);
-
-       vi->blocksize[0]=1<<_oggpack_read(&opb,4);
-       vi->blocksize[1]=1<<_oggpack_read(&opb,4);
-
-       vi->floororder[0]=_oggpack_read(&opb,8);
-       vi->floororder[1]=_oggpack_read(&opb,8);
-       vi->flooroctaves[0]=_oggpack_read(&opb,8);
-       vi->flooroctaves[1]=_oggpack_read(&opb,8);
-       vi->floorch=_oggpack_read(&opb,8);
-
-       if(vi->rate<1)return(-1);
-       if(vi->floorch<1 || vi->floorch>vi->channels)return(-1);
+       return(_vorbis_unpack_info(vi,&opb));
 
-       return(0);
-      case 0x81:
+      case 0x03: /* least significant *bit* is read first */
        if(vi->rate==0){
-         /* um... we didn;t get the initial header */
-         return(-1);
-       }
-       {
-         int vendorlen=_oggpack_read(&opb,32);
-         vi->vendor=calloc(vendorlen+1,1);
-         _v_readstring(&opb,vi->vendor,vendorlen);
-       }
-       {
-         int i;
-         vi->comments=_oggpack_read(&opb,32);
-         vi->user_comments=calloc(vi->comments+1,sizeof(char **));
-           
-         for(i=0;i<vi->comments;i++){
-           int len=_oggpack_read(&opb,32);
-           vi->user_comments[i]=calloc(len+1,1);
-           _v_readstring(&opb,vi->user_comments[i],len);
-         }       
+         /* um... we didn't get the initial header */
+         return(OV_EBADHEADER);
        }
 
-       return(0);
-      case 0x82:
-       if(vi->rate==0){
-         /* um... we didn;t get the initial header */
-         return(-1);
+       return(_vorbis_unpack_comment(vc,&opb));
+
+      case 0x05: /* least significant *bit* is read first */
+       if(vi->rate==0 || vc->vendor==NULL){
+         /* um... we didn;t get the initial header or comments yet */
+         return(OV_EBADHEADER);
        }
 
-       /* not implemented quite yet */
+       return(_vorbis_unpack_books(vi,&opb));
 
-       return(0);
       default:
        /* Not a valid vorbis header type */
-       return(-1);
+       return(OV_EBADHEADER);
        break;
       }
     }
   }
-  return(-1);
+  return(OV_EBADHEADER);
 }
 
-int vorbis_info_headerout(vorbis_info *vi,
-                         ogg_packet *op,
-                         ogg_packet *op_comm,
-                         ogg_packet *op_code){
+/* pack side **********************************************************/
 
-  oggpack_buffer opb;
-  /* initial header:
-
-     codec id     "vorbis"
-     header id    0x80 (byte)
-     codec ver    (4 octets, lsb first: currently 0x00)
-     pcm channels (4 octets, lsb first)
-     pcm rate     (4 octets, lsb first)
-     
-     small block  (4 octets, lsb first)
-     large block  (4 octets, lsb first)
-     floor order for small block (octet)
-     floor order for large block (octet)
-     floor octaves for small block (octet)
-     floor octaves for large block (octet)
-     floorch      (4 octets, lsb first)
-   */
-
-  _oggpack_writeinit(&opb);
-  _v_writestring(&opb,"vorbis");
-  _oggpack_write(&opb,0x80,8);
-
-  _oggpack_write(&opb,0x00,32);
-
-  _oggpack_write(&opb,vi->channels,8);
-  _oggpack_write(&opb,vi->rate,32);
-
-  _oggpack_write(&opb,vi->bitrate_upper,32);
-  _oggpack_write(&opb,vi->bitrate_nominal,32);
-  _oggpack_write(&opb,vi->bitrate_lower,32);
-
-  _oggpack_write(&opb,ilog2(vi->blocksize[0]),4);
-  _oggpack_write(&opb,ilog2(vi->blocksize[1]),4);
-  _oggpack_write(&opb,vi->floororder[0],8);
-  _oggpack_write(&opb,vi->floororder[1],8);
-  _oggpack_write(&opb,vi->flooroctaves[0],8);
-  _oggpack_write(&opb,vi->flooroctaves[1],8);
-  _oggpack_write(&opb,vi->floorch,8);
+static int _vorbis_pack_info(oggpack_buffer *opb,vorbis_info *vi){
+  codec_setup_info     *ci=vi->codec_setup;
+  if(!ci)return(OV_EFAULT);
 
-  /* build the packet */
-  if(vi->header)free(vi->header);
-  vi->header=malloc(_oggpack_bytes(&opb));
-  memcpy(vi->header,opb.buffer,_oggpack_bytes(&opb));
-  op->packet=vi->header;
-  op->bytes=_oggpack_bytes(&opb);
-  op->b_o_s=1;
-  op->e_o_s=0;
-  op->frameno=0;
-
-  /* comment header:
-     codec id       "vorbis"
-     header id      0x81 (byte)
-     vendor len     (4 octets, lsb first)
-     vendor and id  (n octects as above)
-     comments       (4 octets, lsb first)
-     comment 0 len  (4 octets, lsb first)
-     comment 0 len  (n octets as above)
-     ...
-     comment n-1 len  (4 octets, lsb first)
-     comment 0-1 len  (n octets as above)
-  */
-
-  _oggpack_reset(&opb);
-  _v_writestring(&opb,"vorbis");
-  _oggpack_write(&opb,0x81,8);
-
-  if(vi->vendor){
-    _oggpack_write(&opb,strlen(vi->vendor),32);
-    _v_writestring(&opb,vi->vendor);
-  }else{
-    _oggpack_write(&opb,0,32);
-  }
+  /* preamble */  
+  oggpack_write(opb,0x01,8);
+  _v_writestring(opb,"vorbis", 6);
+
+  /* basic information about the stream */
+  oggpack_write(opb,0x00,32);
+  oggpack_write(opb,vi->channels,8);
+  oggpack_write(opb,vi->rate,32);
+
+  oggpack_write(opb,vi->bitrate_upper,32);
+  oggpack_write(opb,vi->bitrate_nominal,32);
+  oggpack_write(opb,vi->bitrate_lower,32);
+
+  oggpack_write(opb,ilog2(ci->blocksizes[0]),4);
+  oggpack_write(opb,ilog2(ci->blocksizes[1]),4);
+  oggpack_write(opb,1,1);
+
+  return(0);
+}
+
+static int _vorbis_pack_comment(oggpack_buffer *opb,vorbis_comment *vc){
+  char temp[]="Xiph.Org libVorbis I 20040629";
+  int bytes = strlen(temp);
+
+  /* preamble */  
+  oggpack_write(opb,0x03,8);
+  _v_writestring(opb,"vorbis", 6);
+
+  /* vendor */
+  oggpack_write(opb,bytes,32);
+  _v_writestring(opb,temp, bytes);
   
-  _oggpack_write(&opb,vi->comments,32);
-  if(vi->comments){
+  /* comments */
+
+  oggpack_write(opb,vc->comments,32);
+  if(vc->comments){
     int i;
-    for(i=0;i<vi->comments;i++){
-      if(vi->user_comments[i]){
-       _oggpack_write(&opb,strlen(vi->user_comments[i]),32);
-       _v_writestring(&opb,vi->user_comments[i]);
+    for(i=0;i<vc->comments;i++){
+      if(vc->user_comments[i]){
+       oggpack_write(opb,vc->comment_lengths[i],32);
+       _v_writestring(opb,vc->user_comments[i], vc->comment_lengths[i]);
       }else{
-       _oggpack_write(&opb,0,32);
+       oggpack_write(opb,0,32);
       }
     }
   }
-  
-  if(vi->header1)free(vi->header1);
-  vi->header1=malloc(_oggpack_bytes(&opb));
-  memcpy(vi->header1,opb.buffer,_oggpack_bytes(&opb));
-  op_comm->packet=vi->header1;
-  op_comm->bytes=_oggpack_bytes(&opb);
-  op_comm->b_o_s=0;
-  op_comm->e_o_s=0;
-  op_comm->frameno=0;
-
-  /* codebook header:
-     codec id       "vorbis"
-     header id      0x82 (byte)
-     nul so far; not encoded yet */
-
-  _oggpack_reset(&opb);
-  _v_writestring(&opb,"vorbis");
-  _oggpack_write(&opb,0x82,8);
-
-  if(vi->header2)free(vi->header2);
-  vi->header2=malloc(_oggpack_bytes(&opb));
-  memcpy(vi->header2,opb.buffer,_oggpack_bytes(&opb));
-  op_code->packet=vi->header2;
-  op_code->bytes=_oggpack_bytes(&opb);
-  op_code->b_o_s=0;
-  op_code->e_o_s=0;
-  op_code->frameno=0;
+  oggpack_write(opb,1,1);
 
-  _oggpack_writeclear(&opb);
+  return(0);
+}
+static int _vorbis_pack_books(oggpack_buffer *opb,vorbis_info *vi){
+  codec_setup_info     *ci=vi->codec_setup;
+  int i;
+  if(!ci)return(OV_EFAULT);
+
+  oggpack_write(opb,0x05,8);
+  _v_writestring(opb,"vorbis", 6);
+
+  /* books */
+  oggpack_write(opb,ci->books-1,8);
+  for(i=0;i<ci->books;i++)
+    if(vorbis_staticbook_pack(ci->book_param[i],opb))goto err_out;
+
+  /* times; hook placeholders */
+  oggpack_write(opb,0,6);
+  oggpack_write(opb,0,16);
+
+  /* floors */
+  oggpack_write(opb,ci->floors-1,6);
+  for(i=0;i<ci->floors;i++){
+    oggpack_write(opb,ci->floor_type[i],16);
+    if(_floor_P[ci->floor_type[i]]->pack)
+      _floor_P[ci->floor_type[i]]->pack(ci->floor_param[i],opb);
+    else
+      goto err_out;
+  }
+
+  /* residues */
+  oggpack_write(opb,ci->residues-1,6);
+  for(i=0;i<ci->residues;i++){
+    oggpack_write(opb,ci->residue_type[i],16);
+    _residue_P[ci->residue_type[i]]->pack(ci->residue_param[i],opb);
+  }
+
+  /* maps */
+  oggpack_write(opb,ci->maps-1,6);
+  for(i=0;i<ci->maps;i++){
+    oggpack_write(opb,ci->map_type[i],16);
+    _mapping_P[ci->map_type[i]]->pack(vi,ci->map_param[i],opb);
+  }
+
+  /* modes */
+  oggpack_write(opb,ci->modes-1,6);
+  for(i=0;i<ci->modes;i++){
+    oggpack_write(opb,ci->mode_param[i]->blockflag,1);
+    oggpack_write(opb,ci->mode_param[i]->windowtype,16);
+    oggpack_write(opb,ci->mode_param[i]->transformtype,16);
+    oggpack_write(opb,ci->mode_param[i]->mapping,8);
+  }
+  oggpack_write(opb,1,1);
 
   return(0);
+err_out:
+  return(-1);
+} 
+
+int vorbis_commentheader_out(vorbis_comment *vc,
+                                     ogg_packet *op){
+
+  oggpack_buffer opb;
+
+  oggpack_writeinit(&opb);
+  if(_vorbis_pack_comment(&opb,vc)) return OV_EIMPL;
+
+  op->packet = _ogg_malloc(oggpack_bytes(&opb));
+  memcpy(op->packet, opb.buffer, oggpack_bytes(&opb));
+
+  op->bytes=oggpack_bytes(&opb);
+  op->b_o_s=0;
+  op->e_o_s=0;
+  op->granulepos=0;
+
+  return 0;
 }
 
-void vorbis_info_clear(vorbis_info *vi){
-  /* clear the non-flat storage before zeroing */
+int vorbis_analysis_headerout(vorbis_dsp_state *v,
+                             vorbis_comment *vc,
+                             ogg_packet *op,
+                             ogg_packet *op_comm,
+                             ogg_packet *op_code){
+  int ret=OV_EIMPL;
+  vorbis_info *vi=v->vi;
+  oggpack_buffer opb;
+  private_state *b=v->backend_state;
 
-  /* comments */
-  if(vi->user_comments){
-    char **ptr=vi->user_comments;
-    while(*ptr){
-      free(*(ptr++));
-    }
-    free(vi->user_comments);
+  if(!b){
+    ret=OV_EFAULT;
+    goto err_out;
   }
 
-  /* vendor string */
-  if(vi->vendor)free(vi->vendor);
+  /* first header packet **********************************************/
+
+  oggpack_writeinit(&opb);
+  if(_vorbis_pack_info(&opb,vi))goto err_out;
 
-  /* local encoding storage */
-  if(vi->header)free(vi->header);
-  if(vi->header1)free(vi->header1);
-  if(vi->header2)free(vi->header2);
+  /* build the packet */
+  if(b->header)_ogg_free(b->header);
+  b->header=_ogg_malloc(oggpack_bytes(&opb));
+  memcpy(b->header,opb.buffer,oggpack_bytes(&opb));
+  op->packet=b->header;
+  op->bytes=oggpack_bytes(&opb);
+  op->b_o_s=1;
+  op->e_o_s=0;
+  op->granulepos=0;
+
+  /* second header packet (comments) **********************************/
+
+  oggpack_reset(&opb);
+  if(_vorbis_pack_comment(&opb,vc))goto err_out;
+
+  if(b->header1)_ogg_free(b->header1);
+  b->header1=_ogg_malloc(oggpack_bytes(&opb));
+  memcpy(b->header1,opb.buffer,oggpack_bytes(&opb));
+  op_comm->packet=b->header1;
+  op_comm->bytes=oggpack_bytes(&opb);
+  op_comm->b_o_s=0;
+  op_comm->e_o_s=0;
+  op_comm->granulepos=0;
+
+  /* third header packet (modes/codebooks) ****************************/
 
-  memset(vi,0,sizeof(vorbis_info));
+  oggpack_reset(&opb);
+  if(_vorbis_pack_books(&opb,vi))goto err_out;
+
+  if(b->header2)_ogg_free(b->header2);
+  b->header2=_ogg_malloc(oggpack_bytes(&opb));
+  memcpy(b->header2,opb.buffer,oggpack_bytes(&opb));
+  op_code->packet=b->header2;
+  op_code->bytes=oggpack_bytes(&opb);
+  op_code->b_o_s=0;
+  op_code->e_o_s=0;
+  op_code->granulepos=0;
+
+  oggpack_writeclear(&opb);
+  return(0);
+ err_out:
+  oggpack_writeclear(&opb);
+  memset(op,0,sizeof(*op));
+  memset(op_comm,0,sizeof(*op_comm));
+  memset(op_code,0,sizeof(*op_code));
+
+  if(b->header)_ogg_free(b->header);
+  if(b->header1)_ogg_free(b->header1);
+  if(b->header2)_ogg_free(b->header2);
+  b->header=NULL;
+  b->header1=NULL;
+  b->header2=NULL;
+  return(ret);
 }
-  
 
+double vorbis_granule_time(vorbis_dsp_state *v,ogg_int64_t granulepos){
+  if(granulepos>=0)
+    return((double)granulepos/v->vi->rate);
+  return(-1);
+}