Pd-cvs January 2004

pd-cvs@lists.iem.at

12 participants
91 discussions

externals/grill/xsample config-pd-bcc.txt,1.1,1.2 make-files.txt,1.3,1.4 makefile.pd-bcc,1.2,1.3
by xovo＠users.sourceforge.net 08 Jan '04

08 Jan '04

Update of /cvsroot/pure-data/externals/grill/xsample In directory sc8-pr-cvs1:/tmp/cvs-serv31590 Modified Files: config-pd-bcc.txt make-files.txt makefile.pd-bcc Log Message: "" Index: config-pd-bcc.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/config-pd-bcc.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** config-pd-bcc.txt 14 Apr 2003 10:04:47 -0000 1.1 --- config-pd-bcc.txt 8 Jan 2004 03:37:38 -0000 1.2 *************** *** 1,4 **** # xsample - extended sample objects for Max/MSP and pd (pure data) ! # Copyright (c) 2001-2003 Thomas Grill (xovo(a)gmx.net) # --- 1,4 ---- # xsample - extended sample objects for Max/MSP and pd (pure data) ! # Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) # *************** *** 20,21 **** --- 20,24 ---- # where should the external be installed? INSTDIR=$(PDPATH)\extra + + # additional compiler flags + UFLAGS=-6 -O2 -OS -ff Index: make-files.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/make-files.txt,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** make-files.txt 14 Apr 2003 10:04:47 -0000 1.3 --- make-files.txt 8 Jan 2004 03:37:38 -0000 1.4 *************** *** 1,6 **** # all the source files from the package SRCDIR=source SRCS=main.cpp play.cpp groove.cpp record.cpp inter.cpp - HDRS=main.h inter.h --- 1,7 ---- # all the source files from the package + NAME=xsample + SRCDIR=source SRCS=main.cpp play.cpp groove.cpp record.cpp inter.cpp HDRS=main.h inter.h Index: makefile.pd-bcc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/xsample/makefile.pd-bcc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makefile.pd-bcc 10 Dec 2003 03:37:33 -0000 1.2 --- makefile.pd-bcc 8 Jan 2004 03:37:38 -0000 1.3 *************** *** 1,4 **** # xsample - extended sample objects for Max/MSP and pd (pure data) ! # Copyright (c) 2001-2003 Thomas Grill (xovo(a)gmx.net) # # Makefile for BorlandC++ --- 1,4 ---- # xsample - extended sample objects for Max/MSP and pd (pure data) ! # Copyright (c) 2001-2004 Thomas Grill (xovo(a)gmx.net) # # Makefile for BorlandC++ *************** *** 10,14 **** !include config-pd-bcc.txt ! NAME=xsample SETUPFUNCTION=$(NAME)_setup --- 10,16 ---- !include config-pd-bcc.txt ! # all the source files from the package ! !include make-files.txt ! SETUPFUNCTION=$(NAME)_setup *************** *** 23,34 **** # compiler definitions and flags DEFS=-DFLEXT_SYS=2 ! CFLAGS=-6 -O2 -OS -ff -tWD # the rest can stay untouched # ---------------------------------------------- - - # all the source files from the package - !include make-files.txt # default target --- 25,33 ---- # compiler definitions and flags DEFS=-DFLEXT_SYS=2 ! CFLAGS=-tWD $(UFLAGS) # the rest can stay untouched # ---------------------------------------------- # default target

1 0

externals/grill/py/source main.cpp,1.8,1.9 main.h,1.13,1.14 pyargs.cpp,1.3,1.4 pyext.cpp,1.11,1.12 pyext.h,1.9,1.10
by xovo＠users.sourceforge.net 07 Jan '04

07 Jan '04

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1:/tmp/cvs-serv16867/source Modified Files: main.cpp main.h pyargs.cpp pyext.cpp pyext.h Log Message: "" Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** main.cpp 6 Jan 2004 03:38:37 -0000 1.8 --- main.cpp 7 Jan 2004 03:38:25 -0000 1.9 *************** *** 129,133 **** ! void py::m__dir(PyObject *obj) { if(obj) { --- 129,133 ---- ! void py::GetDir(PyObject *obj,AtomList &lst) { if(obj) { *************** *** 135,147 **** PyObject *pvar = PyObject_Dir(obj); ! if(pvar == NULL) { PyErr_Print(); // no method found - } else { ! AtomList *lst = GetPyArgs(pvar); ! if(lst) { ! // dump dir to attribute outlet ! ToOutAnything(GetOutAttr(),thisTag(),lst->Count(),lst->Atoms()); ! delete lst; } else --- 135,144 ---- PyObject *pvar = PyObject_Dir(obj); ! if(!pvar) PyErr_Print(); // no method found else { ! AtomList *l = GetPyArgs(pvar); ! if(l) { ! lst = *l; delete l; } else *************** *** 152,155 **** --- 149,160 ---- PY_UNLOCK } + } + + void py::m__dir(PyObject *obj) + { + AtomList lst; + GetDir(obj,lst); + // dump dir to attribute outlet + ToOutAnything(GetOutAttr(),thisTag(),lst.Count(),lst.Atoms()); } Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** main.h 6 Jan 2004 03:38:37 -0000 1.13 --- main.h 7 Jan 2004 03:38:25 -0000 1.14 *************** *** 70,73 **** --- 70,74 ---- V m_dir() { m__dir(module); } + V mg_dir(AtomList &lst) { m__dir(module); } V m_doc() { m__doc(dict); } *************** *** 77,80 **** --- 78,83 ---- static const C *py_doc; + V GetDir(PyObject *obj,AtomList &lst); + V GetModulePath(const C *mod,C *dir,I len); V AddToPath(const C *dir); *************** *** 138,141 **** --- 141,145 ---- FLEXT_CALLBACK_V(m_stop) FLEXT_CALLBACK(m_dir) + FLEXT_ATTRGET_V(mg_dir) FLEXT_CALLBACK(m_doc) FLEXT_CALLBACK_T(tick) Index: pyargs.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyargs.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pyargs.cpp 6 Jan 2004 03:38:37 -0000 1.3 --- pyargs.cpp 7 Jan 2004 03:38:25 -0000 1.4 *************** *** 13,21 **** static PyObject *MakePyAtom(const t_atom &at) { ! if(flext::IsFloat(at)) return PyFloat_FromDouble((D)flext::GetFloat(at)); ! else if(flext::IsInt(at)) return PyInt_FromLong(flext::GetInt(at)); ! else if(flext::IsSymbol(at)) return PyString_FromString(flext::GetString(at)); // else if(flext::IsPointer(at)) return NULL; // not handled ! else return NULL; } --- 13,29 ---- static PyObject *MakePyAtom(const t_atom &at) { ! if(flext::IsSymbol(at)) return PyString_FromString(flext::GetString(at)); // else if(flext::IsPointer(at)) return NULL; // not handled ! else if(flext::CanbeInt(at) && flext::CanbeFloat(at)) { ! // if a number can be an integer... let at be an integer! ! int ival = flext::GetAInt(at); ! double fval = flext::GetAFloat(at); ! return (double)ival == fval?PyInt_FromLong(ival):PyFloat_FromDouble(fval); ! } ! // these following should never happen ! else if(flext::IsFloat(at)) return PyFloat_FromDouble((D)flext::GetFloat(at)); ! else if(flext::IsInt(at)) return PyInt_FromLong(flext::GetInt(at)); ! ! return NULL; } Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** pyext.cpp 6 Jan 2004 03:38:37 -0000 1.11 --- pyext.cpp 7 Jan 2004 03:38:25 -0000 1.12 *************** *** 13,17 **** ! FLEXT_LIB_V("pyext",pyext) V pyext::Setup(t_classid c) --- 13,17 ---- ! FLEXT_LIB_V("pyext pyx",pyext) V pyext::Setup(t_classid c) *************** *** 23,26 **** --- 23,29 ---- FLEXT_CADDMETHOD_(c,0,"doc",m_doc); FLEXT_CADDMETHOD_(c,0,"doc+",m_doc_); + + FLEXT_CADDATTR_VAR(c,"args",args,ms_args); + FLEXT_CADDATTR_GET(c,"dir+",mg_dir_); #ifdef FLEXT_THREADS Index: pyext.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** pyext.h 21 Oct 2003 02:38:31 -0000 1.9 --- pyext.h 7 Jan 2004 03:38:25 -0000 1.10 *************** *** 49,53 **** --- 49,55 ---- V m_reload(); V m_reload_(I argc,const t_atom *argv); + V ms_args(const AtomList &a) { m_reload_(a.Count(),a.Atoms()); } V m_dir_() { m__dir(pyobj); } + V mg_dir_(AtomList &lst) { GetDir(pyobj,lst); } V m_doc_() { m__doc(pyobj); } virtual V m_help(); *************** *** 109,113 **** --- 111,120 ---- FLEXT_CALLBACK_V(m_reload_) FLEXT_CALLBACK(m_dir_) + FLEXT_CALLGET_V(mg_dir_) FLEXT_CALLBACK(m_doc_) + FLEXT_CALLGET_V(mg_doc_) + + FLEXT_ATTRGET_V(args) + FLEXT_CALLSET_V(ms_args) FLEXT_CALLBACK_S(m_get)

1 0

externals/grill/py readme.txt,1.12,1.13
by xovo＠users.sourceforge.net 07 Jan '04

07 Jan '04

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1:/tmp/cvs-serv16867 Modified Files: readme.txt Log Message: "" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** readme.txt 6 Jan 2004 03:38:37 -0000 1.12 --- readme.txt 7 Jan 2004 03:38:24 -0000 1.13 *************** *** 85,88 **** --- 85,91 ---- 0.1.3: - FIX: class variables are now set atomic if parameter list has only 1 element + - ADD: introduced shortcut "pyx" for pyext. + - ADD: arguments to the pyext class are now exposed as attributes "args" + - FIX: parameters to Python functions are treated as integers when they can be. 0.1.2:

1 0

externals/grill/py/source main.cpp,1.7,1.8 main.h,1.12,1.13 pyargs.cpp,1.2,1.3 pyext.cpp,1.10,1.11
by xovo＠users.sourceforge.net 06 Jan '04

06 Jan '04

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1:/tmp/cvs-serv26150/source Modified Files: main.cpp main.h pyargs.cpp pyext.cpp Log Message: "" Index: main.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** main.cpp 29 Nov 2003 03:38:01 -0000 1.7 --- main.cpp 6 Jan 2004 03:38:37 -0000 1.8 *************** *** 3,7 **** py/pyext - python external object for PD and MaxMSP ! Copyright (c) 2002-2003 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python external object for PD and MaxMSP ! Copyright (c) 2002-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 14,18 **** { post(""); ! post("py/pyext %s - python script objects, (C)2002,2003 Thomas Grill",PY__VERSION); post(""); --- 14,18 ---- { post(""); ! post("py/pyext %s - python script objects, (C)2002-2004 Thomas Grill",PY__VERSION); post(""); Index: main.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/main.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** main.h 29 Dec 2003 21:30:25 -0000 1.12 --- main.h 6 Jan 2004 03:38:37 -0000 1.13 *************** *** 30,34 **** #endif ! #define PY__VERSION "0.1.2" --- 30,34 ---- #endif ! #define PY__VERSION "0.1.3pre" Index: pyargs.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyargs.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pyargs.cpp 4 Jan 2003 04:36:49 -0000 1.2 --- pyargs.cpp 6 Jan 2004 03:38:37 -0000 1.3 *************** *** 11,14 **** --- 11,22 ---- #include "main.h" + static PyObject *MakePyAtom(const t_atom &at) + { + if(flext::IsFloat(at)) return PyFloat_FromDouble((D)flext::GetFloat(at)); + else if(flext::IsInt(at)) return PyInt_FromLong(flext::GetInt(at)); + else if(flext::IsSymbol(at)) return PyString_FromString(flext::GetString(at)); + // else if(flext::IsPointer(at)) return NULL; // not handled + else return NULL; + } PyObject *py::MakePyArgs(const t_symbol *s,const AtomList &args,I inlet,BL withself) *************** *** 16,68 **** PyObject *pArgs; ! BL any = IsAnything(s); ! pArgs = PyTuple_New(args.Count()+(any?1:0)+(inlet >= 0?1:0)); ! ! I pix = 0; ! if(inlet >= 0) { ! PyObject *pValue = PyInt_FromLong(inlet); ! ! // reference stolen: ! PyTuple_SetItem(pArgs, pix++, pValue); ! } ! I ix; ! PyObject *tmp; ! if(!withself || args.Count() < (any?1:2)) tmp = pArgs,ix = pix; ! else tmp = PyTuple_New(args.Count()+(any?1:0)),ix = 0; ! if(any) { ! PyObject *pValue = PyString_FromString(GetString(s)); ! // reference stolen here: ! PyTuple_SetItem(tmp, ix++, pValue); ! } ! for(I i = 0; i < args.Count(); ++i) { ! PyObject *pValue = NULL; ! ! if(IsFloat(args[i])) pValue = PyFloat_FromDouble((D)GetFloat(args[i])); ! else if(IsInt(args[i])) pValue = PyInt_FromLong(GetInt(args[i])); ! else if(IsSymbol(args[i])) pValue = PyString_FromString(GetString(args[i])); ! else if(IsPointer(args[i])) pValue = NULL; // not handled ! if(!pValue) { ! post("py/pyext: cannot convert argument %i",any?i+1:i); ! continue; ! } ! /* pValue reference stolen here: */ ! PyTuple_SetItem(tmp, ix++, pValue); ! } ! if(tmp != pArgs) { ! PyTuple_SetItem(pArgs, pix++, tmp); ! #if PY_VERSION_HEX >= 0x02020000 ! _PyTuple_Resize(&pArgs,pix); ! #else ! _PyTuple_Resize(&pArgs,pix,0); ! #endif ! } return pArgs; --- 24,80 ---- PyObject *pArgs; ! /* ! if(!s && args.Count() == 1) { ! pArgs = MakePyAtom(args[0]); ! if(!pArgs) ! post("py/pyext: cannot convert argument(s)"); ! } ! else ! */ ! { ! BL any = IsAnything(s); ! pArgs = PyTuple_New(args.Count()+(any?1:0)+(inlet >= 0?1:0)); ! I pix = 0; ! if(inlet >= 0) { ! PyObject *pValue = PyInt_FromLong(inlet); ! ! // reference stolen: ! PyTuple_SetItem(pArgs, pix++, pValue); ! } ! I ix; ! PyObject *tmp; ! if(!withself || args.Count() < (any?1:2)) tmp = pArgs,ix = pix; ! else tmp = PyTuple_New(args.Count()+(any?1:0)),ix = 0; ! if(any) { ! PyObject *pValue = PyString_FromString(GetString(s)); ! // reference stolen here: ! PyTuple_SetItem(tmp, ix++, pValue); ! } ! for(I i = 0; i < args.Count(); ++i) { ! PyObject *pValue = MakePyAtom(args[i]); ! if(!pValue) { ! post("py/pyext: cannot convert argument %i",any?i+1:i); ! continue; ! } ! /* pValue reference stolen here: */ ! PyTuple_SetItem(tmp, ix++, pValue); ! } ! if(tmp != pArgs) { ! PyTuple_SetItem(pArgs, pix++, tmp); ! #if PY_VERSION_HEX >= 0x02020000 ! _PyTuple_Resize(&pArgs,pix); ! #else ! _PyTuple_Resize(&pArgs,pix,0); ! #endif ! } ! } return pArgs; Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** pyext.cpp 29 Nov 2003 03:38:01 -0000 1.10 --- pyext.cpp 6 Jan 2004 03:38:37 -0000 1.11 *************** *** 3,7 **** py/pyext - python script object for PD and MaxMSP ! Copyright (c) 2002-2003 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 3,7 ---- py/pyext - python script object for PD and MaxMSP ! Copyright (c) 2002-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 340,347 **** } else { ! PyObject *pval = MakePyArgs(sym_list,AtomList(argc-1,argv+1),-1,false); ! if(!pval) PyErr_Print(); else { PyObject_SetAttrString(pyobj,ch,pval); Py_DECREF(pval); --- 340,356 ---- } else { ! PyObject *pval = MakePyArgs(NULL,AtomList(argc-1,argv+1),-1,false); ! ! if(!pval) PyErr_Print(); else { + if(PySequence_Size(pval) == 1) { + // reduce lists of one element to element itself + + PyObject *val1 = PySequence_GetItem(pval,0); + Py_DECREF(pval); + pval = val1; + } + PyObject_SetAttrString(pyobj,ch,pval); Py_DECREF(pval);

1 0

externals/grill/py readme.txt,1.11,1.12
by xovo＠users.sourceforge.net 06 Jan '04

06 Jan '04

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1:/tmp/cvs-serv26150 Modified Files: readme.txt Log Message: "" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** readme.txt 29 Dec 2003 21:30:25 -0000 1.11 --- readme.txt 6 Jan 2004 03:38:37 -0000 1.12 *************** *** 83,86 **** --- 83,89 ---- Version history: + 0.1.3: + - FIX: class variables are now set atomic if parameter list has only 1 element + 0.1.2: - CHANGE: updates for flext 0.4.1 - method registering within class scope *************** *** 124,127 **** --- 127,131 ---- general: - Documentation and better example patches + - better error reporting for runtime errors features:

1 0

externals/grill/pool readme.txt,1.14,1.15
by xovo＠users.sourceforge.net 06 Jan '04

06 Jan '04

Update of /cvsroot/pure-data/externals/grill/pool In directory sc8-pr-cvs1:/tmp/cvs-serv26044 Modified Files: readme.txt Log Message: "" Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/pool/readme.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** readme.txt 17 Dec 2003 03:37:55 -0000 1.14 --- readme.txt 6 Jan 2004 03:38:08 -0000 1.15 *************** *** 1,5 **** pool - a hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2003 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. --- 1,5 ---- pool - a hierarchical storage object for PD and Max/MSP ! Copyright (c) 2002-2004 Thomas Grill (xovo(a)gmx.net) For information on usage and redistribution, and for a DISCLAIMER OF ALL WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 38,42 **** o Borland C++ 5.5 (free): edit "config-pd-bcc.txt" & run "build-pd-bcc.bat" ! o Microsoft Visual C++ 6: edit the project file "pool.dsp" & build pd - linux: --- 38,42 ---- o Borland C++ 5.5 (free): edit "config-pd-bcc.txt" & run "build-pd-bcc.bat" ! o Microsoft Visual C++ 6/7: edit "config-pd-msvc.txt" & run "build-pd-msvc.bat" pd - linux: *************** *** 51,54 **** --- 51,59 ---- ------------------- o CodeWarrior: edit "pool.cw" and build + + Max/MSP - Windows: + ------------------- + o Microsoft Visual C++ 7: edit "config-max-msvc.txt" & run "build-max-msvc.bat" + ----------------------------------------------------------------------------

1 0

externals/pdogg/oggcast~ HISTORY,1.2,1.3 codec.h,1.2,1.3 help-oggcast~.pd,1.2,1.3 oggcast~.c,1.5,1.6 readme,1.2,1.3 vorbisenc.h,1.2,1.3
by x75＠users.sourceforge.net 04 Jan '04

04 Jan '04

Update of /cvsroot/pure-data/externals/pdogg/oggcast~ In directory sc8-pr-cvs1:/tmp/cvs-serv17605/oggcast~ Modified Files: HISTORY codec.h help-oggcast~.pd oggcast~.c readme vorbisenc.h Log Message: recommitting olaf's sources from 0.25 Index: HISTORY =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggcast~/HISTORY,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HISTORY 23 Apr 2003 10:36:25 -0000 1.2 --- HISTORY 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,70 **** ! Version history of oggcast~ external for pure-data ! ! v 0.2h (27th March 2003): ! - added HTTP base auth login for (alpha) Icecast2 server: ! message 'server 1' switches to Icecast2, 'server 0' back ! top JRoar and PeerCast compatibility (which is the default) ! ! v 0.2g (3rd August 2002): ! - finally fixed the bug that made oggcast~ crash after a ! while. seems to be realted with output from child thread ! using t_clocks but couldn't proove that ! ! v 0.2f (20st july 2002): ! - recompiled with the final 1.0 release of Ogg Vorbis ! - changed the URL to the new akustische-kunst.org domain ! ! v 0.2e (5th july 2002): ! - added simple downsampling to stream at lower sample rates ! ! v 0.2d (21st june 2002 - stable release!): ! - cleaned up code a bit ! - now clean disconnect in case server dies or closes ! socket ! ! v 0.2c (13th june 2002): ! - fixed some small bugs ! - buffer size now in kbytes per channel ! - some more info-printout ! ! v 0.2b (12th june 2002): ! - completetly rewritten multithreaded version, first ! sort-of-stable release ! - KNOWN BUG: eats too much CPU power ! ! v 0.1g (23rd feb. 2002, not for public use!): ! - added multithreading functionality: now sending data ! to server in a second thread ! - now included the static ogg vorbis libraries - no dll's ! needed under win any longer ! - fixed a bug that sometimes made pd crash ! ! v 0.1f (11th feb. 2002): ! - converted ringbuffer to simple buffer of fixed size ! ! v 0.1e (10th feb. 2002): ! - now really fixed the bug that made pd die when server ! disconnected ! ! v 0.1d (9th feb. 2002): ! - fixed a bug in the "vorbis" setting that made on-the-run ! changes impossible ! - introduced a function to check writeability of the socket ! - fixed the bug that crashed pd due to an access violation ! in vorbis.dll when send() returned an error (more of a ! fast workaround) ! - corrected bitrate setting, now it really is _k_bps ! ! ! v 0.1c (9th feb. 2002): ! - added support for setting / changing the comment tags in ! the ogg/vorbis header, spaces have to be replaced by '=' ! - fixed a bug in oggcast_stream() that made Pd crash - now ! it's vorbis.dll that makes Pd crash... ;-( ! ! v 0.1b (not released): ! - added support for changing encoder settings when stream ! is running (no need to disconnect), seems to be unstable ! on linux (with JRoar) ! v 0.1: first public release --- 1,83 ---- ! Version history of oggcast~ external for pure-data ! ! v 0.2k (29th Sept. 2003): ! - fixed a bug in multichannel support ! - fixed a memory leak in Icecast2 login ! ! v 0.2i (13th September 2003): ! - updated login scheme to work with latest Icecast2 server ! from CVS (tested on Windows and Debian Linux) ! - changed handling of comment tags: it's no longer necessarry ! to replace spaces with underscores! Just use spaces for spaces. ! - fixed (no: avoided!) the bug that deleted underscores from ! the Pd patch ! - made Icecast2 login the default scheme ! ! v 0.2h (27th March 2003): ! - added HTTP base auth login for (alpha) Icecast2 server: ! message 'server 1' switches to Icecast2, 'server 0' back ! top JRoar and PeerCast compatibility (which is the default) ! ! v 0.2g (3rd August 2002): ! - finally fixed the bug that made oggcast~ crash after a ! while. seems to be realted with output from child thread ! using t_clocks but couldn't proove that ! ! v 0.2f (20st july 2002): ! - recompiled with the final 1.0 release of Ogg Vorbis ! - changed the URL to the new akustische-kunst.org domain ! ! v 0.2e (5th july 2002): ! - added simple downsampling to stream at lower sample rates ! ! v 0.2d (21st june 2002 - stable release!): ! - cleaned up code a bit ! - now clean disconnect in case server dies or closes ! socket ! ! v 0.2c (13th june 2002): ! - fixed some small bugs ! - buffer size now in kbytes per channel ! - some more info-printout ! ! v 0.2b (12th june 2002): ! - completetly rewritten multithreaded version, first ! sort-of-stable release ! - KNOWN BUG: eats too much CPU power ! ! v 0.1g (23rd feb. 2002, not for public use!): ! - added multithreading functionality: now sending data ! to server in a second thread ! - now included the static ogg vorbis libraries - no dll's ! needed under win any longer ! - fixed a bug that sometimes made pd crash ! ! v 0.1f (11th feb. 2002): ! - converted ringbuffer to simple buffer of fixed size ! ! v 0.1e (10th feb. 2002): ! - now really fixed the bug that made pd die when server ! disconnected ! ! v 0.1d (9th feb. 2002): ! - fixed a bug in the "vorbis" setting that made on-the-run ! changes impossible ! - introduced a function to check writeability of the socket ! - fixed the bug that crashed pd due to an access violation ! in vorbis.dll when send() returned an error (more of a ! fast workaround) ! - corrected bitrate setting, now it really is _k_bps ! ! ! v 0.1c (9th feb. 2002): ! - added support for setting / changing the comment tags in ! the ogg/vorbis header, spaces have to be replaced by '=' ! - fixed a bug in oggcast_stream() that made Pd crash - now ! it's vorbis.dll that makes Pd crash... ;-( ! ! v 0.1b (not released): ! - added support for changing encoder settings when stream ! is running (no need to disconnect), seems to be unstable ! on linux (with JRoar) ! v 0.1: first public release Index: codec.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggcast~/codec.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** codec.h 23 Apr 2003 10:36:25 -0000 1.2 --- codec.h 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,233 **** ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! --- 1,233 ---- ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! Index: help-oggcast~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggcast~/help-oggcast~.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-oggcast~.pd 23 Apr 2003 10:36:25 -0000 1.2 --- help-oggcast~.pd 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,65 **** ! #N canvas 298 121 629 593 10; ! #X floatatom 18 36 0 40 16000 0 - - -; ! #X msg 468 508 \; pd dsp 1; ! #X floatatom 18 524 0 0 0 0 - - -; ! #X msg 185 250 disconnect; ! #X msg 213 352 print; ! #X msg 534 508 \; pd dsp 0; ! #X obj 468 482 loadbang; ! #X floatatom 97 502 10 0 0 0 - - -; ! #X text 131 154 connect <host> <mountpoint> <port>; ! #X text 272 45 get latest version at; ! #X text 168 502 ogg pages; ! #X text 48 527 connection state; ! #X text 378 337 channels: 1 or 2 (default); ! #X text 210 304 vbr <samplerate> <channels> <quality>; ! #X msg 100 57 passwd letmein; ! #X obj 18 63 osc~ 440; ! #X text 330 326 quality settings: 0 - 1 (low - hi); ! #X text 227 412 possible tags: TITLE \, ARTIST \, PERFORMER \, DESCRIPTION ! \,; ! #X text 316 425 GENRE \, LOCATION \, COPYRIGHT \, CONTACT \, DATE; ! #X msg 163 194 connect 141.53.196.149 puredata.ogg 8000; ! #X msg 133 172 connect localhost puredata.ogg 8000; ! #X msg 170 220 connect 141.53.3.18 musicforfilms.ogg 8100; ! #X obj 18 475 oggcast~ 2 512; ! #X text 273 34 written by Olaf Matthes <olaf.matthes(a)gmx.de>; ! #X text 252 353 print current settings to console window; ! #X text 225 373 comment: <TAG> <content>; ! #X msg 225 390 ARTIST your_name; ! #X text 228 444 '_' (underline) or '=' (equal sign) will get replaced ! with spaces!; ! #X text 240 493 default is 2 channels and 512k; ! #X text 241 505 bytes buffer size; ! #X text 119 475 creation arguments: oggcast~ <channels> <buffer size> ! ; ! #X msg 195 285 vorbis 44100 2 144 128 96; ! #X obj 33 110 noise~; ! #X text 19 6 oggcast~ 0.2f - send Ogg Vorbis stream to IceCast2 or ! JRoar; ! #X text 274 59 http://www.akustische-kunst.org/puredata/; ! #X text 195 268 vorbis <samplerate> <channels> <max.br> <nom.br> <min.br> ! ; ! #X msg 210 320 vbr 44100 2 0.6; ! #X msg 117 95 server 0; ! #X msg 129 120 server 1; ! #X text 175 94 choose JRoar or old Icecast2 as server type (default) ! ; ! #X text 188 121 choose new Icecast2 (final) as server type; ! #X connect 0 0 15 0; ! #X connect 3 0 22 0; ! #X connect 4 0 22 0; ! #X connect 6 0 1 0; ! #X connect 14 0 22 0; ! #X connect 15 0 22 0; ! #X connect 19 0 22 0; ! #X connect 20 0 22 0; ! #X connect 21 0 22 0; ! #X connect 22 0 2 0; ! #X connect 22 1 7 0; ! #X connect 26 0 22 0; ! #X connect 31 0 22 0; ! #X connect 32 0 22 1; ! #X connect 36 0 22 0; ! #X connect 37 0 22 0; ! #X connect 38 0 22 0; --- 1,65 ---- ! #N canvas 298 121 629 593 10; ! #X floatatom 18 36 0 40 16000 0 - - -; ! #X msg 468 508 \; pd dsp 1; ! #X floatatom 18 524 0 0 0 0 - - -; ! #X msg 185 250 disconnect; ! #X msg 213 352 print; ! #X msg 534 508 \; pd dsp 0; ! #X obj 468 482 loadbang; ! #X floatatom 97 502 10 0 0 0 - - -; ! #X text 131 154 connect <host> <mountpoint> <port>; ! #X text 272 45 get latest version at; ! #X text 168 502 ogg pages; ! #X text 48 527 connection state; ! #X text 378 337 channels: 1 or 2 (default); ! #X text 210 304 vbr <samplerate> <channels> <quality>; ! #X msg 100 57 passwd letmein; ! #X obj 18 63 osc~ 440; ! #X text 330 326 quality settings: 0 - 1 (low - hi); ! #X text 227 412 possible tags: TITLE \, ARTIST \, PERFORMER \, DESCRIPTION ! \,; ! #X text 316 425 GENRE \, LOCATION \, COPYRIGHT \, CONTACT \, DATE; ! #X msg 163 194 connect 141.53.196.149 puredata.ogg 8000; ! #X msg 133 172 connect localhost puredata.ogg 8000; ! #X msg 170 220 connect 141.53.3.18 musicforfilms.ogg 8100; ! #X obj 18 475 oggcast~ 2 512; ! #X text 273 34 written by Olaf Matthes <olaf.matthes(a)gmx.de>; ! #X text 252 353 print current settings to console window; ! #X text 225 373 comment: <TAG> <content>; ! #X msg 225 390 ARTIST your_name; ! #X text 228 444 '_' (underline) or '=' (equal sign) will get replaced ! with spaces!; ! #X text 240 493 default is 2 channels and 512k; ! #X text 241 505 bytes buffer size; ! #X text 119 475 creation arguments: oggcast~ <channels> <buffer size> ! ; ! #X msg 195 285 vorbis 44100 2 144 128 96; ! #X obj 33 110 noise~; ! #X text 19 6 oggcast~ 0.2f - send Ogg Vorbis stream to IceCast2 or ! JRoar; ! #X text 274 59 http://www.akustische-kunst.org/puredata/; ! #X text 195 268 vorbis <samplerate> <channels> <max.br> <nom.br> <min.br> ! ; ! #X msg 210 320 vbr 44100 2 0.6; ! #X msg 117 95 server 0; ! #X msg 129 120 server 1; ! #X text 175 94 choose JRoar or old Icecast2 as server type (default) ! ; ! #X text 188 121 choose new Icecast2 (final) as server type; ! #X connect 0 0 15 0; ! #X connect 3 0 22 0; ! #X connect 4 0 22 0; ! #X connect 6 0 1 0; ! #X connect 14 0 22 0; ! #X connect 15 0 22 0; ! #X connect 19 0 22 0; ! #X connect 20 0 22 0; ! #X connect 21 0 22 0; ! #X connect 22 0 2 0; ! #X connect 22 1 7 0; ! #X connect 26 0 22 0; ! #X connect 31 0 22 0; ! #X connect 32 0 22 1; ! #X connect 36 0 22 0; ! #X connect 37 0 22 0; ! #X connect 38 0 22 0; Index: oggcast~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggcast~/oggcast~.c,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** oggcast~.c 13 Sep 2003 23:04:26 -0000 1.5 --- oggcast~.c 4 Jan 2004 12:16:07 -0000 1.6 *************** *** 1,1435 **** ! /* ------------------------- oggcast~ ----------------------------------------- */ ! /* */ ! /* Tilde object to send an Ogg Vorbis stream from to IceCast2 server. */ ! /* Written by Olaf Matthes (olaf.matthes(a)gmx.de) */ ! /* Get source at http://www.akustische-kunst.org/puredata/pdogg/ */ ! /* */ ! /* This library is free software; you can redistribute it and/or */ ! /* modify it under the terms of the GNU Lesser General Public */ ! /* License as published by the Free Software Foundation; either */ ! /* version 2 of the License, or (at your option) any later version. */ [...2851 lines suppressed...] ! } ! ! void oggcast_tilde_setup(void) ! { ! oggcast_class = class_new(gensym("oggcast~"), (t_newmethod)oggcast_new, ! (t_method)oggcast_free, sizeof(t_oggcast), 0, A_DEFFLOAT, A_DEFFLOAT, 0); ! CLASS_MAINSIGNALIN(oggcast_class, t_oggcast, x_f ); ! class_addfloat(oggcast_class, (t_method)oggcast_float); ! class_addmethod(oggcast_class, (t_method)oggcast_disconnect, gensym("disconnect"), 0); ! class_addmethod(oggcast_class, (t_method)oggcast_dsp, gensym("dsp"), 0); ! class_addmethod(oggcast_class, (t_method)oggcast_connect, gensym("connect"), A_GIMME, 0); ! class_addmethod(oggcast_class, (t_method)oggcast_print, gensym("print"), 0); ! class_addmethod(oggcast_class, (t_method)oggcast_password, gensym("passwd"), A_SYMBOL, 0); ! class_addmethod(oggcast_class, (t_method)oggcast_vorbis, gensym("vorbis"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(oggcast_class, (t_method)oggcast_vbr, gensym("vbr"), A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(oggcast_class, (t_method)oggcast_server, gensym("server"), A_FLOAT, 0); ! class_addanything(oggcast_class, oggcast_comment); ! class_sethelpsymbol(oggcast_class, gensym("help-oggcast~.pd")); ! } \ No newline at end of file Index: readme =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggcast~/readme,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme 23 Apr 2003 10:36:25 -0000 1.2 --- readme 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,116 **** ! Version 0.2 ! copyright (c) 2002 by Olaf Matthes ! ! oggcast~ is a ogg/vorbis streaming external for pd (by Miller ! Puckette) that connects to an IceCast2 server. ! ! ! To run oggcast~ place the file oggcast~.dll for win or oggcast~.pd_linux ! in the directory of our patch or start pd with '-lib oggcast~' flag. ! ! To compile oggcast~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggcast~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Usage: ! ! Use message "vbr <samplerate> <channels> <quality>" to set the vorbis ! encoding parameters. Resampling is currently not supported, so 'samplerate' ! should be the one pd is running at. 'channels' specyfies the number of channels ! to stream. This can be set to 2 (default) or 1 which means mono stream taking ! the leftmost audio input only. 'quality' can be a value between 0.0 and 1.0 ! giving the quality of the stream. 0.4 (default) results in a stream that's ! about 128kbps. ! ! Since Vorbis uses VBR encoding, bitrates vary depending on the type of audio ! signal to be encoded. A pure sine [osc~] results in the smalest stream, com- ! plex audio signals will increase this value significantly. To test the maximum ! bitrate that might occur for a quality setting use noise~ as signal input. ! ! Use message "vorbis <samplerate> <channels> <maximum bitrate> <nominal bit- ! rate> <minimal bitrate>" to set encoding quality on the basis of bitrates. ! When setting all three bitrate parameters to the same value one gets a ! constant bitrate stream. Values are in kbps! ! ! Message "connect <host> <mountpoint> <port>" connects to the IceCast2 server. ! Note that no response about succesfull connection is send by the server. All ! messages in the pd console window about connection status depend on the ability ! to send data to the server. ! The mountpoint should end with '.ogg' to indiocate to the player/client that ! it is an ogg/vorbis encoded stream. ! ! Use "passwd <passwort>" to set your password (default is 'letmein') and ! "disconnect" to disconnect from the server. "print" prints out the current ! vorbis encoder settings. ! ! To set the comment tags in the ogg/vorbis header (which can be displayed by ! the receiving client) use message "<NAMEOFTAG> <comment>". Supported tags are: ! TITLE, ARTIST, GENRE, PERFORMER, LOCATION, COPYRIGHT, CONTACT, DESCRIPTION and ! DATE (which is automatically set to the date/time the broadcast started). To ! get spaces use '=' or '_' instead. Note that under Win2k '=' sometimes get lost ! from the patch after saving!!! ! ! ! Listening to it: ! ! To listen to ogg/vorbis encoded livestreams many player need an extra plug-in. ! Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your ! player. ! To play back the stream just open lacation http://<server>:<port>/<mountpoint>. ! ! Note that changing encoding parameters or header comments while oggcast~ is ! streaming to the server might result in audible dropouts. ! ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de! --- 1,116 ---- ! Version 0.2 ! copyright (c) 2002 by Olaf Matthes ! ! oggcast~ is a ogg/vorbis streaming external for pd (by Miller ! Puckette) that connects to an IceCast2 server. ! ! ! To run oggcast~ place the file oggcast~.dll for win or oggcast~.pd_linux ! in the directory of our patch or start pd with '-lib oggcast~' flag. ! ! To compile oggcast~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggcast~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Usage: ! ! Use message "vbr <samplerate> <channels> <quality>" to set the vorbis ! encoding parameters. Resampling is currently not supported, so 'samplerate' ! should be the one pd is running at. 'channels' specyfies the number of channels ! to stream. This can be set to 2 (default) or 1 which means mono stream taking ! the leftmost audio input only. 'quality' can be a value between 0.0 and 1.0 ! giving the quality of the stream. 0.4 (default) results in a stream that's ! about 128kbps. ! ! Since Vorbis uses VBR encoding, bitrates vary depending on the type of audio ! signal to be encoded. A pure sine [osc~] results in the smalest stream, com- ! plex audio signals will increase this value significantly. To test the maximum ! bitrate that might occur for a quality setting use noise~ as signal input. ! ! Use message "vorbis <samplerate> <channels> <maximum bitrate> <nominal bit- ! rate> <minimal bitrate>" to set encoding quality on the basis of bitrates. ! When setting all three bitrate parameters to the same value one gets a ! constant bitrate stream. Values are in kbps! ! ! Message "connect <host> <mountpoint> <port>" connects to the IceCast2 server. ! Note that no response about succesfull connection is send by the server. All ! messages in the pd console window about connection status depend on the ability ! to send data to the server. ! The mountpoint should end with '.ogg' to indiocate to the player/client that ! it is an ogg/vorbis encoded stream. ! ! Use "passwd <passwort>" to set your password (default is 'letmein') and ! "disconnect" to disconnect from the server. "print" prints out the current ! vorbis encoder settings. ! ! To set the comment tags in the ogg/vorbis header (which can be displayed by ! the receiving client) use message "<NAMEOFTAG> <comment>". Supported tags are: ! TITLE, ARTIST, GENRE, PERFORMER, LOCATION, COPYRIGHT, CONTACT, DESCRIPTION and ! DATE (which is automatically set to the date/time the broadcast started). To ! get spaces use '=' or '_' instead. Note that under Win2k '=' sometimes get lost ! from the patch after saving!!! ! ! ! Listening to it: ! ! To listen to ogg/vorbis encoded livestreams many player need an extra plug-in. ! Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your ! player. ! To play back the stream just open lacation http://<server>:<port>/<mountpoint>. ! ! Note that changing encoding parameters or header comments while oggcast~ is ! streaming to the server might result in audible dropouts. ! ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de! Index: vorbisenc.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggcast~/vorbisenc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vorbisenc.h 23 Apr 2003 10:36:25 -0000 1.2 --- vorbisenc.h 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,93 **** ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! * * ! ******************************************************************** ! ! function: vorbis encode-engine setup ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _OV_ENC_H_ ! #define _OV_ENC_H_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include "codec.h" ! ! extern int vorbis_encode_init(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_managed(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_init_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float base_quality /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_setup_init(vorbis_info *vi); ! ! extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg); ! ! #define OV_ECTL_RATEMANAGE_GET 0x10 ! ! #define OV_ECTL_RATEMANAGE_SET 0x11 ! #define OV_ECTL_RATEMANAGE_AVG 0x12 ! #define OV_ECTL_RATEMANAGE_HARD 0x13 ! ! #define OV_ECTL_LOWPASS_GET 0x20 ! #define OV_ECTL_LOWPASS_SET 0x21 ! ! #define OV_ECTL_IBLOCK_GET 0x30 ! #define OV_ECTL_IBLOCK_SET 0x31 ! ! struct ovectl_ratemanage_arg { ! int management_active; ! ! long bitrate_hard_min; ! long bitrate_hard_max; ! double bitrate_hard_window; ! ! long bitrate_av_lo; ! long bitrate_av_hi; ! double bitrate_av_window; ! double bitrate_av_window_center; ! }; ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! ! --- 1,93 ---- ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! * * ! ******************************************************************** ! ! function: vorbis encode-engine setup ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _OV_ENC_H_ ! #define _OV_ENC_H_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include "codec.h" ! ! extern int vorbis_encode_init(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_managed(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_init_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float base_quality /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_setup_init(vorbis_info *vi); ! ! extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg); ! ! #define OV_ECTL_RATEMANAGE_GET 0x10 ! ! #define OV_ECTL_RATEMANAGE_SET 0x11 ! #define OV_ECTL_RATEMANAGE_AVG 0x12 ! #define OV_ECTL_RATEMANAGE_HARD 0x13 ! ! #define OV_ECTL_LOWPASS_GET 0x20 ! #define OV_ECTL_LOWPASS_SET 0x21 ! ! #define OV_ECTL_IBLOCK_GET 0x30 ! #define OV_ECTL_IBLOCK_SET 0x31 ! ! struct ovectl_ratemanage_arg { ! int management_active; ! ! long bitrate_hard_min; ! long bitrate_hard_max; ! double bitrate_hard_window; ! ! long bitrate_av_lo; ! long bitrate_av_hi; ! double bitrate_av_window; ! double bitrate_av_window_center; ! }; ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! !

1 0

externals/pdogg/oggwrite~ codec.h,1.2,1.3 help-oggwrite~.pd,1.2,1.3 oggwrite~.c,1.3,1.4 readme,1.2,1.3 vorbisenc.h,1.2,1.3
by x75＠users.sourceforge.net 04 Jan '04

04 Jan '04

Update of /cvsroot/pure-data/externals/pdogg/oggwrite~ In directory sc8-pr-cvs1:/tmp/cvs-serv17605/oggwrite~ Modified Files: codec.h help-oggwrite~.pd oggwrite~.c readme vorbisenc.h Log Message: recommitting olaf's sources from 0.25 Index: codec.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggwrite~/codec.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** codec.h 23 Apr 2003 10:36:25 -0000 1.2 --- codec.h 4 Jan 2004 12:16:08 -0000 1.3 *************** *** 1,233 **** ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! --- 1,233 ---- ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! Index: help-oggwrite~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggwrite~/help-oggwrite~.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-oggwrite~.pd 23 Apr 2003 10:36:25 -0000 1.2 --- help-oggwrite~.pd 4 Jan 2004 12:16:08 -0000 1.3 *************** *** 1,59 **** ! #N canvas 286 47 631 513 10; ! #X obj 40 415 oggwrite~; ! #X obj 40 64 osc~ 440; ! #X floatatom 40 33 5 0 0; ! #X msg 120 52 open myfile.ogg; ! #X msg 175 125 start; ! #X msg 185 148 stop; ! #X msg 155 78 append; ! #X msg 166 99 truncate; ! #X floatatom 89 441 5 0 0; ! #X floatatom 40 470 5 0 0; ! #X msg 204 259 print; ! #X text 189 180 vorbis <samplerate> <channles> <max.br> <nom.br> <min.br> ! ; ! #X text 373 251 channels: 1 or 2 (default); ! #X text 204 216 vbr <samplerate> <channels> <quality>; ! #X msg 203 232 vbr 44100 2 0.4; ! #X text 324 238 quality settings: 0 - 1 (low - hi); ! #X text 325 267 resampling currently not supported!; ! #X text 202 290 comment <tag> <content>; ! #X text 204 329 possible tags: TITLE \, ARTIST \, PERFORMER \, DESCRIPTION ! \,; ! #X text 293 342 GENRE \, LOCATION \, COPYRIGHT \, CONTACT \, DATE; ! #X msg 202 307 ARTIST your=name; ! #X msg 189 197 vorbis 44100 2 144 128 96; ! #X text 136 441 ogg pages written to file; ! #X msg 481 455 \; pd dsp 1; ! #X msg 547 455 \; pd dsp 0; ! #X obj 481 429 loadbang; ! #X text 354 9 written by Olaf Matthes (olaf.matthes(a)gmx.de); ! #X text 353 21 get latest version at; ! #X text 354 34 http://www.akustische-kunst.de/puredata/; ! #X text 209 76 append data at end of file; ! #X text 226 97 overwrite previously recorded data; ! #X text 221 145 stop recording; ! #X text 225 50 open a file first!; ! #X text 240 407 might result in audible dropouts!; ! #X text 202 395 note: changing settings while recording; ! #X text 85 470 file state (1 = open \; 0 = closed); ! #X text 5 9 oggwrite~ version 0.1 - write Ogg Vorbis stream to file ! ; ! #X msg 204 361 COPYRIGHT (c)=2002=Olaf=Matthes; ! #X text 220 123 start recording; ! #X connect 0 0 9 0; ! #X connect 0 1 8 0; ! #X connect 1 0 0 0; ! #X connect 1 0 0 1; ! #X connect 2 0 1 0; ! #X connect 3 0 0 0; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; ! #X connect 6 0 0 0; ! #X connect 7 0 0 0; ! #X connect 10 0 0 0; ! #X connect 14 0 0 0; ! #X connect 20 0 0 0; ! #X connect 21 0 0 0; ! #X connect 25 0 23 0; ! #X connect 37 0 0 0; --- 1,59 ---- ! #N canvas 286 47 631 513 10; ! #X obj 40 415 oggwrite~; ! #X obj 40 64 osc~ 440; ! #X floatatom 40 33 5 0 0; ! #X msg 120 52 open myfile.ogg; ! #X msg 175 125 start; ! #X msg 185 148 stop; ! #X msg 155 78 append; ! #X msg 166 99 truncate; ! #X floatatom 89 441 5 0 0; ! #X floatatom 40 470 5 0 0; ! #X msg 204 259 print; ! #X text 189 180 vorbis <samplerate> <channles> <max.br> <nom.br> <min.br> ! ; ! #X text 373 251 channels: 1 or 2 (default); ! #X text 204 216 vbr <samplerate> <channels> <quality>; ! #X msg 203 232 vbr 44100 2 0.4; ! #X text 324 238 quality settings: 0 - 1 (low - hi); ! #X text 325 267 resampling currently not supported!; ! #X text 202 290 comment <tag> <content>; ! #X text 204 329 possible tags: TITLE \, ARTIST \, PERFORMER \, DESCRIPTION ! \,; ! #X text 293 342 GENRE \, LOCATION \, COPYRIGHT \, CONTACT \, DATE; ! #X msg 202 307 ARTIST your=name; ! #X msg 189 197 vorbis 44100 2 144 128 96; ! #X text 136 441 ogg pages written to file; ! #X msg 481 455 \; pd dsp 1; ! #X msg 547 455 \; pd dsp 0; ! #X obj 481 429 loadbang; ! #X text 354 9 written by Olaf Matthes (olaf.matthes(a)gmx.de); ! #X text 353 21 get latest version at; ! #X text 354 34 http://www.akustische-kunst.de/puredata/; ! #X text 209 76 append data at end of file; ! #X text 226 97 overwrite previously recorded data; ! #X text 221 145 stop recording; ! #X text 225 50 open a file first!; ! #X text 240 407 might result in audible dropouts!; ! #X text 202 395 note: changing settings while recording; ! #X text 85 470 file state (1 = open \; 0 = closed); ! #X text 5 9 oggwrite~ version 0.1 - write Ogg Vorbis stream to file ! ; ! #X msg 204 361 COPYRIGHT (c)=2002=Olaf=Matthes; ! #X text 220 123 start recording; ! #X connect 0 0 9 0; ! #X connect 0 1 8 0; ! #X connect 1 0 0 0; ! #X connect 1 0 0 1; ! #X connect 2 0 1 0; ! #X connect 3 0 0 0; ! #X connect 4 0 0 0; ! #X connect 5 0 0 0; ! #X connect 6 0 0 0; ! #X connect 7 0 0 0; ! #X connect 10 0 0 0; ! #X connect 14 0 0 0; ! #X connect 20 0 0 0; ! #X connect 21 0 0 0; ! #X connect 25 0 23 0; ! #X connect 37 0 0 0; Index: oggwrite~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggwrite~/oggwrite~.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** oggwrite~.c 23 Apr 2003 10:36:25 -0000 1.3 --- oggwrite~.c 4 Jan 2004 12:16:08 -0000 1.4 *************** *** 1,751 **** ! /* -------------------------- oggwrite~ ---------------------------------------- */ ! /* */ ! /* Tilde object to send ogg/vorbis encoded stream to icecast2 server. */ ! /* Written by Olaf Matthes (olaf.matthes(a)gmx.de). */ ! /* Get source at http://www.akustische-kunst.de/puredata/ */ ! /* */ ! /* This library is free software; you can redistribute it and/or */ ! /* modify it under the terms of the GNU Lesser General Public */ ! /* License as published by the Free Software Foundation; either */ ! /* version 2 of the License, or (at your option) any later version. */ [...1473 lines suppressed...] ! return(x); ! } ! ! void oggwrite_tilde_setup(void) ! { ! oggwrite_class = class_new(gensym("oggwrite~"), (t_newmethod)oggwrite_new, (t_method)oggwrite_free, ! sizeof(t_oggwrite), 0, 0); ! CLASS_MAINSIGNALIN(oggwrite_class, t_oggwrite, x_f ); ! class_sethelpsymbol(oggwrite_class, gensym("help-oggwrite~.pd")); ! class_addmethod(oggwrite_class, (t_method)oggwrite_dsp, gensym("dsp"), 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_open, gensym("open"), A_SYMBOL, 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_start, gensym("start"), 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_stop, gensym("stop"), 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_append, gensym("append"), 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_truncate, gensym("truncate"), 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_vorbis, gensym("vorbis"), A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_vbr, gensym("vbr"), A_FLOAT, A_FLOAT, A_FLOAT, 0); ! class_addmethod(oggwrite_class, (t_method)oggwrite_print, gensym("print"), 0); ! class_addanything(oggwrite_class, oggwrite_comment); ! } Index: readme =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggwrite~/readme,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme 23 Apr 2003 10:36:25 -0000 1.2 --- readme 4 Jan 2004 12:16:08 -0000 1.3 *************** *** 1,110 **** ! oggwrite~ version 0.1b ! copyright (c) 2002 by Olaf Matthes ! ! oggwrite~ is an ogg/vorbis file writing external for pd (by Miller ! Puckette). ! ! ! To run oggwrite~ place the file oggwrite~.dll for win or oggwrite~.pd_linux ! in the directory of our patch or start pd with '-lib oggwrite~' flag. ! ! To compile oggwrite~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggwrite~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Usage: ! ! Use message "vbr <samplerate> <channels> <quality>" to set the vorbis ! encoding parameters. Resampling is currently not supported, so 'samplerate' ! should be the one pd is running at. 'channels' specyfies the number of channels ! to stream. This can be set to 2 (default) or 1 which means mono stream taking ! the leftmost audio input only. 'quality' can be a value between 0.0 and 1.0 ! giving the quality of the stream. 0.4 (default) results in a stream that's ! about 128kbps. ! ! Since Vorbis uses VBR encoding, bitrates vary depending on the type of audio ! signal to be encoded. A pure sine [osc~] results in the smalest stream, com- ! plex audio signals will increase this value significantly. To test the maximum ! bitrate that might occur for a quality setting use noise~ as signal input. ! ! Use message "vorbis <samplerate> <channels> <maximum bitrate> <nominal bit- ! rate> <minimal bitrate>" to set encoding quality on the basis of bitrates. ! When setting all three bitrate parameters to the same value one gets a ! constant bitrate stream. Values are in kbps! ! ! Message "open <filename>" opens an existing file. In case the file does not ! exist oggwrite~ will create it. Previously opened files will be closed. To ! determine how data should be written to the file choose "append" (default) ! or "truncate" (in case you want to overwrite data in your file). ! ! To set the comment tags in the ogg/vorbis header (which can be displayed by ! the receiving client) use message "<NAMEOFTAG> <comment>". Supported tags are: ! TITLE, ARTIST, GENRE, PERFORMER, LOCATION, COPYRIGHT, CONTACT, DESCRIPTION and ! DATE (which is automatically set to the date/time the broadcast started). To ! get spaces use '=' instead. ! ! Note that changing encoding parameters or header comments while oggwrite~ is ! recording to file might result in audible dropouts. ! ! ! Listening to it: ! ! To listen to ogg/vorbis encoded audio files many player need an extra plug-in. ! Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your ! player. ! ! ! ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de! --- 1,110 ---- ! oggwrite~ version 0.1b ! copyright (c) 2002 by Olaf Matthes ! ! oggwrite~ is an ogg/vorbis file writing external for pd (by Miller ! Puckette). ! ! ! To run oggwrite~ place the file oggwrite~.dll for win or oggwrite~.pd_linux ! in the directory of our patch or start pd with '-lib oggwrite~' flag. ! ! To compile oggwrite~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggwrite~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Usage: ! ! Use message "vbr <samplerate> <channels> <quality>" to set the vorbis ! encoding parameters. Resampling is currently not supported, so 'samplerate' ! should be the one pd is running at. 'channels' specyfies the number of channels ! to stream. This can be set to 2 (default) or 1 which means mono stream taking ! the leftmost audio input only. 'quality' can be a value between 0.0 and 1.0 ! giving the quality of the stream. 0.4 (default) results in a stream that's ! about 128kbps. ! ! Since Vorbis uses VBR encoding, bitrates vary depending on the type of audio ! signal to be encoded. A pure sine [osc~] results in the smalest stream, com- ! plex audio signals will increase this value significantly. To test the maximum ! bitrate that might occur for a quality setting use noise~ as signal input. ! ! Use message "vorbis <samplerate> <channels> <maximum bitrate> <nominal bit- ! rate> <minimal bitrate>" to set encoding quality on the basis of bitrates. ! When setting all three bitrate parameters to the same value one gets a ! constant bitrate stream. Values are in kbps! ! ! Message "open <filename>" opens an existing file. In case the file does not ! exist oggwrite~ will create it. Previously opened files will be closed. To ! determine how data should be written to the file choose "append" (default) ! or "truncate" (in case you want to overwrite data in your file). ! ! To set the comment tags in the ogg/vorbis header (which can be displayed by ! the receiving client) use message "<NAMEOFTAG> <comment>". Supported tags are: ! TITLE, ARTIST, GENRE, PERFORMER, LOCATION, COPYRIGHT, CONTACT, DESCRIPTION and ! DATE (which is automatically set to the date/time the broadcast started). To ! get spaces use '=' instead. ! ! Note that changing encoding parameters or header comments while oggwrite~ is ! recording to file might result in audible dropouts. ! ! ! Listening to it: ! ! To listen to ogg/vorbis encoded audio files many player need an extra plug-in. ! Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your ! player. ! ! ! ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de! Index: vorbisenc.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggwrite~/vorbisenc.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** vorbisenc.h 23 Apr 2003 10:36:25 -0000 1.2 --- vorbisenc.h 4 Jan 2004 12:16:08 -0000 1.3 *************** *** 1,93 **** ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! * * ! ******************************************************************** ! ! function: vorbis encode-engine setup ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _OV_ENC_H_ ! #define _OV_ENC_H_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include "codec.h" ! ! extern int vorbis_encode_init(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_managed(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_init_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float base_quality /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_setup_init(vorbis_info *vi); ! ! extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg); ! ! #define OV_ECTL_RATEMANAGE_GET 0x10 ! ! #define OV_ECTL_RATEMANAGE_SET 0x11 ! #define OV_ECTL_RATEMANAGE_AVG 0x12 ! #define OV_ECTL_RATEMANAGE_HARD 0x13 ! ! #define OV_ECTL_LOWPASS_GET 0x20 ! #define OV_ECTL_LOWPASS_SET 0x21 ! ! #define OV_ECTL_IBLOCK_GET 0x30 ! #define OV_ECTL_IBLOCK_SET 0x31 ! ! struct ovectl_ratemanage_arg { ! int management_active; ! ! long bitrate_hard_min; ! long bitrate_hard_max; ! double bitrate_hard_window; ! ! long bitrate_av_lo; ! long bitrate_av_hi; ! double bitrate_av_window; ! double bitrate_av_window_center; ! }; ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! ! --- 1,93 ---- ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! * * ! ******************************************************************** ! ! function: vorbis encode-engine setup ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _OV_ENC_H_ ! #define _OV_ENC_H_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include "codec.h" ! ! extern int vorbis_encode_init(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_managed(vorbis_info *vi, ! long channels, ! long rate, ! ! long max_bitrate, ! long nominal_bitrate, ! long min_bitrate); ! ! extern int vorbis_encode_setup_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_init_vbr(vorbis_info *vi, ! long channels, ! long rate, ! ! float base_quality /* quality level from 0. (lo) to 1. (hi) */ ! ); ! ! extern int vorbis_encode_setup_init(vorbis_info *vi); ! ! extern int vorbis_encode_ctl(vorbis_info *vi,int number,void *arg); ! ! #define OV_ECTL_RATEMANAGE_GET 0x10 ! ! #define OV_ECTL_RATEMANAGE_SET 0x11 ! #define OV_ECTL_RATEMANAGE_AVG 0x12 ! #define OV_ECTL_RATEMANAGE_HARD 0x13 ! ! #define OV_ECTL_LOWPASS_GET 0x20 ! #define OV_ECTL_LOWPASS_SET 0x21 ! ! #define OV_ECTL_IBLOCK_GET 0x30 ! #define OV_ECTL_IBLOCK_SET 0x31 ! ! struct ovectl_ratemanage_arg { ! int management_active; ! ! long bitrate_hard_min; ! long bitrate_hard_max; ! double bitrate_hard_window; ! ! long bitrate_av_lo; ! long bitrate_av_hi; ! double bitrate_av_window; ! double bitrate_av_window_center; ! }; ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! !

1 0

externals/pdogg/oggamp~ HISTORY,1.2,1.3 codec.h,1.2,1.3 help-oggamp~.pd,1.2,1.3 oggamp~.c,1.3,1.4 readme,1.2,1.3
by x75＠users.sourceforge.net 04 Jan '04

04 Jan '04

Update of /cvsroot/pure-data/externals/pdogg/oggamp~ In directory sc8-pr-cvs1:/tmp/cvs-serv17605/oggamp~ Modified Files: HISTORY codec.h help-oggamp~.pd oggamp~.c readme Log Message: recommitting olaf's sources from 0.25 Index: HISTORY =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggamp~/HISTORY,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** HISTORY 23 Apr 2003 10:36:25 -0000 1.2 --- HISTORY 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,40 **** ! Version history of oggamp~ external for pure-data ! ! v 0.2f (20st july 2002): ! - recompiled with the final 1.0 release of Ogg Vorbis ! ! v 0.2e (21st june 2002 - stable release): ! - added downsamling ! - cleaned up code a bit ! - added some more info-printout ! - fixed some bugs to make it work correctly on Linux ! thanks to Oliver Thuns at radiostudio.org ! - now disconnects correctly at end-of-stream (when no ! chained stream follows) ! - KNOWN BUG: graphic buffer status display might cause ugly ! printout of Tcl/Tk commands to console window on Linux ! under some circumstances (e.g. in case server dies) ! ! v 0.2d (12th june 2002): ! - added upsamling ! - finally fixed the End-Of-Stream bug: it's now ! possible to listen to a playlist with correct ! update of stream information ! ! v 0.2c (10th june 2002): ! - fixed some bugs, introduced some new ones... ! ! v 0.2a (11th mar. 2002): ! - introduced child thread for connect: now pd ! does no longer 'stop' audio; as a side effect it ! is now possible to connect to an oggcast~ stream ! from the same instance of pd ! - threads now use pthreads libraray on Win to have ! things compatible with UNIX ! - fixed a small bug that made 'old' audio appear on ! the beginning of 'new' one after reconnecting ! ! v 0.1c (19th feb. 2002): ! - first (sort of) stable release ! ! --- 1,44 ---- ! Version history of oggamp~ external for pure-data ! ! v 0.3 (2nd january 2004): ! - removed the crappy resampling to get rid of audio clicks ! - multichannel support ! ! v 0.2f (20st july 2002): ! - recompiled with the final 1.0 release of Ogg Vorbis ! ! v 0.2e (21st june 2002 - stable release): ! - added downsamling ! - cleaned up code a bit ! - added some more info-printout ! - fixed some bugs to make it work correctly on Linux ! thanks to Oliver Thuns at radiostudio.org ! - now disconnects correctly at end-of-stream (when no ! chained stream follows) ! - KNOWN BUG: graphic buffer status display might cause ugly ! printout of Tcl/Tk commands to console window on Linux ! under some circumstances (e.g. in case server dies) ! ! v 0.2d (12th june 2002): ! - added upsamling ! - finally fixed the End-Of-Stream bug: it's now ! possible to listen to a playlist with correct ! update of stream information ! ! v 0.2c (10th june 2002): ! - fixed some bugs, introduced some new ones... ! ! v 0.2a (11th mar. 2002): ! - introduced child thread for connect: now pd ! does no longer 'stop' audio; as a side effect it ! is now possible to connect to an oggcast~ stream ! from the same instance of pd ! - threads now use pthreads libraray on Win to have ! things compatible with UNIX ! - fixed a small bug that made 'old' audio appear on ! the beginning of 'new' one after reconnecting ! ! v 0.1c (19th feb. 2002): ! - first (sort of) stable release ! ! Index: codec.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggamp~/codec.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** codec.h 23 Apr 2003 10:36:25 -0000 1.2 --- codec.h 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,233 **** ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! --- 1,233 ---- ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! Index: help-oggamp~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggamp~/help-oggamp~.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-oggamp~.pd 23 Apr 2003 10:36:25 -0000 1.2 --- help-oggamp~.pd 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,54 **** ! #N canvas 176 105 678 455 10; ! #X obj 38 420 dac~; ! #X floatatom 100 419 5 0 0; ! #X text 145 419 connection state; ! #X msg 80 83 connect localhost puredata.ogg 8000; ! #X msg 109 131 disconnect; ! #X msg 35 60 connect ogg.bbc.co.uk radio1_low.ogg 8001; ! #X msg 93 106 connect 141.53.196.149 puredata.ogg 8000; ! #X msg 147 224 recover 0; ! #X msg 163 251 recover 1; ! #X msg 125 153 print; ! #X obj 15 389 *~ 0; ! #X obj 57 391 *~ 0; ! #X floatatom 20 332 5 0 0; ! #X obj 20 354 / 100; ! #X text 57 7 oggamp~ version 0.2 - Ogg Vorbis sreaming client; ! #X msg 139 191 recover -1; ! #X text 218 191 resume (default): mute audio and refill buffer; ! #X text 230 249 reconnect (disconnect and connect again); ! #X text 138 303 CREATION ARGUMENTS:; ! #X text 260 303 oggamp~ <graphic> <outlets> <buffersize>; ! #X text 167 324 <graphic> - turn graphical buffer status display on ! (1) or off (0 \, default); ! #X text 167 351 <outlets> - number of outlets (default = 2) \, mono ! to stereo and stereo to mono conversion supported; ! #X text 333 50 written by Olaf Matthes <olaf.matthes(a)gmx.de>; ! #X text 333 63 get source at http://www.akustische-kunst.de/; ! #X msg 530 406 \; pd dsp 1; ! #X msg 596 406 \; pd dsp 0; ! #X obj 530 380 loadbang; ! #X msg 16 34 connect radio.jcraft.com test.ogg 8000; ! #X obj 15 300 oggamp~ 1 2 256; ! #X text 154 171 BEHAVIOUR ON BUFFER UNDERRUNS:; ! #X text 166 378 <buffersize> - size of circular buffer in kbytes (default ! = 256k); ! #X text 219 222 disconnect on buffer underrun; ! #X connect 3 0 28 0; ! #X connect 4 0 28 0; ! #X connect 5 0 28 0; ! #X connect 6 0 28 0; ! #X connect 7 0 28 0; ! #X connect 8 0 28 0; ! #X connect 9 0 28 0; ! #X connect 10 0 0 0; ! #X connect 11 0 0 1; ! #X connect 12 0 13 0; ! #X connect 13 0 10 1; ! #X connect 13 0 11 1; ! #X connect 15 0 28 0; ! #X connect 26 0 24 0; ! #X connect 27 0 28 0; ! #X connect 28 0 10 0; ! #X connect 28 1 11 0; ! #X connect 28 2 1 0; --- 1,54 ---- ! #N canvas 176 105 678 455 10; ! #X obj 38 420 dac~; ! #X floatatom 100 419 5 0 0; ! #X text 145 419 connection state; ! #X msg 80 83 connect localhost puredata.ogg 8000; ! #X msg 109 131 disconnect; ! #X msg 35 60 connect ogg.bbc.co.uk radio1_low.ogg 8001; ! #X msg 93 106 connect 141.53.196.149 puredata.ogg 8000; ! #X msg 147 224 recover 0; ! #X msg 163 251 recover 1; ! #X msg 125 153 print; ! #X obj 15 389 *~ 0; ! #X obj 57 391 *~ 0; ! #X floatatom 20 332 5 0 0; ! #X obj 20 354 / 100; ! #X text 57 7 oggamp~ version 0.2 - Ogg Vorbis sreaming client; ! #X msg 139 191 recover -1; ! #X text 218 191 resume (default): mute audio and refill buffer; ! #X text 230 249 reconnect (disconnect and connect again); ! #X text 138 303 CREATION ARGUMENTS:; ! #X text 260 303 oggamp~ <graphic> <outlets> <buffersize>; ! #X text 167 324 <graphic> - turn graphical buffer status display on ! (1) or off (0 \, default); ! #X text 167 351 <outlets> - number of outlets (default = 2) \, mono ! to stereo and stereo to mono conversion supported; ! #X text 333 50 written by Olaf Matthes <olaf.matthes(a)gmx.de>; ! #X text 333 63 get source at http://www.akustische-kunst.de/; ! #X msg 530 406 \; pd dsp 1; ! #X msg 596 406 \; pd dsp 0; ! #X obj 530 380 loadbang; ! #X msg 16 34 connect radio.jcraft.com test.ogg 8000; ! #X obj 15 300 oggamp~ 1 2 256; ! #X text 154 171 BEHAVIOUR ON BUFFER UNDERRUNS:; ! #X text 166 378 <buffersize> - size of circular buffer in kbytes (default ! = 256k); ! #X text 219 222 disconnect on buffer underrun; ! #X connect 3 0 28 0; ! #X connect 4 0 28 0; ! #X connect 5 0 28 0; ! #X connect 6 0 28 0; ! #X connect 7 0 28 0; ! #X connect 8 0 28 0; ! #X connect 9 0 28 0; ! #X connect 10 0 0 0; ! #X connect 11 0 0 1; ! #X connect 12 0 13 0; ! #X connect 13 0 10 1; ! #X connect 13 0 11 1; ! #X connect 15 0 28 0; ! #X connect 26 0 24 0; ! #X connect 27 0 28 0; ! #X connect 28 0 10 0; ! #X connect 28 1 11 0; ! #X connect 28 2 1 0; Index: oggamp~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggamp~/oggamp~.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** oggamp~.c 23 Apr 2003 10:36:25 -0000 1.3 --- oggamp~.c 4 Jan 2004 12:16:07 -0000 1.4 *************** *** 1,1491 **** ! /* ------------------------- oggamp~ ------------------------------------------ */ ! /* */ ! /* Tilde object to receive an Ogg Vorbis stream from an IceCast2 server. */ ! /* Written by Olaf Matthes <olaf.matthes(a)gmx.de> */ ! /* Get source at http://www.akustische-kunst.de/puredata/ */ ! /* */ ! /* Graphical buffer status display written by Yves Degoyon. */ ! /* */ ! /* Thanks for hours (maybe days?) of beta testing to Oliver Thuns. */ ! /* */ [...2890 lines suppressed...] ! pthread_cond_destroy(&x->x_answercondition); ! pthread_mutex_destroy(&x->x_mutex); ! freebytes(x->x_buf, x->x_bufsize*sizeof(t_float)); ! freebytes(x->x_outvec, x->x_noutlets * sizeof(t_sample *)); ! clock_free(x->x_clock); ! } ! ! void oggamp_tilde_setup(void) ! { ! oggamp_class = class_new(gensym("oggamp~"), (t_newmethod)oggamp_new, ! (t_method)oggamp_free, sizeof(t_oggamp), 0, A_DEFFLOAT, A_DEFFLOAT, A_DEFFLOAT, 0); ! class_addfloat(oggamp_class, (t_method)oggamp_float); ! class_addmethod(oggamp_class, (t_method)oggamp_disconnect, gensym("disconnect"), 0); ! class_addmethod(oggamp_class, (t_method)oggamp_dsp, gensym("dsp"), 0); ! class_addmethod(oggamp_class, (t_method)oggamp_connect, gensym("connect"), A_GIMME, 0); ! class_addmethod(oggamp_class, (t_method)oggamp_connect_url, gensym("connecturl"), A_SYMBOL, 0); ! class_addmethod(oggamp_class, (t_method)oggamp_recover, gensym("recover"), A_FLOAT, 0); ! class_addmethod(oggamp_class, (t_method)oggamp_print, gensym("print"), 0); ! class_sethelpsymbol(oggamp_class, gensym("help-oggamp~.pd")); } Index: readme =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggamp~/readme,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme 23 Apr 2003 10:36:25 -0000 1.2 --- readme 4 Jan 2004 12:16:07 -0000 1.3 *************** *** 1,87 **** ! Version 0.2 ! copyright (c) 2002 by Olaf Matthes ! ! oggamp~ is an ogg/vorbis streaming client external for pd (by Miller ! Puckette) that connects to an IceCast2 server. ! Graphical buffer status display written by Yves Degoyon (ydegoyon(a)free.fr). ! ! ! To run oggamp~ place the file oggamp~.dll for win or oggamp~.pd_linux ! in the directory of our patch or start pd with '-lib oggamp~' flag. ! ! To compile oggamp~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggamp~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Usage: ! ! To run oggamp~ innormal mode, just use [oggamp~] or, to get the buffer status ! displayed, use [oggamp~ 1]. ! ! Message "connect <host> <mountpoint> <port>" connects to an IceCast2 server. ! Note that no response about succesfull connection is send by the server. All ! messages in the pd console window about connection status depend on the ability ! to receive data from the server. ! Use "connecturl <url>" to use url-like server adresses (like http://host:post/ ! stream.ogg). ! ! Known bugs and other things: ! - pd halts for a moment when oggamp~ connects to the server. This results in a ! short audio drop out of sound currently played back. ! - resampling not jet supported ! - playback does not stop on a buffer underrun ! - oggamp~ disconnects at end of stream, i.e. it is not possible to play back ! files streamed one after another without manual reconnect ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de! --- 1,87 ---- ! Version 0.2 ! copyright (c) 2002 by Olaf Matthes ! ! oggamp~ is an ogg/vorbis streaming client external for pd (by Miller ! Puckette) that connects to an IceCast2 server. ! Graphical buffer status display written by Yves Degoyon (ydegoyon(a)free.fr). ! ! ! To run oggamp~ place the file oggamp~.dll for win or oggamp~.pd_linux ! in the directory of our patch or start pd with '-lib oggamp~' flag. ! ! To compile oggamp~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggamp~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Usage: ! ! To run oggamp~ innormal mode, just use [oggamp~] or, to get the buffer status ! displayed, use [oggamp~ 1]. ! ! Message "connect <host> <mountpoint> <port>" connects to an IceCast2 server. ! Note that no response about succesfull connection is send by the server. All ! messages in the pd console window about connection status depend on the ability ! to receive data from the server. ! Use "connecturl <url>" to use url-like server adresses (like http://host:post/ ! stream.ogg). ! ! Known bugs and other things: ! - pd halts for a moment when oggamp~ connects to the server. This results in a ! short audio drop out of sound currently played back. ! - resampling not jet supported ! - playback does not stop on a buffer underrun ! - oggamp~ disconnects at end of stream, i.e. it is not possible to play back ! files streamed one after another without manual reconnect ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de!

1 0

externals/pdogg/oggread~ codec.h,1.2,1.3 help-oggread~.pd,1.2,1.3 oggread~.c,1.4,1.5 readme,1.2,1.3
by x75＠users.sourceforge.net 04 Jan '04

04 Jan '04

Update of /cvsroot/pure-data/externals/pdogg/oggread~ In directory sc8-pr-cvs1:/tmp/cvs-serv17605/oggread~ Modified Files: codec.h help-oggread~.pd oggread~.c readme Log Message: recommitting olaf's sources from 0.25 Index: codec.h =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggread~/codec.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** codec.h 23 Apr 2003 10:36:25 -0000 1.2 --- codec.h 4 Jan 2004 12:16:08 -0000 1.3 *************** *** 1,233 **** ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! --- 1,233 ---- ! /******************************************************************** ! * * ! * 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-2001 * ! * by the XIPHOPHORUS Company http://www.xiph.org/ * ! ! ******************************************************************** ! ! function: libvorbis codec headers ! last mod: $Id$ ! ! ********************************************************************/ ! ! #ifndef _vorbis_codec_h_ ! #define _vorbis_codec_h_ ! ! #ifdef __cplusplus ! extern "C" ! { ! #endif /* __cplusplus */ ! ! #include <ogg/ogg.h> ! ! typedef struct vorbis_info{ ! int version; ! int channels; ! long rate; ! ! /* The below bitrate declarations are *hints*. ! Combinations of the three values carry the following implications: ! ! all three set to the same value: ! implies a fixed rate bitstream ! only nominal set: ! implies a VBR stream that averages the nominal bitrate. No hard ! upper/lower limit ! upper and or lower set: ! implies a VBR bitstream that obeys the bitrate limits. nominal ! may also be set to give a nominal rate. ! none set: ! the coder does not care to speculate. ! */ ! ! long bitrate_upper; ! long bitrate_nominal; ! long bitrate_lower; ! long bitrate_window; ! ! void *codec_setup; ! } vorbis_info; ! ! /* vorbis_dsp_state buffers the current vorbis audio ! analysis/synthesis state. The DSP state belongs to a specific ! logical bitstream ****************************************************/ ! typedef struct vorbis_dsp_state{ ! int analysisp; ! vorbis_info *vi; ! ! float **pcm; ! float **pcmret; ! int pcm_storage; ! int pcm_current; ! int pcm_returned; ! ! int preextrapolate; ! int eofflag; ! ! long lW; ! long W; ! long nW; ! long centerW; ! ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! ! ogg_int64_t glue_bits; ! ogg_int64_t time_bits; ! ogg_int64_t floor_bits; ! ogg_int64_t res_bits; ! ! void *backend_state; ! } vorbis_dsp_state; ! ! 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; ! ! long lW; ! long W; ! long nW; ! int pcmend; ! int mode; ! ! int eofflag; ! ogg_int64_t granulepos; ! ogg_int64_t sequence; ! vorbis_dsp_state *vd; /* For read-only access of configuration */ ! ! /* local storage to avoid remallocing; it's up to the mapping to ! structure it */ ! void *localstore; ! long localtop; ! long localalloc; ! long totaluse; ! struct alloc_chain *reap; ! ! /* bitmetrics for the frame */ ! long glue_bits; ! long time_bits; ! long floor_bits; ! long res_bits; ! ! void *internal; ! ! } vorbis_block; ! ! /* vorbis_block is a single block of data to be processed as part of ! the analysis/synthesis stream; it belongs to a specific logical ! bitstream, but is independant from other vorbis_blocks belonging to ! that logical bitstream. *************************************************/ ! ! struct alloc_chain{ ! void *ptr; ! struct alloc_chain *next; ! }; ! ! /* vorbis_info contains all the setup information specific to the ! specific compression/decompression mode in progress (eg, ! psychoacoustic settings, channel setup, options, codebook ! etc). vorbis_info and substructures are in backends.h. ! *********************************************************************/ ! ! /* the comments are not part of vorbis_info so that vorbis_info can be ! static storage */ ! typedef struct vorbis_comment{ ! /* unlimited user comment fields. libvorbis writes 'libvorbis' ! whatever vendor is set to in encode */ ! char **user_comments; ! int *comment_lengths; ! int comments; ! char *vendor; ! ! } vorbis_comment; ! ! ! /* libvorbis encodes in two abstraction layers; first we perform DSP ! and produce a packet (see docs/analysis.txt). The packet is then ! coded into a framed OggSquish bitstream by the second layer (see ! docs/framing.txt). Decode is the reverse process; we sync/frame ! the bitstream and extract individual packets, then decode the ! packet back into PCM audio. ! ! The extra framing/packetizing is used in streaming formats, such as ! files. Over the net (such as with UDP), the framing and ! packetization aren't necessary as they're provided by the transport ! and the streaming layer is not used */ ! ! /* Vorbis PRIMITIVES: general ***************************************/ ! ! extern void vorbis_info_init(vorbis_info *vi); ! extern void vorbis_info_clear(vorbis_info *vi); ! extern int vorbis_info_blocksize(vorbis_info *vi,int zo); ! extern void vorbis_comment_init(vorbis_comment *vc); ! extern void vorbis_comment_add(vorbis_comment *vc, char *comment); ! extern void vorbis_comment_add_tag(vorbis_comment *vc, ! char *tag, char *contents); ! extern char *vorbis_comment_query(vorbis_comment *vc, char *tag, int count); ! extern int vorbis_comment_query_count(vorbis_comment *vc, char *tag); ! extern void vorbis_comment_clear(vorbis_comment *vc); ! ! extern int vorbis_block_init(vorbis_dsp_state *v, vorbis_block *vb); ! extern int vorbis_block_clear(vorbis_block *vb); ! extern void vorbis_dsp_clear(vorbis_dsp_state *v); ! ! /* 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_analysis_headerout(vorbis_dsp_state *v, ! vorbis_comment *vc, ! ogg_packet *op, ! ogg_packet *op_comm, ! ogg_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_bitrate_addblock(vorbis_block *vb); ! extern int vorbis_bitrate_flushpacket(vorbis_dsp_state *vd, ! ogg_packet *op); ! ! /* Vorbis PRIMITIVES: synthesis layer *******************************/ ! extern int vorbis_synthesis_headerin(vorbis_info *vi,vorbis_comment *vc, ! ogg_packet *op); ! ! extern int vorbis_synthesis_init(vorbis_dsp_state *v,vorbis_info *vi); ! 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_blockin(vorbis_dsp_state *v,vorbis_block *vb); ! extern int vorbis_synthesis_pcmout(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); ! ! /* Vorbis ERRORS and return codes ***********************************/ ! ! #define OV_FALSE -1 ! #define OV_EOF -2 ! #define OV_HOLE -3 ! ! #define OV_EREAD -128 ! #define OV_EFAULT -129 ! #define OV_EIMPL -130 ! #define OV_EINVAL -131 ! #define OV_ENOTVORBIS -132 ! #define OV_EBADHEADER -133 ! #define OV_EVERSION -134 ! #define OV_ENOTAUDIO -135 ! #define OV_EBADPACKET -136 ! #define OV_EBADLINK -137 ! #define OV_ENOSEEK -138 ! ! #ifdef __cplusplus ! } ! #endif /* __cplusplus */ ! ! #endif ! Index: help-oggread~.pd =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggread~/help-oggread~.pd,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** help-oggread~.pd 23 Apr 2003 10:36:25 -0000 1.2 --- help-oggread~.pd 4 Jan 2004 12:16:08 -0000 1.3 *************** *** 1,44 **** ! #N canvas 280 107 572 464 12; ! #X obj 27 411 dac~; ! #X floatatom 75 412 8 0 0 0 - - -; ! #X obj 36 343 oggread~; ! #X msg 71 170 start; ! #X msg 110 226 stop; ! #X msg 118 287 resume; ! #X msg 36 45 open myfile.ogg; ! #X text 119 168 play file from beginning; ! #X text 152 226 stop (pause) playing; ! #X text 179 288 resume playing at current position; ! #X msg 396 394 \; pd dsp 1; ! #X msg 472 394 \; pd dsp 0; ! #X obj 396 368 loadbang; ! #X text 185 52 get latest version at; ! #X text 152 411 position in file (seconds); ! #X text 186 38 written by Olaf Matthes <olaf.matthes(a)gmx.de>; ! #X text 17 16 oggread~ version 0.2 - Ogg Vorbis file player; ! #X msg 126 250 0; ! #X msg 95 195 1; ! #X text 230 318 set new playing position (in seconds); ! #X obj 95 375 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X text 121 375 bang at end of file; ! #X text 186 67 http://www.akustische-kunst.org/puredata/; ! #X obj 55 102 openpanel; ! #X msg 55 74 bang; ! #X msg 55 129 open \$1; ! #X msg 149 317 seek 60; ! #X connect 2 0 0 0; ! #X connect 2 1 0 1; ! #X connect 2 2 1 0; ! #X connect 2 3 20 0; ! #X connect 3 0 2 0; ! #X connect 4 0 2 0; ! #X connect 5 0 2 0; ! #X connect 6 0 2 0; ! #X connect 12 0 10 0; ! #X connect 17 0 2 0; ! #X connect 18 0 2 0; ! #X connect 23 0 25 0; ! #X connect 24 0 23 0; ! #X connect 25 0 2 0; ! #X connect 26 0 2 0; --- 1,44 ---- ! #N canvas 280 107 572 464 12; ! #X obj 27 411 dac~; ! #X floatatom 75 412 8 0 0 0 - - -; ! #X obj 36 343 oggread~; ! #X msg 71 170 start; ! #X msg 110 226 stop; ! #X msg 118 287 resume; ! #X msg 36 45 open myfile.ogg; ! #X text 119 168 play file from beginning; ! #X text 152 226 stop (pause) playing; ! #X text 179 288 resume playing at current position; ! #X msg 396 394 \; pd dsp 1; ! #X msg 472 394 \; pd dsp 0; ! #X obj 396 368 loadbang; ! #X text 185 52 get latest version at; ! #X text 152 411 position in file (seconds); ! #X text 186 38 written by Olaf Matthes <olaf.matthes(a)gmx.de>; ! #X text 17 16 oggread~ version 0.2 - Ogg Vorbis file player; ! #X msg 126 250 0; ! #X msg 95 195 1; ! #X text 230 318 set new playing position (in seconds); ! #X obj 95 375 bng 15 250 50 0 empty empty empty 0 -6 0 8 -262144 -1 ! -1; ! #X text 121 375 bang at end of file; ! #X text 186 67 http://www.akustische-kunst.org/puredata/; ! #X obj 55 102 openpanel; ! #X msg 55 74 bang; ! #X msg 55 129 open \$1; ! #X msg 149 317 seek 60; ! #X connect 2 0 0 0; ! #X connect 2 1 0 1; ! #X connect 2 2 1 0; ! #X connect 2 3 20 0; ! #X connect 3 0 2 0; ! #X connect 4 0 2 0; ! #X connect 5 0 2 0; ! #X connect 6 0 2 0; ! #X connect 12 0 10 0; ! #X connect 17 0 2 0; ! #X connect 18 0 2 0; ! #X connect 23 0 25 0; ! #X connect 24 0 23 0; ! #X connect 25 0 2 0; ! #X connect 26 0 2 0; Index: oggread~.c =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggread~/oggread~.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** oggread~.c 23 Jun 2003 13:16:22 -0000 1.4 --- oggread~.c 4 Jan 2004 12:16:08 -0000 1.5 *************** *** 1,414 **** ! /* ------------------------- oggread~ ------------------------------------------ */ ! /* */ ! /* Tilde object to read and play back Ogg Vorbis files. */ ! /* Written by Olaf Matthes (olaf.matthes(a)gmx.de) */ ! /* Get source at http://www.akustische-kunst.de/puredata/ */ ! /* */ ! /* This library is free software; you can redistribute it and/or */ ! /* modify it under the terms of the GNU Lesser General Public */ ! /* License as published by the Free Software Foundation; either */ ! /* version 2 of the License, or (at your option) any later version. */ ! /* */ ! /* This library is distributed in the hope that it will be useful, */ ! /* but WITHOUT ANY WARRANTY; without even the implied warranty of */ ! /* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ ! /* Lesser General Public License for more details. */ ! /* */ ! /* You should have received a copy of the GNU Lesser General Public */ ! /* License along with this library; if not, write to the */ ! /* Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ ! /* Boston, MA 02111-1307, USA. */ ! /* */ ! /* Based on PureData by Miller Puckette and others. */ ! /* Uses the Ogg Vorbis decoding library which can be found at */ ! /* http://www.vorbis.com/ */ ! /* */ ! /* ---------------------------------------------------------------------------- */ ! ! #include "m_pd.h" ! #include "s_stuff.h" ! #include "codec.h" ! #include "vorbis/vorbisfile.h" ! ! #include <sys/types.h> ! #include <string.h> ! #include <stdio.h> ! #include <errno.h> ! #include <fcntl.h> ! #ifdef UNIX ! #include <sys/socket.h> ! #include <netinet/in.h> ! #include <netinet/tcp.h> ! #include <arpa/inet.h> ! #include <netdb.h> ! #include <sys/time.h> ! #include <unistd.h> ! #define SOCKET_ERROR -1 ! #else ! #include <io.h> ! #include <stdlib.h> ! #endif ! ! #ifdef NT ! #pragma warning( disable : 4244 ) ! #pragma warning( disable : 4305 ) ! #endif ! ! #define READ 4096 /* amount of data we pass on to decoder */ ! #define MIN_AUDIO_INPUT READ*8 /* this is completely guessed! we just fill half the buffer */ ! #define OUTPUT_BUFFER_SIZE 65536 /* audio output buffer: 64k */ ! ! static char *oggread_version = "oggread~: ogg/vorbis file reader version 0.2c, written by Olaf Matthes"; ! ! /* ------------------------ oggread~ ----------------------------- */ ! ! static t_class *oggread_class; ! ! typedef struct _oggread ! { ! t_object x_obj; ! t_clock *x_clock; ! /* ogg/vorbis related stuff */ ! OggVorbis_File x_ov; ! ogg_stream_state x_os; /* take physical pages, weld into a logical stream of packets */ ! ogg_sync_state x_oy; /* sync and verify incoming physical bitstream */ ! ogg_page x_og; /* one Ogg bitstream page. Vorbis packets are inside */ ! ogg_packet x_op; /* one raw packet of data for decode */ ! vorbis_info *x_vi; /* struct that stores all the static vorbis bitstream settings */ ! vorbis_comment x_vc; /* struct that stores all the user comments */ ! vorbis_dsp_state x_vd; /* central working state for the packet->PCM decoder */ ! vorbis_block x_vb; /* local working space for packet->PCM decode */ ! t_int x_eos; /* end of stream */ ! char *x_buffer;/* buffer used to pass on data to ogg/vorbis */ ! ! t_float x_position; /* current playing position */ ! t_outlet *x_out_position; /* output to send them to */ ! t_outlet *x_out_end; /* signal end of file */ ! ! t_outlet *x_connection; ! t_int x_fd; /* the file handle */ ! FILE *x_file; ! int x_current_section; ! t_int x_blocksize; /* size of a dsp block */ ! t_int x_decoded; /* number of samples we got from decoder on last call */ ! ! t_float *x_outbuffer; /* buffer to store audio decoded data */ ! t_int x_outwriteposition; ! t_int x_outreadposition; ! t_int x_outunread; ! t_int x_outbuffersize; ! ! t_int x_samplerate; /* pd's samplerate, might differ from stream */ ! t_int x_stream; /* indicates if a stream gets output */ ! } t_oggread; ! ! /* output playing position */ ! static void oggread_tick(t_oggread *x) ! { ! outlet_float(x->x_out_position, x->x_position); ! clock_delay(x->x_clock, 250); ! } ! ! static int oggread_decode_input(t_oggread *x) ! { ! long ret; /* bytes per channel returned by decoder */ ! int i; ! float **pcm; ! ! x->x_vi = ov_info(&x->x_ov, x->x_current_section); ! ! while(!x->x_eos) ! { ! ret = ov_read_float(&x->x_ov, &pcm, READ, &x->x_current_section); ! if (ret == 0) ! { ! /* EOF */ ! x->x_eos = 1; ! x->x_stream = 0; ! clock_unset(x->x_clock); ! // post("oggread~: end of file detected, stopping"); ! outlet_bang(x->x_out_end); ! } ! else if (ret < 0) ! { ! /* error in the stream. Not a problem, just reporting it in ! case we (the app) cares. In this case, we don't. */ ! } ! else ! { ! /* we don't bother dealing with sample rate changes, etc, but ! you'll have to */ ! long j; ! for(j = 0; j < ret; j++) ! { ! for(i = 0; i < x->x_vi->channels; i++) ! { ! x->x_outbuffer[x->x_outwriteposition] = pcm[i][j]; ! x->x_outwriteposition = (x->x_outwriteposition + 1)%x->x_outbuffersize; ! } ! } ! x->x_outunread += (t_int)ret * x->x_vi->channels; ! ! } ! break; ! } ! x->x_decoded = (t_int)ret * x->x_vi->channels; /* num. of samples we got from decoder */ ! ! x->x_position = (t_float)ov_time_tell(&x->x_ov); ! ! /* exit decoding 'loop' here, we'll get called again by perform() */ ! return 1; ! } ! ! ! static t_int *oggread_perform(t_int *w) ! { ! t_oggread *x = (t_oggread*) (w[1]); ! t_float *out1 = (t_float *)(w[2]); ! t_float *out2 = (t_float *)(w[3]); ! int n = (int)(w[4]); ! int ret; ! int i = 0; ! ! x->x_blocksize = n; ! ! while( n-- ) ! { /* check that the stream provides enough data */ ! if((x->x_stream == 1) && (x->x_outunread > (x->x_blocksize * x->x_vi->channels))) ! { ! if(x->x_vi->channels != 1) /* play stereo */ ! { ! *out1++=*(x->x_outbuffer+x->x_outreadposition); ! x->x_outreadposition = (x->x_outreadposition + 1)%x->x_outbuffersize; ! *out2++=*(x->x_outbuffer+x->x_outreadposition); ! x->x_outreadposition = (x->x_outreadposition + 1)%x->x_outbuffersize; ! x->x_outunread-=2; ! } ! else /* play mono on both sides */ ! { ! *out1++=*(x->x_outbuffer+x->x_outreadposition); ! *out2++=*(x->x_outbuffer+x->x_outreadposition); ! x->x_outreadposition = (x->x_outreadposition + 1)%x->x_outbuffersize; ! x->x_outunread--; ! } ! } ! else /* silence in case of buffer underrun */ ! { ! *out1++=0.0; ! *out2++=0.0; ! } ! } ! ! /* decode data whenever we used up some samples from outbuffer */ ! if((x->x_fd > 0) && (x->x_stream) /* only go when file is open and ready */ ! && (x->x_outunread < (MIN_AUDIO_INPUT - x->x_decoded))) /* we used up data from last decode */ ! { ! // post("oggread~: decoding..."); ! if(oggread_decode_input(x) != 1) ! { ! post("oggread~: decoder error"); ! } ! // else post("oggread~: decoder returned %d samples", x->x_decoded); ! } ! return (w+5); ! } ! ! static void oggread_dsp(t_oggread *x, t_signal **sp) ! { ! dsp_add(oggread_perform, 4, x, sp[1]->s_vec, sp[2]->s_vec, sp[1]->s_n); ! } ! ! ! /* start playing */ ! static void oggread_start(t_oggread *x) ! { ! if(x->x_fd > 0) ! { ! if(ov_time_seek(&x->x_ov, 0) < 0) ! { ! post("oggread~: could not rewind file to beginning"); ! } ! post("oggread~: START"); ! x->x_eos = 0; ! x->x_outreadposition = 0; ! x->x_outwriteposition = 0; ! x->x_outunread = 0; ! x->x_position = 0; ! clock_delay(x->x_clock, 0); ! x->x_stream = 1; ! } ! else post("oggread~: no file open (ignored)"); ! } ! ! /* resume file reading */ ! static void oggread_resume(t_oggread *x) ! { ! if(x->x_fd > 0) ! { ! x->x_stream = 1; ! clock_delay(x->x_clock, 0); ! post("oggread~: RESUME"); ! } ! else post("oggread~: encoder not initialised"); ! } ! ! /* seek in file */ ! static void oggread_seek(t_oggread *x, t_floatarg f) ! { ! if(x->x_fd > 0) ! if(ov_time_seek(&x->x_ov, f) < 0) ! { ! post("oggread~: could not set playing position to %g seconds", f); ! } ! else post("oggread~: playing position set to %g seconds", f); ! } ! ! /* stop playing */ ! static void oggread_stop(t_oggread *x) ! { ! if(x->x_stream)post("oggread~: STOP"); ! x->x_stream = 0; ! clock_unset(x->x_clock); ! } ! ! static void oggread_float(t_oggread *x, t_floatarg f) ! { ! if(f == 0) oggread_stop(x); ! else oggread_start(x); ! } ! ! /* open ogg/vorbis file */ ! static void oggread_open(t_oggread *x, t_symbol *filename) ! { ! int i; ! ! x->x_stream = 0; ! /* first close previous file */ ! if(x->x_fd > 0) ! { ! ov_clear(&x->x_ov); ! post("oggread~: previous file closed"); ! } ! /* open file for reading */ ! #ifdef UNIX ! if((x->x_file = fopen(filename->s_name, "r")) < 0) ! #else ! if((x->x_file = fopen(filename->s_name, "rb")) < 0) ! #endif ! { ! post("oggread~: could not open file \"%s\"", filename->s_name); ! x->x_eos = 1; ! x->x_fd = -1; ! } ! else ! { ! x->x_stream = 0; ! x->x_eos = 0; ! x->x_fd = 1; ! x->x_outreadposition = 0; ! x->x_outwriteposition = 0; ! x->x_outunread = 0; ! post("oggread~: file \"%s\" opened", filename->s_name); ! outlet_float( x->x_out_position, 0); ! ! /* try to open as ogg vorbis file */ ! if(ov_open(x->x_file, &x->x_ov, NULL, -1) < 0) ! { /* an error occured (no ogg vorbis file ?) */ ! post("oggread~: error: could not open \"%s\" as an OggVorbis file", filename->s_name); ! ov_clear(&x->x_ov); ! post("oggread~: file closed due to error"); ! } ! ! /* print details about each logical bitstream in the input */ ! if(ov_seekable(&x->x_ov)) ! { ! post("oggread~: input bitstream contained %ld logical bitstream section(s)", ov_streams(&x->x_ov)); ! post("oggread~: total bitstream playing time: %ld seconds", (long)ov_time_total(&x->x_ov,-1)); ! post("oggread~: encoded by: %s\n",ov_comment(&x->x_ov,-1)->vendor); ! } ! else ! { ! post("oggread~: file \"%s\" was not seekable" ! "oggread~: first logical bitstream information:", filename->s_name); ! } ! ! for(i = 0; i < ov_streams(&x->x_ov); i++) ! { ! x->x_vi = ov_info(&x->x_ov,i); ! post("\tlogical bitstream section %d information:",i+1); ! post("\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld", ! x->x_vi->rate,x->x_vi->channels,ov_bitrate(&x->x_ov,i)/1000, ov_serialnumber(&x->x_ov,i)); ! post("\t\theader length: %ld bytes",(long) ! (x->x_ov.dataoffsets[i] - x->x_ov.offsets[i])); ! post("\t\tcompressed length: %ld bytes",(long)(ov_raw_total(&x->x_ov,i))); ! post("\t\tplay time: %ld seconds\n",(long)ov_time_total(&x->x_ov,i)); ! } ! ! } ! } ! ! ! static void oggread_free(t_oggread *x) ! { ! if (x->x_fd > 0) { ! post( "oggread~: closing file" ); ! ov_clear(&x->x_ov); ! x->x_fd = -1; ! } ! freebytes(x->x_outbuffer, OUTPUT_BUFFER_SIZE*sizeof(t_float)); ! clock_free(x->x_clock); ! } ! ! static void *oggread_new(t_floatarg fdographics) ! { ! t_oggread *x = NULL; ! ! x = (t_oggread *)pd_new(oggread_class); ! outlet_new(&x->x_obj, gensym("signal")); ! outlet_new(&x->x_obj, gensym("signal")); ! x->x_out_position = outlet_new(&x->x_obj, gensym("float")); ! x->x_out_end = outlet_new(&x->x_obj, gensym("bang")); ! x->x_clock = clock_new(x, (t_method)oggread_tick); ! ! x->x_fd = -1; ! x->x_eos = 1; ! x->x_stream = 0; ! x->x_position = 0; ! x->x_samplerate = sys_getsr(); ! ! x->x_outbuffersize = OUTPUT_BUFFER_SIZE; ! x->x_outbuffer = (t_float*) getbytes(OUTPUT_BUFFER_SIZE*sizeof(t_float)); ! ! if(!x->x_outbuffer) ! { ! post( "oggread~: could not allocate buffer" ); ! return NULL; ! } ! memset(x->x_outbuffer, 0x0, OUTPUT_BUFFER_SIZE); ! ! x->x_outreadposition = 0; ! x->x_outwriteposition = 0; ! x->x_outunread = 0; ! x->x_decoded = 0; ! ! post(oggread_version); ! ! return (x); ! } ! ! ! void oggread_tilde_setup(void) ! { ! oggread_class = class_new(gensym("oggread~"), ! (t_newmethod) oggread_new, (t_method) oggread_free, ! sizeof(t_oggread), 0, A_DEFFLOAT, A_NULL); ! class_addfloat(oggread_class, (t_method)oggread_float); ! class_addmethod(oggread_class, nullfn, gensym("signal"), 0); ! class_addmethod(oggread_class, (t_method)oggread_dsp, gensym("dsp"), 0); ! class_addmethod(oggread_class, (t_method)oggread_open, gensym("open"), A_SYMBOL, 0); ! class_addmethod(oggread_class, (t_method)oggread_start, gensym("start"), 0); ! class_addmethod(oggread_class, (t_method)oggread_resume, gensym("resume"), 0); ! class_addmethod(oggread_class, (t_method)oggread_seek, gensym("seek"), A_DEFFLOAT, 0); ! class_addmethod(oggread_class, (t_method)oggread_stop, gensym("stop"), 0); ! class_sethelpsymbol(oggread_class, gensym("help-oggread~.pd")); ! } --- 1,414 ---- ! /* ------------------------- oggread~ ------------------------------------------ */ ! /* */ ! /* Tilde object to read and play back Ogg Vorbis files. */ ! /* Written by Olaf Matthes (olaf.matthes(a)gmx.de) */ ! /* Get source at http://www.akustische-kunst.de/puredata/ */ ! /* */ ! /* This library is free software; you can redistribute it and/or */ ! /* modify it under the terms of the GNU Lesser General Public */ ! /* License as published by the Free Software Foundation; either */ ! /* version 2 of the License, or (at your option) any later version. */ ! /* */ ! /* This library is distributed in the hope that it will be useful, */ ! /* but WITHOUT ANY WARRANTY; without even the implied warranty of */ ! /* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU */ ! /* Lesser General Public License for more details. */ ! /* */ ! /* You should have received a copy of the GNU Lesser General Public */ ! /* License along with this library; if not, write to the */ ! /* Free Software Foundation, Inc., 59 Temple Place - Suite 330, */ ! /* Boston, MA 02111-1307, USA. */ ! /* */ ! /* Based on PureData by Miller Puckette and others. */ ! /* Uses the Ogg Vorbis decoding library which can be found at */ ! /* http://www.vorbis.com/ */ ! /* */ ! /* ---------------------------------------------------------------------------- */ ! ! #include "m_pd.h" ! #include "s_stuff.h" ! #include "codec.h" ! #include "vorbis/vorbisfile.h" ! ! #include <sys/types.h> ! #include <string.h> ! #include <stdio.h> ! #include <errno.h> ! #include <fcntl.h> ! #ifdef UNIX ! #include <sys/socket.h> ! #include <netinet/in.h> ! #include <netinet/tcp.h> ! #include <arpa/inet.h> ! #include <netdb.h> ! #include <sys/time.h> ! #include <unistd.h> ! #define SOCKET_ERROR -1 ! #else ! #include <io.h> ! #include <stdlib.h> ! #endif ! ! #ifdef NT ! #pragma warning( disable : 4244 ) ! #pragma warning( disable : 4305 ) ! #endif ! ! #define READ 4096 /* amount of data we pass on to decoder */ ! #define MIN_AUDIO_INPUT READ*8 /* this is completely guessed! we just fill half the buffer */ ! #define OUTPUT_BUFFER_SIZE 65536 /* audio output buffer: 64k */ ! ! static char *oggread_version = "oggread~: ogg/vorbis file reader version 0.2c, written by Olaf Matthes"; ! ! /* ------------------------ oggread~ ----------------------------- */ ! ! static t_class *oggread_class; ! ! typedef struct _oggread ! { ! t_object x_obj; ! t_clock *x_clock; ! /* ogg/vorbis related stuff */ ! OggVorbis_File x_ov; ! ogg_stream_state x_os; /* take physical pages, weld into a logical stream of packets */ ! ogg_sync_state x_oy; /* sync and verify incoming physical bitstream */ ! ogg_page x_og; /* one Ogg bitstream page. Vorbis packets are inside */ ! ogg_packet x_op; /* one raw packet of data for decode */ ! vorbis_info *x_vi; /* struct that stores all the static vorbis bitstream settings */ ! vorbis_comment x_vc; /* struct that stores all the user comments */ ! vorbis_dsp_state x_vd; /* central working state for the packet->PCM decoder */ ! vorbis_block x_vb; /* local working space for packet->PCM decode */ ! t_int x_eos; /* end of stream */ ! char *x_buffer;/* buffer used to pass on data to ogg/vorbis */ ! ! t_float x_position; /* current playing position */ ! t_outlet *x_out_position; /* output to send them to */ ! t_outlet *x_out_end; /* signal end of file */ ! ! t_outlet *x_connection; ! t_int x_fd; /* the file handle */ ! FILE *x_file; ! int x_current_section; ! t_int x_blocksize; /* size of a dsp block */ ! t_int x_decoded; /* number of samples we got from decoder on last call */ ! ! t_float *x_outbuffer; /* buffer to store audio decoded data */ ! t_int x_outwriteposition; ! t_int x_outreadposition; ! t_int x_outunread; ! t_int x_outbuffersize; ! ! t_int x_samplerate; /* pd's samplerate, might differ from stream */ ! t_int x_stream; /* indicates if a stream gets output */ ! } t_oggread; ! ! /* output playing position */ ! static void oggread_tick(t_oggread *x) ! { ! outlet_float(x->x_out_position, x->x_position); ! clock_delay(x->x_clock, 250); ! } ! ! static int oggread_decode_input(t_oggread *x) ! { ! long ret; /* bytes per channel returned by decoder */ ! int i; ! float **pcm; ! ! x->x_vi = ov_info(&x->x_ov, x->x_current_section); ! ! while(!x->x_eos) ! { ! ret = ov_read_float(&x->x_ov, &pcm, READ, &x->x_current_section); ! if (ret == 0) ! { ! /* EOF */ ! x->x_eos = 1; ! x->x_stream = 0; ! clock_unset(x->x_clock); ! // post("oggread~: end of file detected, stopping"); ! outlet_bang(x->x_out_end); ! } ! else if (ret < 0) ! { ! /* error in the stream. Not a problem, just reporting it in ! case we (the app) cares. In this case, we don't. */ ! } ! else ! { ! /* we don't bother dealing with sample rate changes, etc, but ! you'll have to */ ! long j; ! for(j = 0; j < ret; j++) ! { ! for(i = 0; i < x->x_vi->channels; i++) ! { ! x->x_outbuffer[x->x_outwriteposition] = pcm[i][j]; ! x->x_outwriteposition = (x->x_outwriteposition + 1)%x->x_outbuffersize; ! } ! } ! x->x_outunread += (t_int)ret * x->x_vi->channels; ! ! } ! break; ! } ! x->x_decoded = (t_int)ret * x->x_vi->channels; /* num. of samples we got from decoder */ ! ! x->x_position = (t_float)ov_time_tell(&x->x_ov); ! ! /* exit decoding 'loop' here, we'll get called again by perform() */ ! return 1; ! } ! ! ! static t_int *oggread_perform(t_int *w) ! { ! t_oggread *x = (t_oggread*) (w[1]); ! t_float *out1 = (t_float *)(w[2]); ! t_float *out2 = (t_float *)(w[3]); ! int n = (int)(w[4]); ! int ret; ! int i = 0; ! ! x->x_blocksize = n; ! ! while( n-- ) ! { /* check that the stream provides enough data */ ! if((x->x_stream == 1) && (x->x_outunread > (x->x_blocksize * x->x_vi->channels))) ! { ! if(x->x_vi->channels != 1) /* play stereo */ ! { ! *out1++=*(x->x_outbuffer+x->x_outreadposition); ! x->x_outreadposition = (x->x_outreadposition + 1)%x->x_outbuffersize; ! *out2++=*(x->x_outbuffer+x->x_outreadposition); ! x->x_outreadposition = (x->x_outreadposition + 1)%x->x_outbuffersize; ! x->x_outunread-=2; ! } ! else /* play mono on both sides */ ! { ! *out1++=*(x->x_outbuffer+x->x_outreadposition); ! *out2++=*(x->x_outbuffer+x->x_outreadposition); ! x->x_outreadposition = (x->x_outreadposition + 1)%x->x_outbuffersize; ! x->x_outunread--; ! } ! } ! else /* silence in case of buffer underrun */ ! { ! *out1++=0.0; ! *out2++=0.0; ! } ! } ! ! /* decode data whenever we used up some samples from outbuffer */ ! if((x->x_fd > 0) && (x->x_stream) /* only go when file is open and ready */ ! && (x->x_outunread < (MIN_AUDIO_INPUT - x->x_decoded))) /* we used up data from last decode */ ! { ! // post("oggread~: decoding..."); ! if(oggread_decode_input(x) != 1) ! { ! post("oggread~: decoder error"); ! } ! // else post("oggread~: decoder returned %d samples", x->x_decoded); ! } ! return (w+5); ! } ! ! static void oggread_dsp(t_oggread *x, t_signal **sp) ! { ! dsp_add(oggread_perform, 4, x, sp[1]->s_vec, sp[2]->s_vec, sp[1]->s_n); ! } ! ! ! /* start playing */ ! static void oggread_start(t_oggread *x) ! { ! if(x->x_fd > 0) ! { ! if(ov_time_seek(&x->x_ov, 0) < 0) ! { ! post("oggread~: could not rewind file to beginning"); ! } ! post("oggread~: START"); ! x->x_eos = 0; ! x->x_outreadposition = 0; ! x->x_outwriteposition = 0; ! x->x_outunread = 0; ! x->x_position = 0; ! clock_delay(x->x_clock, 0); ! x->x_stream = 1; ! } ! else post("oggread~: no file open (ignored)"); ! } ! ! /* resume file reading */ ! static void oggread_resume(t_oggread *x) ! { ! if(x->x_fd > 0) ! { ! x->x_stream = 1; ! clock_delay(x->x_clock, 0); ! post("oggread~: RESUME"); ! } ! else post("oggread~: encoder not initialised"); ! } ! ! /* seek in file */ ! static void oggread_seek(t_oggread *x, t_floatarg f) ! { ! if(x->x_fd > 0) ! if(ov_time_seek(&x->x_ov, f) < 0) ! { ! post("oggread~: could not set playing position to %g seconds", f); ! } ! else post("oggread~: playing position set to %g seconds", f); ! } ! ! /* stop playing */ ! static void oggread_stop(t_oggread *x) ! { ! if(x->x_stream)post("oggread~: STOP"); ! x->x_stream = 0; ! clock_unset(x->x_clock); ! } ! ! static void oggread_float(t_oggread *x, t_floatarg f) ! { ! if(f == 0) oggread_stop(x); ! else oggread_start(x); ! } ! ! /* open ogg/vorbis file */ ! static void oggread_open(t_oggread *x, t_symbol *filename) ! { ! int i; ! ! x->x_stream = 0; ! /* first close previous file */ ! if(x->x_fd > 0) ! { ! ov_clear(&x->x_ov); ! post("oggread~: previous file closed"); ! } ! /* open file for reading */ ! #ifdef UNIX ! if((x->x_file = fopen(filename->s_name, "r")) < 0) ! #else ! if((x->x_file = fopen(filename->s_name, "rb")) < 0) ! #endif ! { ! post("oggread~: could not open file \"%s\"", filename->s_name); ! x->x_eos = 1; ! x->x_fd = -1; ! } ! else ! { ! x->x_stream = 0; ! x->x_eos = 0; ! x->x_fd = 1; ! x->x_outreadposition = 0; ! x->x_outwriteposition = 0; ! x->x_outunread = 0; ! post("oggread~: file \"%s\" opened", filename->s_name); ! outlet_float( x->x_out_position, 0); ! ! /* try to open as ogg vorbis file */ ! if(ov_open(x->x_file, &x->x_ov, NULL, -1) < 0) ! { /* an error occured (no ogg vorbis file ?) */ ! post("oggread~: error: could not open \"%s\" as an OggVorbis file", filename->s_name); ! ov_clear(&x->x_ov); ! post("oggread~: file closed due to error"); ! } ! ! /* print details about each logical bitstream in the input */ ! if(ov_seekable(&x->x_ov)) ! { ! post("oggread~: input bitstream contained %ld logical bitstream section(s)", ov_streams(&x->x_ov)); ! post("oggread~: total bitstream playing time: %ld seconds", (long)ov_time_total(&x->x_ov,-1)); ! post("oggread~: encoded by: %s\n",ov_comment(&x->x_ov,-1)->vendor); ! } ! else ! { ! post("oggread~: file \"%s\" was not seekable" ! "oggread~: first logical bitstream information:", filename->s_name); ! } ! ! for(i = 0; i < ov_streams(&x->x_ov); i++) ! { ! x->x_vi = ov_info(&x->x_ov,i); ! post("\tlogical bitstream section %d information:",i+1); ! post("\t\t%ldHz %d channels bitrate %ldkbps serial number=%ld", ! x->x_vi->rate,x->x_vi->channels,ov_bitrate(&x->x_ov,i)/1000, ov_serialnumber(&x->x_ov,i)); ! post("\t\theader length: %ld bytes",(long) ! (x->x_ov.dataoffsets[i] - x->x_ov.offsets[i])); ! post("\t\tcompressed length: %ld bytes",(long)(ov_raw_total(&x->x_ov,i))); ! post("\t\tplay time: %ld seconds\n",(long)ov_time_total(&x->x_ov,i)); ! } ! ! } ! } ! ! ! static void oggread_free(t_oggread *x) ! { ! if (x->x_fd > 0) { ! post( "oggread~: closing file" ); ! ov_clear(&x->x_ov); ! x->x_fd = -1; ! } ! freebytes(x->x_outbuffer, OUTPUT_BUFFER_SIZE*sizeof(t_float)); ! clock_free(x->x_clock); ! } ! ! static void *oggread_new(t_floatarg fdographics) ! { ! t_oggread *x = NULL; ! ! x = (t_oggread *)pd_new(oggread_class); ! outlet_new(&x->x_obj, gensym("signal")); ! outlet_new(&x->x_obj, gensym("signal")); ! x->x_out_position = outlet_new(&x->x_obj, gensym("float")); ! x->x_out_end = outlet_new(&x->x_obj, gensym("bang")); ! x->x_clock = clock_new(x, (t_method)oggread_tick); ! ! x->x_fd = -1; ! x->x_eos = 1; ! x->x_stream = 0; ! x->x_position = 0; ! x->x_samplerate = sys_getsr(); ! ! x->x_outbuffersize = OUTPUT_BUFFER_SIZE; ! x->x_outbuffer = (t_float*) getbytes(OUTPUT_BUFFER_SIZE*sizeof(t_float)); ! ! if(!x->x_outbuffer) ! { ! post( "oggread~: could not allocate buffer" ); ! return NULL; ! } ! memset(x->x_outbuffer, 0x0, OUTPUT_BUFFER_SIZE); ! ! x->x_outreadposition = 0; ! x->x_outwriteposition = 0; ! x->x_outunread = 0; ! x->x_decoded = 0; ! ! post(oggread_version); ! ! return (x); ! } ! ! ! void oggread_tilde_setup(void) ! { ! oggread_class = class_new(gensym("oggread~"), ! (t_newmethod) oggread_new, (t_method) oggread_free, ! sizeof(t_oggread), 0, A_DEFFLOAT, A_NULL); ! class_addfloat(oggread_class, (t_method)oggread_float); ! class_addmethod(oggread_class, nullfn, gensym("signal"), 0); ! class_addmethod(oggread_class, (t_method)oggread_dsp, gensym("dsp"), 0); ! class_addmethod(oggread_class, (t_method)oggread_open, gensym("open"), A_SYMBOL, 0); ! class_addmethod(oggread_class, (t_method)oggread_start, gensym("start"), 0); ! class_addmethod(oggread_class, (t_method)oggread_resume, gensym("resume"), 0); ! class_addmethod(oggread_class, (t_method)oggread_seek, gensym("seek"), A_DEFFLOAT, 0); ! class_addmethod(oggread_class, (t_method)oggread_stop, gensym("stop"), 0); ! class_sethelpsymbol(oggread_class, gensym("help-oggread~.pd")); ! } Index: readme =================================================================== RCS file: /cvsroot/pure-data/externals/pdogg/oggread~/readme,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** readme 23 Apr 2003 10:36:25 -0000 1.2 --- readme 4 Jan 2004 12:16:08 -0000 1.3 *************** *** 1,75 **** ! oggread~ version 0.2c ! copyright (c) 2002 by Olaf Matthes ! ! oggread~ is an ogg/vorbis file player external for pd (by Miller ! Puckette). ! ! ! To run oggread~ place the file oggread~.dll for win or oggread~.pd_linux ! in the directory of our patch or start pd with '-lib oggread~' flag. ! ! To compile oggread~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggread~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Listening to it: ! ! To listen to ogg/vorbis encoded audio files many player need an extra plug-in. ! Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your ! player. ! ! ! ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de! --- 1,75 ---- ! oggread~ version 0.2c ! copyright (c) 2002 by Olaf Matthes ! ! oggread~ is an ogg/vorbis file player external for pd (by Miller ! Puckette). ! ! ! To run oggread~ place the file oggread~.dll for win or oggread~.pd_linux ! in the directory of our patch or start pd with '-lib oggread~' flag. ! ! To compile oggread~ on Linux get the ogg/vorbice library from ! http://www.vorbis.com/. ! You have to modify the makefile to make it point to the place where the ! ogg/vorbis library is. ! ! ! This software is published under LGPL terms. ! ! This is software with ABSOLUTELY NO WARRANTY. ! Use it at your OWN RISK. It's possible to damage e.g. hardware or your hearing ! due to a bug or for other reasons. ! ! ***************************************************************************** ! ! oggread~ uses the ogg/vorbice library to encode audio data. ! The latest version of ogg/vorbis can be found at http://www.vorbice.com/ ! ! Below is the original copyright information taken from the ogg/vorbis library: ! ! ! Copyright (c) 2001, Xiphophorus ! ! Redistribution and use in source and binary forms, with or without ! modification, are permitted provided that the following conditions ! are met: ! ! - Redistributions of source code must retain the above copyright ! notice, this list of conditions and the following disclaimer. ! ! - Redistributions in binary form must reproduce the above copyright ! notice, this list of conditions and the following disclaimer in the ! documentation and/or other materials provided with the distribution. ! ! - Neither the name of the Xiphophorus nor the names of its contributors ! may be used to endorse or promote products derived from this software ! without specific prior written permission. ! ! THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ! ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ! LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ! A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR ! CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, ! EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ! PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR ! PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF ! LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING ! NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS ! SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ! ! ***************************************************************************** ! ! Listening to it: ! ! To listen to ogg/vorbis encoded audio files many player need an extra plug-in. ! Have a look at http://www.vorbis.com/ to find the appropiate plug-in for your ! player. ! ! ! ! ! ! Latest version can be found at: ! http://www.akustische-kunst.de/puredata/ ! Please report any bugs to olaf.matthes(a)gmx.de!

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs January 2004