Correct allocation tilt estimation in the CELT encoder for stereo.

Remove a redundant negative length check in celt_decode.
This commit is contained in:
Gregory Maxwell 2011-08-07 00:57:31 -04:00
parent fd386fd9cb
commit f93d81b15e

View file

@ -839,7 +839,7 @@ static int alloc_trim_analysis(const CELTMode *m, const celt_norm *X,
{ {
diff += bandLogE[i+c*m->nbEBands]*(opus_int32)(2+2*i-m->nbEBands); diff += bandLogE[i+c*m->nbEBands]*(opus_int32)(2+2*i-m->nbEBands);
} }
} while (++c<0); } while (++c<C);
diff /= C*(end-1); diff /= C*(end-1);
/*printf("%f\n", diff);*/ /*printf("%f\n", diff);*/
if (diff > QCONST16(2.f, DB_SHIFT)) if (diff > QCONST16(2.f, DB_SHIFT))
@ -2364,10 +2364,6 @@ int celt_decode_with_ec_float(CELTDecoder * restrict st, const unsigned char *da
RESTORE_STACK; RESTORE_STACK;
return frame_size/st->downsample; return frame_size/st->downsample;
} }
if (len<0) {
RESTORE_STACK;
return CELT_BAD_ARG;
}
if (dec == NULL) if (dec == NULL)
{ {