Author: andoma Date: Wed Mar 5 11:10:06 2008 New Revision: 1956 Log: Move the vector-functions that are only used by SSR code closer to the other SSR functions. This is part of adding #ifdefs around all the SSR related code. Modified: aac/aac.c Modified: aac/aac.c ============================================================================== --- aac/aac.c (original) +++ aac/aac.c Wed Mar 5 11:10:06 2008 @@ -333,12 +333,6 @@ typedef struct { //aux // TODO: Maybe add to dsputil?! -static void vector_add_dst(AACContext * ac, float * dst, const float * src0, const float * src1, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src0[i] + src1[i]; -} - static void vector_fmul_dst(AACContext * ac, float * dst, const float * src0, const float * src1, int len) { memcpy(dst, src0, len * sizeof(float)); ac->dsp.vector_fmul(dst, src1, len); @@ -351,12 +345,6 @@ static void vector_fmul_add_add_add(AACC dst[i] += src3[i]; } -static void vector_reverse(AACContext * ac, float * dst, const float * src, int len) { - int i; - for (i = 0; i < len; i++) - dst[i] = src[len - i]; -} - static inline int16_t LTP_ROUND(float x) { if (x >= 0) { @@ -1892,6 +1880,12 @@ static void window_ssr_tool(AACContext * } } +static void vector_add_dst(AACContext * ac, float * dst, const float * src0, const float * src1, int len) { + int i; + for (i = 0; i < len; i++) + dst[i] = src0[i] + src1[i]; +} + static void ssr_gain_tool(AACContext * ac, sce_struct * sce, int band, float * in, float * preret, float * saved) { // TODO: 'in' buffer gain normalization if (sce->ics.window_sequence != EIGHT_SHORT_SEQUENCE) { @@ -1948,6 +1942,12 @@ static void ssr_ipqf_tool(AACContext * a } } +static void vector_reverse(AACContext * ac, float * dst, const float * src, int len) { + int i; + for (i = 0; i < len; i++) + dst[i] = src[len - i]; +} + static void ssr_trans(AACContext * ac, sce_struct * sce) { float * in = sce->coeffs; DECLARE_ALIGNED_16(float, tmp_buf[512]);
participants (1)
-
andoma