ref: 800f550eabc3155fcbae4c4b8dad3edcb61f3b5f
parent: 7778db108536ffa6ebdf18e3591c92ec2bd14972
author: menno <menno>
date: Tue Sep 30 12:32:02 EDT 2003
1 more DRM fix
--- a/libfaad/sbr_syntax.c
+++ b/libfaad/sbr_syntax.c
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003 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
** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version.
-**
+**
** This program 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 General Public License for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
+** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
@@ -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.10 2003/09/10 12:25:54 menno Exp $
+** $Id: sbr_syntax.c,v 1.11 2003/09/30 16:32:02 menno Exp $
**/
#include "common.h"
@@ -308,16 +308,16 @@
switch (id_aac)
{case ID_SCE:
- if ((result = sbr_single_channel_element(ld, sbr)) > 0)
- return result;
+ if ((result = sbr_single_channel_element(ld, sbr)) > 0)
+ return result;
break;
case ID_CPE:
- if ((result = sbr_channel_pair_element(ld, sbr)) > 0)
- return result;
+ if ((result = sbr_channel_pair_element(ld, sbr)) > 0)
+ return result;
break;
}
- return 0;
+ return 0;
}
/* table 5 */
@@ -608,7 +608,7 @@
sbr->f[ch][env] = i;
sbr->abs_bord_lead[ch] = 0;
- sbr->abs_bord_trail[ch] = NO_TIME_SLOTS;
+ sbr->abs_bord_trail[ch] = sbr->numTimeSlots;
sbr->n_rel_lead[ch] = bs_num_env - 1;
sbr->n_rel_trail[ch] = 0;
break;
@@ -680,7 +680,7 @@
}
sbr->abs_bord_lead[ch] = bs_abs_bord;
- sbr->abs_bord_trail[ch] = NO_TIME_SLOTS;
+ sbr->abs_bord_trail[ch] = sbr->numTimeSlots;
sbr->n_rel_lead[ch] = bs_num_env - 1;
sbr->n_rel_trail[ch] = 0;
break;
--- a/libfaad/sbr_tf_grid.c
+++ b/libfaad/sbr_tf_grid.c
@@ -1,19 +1,19 @@
/*
** FAAD2 - Freeware Advanced Audio (AAC) Decoder including SBR decoding
** Copyright (C) 2003 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
** the Free Software Foundation; either version 2 of the License, or
** (at your option) any later version.
-**
+**
** This program 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 General Public License for more details.
-**
+**
** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software
+** along with this program; if not, write to the Free Software
** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
**
** Any non-GPL usage of this software or parts of this software is strictly
@@ -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_tf_grid.c,v 1.3 2003/09/09 18:37:32 menno Exp $
+** $Id: sbr_tf_grid.c,v 1.4 2003/09/30 16:32:02 menno Exp $
**/
/* Time/Frequency grid */
@@ -163,7 +163,7 @@
switch (sbr->bs_frame_class[ch])
{case FIXFIX:
- return NO_TIME_SLOTS/sbr->L_E[ch];
+ return sbr->numTimeSlots/sbr->L_E[ch];
case FIXVAR:
return 0;
case VARFIX: