Looks like the bit allocation code is mostly working. Just need to actually

use it now.

1 files changed, 48 insertions, 12 deletions

diff --git a/libcelt/rate.h b/libcelt/rate.h
index 7867097..4ec1a73 100644
--- a/libcelt/rate.h
+++ b/libcelt/rate.h
@@ -1,13 +1,49 @@
-//
-// C++ Interface: rate
-//
-// Description: 
-//
-//
-// Author: Jean-Marc Valin <Jean-Marc.Valin@USherbrooke.ca>, (C) 2008
-//
-// Copyright: See COPYING file that comes with this distribution
-//
-//
-int compute_allocation(const CELTMode *m, int *pulses);
+/* (C) 2007 Jean-Marc Valin, CSIRO
+*/
+/*
+   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 Xiph.org Foundation 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 FOUNDATION 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.
+*/
 
+#ifndef RATE_H
+#define RATE_H
+
+struct alloc_data {
+   const CELTMode *mode;
+   int len;
+   const int *bands;
+   int **bits;
+};
+void alloc_init(struct alloc_data *alloc, const CELTMode *m);
+
+void alloc_clear(struct alloc_data *alloc);
+
+
+int compute_allocation(const struct alloc_data *alloc, int *offsets, int total, int *pulses);
+
+
+#endif