devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

note to self: never commit a fix in a hurry.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6186 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jean-Philippe Bernardy 2005-03-10 22:08:42 +00:00
parent 5b4a339486
commit 6c3a875ec7
1 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/codecs/libmad/layer3.c
View file

@ -25,9 +25,6 @@
# include "global.h" # include "global.h"
#include "debug.h"
# include <string.h> # include <string.h>
# ifdef HAVE_ASSERT_H # ifdef HAVE_ASSERT_H
@ -837,8 +834,8 @@ void III_exponents(struct channel const *channel,
exponents[sfbi] = gain - exponents[sfbi] = gain -
(signed int) ((channel->scalefac[sfbi] + (pretab[sfbi] & premask)) << (signed int) ((channel->scalefac[sfbi] + (pretab[sfbi] & premask)) <<
scalefac_multiplier); scalefac_multiplier);
unsigned int w = sfbwidth[sfbi++];
l += 3 * w; l += sfbwidth[sfbi++];
} }
} }
@ -855,8 +852,8 @@ void III_exponents(struct channel const *channel,
(signed int) (channel->scalefac[sfbi + 1] << scalefac_multiplier); (signed int) (channel->scalefac[sfbi + 1] << scalefac_multiplier);
exponents[sfbi + 2] = gain2 - exponents[sfbi + 2] = gain2 -
(signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier); (signed int) (channel->scalefac[sfbi + 2] << scalefac_multiplier);
unsigned int w = sfbwidth[sfbi];
l += sfbwidth[sfbi]; l += 3 * w;
sfbi += 3; sfbi += 3;
} }
} }
@ -2639,15 +2636,12 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
enum mad_error error; enum mad_error error;
int result = 0; int result = 0;
DEBUGF("mad_layer_III: 0 Enter");
/* allocate Layer III dynamic structures */ /* allocate Layer III dynamic structures */
if (stream->main_data == 0) { if (stream->main_data == 0) {
stream->main_data = malloc(MAD_BUFFER_MDLEN); stream->main_data = malloc(MAD_BUFFER_MDLEN);
if (stream->main_data == 0) { if (stream->main_data == 0) {
stream->error = MAD_ERROR_NOMEM; stream->error = MAD_ERROR_NOMEM;
DEBUGF("mad_layer_III: Nomem 1");
return -1; return -1;
} }
} }
@ -2656,7 +2650,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
frame->overlap = calloc(2 * 32 * 18, sizeof(mad_fixed_t)); frame->overlap = calloc(2 * 32 * 18, sizeof(mad_fixed_t));
if (frame->overlap == 0) { if (frame->overlap == 0) {
stream->error = MAD_ERROR_NOMEM; stream->error = MAD_ERROR_NOMEM;
DEBUGF("mad_layer_III: Nomem 2");
return -1; return -1;
} }
} }
@ -2671,8 +2664,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
(signed int) si_len) { (signed int) si_len) {
stream->error = MAD_ERROR_BADFRAMELEN; stream->error = MAD_ERROR_BADFRAMELEN;
stream->md_len = 0; stream->md_len = 0;
DEBUGF("mad_layer_III: Insane frame");
return -1; return -1;
} }
@ -2686,7 +2677,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
!(frame->options & MAD_OPTION_IGNORECRC)) { !(frame->options & MAD_OPTION_IGNORECRC)) {
stream->error = MAD_ERROR_BADCRC; stream->error = MAD_ERROR_BADCRC;
result = -1; result = -1;
DEBUGF("mad_layer_III: CRC incorrect");
} }
} }
@ -2697,7 +2687,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
if (error && result == 0) { if (error && result == 0) {
stream->error = error; stream->error = error;
result = -1; result = -1;
DEBUGF("mad_layer_III: III_sideinfo error");
} }
header->flags |= priv_bitlen; header->flags |= priv_bitlen;
@ -2745,9 +2734,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
if (result == 0) { if (result == 0) {
stream->error = MAD_ERROR_BADDATAPTR; stream->error = MAD_ERROR_BADDATAPTR;
result = -1; result = -1;
DEBUGF("mad_layer_III: bad data ptr si.main_data_begin=%x stream->md_len=%x", si.main_data_begin, stream->md_len);
DEBUGF("frame space = %x", frame_space);
DEBUGF("next_md_begin = %x", next_md_begin);
} }
} }
else { else {
@ -2774,7 +2760,6 @@ int mad_layer_III(struct mad_stream *stream, struct mad_frame *frame)
error = III_decode(&ptr, frame, &si, nch); error = III_decode(&ptr, frame, &si, nch);
if (error) { if (error) {
stream->error = error; stream->error = error;
DEBUGF("mad_layer_III: III_decode error");
result = -1; result = -1;
} }