[xiph-commits] r9272 - branches/ogg2-vorbis/include/vorbis
arc at motherfish-iii.xiph.org
arc at motherfish-iii.xiph.org
Wed May 11 22:05:49 PDT 2005
Author: arc
Date: 2005-05-11 22:05:48 -0700 (Wed, 11 May 2005)
New Revision: 9272
Modified:
branches/ogg2-vorbis/include/vorbis/codec.h
branches/ogg2-vorbis/include/vorbis/vorbisenc.h
branches/ogg2-vorbis/include/vorbis/vorbisfile.h
Log:
Getting the includes out of the way early on.
Basically, all the ogg_* objects are now pointers to ogg2_* objects.
Modified: branches/ogg2-vorbis/include/vorbis/codec.h
===================================================================
--- branches/ogg2-vorbis/include/vorbis/codec.h 2005-05-12 04:47:28 UTC (rev 9271)
+++ branches/ogg2-vorbis/include/vorbis/codec.h 2005-05-12 05:05:48 UTC (rev 9272)
@@ -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-2001 *
- * 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/ *
********************************************************************
@@ -23,7 +23,7 @@
{
#endif /* __cplusplus */
-#include <ogg/ogg.h>
+#include <ogg/ogg2.h>
typedef struct vorbis_info{
int version;
@@ -88,7 +88,7 @@
typedef struct vorbis_block{
/* necessary stream state for linking to the framing abstraction */
float **pcm; /* this is a pointer into local storage */
- oggpack_buffer opb;
+ ogg2pack_buffer *opb;
long lW;
long W;
@@ -182,34 +182,34 @@
/* Vorbis PRIMITIVES: analysis/DSP layer ****************************/
extern int vorbis_analysis_init(vorbis_dsp_state *v,vorbis_info *vi);
-extern int vorbis_commentheader_out(vorbis_comment *vc, ogg_packet *op);
+extern int vorbis_commentheader_out(vorbis_comment *vc, ogg2_packet *op);
extern int vorbis_analysis_headerout(vorbis_dsp_state *v,
vorbis_comment *vc,
- ogg_packet *op,
- ogg_packet *op_comm,
- ogg_packet *op_code);
+ ogg2_packet *op,
+ ogg2_packet *op_comm,
+ ogg2_packet *op_code);
extern float **vorbis_analysis_buffer(vorbis_dsp_state *v,int vals);
extern int vorbis_analysis_wrote(vorbis_dsp_state *v,int vals);
extern int vorbis_analysis_blockout(vorbis_dsp_state *v,vorbis_block *vb);
-extern int vorbis_analysis(vorbis_block *vb,ogg_packet *op);
+extern int vorbis_analysis(vorbis_block *vb, ogg2_packet *op);
extern int vorbis_bitrate_addblock(vorbis_block *vb);
extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd,
- ogg_packet *op);
+ ogg2_packet *op);
/* Vorbis PRIMITIVES: synthesis layer *******************************/
extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc,
- ogg_packet *op);
+ ogg2_packet *op);
extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi);
extern int vorbis_synthesis_restart(vorbis_dsp_state *v);
-extern int vorbis_synthesis(vorbis_block *vb,ogg_packet *op);
-extern int vorbis_synthesis_trackonly(vorbis_block *vb,ogg_packet *op);
+extern int vorbis_synthesis(vorbis_block *vb,ogg2_packet *op);
+extern int vorbis_synthesis_trackonly(vorbis_block *vb,ogg2_packet *op);
extern int vorbis_synthesis_blockin(vorbis_dsp_state *v,vorbis_block *vb);
extern int vorbis_synthesis_pcmout(vorbis_dsp_state *v,float ***pcm);
extern int vorbis_synthesis_lapout(vorbis_dsp_state *v,float ***pcm);
extern int vorbis_synthesis_read(vorbis_dsp_state *v,int samples);
-extern long vorbis_packet_blocksize(vorbis_info *vi,ogg_packet *op);
+extern long vorbis_packet_blocksize(vorbis_info *vi,ogg2_packet *op);
extern int vorbis_synthesis_halfrate(vorbis_info *v,int flag);
extern int vorbis_synthesis_halfrate_p(vorbis_info *v);
Modified: branches/ogg2-vorbis/include/vorbis/vorbisenc.h
===================================================================
--- branches/ogg2-vorbis/include/vorbis/vorbisenc.h 2005-05-12 04:47:28 UTC (rev 9271)
+++ branches/ogg2-vorbis/include/vorbis/vorbisenc.h 2005-05-12 05:05:48 UTC (rev 9272)
@@ -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-2001 *
- * 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/ *
* *
********************************************************************
Modified: branches/ogg2-vorbis/include/vorbis/vorbisfile.h
===================================================================
--- branches/ogg2-vorbis/include/vorbis/vorbisfile.h 2005-05-12 04:47:28 UTC (rev 9271)
+++ branches/ogg2-vorbis/include/vorbis/vorbisfile.h 2005-05-12 05:05:48 UTC (rev 9272)
@@ -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-2001 *
- * 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/ *
* *
********************************************************************
@@ -54,7 +54,7 @@
int seekable;
ogg_int64_t offset;
ogg_int64_t end;
- ogg_sync_state oy;
+ ogg2_sync_state *oy;
/* If the FILE handle isn't seekable (eg, a pipe), only the current
stream appears */
@@ -77,8 +77,8 @@
double bittrack;
double samptrack;
- ogg_stream_state os; /* take physical pages, weld into a logical
- stream of packets */
+ ogg2_stream_state *os; /* take physical pages, weld into a logical
+ stream of packets */
vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
vorbis_block vb; /* local working space for packet->PCM decode */
More information about the commits
mailing list