[xiph-commits] r7197 - in branches/ogg2-arc: . include/ogg2 src
arc at dactyl.lonelymoon.com
arc
Tue Jul 20 16:09:37 PDT 2004
Author: arc
Date: Tue Jul 20 16:09:37 2004
New Revision: 7197
Modified:
branches/ogg2-arc/README
branches/ogg2-arc/include/ogg2/mutex.c
branches/ogg2-arc/include/ogg2/ogg.h
branches/ogg2-arc/include/ogg2/os_types.h
branches/ogg2-arc/src/bitwise.c
branches/ogg2-arc/src/buffer.c
branches/ogg2-arc/src/bytewise.c
branches/ogg2-arc/src/mutex.h
branches/ogg2-arc/src/ogginternal.h
branches/ogg2-arc/src/stream.c
branches/ogg2-arc/src/sync.c
Log:
(Hopefully this actually commits to the branch this time)
Updated all the copyright notices, started work on resolving bug 545.
Modified: branches/ogg2-arc/README
===================================================================
--- branches/ogg2-arc/README 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/README 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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-2004 *
-* 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:
Modified: branches/ogg2-arc/include/ogg2/mutex.c
===================================================================
--- branches/ogg2-arc/include/ogg2/mutex.c 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/include/ogg2/mutex.c 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/include/ogg2/ogg.h
===================================================================
--- branches/ogg2-arc/include/ogg2/ogg.h 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/include/ogg2/ogg.h 2004-07-20 23:09:35 UTC (rev 7197)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * 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-2004 *
+ * THE Ogg Reference Library SOURCE CODE IS (C) COPYRIGHT 1994-2004 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
@@ -118,7 +118,7 @@
/* 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);
Modified: branches/ogg2-arc/include/ogg2/os_types.h
===================================================================
--- branches/ogg2-arc/include/ogg2/os_types.h 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/include/ogg2/os_types.h 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/src/bitwise.c
===================================================================
--- branches/ogg2-arc/src/bitwise.c 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/src/bitwise.c 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/src/buffer.c
===================================================================
--- branches/ogg2-arc/src/buffer.c 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/src/buffer.c 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/src/bytewise.c
===================================================================
--- branches/ogg2-arc/src/bytewise.c 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/src/bytewise.c 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/src/mutex.h
===================================================================
--- branches/ogg2-arc/src/mutex.h 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/src/mutex.h 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/src/ogginternal.h
===================================================================
--- branches/ogg2-arc/src/ogginternal.h 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/src/ogginternal.h 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/src/stream.c
===================================================================
--- branches/ogg2-arc/src/stream.c 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/src/stream.c 2004-07-20 23:09:35 UTC (rev 7197)
@@ -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: branches/ogg2-arc/src/sync.c
===================================================================
--- branches/ogg2-arc/src/sync.c 2004-07-20 22:20:56 UTC (rev 7196)
+++ branches/ogg2-arc/src/sync.c 2004-07-20 23:09:35 UTC (rev 7197)
@@ -1,11 +1,11 @@
/********************************************************************
* *
- * 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/ *
* *
********************************************************************
More information about the commits
mailing list