[xiph-commits] r9273 - branches/ogg2-vorbis/lib
arc at motherfish-iii.xiph.org
arc at motherfish-iii.xiph.org
Wed May 11 23:11:51 PDT 2005
Author: arc
Date: 2005-05-11 23:11:46 -0700 (Wed, 11 May 2005)
New Revision: 9273
Modified:
branches/ogg2-vorbis/lib/analysis.c
branches/ogg2-vorbis/lib/backends.h
branches/ogg2-vorbis/lib/bitrate.c
branches/ogg2-vorbis/lib/block.c
branches/ogg2-vorbis/lib/codebook.c
branches/ogg2-vorbis/lib/codebook.h
branches/ogg2-vorbis/lib/codec_internal.h
branches/ogg2-vorbis/lib/envelope.c
branches/ogg2-vorbis/lib/floor0.c
branches/ogg2-vorbis/lib/floor1.c
branches/ogg2-vorbis/lib/info.c
branches/ogg2-vorbis/lib/mapping0.c
branches/ogg2-vorbis/lib/res0.c
branches/ogg2-vorbis/lib/sharedbook.c
branches/ogg2-vorbis/lib/synthesis.c
Log:
A chunk of work from tonight.
Modified: branches/ogg2-vorbis/lib/analysis.c
===================================================================
--- branches/ogg2-vorbis/lib/analysis.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/analysis.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,24 +1,24 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: single-block PCM analysis mode dispatch
- last mod: $Id: analysis.c,v 1.56 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#include <stdio.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
@@ -29,7 +29,7 @@
int analysis_noisy=1;
/* decides between modes, dispatches to the appropriate mapping. */
-int vorbis_analysis(vorbis_block *vb, ogg_packet *op){
+int vorbis_analysis(vorbis_block *vb, ogg2_packet *op){
int ret,i;
vorbis_block_internal *vbi=vb->internal;
@@ -40,8 +40,8 @@
/* first things first. Make sure encode is ready */
for(i=0;i<PACKETBLOBS;i++)
- oggpack_reset(vbi->packetblob[i]);
-
+ ogg2pack_writeinit(vbi->packetblob[i], vbi->ogg2bufferstate);
+
/* we only have one mapping type (0), and we let the mapping code
itself figure out what soft mode to use. This allows easier
bitrate management */
@@ -55,11 +55,13 @@
bitrate management interface. */
return(OV_EINVAL);
- op->packet=oggpack_get_buffer(&vb->opb);
- op->bytes=oggpack_bytes(&vb->opb);
+ op->packet=ogg2pack_writebuffer(&vb->opb);
+ op->bytes=ogg2pack_bytes(&vb->opb);
op->b_o_s=0;
op->e_o_s=vb->eofflag;
- op->granulepos=vb->granulepos;
+ # This should be the first granule, this is a temporary cheat
+ op->top_granule=0;
+ op->end_granule=vb->granulepos;
op->packetno=vb->sequence; /* for sake of completeness */
}
return(0);
@@ -106,16 +108,3 @@
ogg_int64_t off){
if(analysis_noisy)_analysis_output_always(base,i,v,n,bark,dB,off);
}
-
-
-
-
-
-
-
-
-
-
-
-
-
Modified: branches/ogg2-vorbis/lib/backends.h
===================================================================
--- branches/ogg2-vorbis/lib/backends.h 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/backends.h 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,18 +1,18 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: libvorbis backend and mapping structures; needed for
static mode headers
- last mod: $Id: backends.h,v 1.15 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -28,8 +28,8 @@
/* this would all be simpler/shorter with templates, but.... */
/* Floor backend generic *****************************************/
typedef struct{
- void (*pack) (vorbis_info_floor *,oggpack_buffer *);
- vorbis_info_floor *(*unpack)(vorbis_info *,oggpack_buffer *);
+ void (*pack) (vorbis_info_floor *,ogg2pack_buffer *);
+ vorbis_info_floor *(*unpack)(vorbis_info *,ogg2pack_buffer *);
vorbis_look_floor *(*look) (vorbis_dsp_state *,vorbis_info_floor *);
void (*free_info) (vorbis_info_floor *);
void (*free_look) (vorbis_look_floor *);
@@ -86,15 +86,15 @@
/* Residue backend generic *****************************************/
typedef struct{
- void (*pack) (vorbis_info_residue *,oggpack_buffer *);
- vorbis_info_residue *(*unpack)(vorbis_info *,oggpack_buffer *);
+ void (*pack) (vorbis_info_residue *,ogg2pack_buffer *);
+ vorbis_info_residue *(*unpack)(vorbis_info *,ogg2pack_buffer *);
vorbis_look_residue *(*look) (vorbis_dsp_state *,
vorbis_info_residue *);
void (*free_info) (vorbis_info_residue *);
void (*free_look) (vorbis_look_residue *);
long **(*class) (struct vorbis_block *,vorbis_look_residue *,
float **,int *,int);
- int (*forward) (oggpack_buffer *,struct vorbis_block *,
+ int (*forward) (ogg2pack_buffer *,struct vorbis_block *,
vorbis_look_residue *,
float **,float **,int *,int,long **);
int (*inverse) (struct vorbis_block *,vorbis_look_residue *,
@@ -121,8 +121,8 @@
/* Mapping backend generic *****************************************/
typedef struct{
void (*pack) (vorbis_info *,vorbis_info_mapping *,
- oggpack_buffer *);
- vorbis_info_mapping *(*unpack)(vorbis_info *,oggpack_buffer *);
+ ogg2pack_buffer *);
+ vorbis_info_mapping *(*unpack)(vorbis_info *,ogg2pack_buffer *);
void (*free_info) (vorbis_info_mapping *);
int (*forward) (struct vorbis_block *vb);
int (*inverse) (struct vorbis_block *vb,vorbis_info_mapping *);
@@ -142,5 +142,3 @@
} vorbis_info_mapping0;
#endif
-
-
Modified: branches/ogg2-vorbis/lib/bitrate.c
===================================================================
--- branches/ogg2-vorbis/lib/bitrate.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/bitrate.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,12 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "os.h"
@@ -81,7 +81,7 @@
bitrate_manager_info *bi=&ci->bi;
int choice=rint(bm->avgfloat);
- long this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ long this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
long min_target_bits=(vb->W?bm->min_bitsper*bm->short_per_long:bm->min_bitsper);
long max_target_bits=(vb->W?bm->max_bitsper*bm->short_per_long:bm->max_bitsper);
int samples=ci->blocksizes[vb->W]>>1;
@@ -119,13 +119,13 @@
while(choice>0 && this_bits>avg_target_bits &&
bm->avg_reservoir+(this_bits-avg_target_bits)>desired_fill){
choice--;
- this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
}
}else if(bm->avg_reservoir+(this_bits-avg_target_bits)<desired_fill){
while(choice+1<PACKETBLOBS && this_bits<avg_target_bits &&
bm->avg_reservoir+(this_bits-avg_target_bits)<desired_fill){
choice++;
- this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
}
}
@@ -133,7 +133,7 @@
if(slew<-slewlimit)slew=-slewlimit;
if(slew>slewlimit)slew=slewlimit;
choice=rint(bm->avgfloat+= slew/vi->rate*samples);
- this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
}
@@ -145,7 +145,7 @@
while(bm->minmax_reservoir-(min_target_bits-this_bits)<0){
choice++;
if(choice>=PACKETBLOBS)break;
- this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
}
}
}
@@ -157,7 +157,7 @@
while(bm->minmax_reservoir+(this_bits-max_target_bits)>bi->reservoir_bits){
choice--;
if(choice<0)break;
- this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
}
}
}
@@ -171,10 +171,10 @@
long maxsize=(max_target_bits+(bi->reservoir_bits-bm->minmax_reservoir))/8;
bm->choice=choice=0;
- if(oggpack_bytes(vbi->packetblob[choice])>maxsize){
-
- oggpack_writetrunc(vbi->packetblob[choice],maxsize*8);
- this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ if(ogg2pack_bytes(vbi->packetblob[choice])>maxsize){
+/*!!! I have no idea how to implement this with libogg2
+ oggpack_writetrunc(vbi->packetblob[choice],maxsize*8); !!!*/
+ this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
}
}else{
long minsize=(min_target_bits-bm->minmax_reservoir+7)/8;
@@ -184,9 +184,9 @@
bm->choice=choice;
/* prop up bitrate according to demand. pad this frame out with zeroes */
- minsize-=oggpack_bytes(vbi->packetblob[choice]);
- while(minsize-->0)oggpack_write(vbi->packetblob[choice],0,8);
- this_bits=oggpack_bytes(vbi->packetblob[choice])*8;
+ minsize-=ogg2pack_bytes(vbi->packetblob[choice]);
+ while(minsize-->0)ogg2pack_write(vbi->packetblob[choice],0,8);
+ this_bits=ogg2pack_bytes(vbi->packetblob[choice])*8;
}
@@ -227,7 +227,7 @@
return(0);
}
-int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,ogg_packet *op){
+int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,ogg2_packet *op){
private_state *b=vd->backend_state;
bitrate_manager_state *bm=&b->bms;
vorbis_block *vb=bm->vb;
@@ -240,11 +240,13 @@
if(vorbis_bitrate_managed(vb))
choice=bm->choice;
- op->packet=oggpack_get_buffer(vbi->packetblob[choice]);
- op->bytes=oggpack_bytes(vbi->packetblob[choice]);
+ op->packet=ogg2pack_writebuffer(vbi->packetblob[choice]);
+ op->bytes=ogg2pack_bytes(vbi->packetblob[choice]);
op->b_o_s=0;
op->e_o_s=vb->eofflag;
- op->granulepos=vb->granulepos;
+ # This should be the first granule, this is a temporary cheat
+ op->top_granule=0;
+ op->end_granule=vb->granulepos;
op->packetno=vb->sequence; /* for sake of completeness */
}
Modified: branches/ogg2-vorbis/lib/block.c
===================================================================
--- branches/ogg2-vorbis/lib/block.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/block.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2003 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: PCM data vector blocking, windowing and dis/reassembly
- last mod: $Id: block.c,v 1.76 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
Handle windowing, overlap-add, etc of the PCM vectors. This is made
more amusing by Vorbis' current two allowed block sizes.
@@ -21,7 +21,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
Modified: branches/ogg2-vorbis/lib/codebook.c
===================================================================
--- branches/ogg2-vorbis/lib/codebook.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/codebook.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,24 +1,24 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: basic codebook pack/unpack/code/decode operations
- last mod: $Id: codebook.c,v 1.39 2002/06/28 22:19:35 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codebook.h"
#include "scales.h"
Modified: branches/ogg2-vorbis/lib/codebook.h
===================================================================
--- branches/ogg2-vorbis/lib/codebook.h 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/codebook.h 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,24 +1,24 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: basic shared codebook operations
- last mod: $Id: codebook.h,v 1.13 2002/06/28 22:19:35 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#ifndef _V_CODEBOOK_H_
#define _V_CODEBOOK_H_
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
/* This structure encapsulates huffman and VQ style encoding books; it
doesn't do anything specific to either.
Modified: branches/ogg2-vorbis/lib/codec_internal.h
===================================================================
--- branches/ogg2-vorbis/lib/codec_internal.h 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/codec_internal.h 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: libvorbis codec headers
- last mod: $Id: codec_internal.h,v 1.18 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -33,10 +33,11 @@
float ampmax;
int blocktype;
- oggpack_buffer *packetblob[PACKETBLOBS]; /* initialized, must be freed;
- blob [PACKETBLOBS/2] points to
- the oggpack_buffer in the
- main vorbis_block */
+ ogg2pack_buffer *packetblob[PACKETBLOBS]; /* initialized, must be freed;
+ blob [PACKETBLOBS/2] points to
+ the ogg2pack_buffer in the
+ main vorbis_block */
+ ogg2_buffer_state *ogg2bufferstate;
} vorbis_block_internal;
typedef void vorbis_look_floor;
Modified: branches/ogg2-vorbis/lib/envelope.c
===================================================================
--- branches/ogg2-vorbis/lib/envelope.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/envelope.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,12 +1,12 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -19,7 +19,7 @@
#include <string.h>
#include <stdio.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
Modified: branches/ogg2-vorbis/lib/floor0.c
===================================================================
--- branches/ogg2-vorbis/lib/floor0.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/floor0.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,24 +1,24 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: floor backend 0 implementation
- last mod: $Id: floor0.c,v 1.55 2003/09/05 23:17:49 giles Exp $
+ last mod: $Id$
********************************************************************/
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Modified: branches/ogg2-vorbis/lib/floor1.c
===================================================================
--- branches/ogg2-vorbis/lib/floor1.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/floor1.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,24 +1,24 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: floor backend 1 implementation
- last mod: $Id: floor1.c,v 1.27 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Modified: branches/ogg2-vorbis/lib/info.c
===================================================================
--- branches/ogg2-vorbis/lib/info.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/info.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2003 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: maintain the info structure, info <-> header packets
- last mod: $Id: info.c,v 1.63 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "codebook.h"
Modified: branches/ogg2-vorbis/lib/mapping0.c
===================================================================
--- branches/ogg2-vorbis/lib/mapping0.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/mapping0.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: channel mapping 0 implementation
- last mod: $Id: mapping0.c,v 1.61 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "codebook.h"
Modified: branches/ogg2-vorbis/lib/res0.c
===================================================================
--- branches/ogg2-vorbis/lib/res0.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/res0.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: residue backend 0, 1 and 2 implementation
- last mod: $Id: res0.c,v 1.50 2003/12/30 11:02:22 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <math.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
Modified: branches/ogg2-vorbis/lib/sharedbook.c
===================================================================
--- branches/ogg2-vorbis/lib/sharedbook.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/sharedbook.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,24 +1,24 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: basic shared codebook operations
- last mod: $Id: sharedbook.c,v 1.29 2002/10/11 07:44:28 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#include <stdlib.h>
#include <math.h>
#include <string.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "os.h"
#include "misc.h"
#include "vorbis/codec.h"
Modified: branches/ogg2-vorbis/lib/synthesis.c
===================================================================
--- branches/ogg2-vorbis/lib/synthesis.c 2005-05-12 05:05:48 UTC (rev 9272)
+++ branches/ogg2-vorbis/lib/synthesis.c 2005-05-12 06:11:46 UTC (rev 9273)
@@ -1,22 +1,22 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Vorbis 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-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE Ogg Vorbis SOURCE CODE IS (C) COPYRIGHT 1994-2005 *
+ * by the Xiph.org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: single-block PCM synthesis
- last mod: $Id: synthesis.c,v 1.30 2003/08/18 05:34:01 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#include <stdio.h>
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
#include "vorbis/codec.h"
#include "codec_internal.h"
#include "registry.h"
More information about the commits
mailing list