shithub: aacdec

Download patch

ref: bbdbf311656bb20e93a9bc4d3dc427d8b0276390
parent: 162e0015ec094669e30cfacb7c4f8088a14141e9
author: menno <menno>
date: Tue Sep 30 04:07:47 EDT 2003 

stdout output fixed
small function definition fixes


--- a/frontend/main.c
+++ b/frontend/main.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: main.c,v 1.48 2003/09/23 08:12:29 menno Exp $
+** $Id: main.c,v 1.49 2003/09/30 08:07:47 menno Exp $
 **/
 
 #ifdef _WIN32
@@ -221,30 +221,30 @@
     int i;
     long channelMask = aacChannelConfig2wavexChannelMask(frameInfo);
 
-    printf("  ---------------------\n");
+    fprintf(stderr, "  ---------------------\n");
     if (frameInfo->num_lfe_channels > 0)
     {
-        printf(" | Config: %2d.%d Ch     |", frameInfo->channels-frameInfo->num_lfe_channels, frameInfo->num_lfe_channels);
+        fprintf(stderr, " | Config: %2d.%d Ch     |", frameInfo->channels-frameInfo->num_lfe_channels, frameInfo->num_lfe_channels);
     } else {
-        printf(" | Config: %2d Ch       |", frameInfo->channels);
+        fprintf(stderr, " | Config: %2d Ch       |", frameInfo->channels);
     }
     if (channelMask)
-        printf(" WARNING: channels are reordered according to\n");
+        fprintf(stderr, " WARNING: channels are reordered according to\n");
     else
-        printf("\n");
-    printf("  ---------------------");
+        fprintf(stderr, "\n");
+    fprintf(stderr, "  ---------------------");
     if (channelMask)
-        printf("  MS defaults defined in WAVE_FORMAT_EXTENSIBLE\n");
+        fprintf(stderr, "  MS defaults defined in WAVE_FORMAT_EXTENSIBLE\n");
     else
-        printf("\n");
-    printf(" | Ch |    Position    |\n");
-    printf("  ---------------------\n");
+        fprintf(stderr, "\n");
+    fprintf(stderr, " | Ch |    Position    |\n");
+    fprintf(stderr, "  ---------------------\n");
     for (i = 0; i < frameInfo->channels; i++)
     {
-        printf(" | %.2d | %-14s |\n", i, position2string((int)frameInfo->channel_position[i]));
+        fprintf(stderr, " | %.2d | %-14s |\n", i, position2string((int)frameInfo->channel_position[i]));
     }
-    printf("  ---------------------\n");
-    printf("\n");
+    fprintf(stderr, "  ---------------------\n");
+    fprintf(stderr, "\n");
 }
 
 int FindAdtsSRIndex(int sr)
--- a/libfaad/sbr_hfgen.h
+++ b/libfaad/sbr_hfgen.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: sbr_hfgen.h,v 1.2 2003/09/09 18:09:52 menno Exp $
+** $Id: sbr_hfgen.h,v 1.3 2003/09/30 08:07:47 menno Exp $
 **/
 
 #ifndef __SBR_HFGEN_H__
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-void hf_generation(sbr_info *sbr, qmf_t *Xlow,
+void hf_generation(sbr_info *sbr, const qmf_t *Xlow,
                    qmf_t *Xhigh
 #ifdef SBR_LOW_POWER
                    ,real_t *deg
@@ -39,7 +39,7 @@
 #endif
                    ,uint8_t ch);
 
-static void calc_prediction_coef(sbr_info *sbr, qmf_t *Xlow,
+static void calc_prediction_coef(sbr_info *sbr, const qmf_t *Xlow,
                                  complex_t *alpha_0, complex_t *alpha_1
 #ifdef SBR_LOW_POWER
                                  , real_t *rxx