shithub: aacdec

Download patch

ref: 00626046473379e2be1594539504f8c43761ba61
parent: 52bf7848677fea697a0d96711495606f7bb6f43b
author: menno <menno>
date: Thu Mar 11 06:40:13 EST 2004 

fix in element id storage


--- a/libfaad/specrec.c
+++ b/libfaad/specrec.c
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: specrec.c,v 1.46 2004/03/02 20:09:58 menno Exp $
+** $Id: specrec.c,v 1.47 2004/03/11 11:40:13 menno Exp $
 **/
 
 /*
@@ -1031,7 +1031,7 @@
         if (hDecoder->sbr[ele] == NULL)
         {
             hDecoder->sbr[ele] = sbrDecodeInit(hDecoder->frameLength,
-                sce->ele_id, 2*get_sample_rate(hDecoder->sf_index),
+                hDecoder->element_id[ele], 2*get_sample_rate(hDecoder->sf_index),
                 hDecoder->downSampledSBR
 #ifdef DRM
                 , 0
@@ -1257,7 +1257,7 @@
         if (hDecoder->sbr[ele] == NULL)
         {
             hDecoder->sbr[ele] = sbrDecodeInit(hDecoder->frameLength,
-                cpe->ele_id, 2*get_sample_rate(hDecoder->sf_index),
+                hDecoder->element_id[ele], 2*get_sample_rate(hDecoder->sf_index),
                 hDecoder->downSampledSBR
 #ifdef DRM
                 , 0
--- a/libfaad/structs.h
+++ b/libfaad/structs.h
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: structs.h,v 1.35 2004/03/10 19:45:42 menno Exp $
+** $Id: structs.h,v 1.36 2004/03/11 11:40:13 menno Exp $
 **/
 
 #ifndef __STRUCTS_H__
@@ -292,8 +292,6 @@
 
 typedef struct
 {
-    uint8_t ele_id;
-
     uint8_t channel;
     int16_t paired_channel;
 
--- a/libfaad/syntax.c
+++ b/libfaad/syntax.c
@@ -22,7 +22,7 @@
 ** Commercial non-GPL licensing of this software is possible.
 ** For more info contact Ahead Software through Mpeg4AAClicense@nero.com.
 **
-** $Id: syntax.c,v 1.75 2004/03/10 19:45:42 menno Exp $
+** $Id: syntax.c,v 1.76 2004/03/11 11:40:13 menno Exp $
 **/
 
 /*
@@ -1147,11 +1147,11 @@
     cpe.common_window = 1;
     if (this_layer_stereo)
     {
-        cpe.ele_id = ID_CPE;
+        hDecoder->element_id[0] = ID_CPE;
         if (hDecoder->element_output_channels[hDecoder->fr_ch_ele] == 0)
             hDecoder->element_output_channels[hDecoder->fr_ch_ele] = 2;
     } else {
-        cpe.ele_id = ID_SCE;
+        hDecoder->element_id[0] = ID_SCE;
     }
 
     for (ch = 0; ch < (this_layer_stereo ? 2 : 1); ch++)
@@ -1196,7 +1196,7 @@
 
         if (!hDecoder->sbr[0])
         {
-            hDecoder->sbr[0] = sbrDecodeInit(hDecoder->frameLength, cpe.ele_id,
+            hDecoder->sbr[0] = sbrDecodeInit(hDecoder->frameLength, hDecoder->element_id[0],
                 2*get_sample_rate(hDecoder->sf_index), 0 /* ds SBR */, 1);
         }
 
@@ -1258,8 +1258,6 @@
     } else {
         hDecoder->internal_channel[channels] = channels;
     }
-
-    hDecoder->element_id[hDecoder->fr_ch_ele] = cpe.ele_id;
 
     hDecoder->fr_channels += hDecoder->element_output_channels[hDecoder->fr_ch_ele];
     hDecoder->fr_ch_ele++;