libogg and libvorbis are no longer part of this source tree

6 files changed, 0 insertions, 517 deletions

diff --git a/contrib/vorbis/test/Makefile.am b/contrib/vorbis/test/Makefile.am
deleted file mode 100644
index b68ebdb..0000000
--- a/contrib/vorbis/test/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-AUTOMAKE_OPTIONS = foreign
-
-check_PROGRAMS = test
-
-check: $(check_PROGRAMS)
-	./test$(EXEEXT)
-
-AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
-
-test_SOURCES = util.c util.h write_read.c write_read.h test.c
-test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@
-
-debug:
-	$(MAKE) check CFLAGS="@DEBUG@"
-
-profile:
-	$(MAKE) check CFLAGS="@PROFILE@"
diff --git a/contrib/vorbis/test/test.c b/contrib/vorbis/test/test.c
deleted file mode 100644
index fe1648d..0000000
--- a/contrib/vorbis/test/test.c
+++ /dev/null
@@ -1,99 +0,0 @@
-/********************************************************************
- *                                                                  *
- * 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 OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: vorbis coded test suite using vorbisfile
-
- ********************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-
-#include "util.h"
-#include "write_read.h"
-
-#define DATA_LEN        2048
-
-#define MAX(a,b)        ((a) > (b) ? (a) : (b))
-
-
-static int check_output (const float * data_in, unsigned len, float allowable);
-
-int
-main(void){
-  static float data_out [DATA_LEN] ;
-  static float data_in [DATA_LEN] ;
-
-  /* Do safest and most used sample rates first. */
-  int sample_rates [] = { 44100, 48000, 32000, 22050, 16000, 96000 } ;
-  unsigned k ;
-  int errors = 0 ;
-  int ch;
-
-  gen_windowed_sine (data_out, ARRAY_LEN (data_out), 0.95);
-
-  for(ch=1;ch<=8;ch++){
-    float q=-.05;
-    printf("\nTesting %d channel%s\n\n",ch,ch==1?"":"s");
-    while(q<1.){
-      for (k = 0 ; k < ARRAY_LEN (sample_rates); k ++) {
-        char filename [64] ;
-        snprintf (filename, sizeof (filename), "vorbis_%dch_q%.1f_%u.ogg", ch,q*10,sample_rates [k]);
-
-        printf ("    %-20s : ", filename);
-        fflush (stdout);
-
-        /* Set to know value. */
-        set_data_in (data_in, ARRAY_LEN (data_in), 3.141);
-
-        write_vorbis_data_or_die (filename, sample_rates [k], q, data_out, ARRAY_LEN (data_out),ch);
-        read_vorbis_data_or_die (filename, sample_rates [k], data_in, ARRAY_LEN (data_in));
-
-        if (check_output (data_in, ARRAY_LEN (data_in), (.15f - .1f*q)) != 0)
-          errors ++ ;
-        else {
-          puts ("ok");
-          remove (filename);
-        }
-      }
-      q+=.1;
-    }
-  }
-
-  if (errors)
-    exit (1);
-
-  return 0;
-}
-
-static int
-check_output (const float * data_in, unsigned len, float allowable)
-{
-  float max_abs = 0.0 ;
-  unsigned k ;
-
-  for (k = 0 ; k < len ; k++) {
-    float temp = fabs (data_in [k]);
-    max_abs = MAX (max_abs, temp);
-  }
-
-  if (max_abs < 0.95-allowable) {
-    printf ("Error : max_abs (%f) too small.\n", max_abs);
-    return 1 ;
-  } else if (max_abs > .95+allowable) {
-    printf ("Error : max_abs (%f) too big.\n", max_abs);
-    return 1 ;
-  }
-
-  return 0 ;
-}
-
diff --git a/contrib/vorbis/test/util.c b/contrib/vorbis/test/util.c
deleted file mode 100644
index 2ab7483..0000000
--- a/contrib/vorbis/test/util.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/********************************************************************
- *                                                                  *
- * 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 OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: utility functions for vorbis codec test suite.
-
- ********************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <errno.h>
-
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
-
-#include "util.h"
-
-void
-gen_windowed_sine (float *data, int len, float maximum)
-{    int k ;
-
-    memset (data, 0, len * sizeof (float)) ;
-
-    len /= 2 ;
-
-    for (k = 0 ; k < len ; k++)
-    {    data [k] = sin (2.0 * k * M_PI * 1.0 / 32.0 + 0.4) ;
-
-        /* Apply Hanning Window. */
-        data [k] *= maximum * (0.5 - 0.5 * cos (2.0 * M_PI * k / ((len) - 1))) ;
-        }
-
-    return ;
-}
-
-void
-set_data_in (float * data, unsigned len, float value)
-{        unsigned k ;
-
-        for (k = 0 ; k < len ; k++)
-                data [k] = value ;
-}
diff --git a/contrib/vorbis/test/util.h b/contrib/vorbis/test/util.h
deleted file mode 100644
index 85f8d4f..0000000
--- a/contrib/vorbis/test/util.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/********************************************************************
- *                                                                  *
- * 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 OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: utility functions for vorbis codec test suite.
-
- ********************************************************************/
-
-#define ARRAY_LEN(x)   (sizeof(x)/sizeof(x[0]))
-
-/* Create simple test data consisting of a windowed sine wave. */
-void gen_windowed_sine (float *data, int len, float maximum) ;
-
-/* Set len values of data array to given value. */
-void set_data_in (float * data, unsigned len, float value) ;
diff --git a/contrib/vorbis/test/write_read.c b/contrib/vorbis/test/write_read.c
deleted file mode 100644
index f1190dc..0000000
--- a/contrib/vorbis/test/write_read.c
+++ /dev/null
@@ -1,297 +0,0 @@
-/********************************************************************
- *                                                                  *
- * 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 OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: utility functions for vorbis codec test suite.
-
- ********************************************************************/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <math.h>
-#include <string.h>
-#include <errno.h>
-
-#include <vorbis/codec.h>
-#include <vorbis/vorbisenc.h>
-
-#include "write_read.h"
-
-/* The following function is basically a hacked version of the code in
- * examples/encoder_example.c */
-void
-write_vorbis_data_or_die (const char *filename, int srate, float q, const float * data, int count, int ch)
-{
-  FILE * file ;
-  ogg_stream_state os;
-  ogg_page         og;
-  ogg_packet       op;
-  vorbis_info      vi;
-  vorbis_comment   vc;
-  vorbis_dsp_state vd;
-  vorbis_block     vb;
-
-  int eos = 0, ret;
-
-  if ((file = fopen (filename, "wb")) == NULL) {
-    printf("\n\nError : fopen failed : %s\n", strerror (errno)) ;
-    exit (1) ;
-  }
-
-  /********** Encode setup ************/
-
-  vorbis_info_init (&vi);
-
-  ret = vorbis_encode_init_vbr (&vi,ch,srate,q);
-  if (ret) {
-    printf ("vorbis_encode_init_vbr return %d\n", ret) ;
-    exit (1) ;
-  }
-
-  vorbis_comment_init (&vc);
-  vorbis_comment_add_tag (&vc,"ENCODER","test/util.c");
-  vorbis_analysis_init (&vd,&vi);
-  vorbis_block_init (&vd,&vb);
-
-  ogg_stream_init (&os,12345678);
-
-  {
-    ogg_packet header;
-    ogg_packet header_comm;
-    ogg_packet header_code;
-
-    vorbis_analysis_headerout (&vd,&vc,&header,&header_comm,&header_code);
-    ogg_stream_packetin (&os,&header);
-    ogg_stream_packetin (&os,&header_comm);
-    ogg_stream_packetin (&os,&header_code);
-
-    /* Ensures the audio data will start on a new page. */
-    while (!eos){
-        int result = ogg_stream_flush (&os,&og);
-        if (result == 0)
-            break;
-        fwrite (og.header,1,og.header_len,file);
-        fwrite (og.body,1,og.body_len,file);
-    }
-
-  }
-
-  {
-    /* expose the buffer to submit data */
-    float **buffer = vorbis_analysis_buffer (&vd,count);
-    int i;
-
-    for(i=0;i<ch;i++)
-      memcpy (buffer [i], data, count * sizeof (float)) ;
-
-    /* tell the library how much we actually submitted */
-    vorbis_analysis_wrote (&vd,count);
-    vorbis_analysis_wrote (&vd,0);
-  }
-
-  while (vorbis_analysis_blockout (&vd,&vb) == 1) {
-    vorbis_analysis (&vb,NULL);
-    vorbis_bitrate_addblock (&vb);
-
-    while (vorbis_bitrate_flushpacket (&vd,&op)) {
-      ogg_stream_packetin (&os,&op);
-
-      while (!eos) {
-          int result = ogg_stream_pageout (&os,&og);
-          if (result == 0)
-              break;
-          fwrite (og.header,1,og.header_len,file);
-          fwrite (og.body,1,og.body_len,file);
-
-          if (ogg_page_eos (&og))
-              eos = 1;
-      }
-    }
-  }
-
-  ogg_stream_clear (&os);
-  vorbis_block_clear (&vb);
-  vorbis_dsp_clear (&vd);
-  vorbis_comment_clear (&vc);
-  vorbis_info_clear (&vi);
-
- fclose (file) ;
-}
-
-/* The following function is basically a hacked version of the code in
- * examples/decoder_example.c */
-void
-read_vorbis_data_or_die (const char *filename, int srate, float * data, int count)
-{
-  ogg_sync_state   oy;
-  ogg_stream_state os;
-  ogg_page         og;
-  ogg_packet       op;
-
-  vorbis_info      vi;
-  vorbis_comment   vc;
-  vorbis_dsp_state vd;
-  vorbis_block     vb;
-
-  FILE *file;
-  char *buffer;
-  int  bytes;
-  int eos = 0;
-  int i;
-  int read_total = 0 ;
-
-  if ((file = fopen (filename, "rb")) == NULL) {
-    printf("\n\nError : fopen failed : %s\n", strerror (errno)) ;
-    exit (1) ;
-  }
-
-  ogg_sync_init (&oy);
-
-  {
-    /* fragile!  Assumes all of our headers will fit in the first 8kB,
-       which currently they will */
-    buffer = ogg_sync_buffer (&oy,8192);
-    bytes = fread (buffer,1,8192,file);
-    ogg_sync_wrote (&oy,bytes);
-
-    if(ogg_sync_pageout (&oy,&og) != 1) {
-      if(bytes < 8192) {
-        printf ("Out of data.\n") ;
-          goto done_decode ;
-      }
-
-      fprintf (stderr,"Input does not appear to be an Ogg bitstream.\n");
-      exit (1);
-    }
-
-    ogg_stream_init (&os,ogg_page_serialno(&og));
-
-    vorbis_info_init (&vi);
-    vorbis_comment_init (&vc);
-    if (ogg_stream_pagein (&os,&og) < 0) {
-      fprintf (stderr,"Error reading first page of Ogg bitstream data.\n");
-      exit (1);
-    }
-
-    if (ogg_stream_packetout(&os,&op) != 1) {
-      fprintf (stderr,"Error reading initial header packet.\n");
-      exit (1);
-    }
-
-    if (vorbis_synthesis_headerin (&vi,&vc,&op) < 0) {
-      fprintf (stderr,"This Ogg bitstream does not contain Vorbis "
-          "audio data.\n");
-      exit (1);
-    }
-
-    i = 0;
-    while ( i < 2) {
-      while (i < 2) {
-
-        int result = ogg_sync_pageout (&oy,&og);
-        if(result == 0)
-          break;
-        if(result==1) {
-          ogg_stream_pagein(&os,&og);
-
-          while (i < 2) {
-            result = ogg_stream_packetout (&os,&op);
-            if (result == 0) break;
-            if (result < 0) {
-              fprintf (stderr,"Corrupt secondary header.  Exiting.\n");
-              exit(1);
-            }
-            vorbis_synthesis_headerin (&vi,&vc,&op);
-            i++;
-          }
-        }
-      }
-
-      buffer = ogg_sync_buffer (&oy,4096);
-      bytes = fread (buffer,1,4096,file);
-      if (bytes == 0 && i < 2) {
-        fprintf (stderr,"End of file before finding all Vorbis headers!\n");
-        exit (1);
-      }
-
-      ogg_sync_wrote (&oy,bytes);
-    }
-
-    if (vi.rate != srate) {
-      printf ("\n\nError : File '%s' has sample rate of %ld when it should be %d.\n\n", filename, vi.rate, srate);
-      exit (1) ;
-    }
-
-    vorbis_synthesis_init (&vd,&vi);
-    vorbis_block_init (&vd,&vb);
-
-    while(!eos) {
-      while (!eos) {
-        int result = ogg_sync_pageout (&oy,&og);
-        if (result == 0)
-          break;
-        if (result < 0) {
-          fprintf (stderr,"Corrupt or missing data in bitstream; "
-                   "continuing...\n");
-        } else {
-          ogg_stream_pagein (&os,&og);
-          while (1) {
-            result = ogg_stream_packetout (&os,&op);
-
-            if (result == 0)
-              break;
-            if (result < 0) {
-              /* no reason to complain; already complained above */
-            } else {
-              float **pcm;
-              int samples;
-
-              if (vorbis_synthesis (&vb,&op) == 0)
-                vorbis_synthesis_blockin(&vd,&vb);
-              while ((samples = vorbis_synthesis_pcmout (&vd,&pcm)) > 0 && read_total < count) {
-                int bout = samples < count ? samples : count;
-                bout = read_total + bout > count ? count - read_total : bout;
-
-                memcpy (data + read_total, pcm[0], bout * sizeof (float)) ;
-
-                vorbis_synthesis_read (&vd,bout);
-                read_total += bout ;
-              }
-            }
-          }
-
-          if (ogg_page_eos (&og)) eos = 1;
-        }
-      }
-
-      if (!eos) {
-        buffer = ogg_sync_buffer (&oy,4096);
-        bytes = fread (buffer,1,4096,file);
-        ogg_sync_wrote (&oy,bytes);
-        if (bytes == 0) eos = 1;
-      }
-    }
-
-    ogg_stream_clear (&os);
-
-    vorbis_block_clear (&vb);
-    vorbis_dsp_clear (&vd);
-    vorbis_comment_clear (&vc);
-    vorbis_info_clear (&vi);
-  }
-done_decode:
-
-  /* OK, clean up the framer */
-  ogg_sync_clear (&oy);
-
-  fclose (file) ;
-}
-
diff --git a/contrib/vorbis/test/write_read.h b/contrib/vorbis/test/write_read.h
deleted file mode 100644
index c50c483..0000000
--- a/contrib/vorbis/test/write_read.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/********************************************************************
- *                                                                  *
- * 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 OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
- * by the Xiph.Org Foundation http://www.xiph.org/                  *
- *                                                                  *
- ********************************************************************
-
- function: utility functions for vorbis codec test suite.
-
- ********************************************************************/
-
-/* Write supplied data to an Ogg/Vorbis file with specified filename at
- * specified sample rate. Assumes a single channel of audio. */
-void write_vorbis_data_or_die (const char *filename, int srate, float q,
-                               const float * data, int count, int ch) ;
-
-/* Read given Ogg/Vorbis file into data specified data array. This
- * function is basically the inverse of the one above. Again, assumes
- * a single channel of audio. */
-void read_vorbis_data_or_die (const char *filename, int srate,
-                        float * data, int count) ;
-