Have a little more control over debug output.

Do not like "make debug" with debug printf's.

CVS patchset: 6565
CVS date: 2004/05/18 20:04:53

1 files changed, 26 insertions, 26 deletions

diff --git a/src/libdts/parse.c b/src/libdts/parse.c
index 6aa11e606..3806a5594 100644
--- a/src/libdts/parse.c
+++ b/src/libdts/parse.c
@@ -45,7 +45,7 @@
 #include "tables_fir.h"
 #include "tables_vq.h"
 
-/* #define DEBUG */
+/* #define LOG_DEBUG */
 
 #if defined(HAVE_MEMALIGN) && !defined(__cplusplus)
 /* some systems have memalign() but no declaration for it */
@@ -264,7 +264,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     state->dynrnge = 1;
     state->dynrngcall = NULL;
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     fprintf (stderr, "frame type: %i\n", state->frame_type);
     fprintf (stderr, "samples deficit: %i\n", state->samples_deficit);
     fprintf (stderr, "crc present: %i\n", state->crc_present);
@@ -304,7 +304,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     state->subframes = bitstream_get (state, 4) + 1;
     state->prim_channels = bitstream_get (state, 3) + 1;
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     fprintf (stderr, "subframes: %i\n", state->subframes);
     fprintf (stderr, "prim channels: %i\n", state->prim_channels);
 #endif
@@ -312,7 +312,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     for (i = 0; i < state->prim_channels; i++)
     {
         state->subband_activity[i] = bitstream_get (state, 5) + 2;
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "subband activity: %i\n", state->subband_activity[i]);
 #endif
         if (state->subband_activity[i] > DTS_SUBBANDS)
@@ -321,7 +321,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     for (i = 0; i < state->prim_channels; i++)
     {
         state->vq_start_subband[i] = bitstream_get (state, 5) + 1;
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "vq start subband: %i\n", state->vq_start_subband[i]);
 #endif
         if (state->vq_start_subband[i] > DTS_SUBBANDS)
@@ -330,7 +330,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     for (i = 0; i < state->prim_channels; i++)
     {
         state->joint_intensity[i] = bitstream_get (state, 3);
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "joint intensity: %i\n", state->joint_intensity[i]);
         if (state->joint_intensity[i]) {fprintf (stderr, "JOINTINTENSITY\n");}
 #endif
@@ -338,7 +338,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     for (i = 0; i < state->prim_channels; i++)
     {
         state->transient_huffman[i] = bitstream_get (state, 2);
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "transient mode codebook: %i\n",
                  state->transient_huffman[i]);
 #endif
@@ -346,7 +346,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     for (i = 0; i < state->prim_channels; i++)
     {
         state->scalefactor_huffman[i] = bitstream_get (state, 3);
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "scale factor codebook: %i\n",
                  state->scalefactor_huffman[i]);
 #endif
@@ -355,7 +355,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
     {
         state->bitalloc_huffman[i] = bitstream_get (state, 3);
         /* if (state->bitalloc_huffman[i] == 7) bailout */
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "bit allocation quantizer: %i\n",
                  state->bitalloc_huffman[i]);
 #endif
@@ -377,7 +377,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
         for (i = 0; i < state->prim_channels; i++)
             state->quant_index_huffman[i][j] = 0; /* Not transmitted */
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     for (i = 0; i < state->prim_channels; i++)
     {
         fprintf( stderr, "quant index huff:" );
@@ -418,7 +418,7 @@ int dts_frame (dts_state_t * state, uint8_t * buf, int * flags,
                     adj_table[bitstream_get (state, 2)];
             }
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     for (i = 0; i < state->prim_channels; i++)
     {
         fprintf (stderr, "scalefac adj:");
@@ -447,13 +447,13 @@ static int dts_subframe_header (dts_state_t * state)
 
     /* Subsubframe count */
     state->subsubframes = bitstream_get (state, 2) + 1;
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     fprintf (stderr, "subsubframes: %i\n", state->subsubframes);
 #endif
 
     /* Partial subsubframe sample count */
     state->partial_samples = bitstream_get (state, 3);
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     fprintf (stderr, "partial samples: %i\n", state->partial_samples);
 #endif
 
@@ -462,7 +462,7 @@ static int dts_subframe_header (dts_state_t * state)
     {
         for (k = 0; k < state->subband_activity[j]; k++)
             state->prediction_mode[j][k] = bitstream_get (state, 1);
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "prediction mode:");
         for (k = 0; k < state->subband_activity[j]; k++)
             fprintf (stderr, " %i", state->prediction_mode[j][k]);
@@ -479,7 +479,7 @@ static int dts_subframe_header (dts_state_t * state)
             {
                 /* (Prediction coefficient VQ address) */
                 state->prediction_vq[j][k] = bitstream_get (state, 12);
-#ifdef DEBUG
+#ifdef LOG_DEBUG
                 fprintf (stderr, "prediction coefs: %f, %f, %f, %f\n",
                          (double)adpcm_vb[state->prediction_vq[j][k]][0]/8192,
                          (double)adpcm_vb[state->prediction_vq[j][k]][1]/8192,
@@ -513,7 +513,7 @@ static int dts_subframe_header (dts_state_t * state)
             }
         }
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "bitalloc index: ");
         for (k = 0; k < state->vq_start_subband[j]; k++)
             fprintf (stderr, "%2.2i ", state->bitalloc[j][k]);
@@ -535,7 +535,7 @@ static int dts_subframe_header (dts_state_t * state)
                     tmode[state->transient_huffman[j]]);
             }
         }
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "Transition mode:");
         for (k = 0; k < state->subband_activity[j]; k++)
             fprintf (stderr, " %i", state->transition_mode[j][k]);
@@ -607,7 +607,7 @@ static int dts_subframe_header (dts_state_t * state)
             }
         }
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "Scale factor:");
         for (k = 0; k < state->subband_activity[j]; k++)
         {
@@ -670,7 +670,7 @@ static int dts_subframe_header (dts_state_t * state)
                 state->debug_flag |= 0x02;
             }
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
             fprintf (stderr, "Joint scale factor index:\n");
             for (k = state->subband_activity[j];
                  k < state->subband_activity[source_channel]; k++)
@@ -712,7 +712,7 @@ static int dts_subframe_header (dts_state_t * state)
             /* 1 vector -> 32 samples */
             state->high_freq_vq[j][k] = bitstream_get (state, 10);
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
             fprintf( stderr, "VQ index: %i\n", state->high_freq_vq[j][k] );
 #endif
         }
@@ -742,7 +742,7 @@ static int dts_subframe_header (dts_state_t * state)
         for (j = lfe_samples; j < lfe_samples * 2; j++)
             state->lfe_data[j] *= lfe_scale;
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "LFE samples:\n");
         for (j = lfe_samples; j < lfe_samples * 2; j++)
             fprintf (stderr, " %f", state->lfe_data[j]);
@@ -954,7 +954,7 @@ static int dts_subsubframe (dts_state_t * state)
     {
         if (0xFFFF == bitstream_get (state, 16)) /* 0xFFFF */
         {
-#ifdef DEBUG
+#ifdef LOG_DEBUG
             fprintf( stderr, "Got subframe DSYNC\n" );
 #endif
         }
@@ -1047,7 +1047,7 @@ static int dts_subframe_footer (dts_state_t * state)
         state->lfe_data[i] = state->lfe_data[i+lfe_samples];
     }
 
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     fprintf( stderr, "\n" );
 #endif
 
@@ -1066,7 +1066,7 @@ int dts_block (dts_state_t * state)
 
     if (!state->current_subsubframe)
     {
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf (stderr, "DSYNC dts_subframe_header\n");
 #endif
         /* Read subframe header */
@@ -1074,7 +1074,7 @@ int dts_block (dts_state_t * state)
     }
 
     /* Read subsubframe */
-#ifdef DEBUG
+#ifdef LOG_DEBUG
     fprintf (stderr, "DSYNC dts_subsubframe\n");
 #endif
     if (dts_subsubframe (state)) return -1;
@@ -1088,7 +1088,7 @@ int dts_block (dts_state_t * state)
     }
     if (state->current_subframe >= state->subframes)
     {
-#ifdef DEBUG
+#ifdef LOG_DEBUG
         fprintf(stderr, "DSYNC dts_subframe_footer\n");
 #endif
         /* Read subframe footer */