mad: code cleanup

Author: redchenjs

components/mad/align.c

@@ -32,7 +32,6 @@
 # endif
 
 # include "bit.h"
-#include "align.h"
 
 /*
  * This is the lookup table for computing the CRC-check word.
@@ -191,7 +190,6 @@ void mad_bit_write(struct mad_bitptr *bitptr, unsigned int len,
 }
 # endif
 
-
 /*
  * NAME:	bit->crc()
  * DESCRIPTION:	compute CRC-check word
@@ -206,22 +204,24 @@ unsigned short mad_bit_crc(struct mad_bitptr bitptr, unsigned int len,
 
     data = mad_bit_read(&bitptr, 32);
 
-    crc = (crc << 8) ^ unalShort(&crc_table[((crc >> 8) ^ (data >> 24)) & 0xff]);
-    crc = (crc << 8) ^ unalShort(&crc_table[((crc >> 8) ^ (data >> 16)) & 0xff]);
-    crc = (crc << 8) ^ unalShort(&crc_table[((crc >> 8) ^ (data >>  8)) & 0xff]);
-    crc = (crc << 8) ^ unalShort(&crc_table[((crc >> 8) ^ (data >>  0)) & 0xff]);
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 24)) & 0xff];
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >> 16)) & 0xff];
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  8)) & 0xff];
+    crc = (crc << 8) ^ crc_table[((crc >> 8) ^ (data >>  0)) & 0xff];
   }
 
   switch (len / 8) {
   case 3: crc = (crc << 8) ^
-	    unalShort(&crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]);
+	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
 	    /* fall through */
   case 2: crc = (crc << 8) ^
-	    unalShort(&crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]);
+	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
 	    /* fall through */
   case 1: crc = (crc << 8) ^
-	    unalShort(&crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff]);
-	    len %= 8;
+	    crc_table[((crc >> 8) ^ mad_bit_read(&bitptr, 8)) & 0xff];
+
+  len %= 8;
+
   case 0: break;
   }
 

components/mad/align.h

@@ -1,5 +1,4 @@
 /* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to enable diagnostic debugging support. */
 /* #undef DEBUG */
@@ -8,7 +7,7 @@
 /* #undef EXPERIMENTAL */
 
 /* Define to disable debugging assertions. */
-/* #define NDEBUG */
+#define NDEBUG
 
 /* Define to optimize for accuracy over speed. */
 /* #undef OPT_ACCURACY */
@@ -23,53 +22,4 @@
    if this is in opposition with best accepted practices. */
 /* #undef OPT_STRICT */
 
-/* Name of package */
-#define PACKAGE "libmad"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "support@underbit.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "MPEG Audio Decoder"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "MPEG Audio Decoder 0.15.1b"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "libmad"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.15.1b"
-
-/* The size of a `int', as computed by sizeof. */
-#define SIZEOF_INT 4
-
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-
-/* The size of a `long long', as computed by sizeof. */
-#define SIZEOF_LONG_LONG 8
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#define VERSION "0.15.1b"
-
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-/* #undef WORDS_BIGENDIAN */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
 #define FPM_DEFAULT
-
-/* Define to `int' if <sys/types.h> does not define. */
-/* #undef pid_t */

components/mad/bit.c

@@ -322,9 +322,7 @@ int run_sync(struct mad_decoder *decoder)
   struct mad_frame *frame;
   struct mad_synth *synth;
   int result = 0;
-  int r;
 
-//	printf("run_sync\n");
   if (decoder->input_func == 0)
     return 0;
 
@@ -348,9 +346,7 @@ int run_sync(struct mad_decoder *decoder)
   mad_stream_options(stream, decoder->options);
 
   do {
-    r=decoder->input_func(decoder->cb_data, stream);
-//   printf("Input fn: %d\n", r);
-    switch (r) {
+    switch (decoder->input_func(decoder->cb_data, stream)) {
     case MAD_FLOW_STOP:
       goto done;
     case MAD_FLOW_BREAK:
@@ -377,9 +373,7 @@ int run_sync(struct mad_decoder *decoder)
 # endif
 
       if (decoder->header_func) {
-	r=mad_header_decode(&frame->header, stream);
-//	printf("mad_header_decode_func: %d\n", r);
-	if (r!=-1) {
+	if (mad_header_decode(&frame->header, stream) == -1) {
 	  if (!MAD_RECOVERABLE(stream->error))
 	    break;
 
@@ -407,9 +401,7 @@ int run_sync(struct mad_decoder *decoder)
 	}
       }
 
-      r=mad_frame_decode(frame, stream);
-//	printf("mad_frame_decode: %d\n", r);
-      if (r == -1) {
+      if (mad_frame_decode(frame, stream) == -1) {
 	if (!MAD_RECOVERABLE(stream->error))
 	  break;
 
@@ -443,7 +435,6 @@ int run_sync(struct mad_decoder *decoder)
 
       mad_synth_frame(synth, frame);
 
-//	printf("Calling output fn\n");
       if (decoder->output_func) {
 	switch (decoder->output_func(decoder->cb_data,
 				     &frame->header, &synth->pcm)) {
@@ -543,7 +534,6 @@ int mad_decoder_run(struct mad_decoder *decoder, enum mad_decoder_mode mode)
 {
   int result;
   int (*run)(struct mad_decoder *) = 0;
-  static struct sync_t decsync; //statically-allocated decoder obj
 
   switch (decoder->mode = mode) {
   case MAD_DECODER_MODE_SYNC:
@@ -560,15 +550,14 @@ int mad_decoder_run(struct mad_decoder *decoder, enum mad_decoder_mode mode)
   if (run == 0)
     return -1;
 
-//  decoder->sync = malloc(sizeof(*decoder->sync));
-  decoder->sync=&decsync;
+  decoder->sync = malloc(sizeof(*decoder->sync));
   if (decoder->sync == 0)
     return -1;
 
   result = run(decoder);
 
-//  free(decoder->sync);
-//  decoder->sync = 0;
+  free(decoder->sync);
+  decoder->sync = 0;
 
   return result;
 }

components/mad/config.h

@@ -38,36 +38,6 @@ enum mad_flow {
   MAD_FLOW_IGNORE   = 0x0020	/* ignore the current frame */
 };
 
- 
-struct sync_t {
-    struct mad_stream stream;	// definito main_data_t un array di circa 4K
-    struct mad_frame frame;
-    struct mad_synth synth;
-};
-
-// # define MAD_BUFFER_GUARD	8
-// # define MAD_BUFFER_MDLEN	(511 + 2048 + MAD_BUFFER_GUARD)
-// typedef unsigned char main_data_t[MAD_BUFFER_MDLEN];		 2567
-
-// in frame.h
-// struct mad_frame {
-//  struct mad_header header;		/* MPEG audio header */
-//
-//  int options;				/* decoding options (from stream) */
-//
-//  mad_fixed_t sbsample[2][36][32];	/* synthesis subband filter samples 9216 */
-//  mad_fixed_t (*overlap)[2][32][18];	/* Layer III block overlap data     4608 */
-//};
-//
-// in synth.h
-//struct mad_synth {
-//  mad_fixed_t filter[2][2][2][16][8];   /* polyphase filterbank outputs 4096 */
-//  				                      /* [ch][eo][peo][s][v]               */
-//
-//  unsigned int phase;			/* current processing phase */
-//  struct mad_pcm pcm;			/* PCM output */
-//};
-
 struct mad_decoder {
   enum mad_decoder_mode mode;
 
@@ -79,16 +49,12 @@ struct mad_decoder {
     int out;
   } async;
 
-/*
   struct {
     struct mad_stream stream;
     struct mad_frame frame;
     struct mad_synth synth;
   } *sync;
 
-*/
-  struct sync_t *sync;
-
   void *cb_data;
 
   enum mad_flow (*input_func)(void *, struct mad_stream *);

components/mad/decoder.c

@@ -107,7 +107,7 @@ void mad_frame_finish(struct mad_frame *frame)
   mad_header_finish(&frame->header);
 
   if (frame->overlap) {
-//    free(frame->overlap);
+    free(frame->overlap);
     frame->overlap = 0;
   }
 }

components/mad/decoder.h

@@ -22,7 +22,6 @@
 # ifndef LIBMAD_FRAME_H
 # define LIBMAD_FRAME_H
 
-
 # include "fixed.h"
 # include "timer.h"
 # include "stream.h"

components/mad/frame.c

@@ -22,8 +22,6 @@
 # ifndef LIBMAD_GLOBAL_H
 # define LIBMAD_GLOBAL_H
 
-// #include "esp_common.h"
-#include "config.h"
 /* conditional debugging */
 
 # if defined(DEBUG) && defined(NDEBUG)
@@ -50,11 +48,11 @@
 # endif
 
 # if !defined(HAVE_ASSERT_H)
-//#  if defined(NDEBUG)
+#  if defined(NDEBUG)
 #   define assert(x)	/* nothing */
-//#  else
-//#   define assert(x)	do { if (!(x)) abort(); } while (0)
-//#  endif
+#  else
+#   define assert(x)	do { if (!(x)) abort(); } while (0)
+#  endif
 # endif
 
 # endif

components/mad/frame.h

@@ -24,40 +24,40 @@
 
 union huffquad {
   struct {
-    unsigned int final  :  1;
-    unsigned int bits   :  3;
-    unsigned int offset : 12;
+    unsigned short final  :  1;
+    unsigned short bits   :  3;
+    unsigned short offset : 12;
   } ptr;
   struct {
-    unsigned int final  :  1;
-    unsigned int hlen   :  3;
-    unsigned int v      :  1;
-    unsigned int w      :  1;
-    unsigned int x      :  1;
-    unsigned int y      :  1;
+    unsigned short final  :  1;
+    unsigned short hlen   :  3;
+    unsigned short v      :  1;
+    unsigned short w      :  1;
+    unsigned short x      :  1;
+    unsigned short y      :  1;
   } value;
-  unsigned int final    :  1;
+  unsigned short final    :  1;
 };
 
 union huffpair {
   struct {
-    unsigned int final  :  1;
-    unsigned int bits   :  3;
-    unsigned int offset : 12;
+    unsigned short final  :  1;
+    unsigned short bits   :  3;
+    unsigned short offset : 12;
   } ptr;
   struct {
-    unsigned int final  :  1;
-    unsigned int hlen   :  3;
-    unsigned int x      :  4;
-    unsigned int y      :  4;
+    unsigned short final  :  1;
+    unsigned short hlen   :  3;
+    unsigned short x      :  4;
+    unsigned short y      :  4;
   } value;
-  unsigned int final    :  1;
+  unsigned short final    :  1;
 };
 
 struct hufftable {
   union huffpair const *table;
-  unsigned int linbits;
-  unsigned int startbits;
+  unsigned short linbits;
+  unsigned short startbits;
 };
 
 extern union huffquad const *const mad_huff_quad_table[2];