From 06c8ab852b7be4b2788c7d3bfc41e1def3c09503 Mon Sep 17 00:00:00 2001 From: Rafaël Carré Date: Sun, 6 May 2012 23:34:56 -0400 Subject: Don't use function in a function It is not supported by clang --- lib/rbcodec/codecs/mp3_enc.c | 56 ++++++++++++++++++++++---------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/lib/rbcodec/codecs/mp3_enc.c b/lib/rbcodec/codecs/mp3_enc.c index 2f5528f74c..f765e6bba6 100644 --- a/lib/rbcodec/codecs/mp3_enc.c +++ b/lib/rbcodec/codecs/mp3_enc.c @@ -2082,6 +2082,34 @@ static bool init_mp3_encoder_engine(int sample_rate, return true; } +static inline void to_mono(uint16_t **samp) +{ + int16_t l = **samp; + int16_t r = *(*samp+1); + int32_t m; + + switch(cfg.rec_mono_mode) + { + case 1: + /* mono = L */ + m = l; + break; + case 2: + /* mono = R */ + m = r; + break; + case 0: + default: + /* mono = (L+R)/2 */ + m = l + r + err; + err = m & 1; + m >>= 1; + break; + } + *(*samp)++ = (uint16_t)m; + *(*samp)++ = (uint16_t)m; +} /* to_mono */ + STATICIRAM void to_mono_mm(void) ICODE_ATTR; STATICIRAM void to_mono_mm(void) { @@ -2091,34 +2119,6 @@ STATICIRAM void to_mono_mm(void) uint16_t *samp = &mfbuf[2*512]; uint16_t *samp_end = samp + 2*samp_per_frame; - inline void to_mono(uint16_t **samp) - { - int16_t l = **samp; - int16_t r = *(*samp+1); - int32_t m; - - switch(cfg.rec_mono_mode) - { - case 1: - /* mono = L */ - m = l; - break; - case 2: - /* mono = R */ - m = r; - break; - case 0: - default: - /* mono = (L+R)/2 */ - m = l + r + err; - err = m & 1; - m >>= 1; - break; - } - *(*samp)++ = (uint16_t)m; - *(*samp)++ = (uint16_t)m; - } /* to_mono */ - do { to_mono(&samp); -- cgit v1.2.3