[FFmpeg-cvslog] r17599 - trunk/libavcodec/aac.c

[alexc]

Author: alexc
Date: Thu Feb 26 02:51:34 2009
New Revision: 17599

Log:
Refactor AAC unsigned band type decoding for a modest speedup.

Modified:
   trunk/libavcodec/aac.c

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Thu Feb 26 02:50:00 2009	(r17598)
+++ trunk/libavcodec/aac.c	Thu Feb 26 02:51:34 2009	(r17599)
@@ -805,14 +805,6 @@ static int decode_spectrum_and_dequant(A
                                 if (vq_ptr[2]) coef[coef_tmp_idx + 2] = sign_lookup[get_bits1(gb)];
                                 if (vq_ptr[3]) coef[coef_tmp_idx + 3] = sign_lookup[get_bits1(gb)];
                             }
-                        }else {
-                            coef[coef_tmp_idx    ] = 1.0f;
-                            coef[coef_tmp_idx + 1] = 1.0f;
-                            if (dim == 4) {
-                                coef[coef_tmp_idx + 2] = 1.0f;
-                                coef[coef_tmp_idx + 3] = 1.0f;
-                            }
-                        }
                         if (cur_band_type == ESC_BT) {
                             for (j = 0; j < 2; j++) {
                                 if (vq_ptr[j] == 64.0f) {
@@ -838,6 +830,14 @@ static int decode_spectrum_and_dequant(A
                                 coef[coef_tmp_idx + 3] *= vq_ptr[3];
                             }
                         }
+                        }else {
+                            coef[coef_tmp_idx    ] = vq_ptr[0];
+                            coef[coef_tmp_idx + 1] = vq_ptr[1];
+                            if (dim == 4) {
+                                coef[coef_tmp_idx + 2] = vq_ptr[2];
+                                coef[coef_tmp_idx + 3] = vq_ptr[3];
+                            }
+                        }
                         coef[coef_tmp_idx    ] *= sf[idx];
                         coef[coef_tmp_idx + 1] *= sf[idx];
                         if (dim == 4) {