Commit a71e9b62 authored by Alex Converse's avatar Alex Converse

aacenc: Don't make unnecessary compares to the escape value in tight loops.

Originally committed as revision 19943 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 1a918c08
...@@ -173,12 +173,12 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in, ...@@ -173,12 +173,12 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in,
for (k = 0; k < dim; k++) { for (k = 0; k < dim; k++) {
float t = fabsf(in[i+k]); float t = fabsf(in[i+k]);
float di; float di;
if (vec[k] == 64.0f) { //FIXME: slow
//do not code with escape sequence small values //do not code with escape sequence small values
if (vec[k] == 64.0f && t < 39.0f*IQ) { if (t < 39.0f*IQ) {
rd = INFINITY; rd = INFINITY;
break; break;
} }
if (vec[k] == 64.0f) { //FIXME: slow
if (t >= CLIPPED_ESCAPE) { if (t >= CLIPPED_ESCAPE) {
di = t - CLIPPED_ESCAPE; di = t - CLIPPED_ESCAPE;
curbits += 21; curbits += 21;
...@@ -288,12 +288,12 @@ static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb, ...@@ -288,12 +288,12 @@ static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb,
for (k = 0; k < dim; k++) { for (k = 0; k < dim; k++) {
float t = fabsf(in[i+k]); float t = fabsf(in[i+k]);
float di; float di;
if (vec[k] == 64.0f) { //FIXME: slow
//do not code with escape sequence small values //do not code with escape sequence small values
if (vec[k] == 64.0f && t < 39.0f*IQ) { if (t < 39.0f*IQ) {
rd = INFINITY; rd = INFINITY;
break; break;
} }
if (vec[k] == 64.0f) { //FIXME: slow
if (t >= CLIPPED_ESCAPE) { if (t >= CLIPPED_ESCAPE) {
di = t - CLIPPED_ESCAPE; di = t - CLIPPED_ESCAPE;
curbits += 21; curbits += 21;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment