summaryrefslogtreecommitdiff
path: root/src/libfaad/sbr_syntax.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libfaad/sbr_syntax.c')
-rw-r--r--src/libfaad/sbr_syntax.c17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/libfaad/sbr_syntax.c b/src/libfaad/sbr_syntax.c
index f24aff986..e8cdceff5 100644
--- a/src/libfaad/sbr_syntax.c
+++ b/src/libfaad/sbr_syntax.c
@@ -1,6 +1,6 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
-** Copyright (C) 2003 M. Bakker, Ahead Software AG, http://www.nero.com
+** Copyright (C) 2003-2004 M. Bakker, Ahead Software AG, http://www.nero.com
**
** This program is free software; you can redistribute it and/or modify
** it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
** Commercial non-GPL licensing of this software is possible.
** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
**
-** $Id: sbr_syntax.c,v 1.3 2003/12/30 02:00:11 miguelfreitas Exp $
+** $Id: sbr_syntax.c,v 1.4 2004/01/11 15:44:05 mroi Exp $
**/
#include "common.h"
@@ -39,6 +39,17 @@
#include "bits.h"
#include "analysis.h"
+/* static function declarations */
+static void sbr_header(bitfile *ld, sbr_info *sbr);
+static uint8_t sbr_data(bitfile *ld, sbr_info *sbr);
+static uint8_t sbr_single_channel_element(bitfile *ld, sbr_info *sbr);
+static uint8_t sbr_channel_pair_element(bitfile *ld, sbr_info *sbr);
+static uint8_t sbr_grid(bitfile *ld, sbr_info *sbr, uint8_t ch);
+static void sbr_dtdf(bitfile *ld, sbr_info *sbr, uint8_t ch);
+static void invf_mode(bitfile *ld, sbr_info *sbr, uint8_t ch);
+static void sinusoidal_coding(bitfile *ld, sbr_info *sbr, uint8_t ch);
+
+
static void sbr_reset(sbr_info *sbr)
{
#if 0
@@ -484,7 +495,7 @@ static uint8_t sbr_grid(bitfile *ld, sbr_info *sbr, uint8_t ch)
{
uint8_t i, env, rel, result;
uint8_t bs_abs_bord, bs_abs_bord_1;
- uint8_t bs_num_env;
+ uint8_t bs_num_env = 0;
sbr->bs_frame_class[ch] = (uint8_t)faad_getbits(ld, 2
DEBUGVAR(1,248,"sbr_grid(): bs_frame_class"));