* src/mp3-c.c: (III_huffman_decode), (III_dequantize_sample),

(c_decode_mp3):
* src/mp3-ipp.c: (ipp_decode_mp3):
Improve a little the debugging code.


git-svn-id: https://core.fluendo.com/gstreamer/svn/trunk/gst-fluendo-mp3@2502 2b0047a9-a6d8-0310-accf-f7200b2a168c

3 files changed, 40 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 50fa73f..bf82188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2013-09-03  Josep Torra  <josep@fluendo.com>
 
+	* src/mp3-c.c: (III_huffman_decode), (III_dequantize_sample),
+	(c_decode_mp3):
+	* src/mp3-ipp.c: (ipp_decode_mp3):
+	Improve a little the debugging code.
+
+2013-09-03  Josep Torra  <josep@fluendo.com>
+
 	* src/flump3dec-1_0.c: (gst_flump3dec_parse):
 	* src/mp3tl.c: (mp3tl_gather_frame):
 	For GStreamer 1.0 ensure to skip invalid frames like we do in
diff --git a/src/mp3-c.c b/src/mp3-c.c
index 5c0fc0a..9ec187e 100644
--- a/src/mp3-c.c
+++ b/src/mp3-c.c
@@ -621,21 +621,6 @@ III_huffman_decode (gint is[SBLIMIT][SSLIMIT], III_side_info_t * si,
   for (; i < SSLIMIT * SBLIMIT; i++)
     is[i / SSLIMIT][i % SSLIMIT] = 0;
 
-#ifdef HUFFMAN_DEBUG
-    {
-      static gint frame_num = 0;
-      gint j;
-      if (ch == 0 && gr == 0) frame_num++;
-      fprintf (stderr, "\nFrame %d, granule %d, channel %d\n", frame_num, gr, ch);
-      for (i = 0 ; i < 32; i++) {
-        for (j = 0; j < 18; j++) {
-          fprintf (stderr, "%4d ", is[i][j]);
-        }
-        fprintf (stderr, "\n");
-      }
-    }
-#endif
-
   return TRUE;
 }
 
@@ -746,21 +731,6 @@ III_dequantize_sample (gint is[SBLIMIT][SSLIMIT],
       }
     }
   }
-
-#ifdef DEQUANT_DEBUG
-  {
-    static gint frame_num = 0;
-    gint i, j;
-    if (ch == 0 && gr == 0) frame_num++;
-    fprintf (stderr, "\nFrame %d, granule %d, channel %d\n", frame_num, gr, ch);
-    for (i = 0 ; i < 32; i++) {
-      for (j = 0; j < 18; j++) {
-        fprintf (stderr, "%+f ", xr[i][j]);
-      }
-      fprintf (stderr, "\n");
-    }
-  }
-#endif
 }
 
 void
@@ -1753,17 +1723,36 @@ c_decode_mp3 (mp3tl * tl)
         return MP3TL_ERR_BAD_FRAME;
       }
 
+#ifdef HUFFMAN_DEBUG
+      {
+        gint i, j;
+        fprintf (stderr, "\nFrame %" G_GUINT64_FORMAT ", granule %d, channel %d\n",
+            tl->frame_num, gr, ch);
+        for (i = 0 ; i < 32; i++) {
+          fprintf (stderr, "SB %02d: ", i);
+          for (j = 0; j < 18; j++) {
+            fprintf (stderr, "%4d ", is[i][j]);
+          }
+          fprintf (stderr, "\n");
+        }
+      }
+#endif
+
       III_dequantize_sample (is, ro[ch], &III_scalefac,
           &(III_side_info.gr[gr][ch]), ch, gr, &tl->fr_ps);
 
-#if 0
-      int i;
-      for (sb = 0; sb < SBLIMIT; sb++) {
-        g_print ("SB %02d: ", sb);
-        for (i = 0; i < SSLIMIT; i++) {
-          g_print ("%06f ", ro[ch][sb][i]);
+#ifdef DEQUANT_DEBUG
+      {
+        gint i, j;
+        fprintf (stderr, "\nFrame %" G_GUINT64_FORMAT ", granule %d, channel %d\n",
+            tl->frame_num, gr, ch);
+        for (i = 0 ; i < 32; i++) {
+          fprintf (stderr, "SB %02d: ", i);
+          for (j = 0; j < 18; j++) {
+            fprintf (stderr, "%+f ", ro[ch][i][j]);
+          }
+          fprintf (stderr, "\n");
         }
-        g_print ("\n");
       }
 #endif
     }
diff --git a/src/mp3-ipp.c b/src/mp3-ipp.c
index e58d7fe..83653aa 100644
--- a/src/mp3-ipp.c
+++ b/src/mp3-ipp.c
@@ -221,11 +221,11 @@ ipp_decode_mp3 (mp3tl * tl)
 
 #ifdef HUFFMAN_DEBUG
     for (ch = 0; ch < channels; ch++) {
-      static gint frame_num = 0;
       gint i, j;
-      if (ch == 0 && gr == 0) frame_num++;
-      fprintf (stderr, "\nFrame %d, granule %d, channel %d\n", frame_num, gr, ch);
+      fprintf (stderr, "\nFrame %" G_GUINT64_FORMAT ", granule %d, channel %d\n",
+          tl->frame_num, gr, ch);
       for (i = 0 ; i < 32; i++) {
+        fprintf (stderr, "SB %02d: ", i);
         for (j = 0; j < 18; j++) {
           fprintf (stderr, "%4d ", IsXr[(ch * IPP_MP3_GRANULE_LEN) + (i * 18) + j]);
         }
@@ -246,13 +246,13 @@ ipp_decode_mp3 (mp3tl * tl)
 
 #ifdef DEQUANT_DEBUG
     for (ch = 0; ch < channels; ch++) {
-      static gint frame_num = 0;
       gint i, j;
-      if (ch == 0 && gr == 0) frame_num++;
-      fprintf (stderr, "\nFrame %d, granule %d, channel %d\n", frame_num, gr, ch);
+      fprintf (stderr, "\nFrame %" G_GUINT64_FORMAT ", granule %d, channel %d\n",
+          tl->frame_num, gr, ch);
       for (i = 0 ; i < 32; i++) {
+        fprintf (stderr, "SB %02d: ", i);
         for (j = 0; j < 18; j++) {
-          fprintf (stderr, "%+f ", (Ipp32f) IsXr[(ch * IPP_MP3_GRANULE_LEN) + (i * 18) + j] / 0x3FFFFFF.0);
+          fprintf (stderr, "%+f ", (Ipp32f) IsXr[(ch * IPP_MP3_GRANULE_LEN) + (i * 18) + j] / 0x3FFFFFF);
         }
         fprintf (stderr, "\n");
       }