[xiph-commits] r10707 - trunk/Tremor
giles at svn.xiph.org
giles at svn.xiph.org
Sun Jan 8 17:45:07 PST 2006
Author: giles
Date: 2006-01-08 17:45:05 -0800 (Sun, 08 Jan 2006)
New Revision: 10707
Added:
trunk/Tremor/block.h
Modified:
trunk/Tremor/floor0.c
trunk/Tremor/floor1.c
trunk/Tremor/mdct.c
trunk/Tremor/misc.h
trunk/Tremor/res012.c
trunk/Tremor/synthesis.c
trunk/Tremor/vorbisfile.c
Log:
Fix a number of warnings, issue #622.
Added: trunk/Tremor/block.h
===================================================================
--- trunk/Tremor/block.h 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/block.h 2006-01-09 01:45:05 UTC (rev 10707)
@@ -0,0 +1,48 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis 'TREMOR' 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 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2006 *
+ * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: shared block functions
+
+ ********************************************************************/
+
+#ifndef _V_BLOCK_
+#define _V_BLOCK_
+
+extern void _vorbis_block_ripcord(vorbis_block *vb);
+extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
+
+#endif
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggVorbis 'TREMOR' 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 'TREMOR' SOURCE CODE IS (C) COPYRIGHT 1994-2002 *
+ * BY THE Xiph.Org FOUNDATION http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function: block functions
+
+ ********************************************************************/
+
+#ifndef _V_BLOCK_
+#define _V_BLOCK_
+
+extern void _vorbis_block_ripcord(vorbis_block *vb);
+extern void *_vorbis_block_alloc(vorbis_block *vb,long bytes);
+
+#endif
Modified: trunk/Tremor/floor0.c
===================================================================
--- trunk/Tremor/floor0.c 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/floor0.c 2006-01-09 01:45:05 UTC (rev 10707)
@@ -24,6 +24,7 @@
#include "registry.h"
#include "codebook.h"
#include "misc.h"
+#include "block.h"
#define LSP_FRACBITS 14
@@ -342,7 +343,6 @@
static vorbis_look_floor *floor0_look (vorbis_dsp_state *vd,vorbis_info_mode *mi,
vorbis_info_floor *i){
int j;
- ogg_int32_t scale;
vorbis_info *vi=vd->vi;
codec_setup_info *ci=(codec_setup_info *)vi->codec_setup;
vorbis_info_floor0 *info=(vorbis_info_floor0 *)i;
Modified: trunk/Tremor/floor1.c
===================================================================
--- trunk/Tremor/floor1.c 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/floor1.c 2006-01-09 01:45:05 UTC (rev 10707)
@@ -24,6 +24,7 @@
#include "registry.h"
#include "codebook.h"
#include "misc.h"
+#include "block.h"
#define floor1_rangedB 140 /* floor 1 fixed at -140dB to 0dB range */
Modified: trunk/Tremor/mdct.c
===================================================================
--- trunk/Tremor/mdct.c 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/mdct.c 2006-01-09 01:45:05 UTC (rev 10707)
@@ -33,6 +33,7 @@
********************************************************************/
#include "ivorbiscodec.h"
+#include "codebook.h"
#include "misc.h"
#include "mdct.h"
#include "mdct_lookup.h"
Modified: trunk/Tremor/misc.h
===================================================================
--- trunk/Tremor/misc.h 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/misc.h 2006-01-09 01:45:05 UTC (rev 10707)
@@ -21,6 +21,7 @@
#include "os.h"
#include "asm_arm.h"
+#include <stdlib.h> /* for abs() */
#ifndef _V_WIDE_MATH
#define _V_WIDE_MATH
@@ -182,6 +183,8 @@
return 0;
}
+int _ilog(unsigned int);
+
static inline ogg_int32_t VFLOAT_MULTI(ogg_int32_t a,ogg_int32_t ap,
ogg_int32_t i,
ogg_int32_t *p){
Modified: trunk/Tremor/res012.c
===================================================================
--- trunk/Tremor/res012.c 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/res012.c 2006-01-09 01:45:05 UTC (rev 10707)
@@ -25,6 +25,7 @@
#include "codebook.h"
#include "misc.h"
#include "os.h"
+#include "block.h"
typedef struct {
vorbis_info_residue0 *info;
Modified: trunk/Tremor/synthesis.c
===================================================================
--- trunk/Tremor/synthesis.c 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/synthesis.c 2006-01-09 01:45:05 UTC (rev 10707)
@@ -22,6 +22,7 @@
#include "codec_internal.h"
#include "registry.h"
#include "misc.h"
+#include "block.h"
int vorbis_synthesis(vorbis_block *vb,ogg_packet *op,int decodep){
vorbis_dsp_state *vd=vb->vd;
Modified: trunk/Tremor/vorbisfile.c
===================================================================
--- trunk/Tremor/vorbisfile.c 2006-01-09 01:27:10 UTC (rev 10706)
+++ trunk/Tremor/vorbisfile.c 2006-01-09 01:45:05 UTC (rev 10707)
@@ -61,7 +61,7 @@
static long _get_data(OggVorbis_File *vf){
errno=0;
if(vf->datasource){
- char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE);
+ unsigned char *buffer=ogg_sync_bufferin(vf->oy,CHUNKSIZE);
long bytes=(vf->callbacks.read_func)(buffer,1,CHUNKSIZE,vf->datasource);
if(bytes>0)ogg_sync_wrote(vf->oy,bytes);
if(bytes==0 && errno)return(-1);
@@ -678,7 +678,7 @@
previously read data (as we may be reading from a non-seekable
stream) */
if(initial){
- char *buffer=ogg_sync_bufferin(vf->oy,ibytes);
+ unsigned char *buffer=ogg_sync_bufferin(vf->oy,ibytes);
memcpy(buffer,initial,ibytes);
ogg_sync_wrote(vf->oy,ibytes);
}
More information about the commits
mailing list