[FFmpeg-soc] [soc]: r2733 - aac/aac.c

[superdump]

Author: superdump
Date: Tue Jul  8 02:16:13 2008
New Revision: 2733

Log:
Rename functions


Modified:
   aac/aac.c

Modified: aac/aac.c
==============================================================================
--- aac/aac.c	(original)
+++ aac/aac.c	Tue Jul  8 02:16:13 2008
@@ -1326,7 +1326,7 @@ static int decode_spectral_data(AACConte
  * @param   pulse   pointer to pulse data struct
  * @param   icoef   array of quantized spectral data
  */
-static void pulse_tool(AACContext * ac, const IndividualChannelStream * ics, const Pulse * pulse, int icoef[1024]) {
+static void add_pulses(AACContext * ac, const IndividualChannelStream * ics, const Pulse * pulse, int icoef[1024]) {
     int i, off = ics->swb_offset[pulse->start];
     for (i = 0; i < pulse->num_pulse; i++) {
         int ic;
@@ -1344,7 +1344,7 @@ static void pulse_tool(AACContext * ac, 
  * @param   sf      array of scalefactors or intensity stereo positions used for a window group's scalefactor band
  * @param   coef    array of dequantized, scaled spectral data
  */
-static void quant_to_spectral(AACContext * ac, const IndividualChannelStream * ics, const int icoef[1024],
+static void dequant(AACContext * ac, const IndividualChannelStream * ics, const int icoef[1024],
         const enum Codebook cb[][64], const float sf[][64], float coef[1024]) {
     const uint16_t * offsets = ics->swb_offset;
     const int c = 1024/ics->num_window_groups;
@@ -1423,8 +1423,8 @@ static int decode_ics(AACContext * ac, G
     if (decode_spectral_data(ac, gb, ics, sce->cb, icoeffs) < 0)
         return -1;
     if (pulse.present)
-        pulse_tool(ac, ics, &pulse, icoeffs);
-    quant_to_spectral(ac, ics, icoeffs, sce->cb, sce->sf, out);
+        add_pulses(ac, ics, &pulse, icoeffs);
+    dequant(ac, ics, icoeffs, sce->cb, sce->sf, out);
     return 0;
 }
 
@@ -1874,7 +1874,7 @@ static void ltp_update_trans(AACContext 
 /**
  * Conduct IMDCT and windowing.
  */
-static void window_trans(AACContext * ac, SingleChannelElement * sce) {
+static void imdct_and_windowing(AACContext * ac, SingleChannelElement * sce) {
     IndividualChannelStream * ics = &sce->ics;
     float * in = sce->coeffs;
     float * out = sce->ret;
@@ -2184,7 +2184,7 @@ static void spectral_to_sample(AACContex
         transform_sce_tool(ac, ssr_trans);
     else
 #endif /* AAC_SSR */
-        transform_sce_tool(ac, window_trans);
+        transform_sce_tool(ac, imdct_and_windowing);
     coupling_tool(ac, 1, 1);
 #ifdef AAC_LTP
     if (ac->audioObjectType == AOT_AAC_LTP)