summaryrefslogtreecommitdiff
path: root/sys/src/cmd/audio/libvorbis/misc.h
diff options
context:
space:
mode:
authorftrvxmtrx <ftrvxmtrx@gmail.com>2016-03-10 22:43:00 +0100
committerftrvxmtrx <ftrvxmtrx@gmail.com>2016-03-10 22:43:00 +0100
commitfb1551e9973ee86ccdd0ed8b125de97e9865e5ba (patch)
treef6a01c5de357cc2fd6037cce202a45fe36ec42a8 /sys/src/cmd/audio/libvorbis/misc.h
parent0276031c011d28f182492ebbee34df35b005b4f9 (diff)
libvorbis: update to 1.3.5
Diffstat (limited to 'sys/src/cmd/audio/libvorbis/misc.h')
-rw-r--r--sys/src/cmd/audio/libvorbis/misc.h24
1 files changed, 15 insertions, 9 deletions
diff --git a/sys/src/cmd/audio/libvorbis/misc.h b/sys/src/cmd/audio/libvorbis/misc.h
index 18a68e7a8..73b451989 100644
--- a/sys/src/cmd/audio/libvorbis/misc.h
+++ b/sys/src/cmd/audio/libvorbis/misc.h
@@ -5,13 +5,13 @@
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
- * by the XIPHOPHORUS Company http://www.xiph.org/ *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2015 *
+ * by the Xiph.Org Foundation http://www.xiph.org/ *
* *
********************************************************************
function: miscellaneous prototypes
- last mod: $Id: misc.h,v 1.12 2002/06/28 22:19:37 xiphmont Exp $
+ last mod: $Id: misc.h 19457 2015-03-03 00:15:29Z giles $
********************************************************************/
@@ -19,20 +19,26 @@
#define _V_RANDOM_H_
#include "vorbis/codec.h"
-extern int analysis_noisy;
-
extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
extern void _vorbis_block_ripcord(vorbis_block *vb);
+extern int ov_ilog(ogg_uint32_t v);
+
+#ifdef ANALYSIS
+extern int analysis_noisy;
extern void _analysis_output(char *base,int i,float *v,int n,int bark,int dB,
- ogg_int64_t off);
+ ogg_int64_t off);
+extern void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,
+ ogg_int64_t off);
+#endif
#ifdef DEBUG_MALLOC
#define _VDBG_GRAPHFILE "malloc.m"
-extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line);
-extern void _VDBG_free(void *ptr,char *file,long line);
+#undef _VDBG_GRAPHFILE
+extern void *_VDBG_malloc(void *ptr,long bytes,char *file,long line);
+extern void _VDBG_free(void *ptr,char *file,long line);
-#ifndef MISC_C
+#ifndef MISC_C
#undef _ogg_malloc
#undef _ogg_calloc
#undef _ogg_realloc