aacenc: Don't make unnecessary compares to the escape value in tight loops.
authorAlex Converse <alex.converse@gmail.com>
Mon, 21 Sep 2009 03:41:08 +0000 (03:41 +0000)
committerAlex Converse <alex.converse@gmail.com>
Mon, 21 Sep 2009 03:41:08 +0000 (03:41 +0000)
Originally committed as revision 19943 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/aaccoder.c

index ed1d241..4f0e58d 100644 (file)
@@ -173,12 +173,12 @@ static float quantize_band_cost(struct AACEncContext *s, const float *in,
                 for (k = 0; k < dim; k++) {
                     float t = fabsf(in[i+k]);
                     float di;
+                    if (vec[k] == 64.0f) { //FIXME: slow
                     //do not code with escape sequence small values
-                    if (vec[k] == 64.0f && t < 39.0f*IQ) {
+                    if (t < 39.0f*IQ) {
                         rd = INFINITY;
                         break;
                     }
-                    if (vec[k] == 64.0f) { //FIXME: slow
                         if (t >= CLIPPED_ESCAPE) {
                             di = t - CLIPPED_ESCAPE;
                             curbits += 21;
@@ -288,12 +288,12 @@ static void quantize_and_encode_band(struct AACEncContext *s, PutBitContext *pb,
                 for (k = 0; k < dim; k++) {
                     float t = fabsf(in[i+k]);
                     float di;
+                    if (vec[k] == 64.0f) { //FIXME: slow
                     //do not code with escape sequence small values
-                    if (vec[k] == 64.0f && t < 39.0f*IQ) {
+                    if (t < 39.0f*IQ) {
                         rd = INFINITY;
                         break;
                     }
-                    if (vec[k] == 64.0f) { //FIXME: slow
                         if (t >= CLIPPED_ESCAPE) {
                             di = t - CLIPPED_ESCAPE;
                             curbits += 21;