diff options
author | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2005-03-10 22:08:42 +0000 |
---|---|---|
committer | Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com> | 2005-03-10 22:08:42 +0000 |
commit | 6c3a875ec7075800d7c48269fedefaecbf5b67a3 (patch) | |
tree | 17b6fa79a4c5d62f09ab3e2d5aceeff3116dc680 /apps/codecs/libmad | |
parent | 5b4a339486077fbce9928cc9e4d27f0add698f1e (diff) | |
download | rockbox-6c3a875ec7075800d7c48269fedefaecbf5b67a3.tar.gz rockbox-6c3a875ec7075800d7c48269fedefaecbf5b67a3.zip |
note to self: never commit a fix in a hurry.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6186 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libmad')
-rw-r--r-- | apps/codecs/libmad/layer3.c | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/apps/codecs/libmad/layer3.c b/apps/codecs/libmad/layer3.c index 732269f8de..7449be71f2 100644 --- a/apps/codecs/libmad/layer3.c +++ b/apps/codecs/libmad/layer3.c | |||
@@ -25,9 +25,6 @@ | |||
25 | 25 | ||
26 | # include "global.h" | 26 | # include "global.h" |
27 | 27 | ||
28 | #include "debug.h" | ||
29 | |||
30 | |||
31 | # include <string.h> | 28 | # include <string.h> |
32 | 29 | ||
33 | # ifdef HAVE_ASSERT_H | 30 | # ifdef HAVE_ASSERT_H |
@@ -837,8 +834,8 @@ void III_exponents(struct channel const *channel, | |||
837 | exponents[sfbi] = gain - | 834 | exponents[sfbi] = gain - |
838 | (signed int) ((channel->scalefac[sfbi] + (pretab[sfbi] & premask)) << | 835 | (signed int) ((channel->scalefac[sfbi] + (pretab[sfbi] & premask)) << |
839 | scalefac_multiplier); | 836 | scalefac_multiplier); |
840 | unsigned int w = sfbwidth[sfbi++]; | 837 | |
841 | l += 3 * w; | 838 | l += sfbwidth[sfbi++]; |
842 | } | 839 | } |
843 | } | 840 | } |
844 | 841 | ||
@@ -855,8 +852,8 @@ void III_exponents(struct channel const *channel, | |||
855 | (signed int) (channel->scalefac[sfbi + 1] << scalefac_multiplier); | 852 | (signed int) (channel->scalefac[sfbi + 1] << scalefac_multiplier); |
856 | exponents[sfbi + 2] = gain2 - | 853 | exponents[sfbi + 2] = gain2 - |
857 | (signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier); | 854 | (signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier); |
858 | 855 | unsigned int w = sfbwidth[sfbi]; | |
859 | l += sfbwidth[sfbi]; | 856 | l += 3 * w; |
860 | sfbi += 3; | 857 | sfbi += 3; |
861 | } | 858 | } |
862 | } | 859 | } |
@@ -2639,15 +2636,12 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) | |||
2639 | enum mad_error error; | 2636 | enum mad_error error; |
2640 | int result = 0; | 2637 | int result = 0; |
2641 | 2638 | ||
2642 | DEBUGF("mad_layer_III: 0 Enter"); | ||
2643 | |||
2644 | /* allocate Layer III dynamic structures */ | 2639 | /* allocate Layer III dynamic structures */ |
2645 | 2640 | ||
2646 | if (stream->main_data == 0) { | 2641 | if (stream->main_data == 0) { |
2647 | stream->main_data = malloc(MAD_BUFFER_MDLEN); | 2642 | stream->main_data = malloc(MAD_BUFFER_MDLEN); |
2648 | if (stream->main_data == 0) { | 2643 | if (stream->main_data == 0) { |
2649 | stream->error = MAD_ERROR_NOMEM; | 2644 | stream->error = MAD_ERROR_NOMEM; |
2650 | DEBUGF("mad_layer_III: Nomem 1"); | ||
2651 | return -1; | 2645 | return -1; |
2652 | } | 2646 | } |
2653 | } | 2647 | } |
@@ -2656,7 +2650,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) | |||
2656 | frame->overlap = calloc(2 * 32 * 18, sizeof(mad_fixed_t)); | 2650 | frame->overlap = calloc(2 * 32 * 18, sizeof(mad_fixed_t)); |
2657 | if (frame->overlap == 0) { | 2651 | if (frame->overlap == 0) { |
2658 | stream->error = MAD_ERROR_NOMEM; | 2652 | stream->error = MAD_ERROR_NOMEM; |
2659 | DEBUGF("mad_layer_III: Nomem 2"); | ||
2660 | return -1; | 2653 | return -1; |
2661 | } | 2654 | } |
2662 | } | 2655 | } |
@@ -2671,8 +2664,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) | |||
2671 | (signed int) si_len) { | 2664 | (signed int) si_len) { |
2672 | stream->error = MAD_ERROR_BADFRAMELEN; | 2665 | stream->error = MAD_ERROR_BADFRAMELEN; |
2673 | stream->md_len = 0; | 2666 | stream->md_len = 0; |
2674 | DEBUGF("mad_layer_III: Insane frame"); | ||
2675 | |||
2676 | return -1; | 2667 | return -1; |
2677 | } | 2668 | } |
2678 | 2669 | ||
@@ -2686,7 +2677,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) | |||
2686 | !(frame->options & MAD_OPTION_IGNORECRC)) { | 2677 | !(frame->options & MAD_OPTION_IGNORECRC)) { |
2687 | stream->error = MAD_ERROR_BADCRC; | 2678 | stream->error = MAD_ERROR_BADCRC; |
2688 | result = -1; | 2679 | result = -1; |
2689 | DEBUGF("mad_layer_III: CRC incorrect"); | ||
2690 | } | 2680 | } |
2691 | } | 2681 | } |
2692 | 2682 | ||
@@ -2697,7 +2687,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) | |||
2697 | if (error && result == 0) { | 2687 | if (error && result == 0) { |
2698 | stream->error = error; | 2688 | stream->error = error; |
2699 | result = -1; | 2689 | result = -1; |
2700 | DEBUGF("mad_layer_III: III_sideinfo error"); | ||
2701 | } | 2690 | } |
2702 | 2691 | ||
2703 | header->flags |= priv_bitlen; | 2692 | header->flags |= priv_bitlen; |
@@ -2745,9 +2734,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) | |||
2745 | if (result == 0) { | 2734 | if (result == 0) { |
2746 | stream->error = MAD_ERROR_BADDATAPTR; | 2735 | stream->error = MAD_ERROR_BADDATAPTR; |
2747 | result = -1; | 2736 | result = -1; |
2748 | DEBUGF("mad_layer_III: bad data ptr si.main_data_begin=%x stream->md_len=%x", si.main_data_begin, stream->md_len); | ||
2749 | DEBUGF("frame space = %x", frame_space); | ||
2750 | DEBUGF("next_md_begin = %x", next_md_begin); | ||
2751 | } | 2737 | } |
2752 | } | 2738 | } |
2753 | else { | 2739 | else { |
@@ -2774,7 +2760,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame) | |||
2774 | error = III_decode(&ptr, frame, &si, nch); | 2760 | error = III_decode(&ptr, frame, &si, nch); |
2775 | if (error) { | 2761 | if (error) { |
2776 | stream->error = error; | 2762 | stream->error = error; |
2777 | DEBUGF("mad_layer_III: III_decode error"); | ||
2778 | result = -1; | 2763 | result = -1; |
2779 | } | 2764 | } |
2780 | 2765 | ||