devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Don't use function in a function

Browse source 
It is not supported by clang
This commit is contained in:
Rafaël Carré 2012-05-06 23:34:56 -04:00
parent 65bb8e4452
commit 06c8ab852b
1 changed files with 28 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

56
lib/rbcodec/codecs/mp3_enc.c
View file

@ -2082,6 +2082,34 @@ static bool init_mp3_encoder_engine(int sample_rate,
return true; 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) ICODE_ATTR;
STATICIRAM void to_mono_mm(void) 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 = &mfbuf[2*512];
uint16_t *samp_end = samp + 2*samp_per_frame; 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 do
{ {
to_mono(&samp); to_mono(&samp);