[xiph-commits] r7195 - in trunk/ogg2: . debian include/ogg2 src
arc at dactyl.lonelymoon.com
arc
Tue Jul 20 15:11:33 PDT 2004
Author: arc
Date: Tue Jul 20 15:11:33 2004
New Revision: 7195
Modified:
trunk/ogg2/HACKING
trunk/ogg2/README
trunk/ogg2/autogen.sh
trunk/ogg2/debian/rules
trunk/ogg2/include/ogg2/mutex.c
trunk/ogg2/include/ogg2/ogg.h
trunk/ogg2/include/ogg2/os_types.h
trunk/ogg2/src/bitwise.c
trunk/ogg2/src/buffer.c
trunk/ogg2/src/bytewise.c
trunk/ogg2/src/mutex.h
trunk/ogg2/src/ogginternal.h
trunk/ogg2/src/stream.c
trunk/ogg2/src/sync.c
Log:
Replaced remainder of copyright notices (all still refered to this
library as being part of OggVorbis codec) and they're now 1994-2004.
Also did some initial work towards solving bug 545, adding an argument
to ogg_stream_create to allow both continuous and discontinuous to be
supported with existing functions. More work to go on this.
Modified: trunk/ogg2/HACKING
===================================================================
--- trunk/ogg2/HACKING 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/HACKING 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,22 +1,22 @@
Note that these instructions are *not* necessary for distribution
tarballs; they have separate configure/build instructions.
-Building this package from CVS is mainly intended for developers.
+Building this package from SVN is mainly intended for developers.
General users should obtain official distribution packages; both
source and binary distributions are available at
http://www.vorbis.com/.
-----
-These are *brief* instructions on how to build this package from CVS.
+These are *brief* instructions on how to build this package from SVN.
Yes, there are details left out.
-There are generally four steps necessary when building from CVS (i.e.,
+There are generally four steps necessary when building from SVN (i.e.,
a developer's copy):
-1. cvs checkout of the sources, or cvs update. RTFM from your
- favorite flavor of CVS documentation; information on the xiph.org
- CVS repository can be found at http://www.xiph.org/cvs.html.
+1. SVN checkout of the sources, or SVN update. RTFM from your
+ favorite flavor of SVN documentation; information on the xiph.org
+ SVN repository can be found at http://svn.xiph.org/
2. [re-]generate files such as "configure" and "Makefile.in" with the
GNU autoconf/automake tools. Run the "autogen.sh" script to
@@ -37,7 +37,7 @@
4. Run "make" to build the source.
In general, steps 2 and 3 need to be re-run every time any of the
-following files are modified (either manually or by a cvs update):
+following files are modified (either manually or by a SVN update):
configure.in
acinclude.m4
Modified: trunk/ogg2/README
===================================================================
--- trunk/ogg2/README 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/README 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,14 +1,14 @@
-********************************************************************
-* *
-* 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-2003 *
-* by the Xiph.Org Foundation http://www.xiph.org/ *
-* *
-********************************************************************
+ ********************************************************************
+ * *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
+ * by the Xiph.Org Foundation http://www.xiph.org/ *
+ * *
+ ********************************************************************
WHAT'S HERE:
@@ -45,9 +45,9 @@
Up to date technical documents, contact information, source code and
pre-built utilities may be found there.
-BUILDING FROM CVS:
+BUILDING FROM SVN:
-A standard cvs build should consist of nothing more than:
+A standard svn build should consist of nothing more than:
./autogen.sh
make
@@ -100,4 +100,4 @@
(Build instructions for Ogg codecs such as vorbis are similar and may
be found in those source modules' README files)
-$Id: README,v 1.10.2.1 2003/03/27 09:19:42 xiphmont Exp $
+$Id$
Modified: trunk/ogg2/autogen.sh
===================================================================
--- trunk/ogg2/autogen.sh 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/autogen.sh 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,6 +1,6 @@
#!/bin/sh
# Run this to set up the build system: configure, makefiles, etc.
-# (based on the version in enlightenment's cvs)
+# (based on the version in enlightenment's svn)
package="libogg"
Modified: trunk/ogg2/debian/rules
===================================================================
--- trunk/ogg2/debian/rules 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/debian/rules 2004-07-20 22:11:32 UTC (rev 7195)
@@ -33,7 +33,7 @@
mkdir $(objdir)
# run configure with build tree $(objdir)
- # change ../configure to ../autogen.sh for CVS build
+ # change ../configure to ../autogen.sh for SVN build
cd $(objdir) && \
../configure --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) \
--prefix=/usr
Modified: trunk/ogg2/include/ogg2/mutex.c
===================================================================
--- trunk/ogg2/include/ogg2/mutex.c 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/include/ogg2/mutex.c 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: #ifdef jail for basic thread mutexing
- last mod: $Id: mutex.c,v 1.1.2.1 2003/03/06 23:12:27 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
Modified: trunk/ogg2/include/ogg2/ogg.h
===================================================================
--- trunk/ogg2/include/ogg2/ogg.h 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/include/ogg2/ogg.h 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: toplevel libogg include
- last mod: $Id: ogg.h,v 1.1.2.6 2003/07/21 20:32:32 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#ifndef _OGG_H
@@ -59,7 +59,8 @@
/* Ogg BITSTREAM PRIMITIVES: bitstream ************************/
- extern int oggpack_buffersize(void);
+extern ogg_buffer_state *ogg_buffer_create(void);
+extern int oggpack_buffersize(void);
extern void oggpack_writeinit(oggpack_buffer *b,ogg_buffer_state *bs);
extern ogg_reference *oggpack_writebuffer(oggpack_buffer *b);
extern void oggpack_writealign(oggpack_buffer *b);
@@ -117,14 +118,12 @@
/* Ogg BITSTREAM PRIMITIVES: general ***************************/
-extern ogg_stream_state *ogg_stream_create(int serialno);
+extern ogg_stream_state *ogg_stream_create(int serialno, int mode);
extern int ogg_stream_destroy(ogg_stream_state *os);
extern int ogg_stream_reset(ogg_stream_state *os);
extern int ogg_stream_reset_serialno(ogg_stream_state *os,int serialno);
extern int ogg_stream_eos(ogg_stream_state *os);
-extern int ogg_page_checksum_set(ogg_page *og);
-
extern int ogg_page_version(ogg_page *og);
extern int ogg_page_continued(ogg_page *og);
extern int ogg_page_bos(ogg_page *og);
@@ -133,7 +132,6 @@
extern ogg_uint32_t ogg_page_serialno(ogg_page *og);
extern ogg_uint32_t ogg_page_pageno(ogg_page *og);
extern int ogg_page_packets(ogg_page *og);
-extern int ogg_page_getbuffer(ogg_page *og, unsigned char **buffer);
extern int ogg_packet_release(ogg_packet *op);
extern int ogg_page_release(ogg_page *og);
Modified: trunk/ogg2/include/ogg2/os_types.h
===================================================================
--- trunk/ogg2/include/ogg2/os_types.h 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/include/ogg2/os_types.h 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h,v 1.1.2.4 2003/03/27 21:38:16 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
#ifndef _OS_TYPES_H
Modified: trunk/ogg2/src/bitwise.c
===================================================================
--- trunk/ogg2/src/bitwise.c 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/src/bitwise.c 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: pack variable sized words into an octet stream
- last mod: $Id: bitwise.c,v 1.14.2.16 2003/07/21 20:32:33 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
Modified: trunk/ogg2/src/buffer.c
===================================================================
--- trunk/ogg2/src/buffer.c 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/src/buffer.c 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: centralized fragment buffer management
- last mod: $Id: buffer.c,v 1.1.2.15 2003/07/18 04:45:21 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
Modified: trunk/ogg2/src/bytewise.c
===================================================================
--- trunk/ogg2/src/bytewise.c 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/src/bytewise.c 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: byte-aligned access; array-like abstraction over buffers
- last mod: $Id: bytewise.c,v 1.1.2.6 2003/03/28 04:51:33 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
Modified: trunk/ogg2/src/mutex.h
===================================================================
--- trunk/ogg2/src/mutex.h 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/src/mutex.h 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: #ifdef jail for basic thread mutexing
- last mod: $Id: mutex.h,v 1.1.2.5 2003/02/10 18:05:46 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
Modified: trunk/ogg2/src/ogginternal.h
===================================================================
--- trunk/ogg2/src/ogginternal.h 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/src/ogginternal.h 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,17 +1,17 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: internal/hidden data representation structures
- last mod: $Id: ogginternal.h,v 1.1.2.14 2003/03/28 22:37:16 xiphmont Exp $
+ last mod: $Id$
********************************************************************/
@@ -115,6 +115,7 @@
(which is in a seperate abstraction
layer) also knows about the gap */
ogg_int64_t granulepos;
+ int mode; /* 0 = continuous, 1 = discontinuous */
int lacing_fill;
ogg_uint32_t body_fill;
Modified: trunk/ogg2/src/stream.c
===================================================================
--- trunk/ogg2/src/stream.c 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/src/stream.c 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,18 +1,18 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: code raw packets into framed Ogg logical stream and
decode Ogg logical streams back into raw packets
- last mod: $Id: stream.c,v 1.1.2.14 2003/11/30 15:56:32 arc Exp $
+ last mod: $Id$
********************************************************************/
@@ -23,10 +23,11 @@
/* A complete description of Ogg framing exists in docs/framing.html */
-ogg_stream_state *ogg_stream_create(int serialno){
+ogg_stream_state *ogg_stream_create(int serialno, int mode){
ogg_stream_state *os=_ogg_calloc(1,sizeof(*os));
os->watermark=4096;
os->serialno=serialno;
+ os->mode=mode;
os->bufferpool=ogg_buffer_create();
return os;
}
@@ -1046,8 +1047,8 @@
int main(void){
- os_en=ogg_stream_create(0x04030201);
- os_de=ogg_stream_create(0x04030201);
+ os_en=ogg_stream_create(0x04030201, 0);
+ os_de=ogg_stream_create(0x04030201, 0);
oy=ogg_sync_create();
bs=ogg_buffer_create();
Modified: trunk/ogg2/src/sync.c
===================================================================
--- trunk/ogg2/src/sync.c 2004-07-20 21:46:55 UTC (rev 7194)
+++ trunk/ogg2/src/sync.c 2004-07-20 22:11:32 UTC (rev 7195)
@@ -1,18 +1,18 @@
/********************************************************************
* *
- * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE. *
+ * THIS FILE IS PART OF THE Ogg Reference Library 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 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: decode stream sync and memory management foundation code;
takes in raw data, spits out packets
- last mod: $Id: sync.c,v 1.1.2.12 2003/03/29 00:07:32 xiphmont Exp $
+ last mod: $Id$
note: The CRC code is directly derived from public domain code by
Ross Williams (ross at guest.adelaide.edu.au). See docs/framing.html
@@ -99,7 +99,7 @@
return(count);
}
-/* Static CRC calculation table. See older code in CVS for dead
+/* Static CRC calculation table. See older code in SVN for dead
run-time initialization code. */
static ogg_uint32_t crc_lookup[256]={
More information about the commits
mailing list