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

Make generic pcm-mixer.c more generic in the way it writes output.

Browse source 
Also remove unused firmmware/asm/generic directory.

Change-Id: If1961f96f4292f00227a9b0148181152ac405e51
This commit is contained in:
Michael Sevakis 2012-02-05 22:35:23 -05:00
parent 64f71e66b2
commit 691c7a7614
2 changed files with 15 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

100
firmware/asm/generic/pcm-mixer.c
View file

@ -1,100 +0,0 @@
/***************************************************************************
* __________ __ ___.
* Open \______ \ ____ ____ | | _\_ |__ _______ ___
* Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
* Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
* Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
* \/ \/ \/ \/ \/
* $Id$
*
* Copyright (C) 2011 by Michael Sevakis
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
****************************************************************************/
#include "dsp-util.h" /* for clip_sample_16 */
/* Mix channels' samples and apply gain factors */
static FORCE_INLINE void mix_samples(uint32_t *out,
int16_t *src0,
int32_t src0_amp,
int16_t *src1,
int32_t src1_amp,
size_t size)
{
if (src0_amp == MIX_AMP_UNITY && src1_amp == MIX_AMP_UNITY)
{
/* Both are unity amplitude */
do
{
int32_t l = *src0++ + *src1++;
int32_t h = *src0++ + *src1++;
*out++ = (uint16_t)clip_sample_16(l) | (clip_sample_16(h) << 16);
}
while ((size -= 4) > 0);
}
else if (src0_amp != MIX_AMP_UNITY && src1_amp != MIX_AMP_UNITY)
{
/* Neither are unity amplitude */
do
{
int32_t l = (*src0++ * src0_amp >> 16) + (*src1++ * src1_amp >> 16);
int32_t h = (*src0++ * src0_amp >> 16) + (*src1++ * src1_amp >> 16);
*out++ = (uint16_t)clip_sample_16(l) | (clip_sample_16(h) << 16);
}
while ((size -= 4) > 0);
}
else
{
/* One is unity amplitude */
if (src0_amp != MIX_AMP_UNITY)
{
/* Keep unity in src0, amp0 */
int16_t *src_tmp = src0;
src0 = src1;
src1 = src_tmp;
src1_amp = src0_amp;
src0_amp = MIX_AMP_UNITY;
}
do
{
int32_t l = *src0++ + (*src1++ * src1_amp >> 16);
int32_t h = *src0++ + (*src1++ * src1_amp >> 16);
*out++ = (uint16_t)clip_sample_16(l) | (clip_sample_16(h) << 16);
}
while ((size -= 4) > 0);
}
}
/* Write channel's samples and apply gain factor */
static FORCE_INLINE void write_samples(uint32_t *out,
int16_t *src,
int32_t amp,
size_t size)
{
if (LIKELY(amp == MIX_AMP_UNITY))
{
/* Channel is unity amplitude */
memcpy(out, src, size);
}
else
{
/* Channel needs amplitude cut */
do
{
int32_t l = *src++ * amp >> 16;
int32_t h = *src++ * amp & 0xffff0000;
*out++ = (uint16_t)l | h;
}
while ((size -= 4) > 0);
}
}
#endif

27
firmware/asm/pcm-mixer.c
View file

@ -25,10 +25,9 @@
#include "m68k/pcm-mixer.c" #include "m68k/pcm-mixer.c"
#else #else
/* generic pcm-mixer.c */
#include "dsp-util.h" /* for clip_sample_16 */ #include "dsp-util.h" /* for clip_sample_16 */
/* Mix channels' samples and apply gain factors */ /* Mix channels' samples and apply gain factors */
static FORCE_INLINE void mix_samples(uint32_t *out, static FORCE_INLINE void mix_samples(uint16_t *out,
int16_t *src0, int16_t *src0,
int32_t src0_amp, int32_t src0_amp,
int16_t *src1, int16_t *src1,
@ -42,9 +41,10 @@ static FORCE_INLINE void mix_samples(uint32_t *out,
{ {
int32_t l = *src0++ + *src1++; int32_t l = *src0++ + *src1++;
int32_t h = *src0++ + *src1++; int32_t h = *src0++ + *src1++;
*out++ = (uint16_t)clip_sample_16(l) | (clip_sample_16(h) << 16); *out++ = clip_sample_16(l);
*out++ = clip_sample_16(h);
} }
while ((size -= 4) > 0); while ((size -= 2*sizeof(int16_t)) > 0);
} }
else if (src0_amp != MIX_AMP_UNITY && src1_amp != MIX_AMP_UNITY) else if (src0_amp != MIX_AMP_UNITY && src1_amp != MIX_AMP_UNITY)
{ {
@ -53,9 +53,10 @@ static FORCE_INLINE void mix_samples(uint32_t *out,
{ {
int32_t l = (*src0++ * src0_amp >> 16) + (*src1++ * src1_amp >> 16); int32_t l = (*src0++ * src0_amp >> 16) + (*src1++ * src1_amp >> 16);
int32_t h = (*src0++ * src0_amp >> 16) + (*src1++ * src1_amp >> 16); int32_t h = (*src0++ * src0_amp >> 16) + (*src1++ * src1_amp >> 16);
*out++ = (uint16_t)clip_sample_16(l) | (clip_sample_16(h) << 16); *out++ = clip_sample_16(l);
*out++ = clip_sample_16(h);
} }
while ((size -= 4) > 0); while ((size -= 2*sizeof(int16_t)) > 0);
} }
else else
{ {
@ -74,9 +75,10 @@ static FORCE_INLINE void mix_samples(uint32_t *out,
{ {
int32_t l = *src0++ + (*src1++ * src1_amp >> 16); int32_t l = *src0++ + (*src1++ * src1_amp >> 16);
int32_t h = *src0++ + (*src1++ * src1_amp >> 16); int32_t h = *src0++ + (*src1++ * src1_amp >> 16);
*out++ = (uint16_t)clip_sample_16(l) | (clip_sample_16(h) << 16); *out++ = clip_sample_16(l);
*out++ = clip_sample_16(h);
} }
while ((size -= 4) > 0); while ((size -= 2*sizeof(int16_t)) > 0);
} }
} }
@ -97,12 +99,13 @@ static FORCE_INLINE void write_samples(uint32_t *out,
do do
{ {
int32_t l = *src++ * amp >> 16; int32_t l = *src++ * amp >> 16;
int32_t h = *src++ * amp & 0xffff0000; int32_t h = *src++ * amp >> 16;
*out++ = (uint16_t)l | h; *out++ = l;
*out++ = h;
} }
while ((size -= 4) > 0); while ((size -= 2*sizeof(int16_t)) > 0);
} }
} }
#endif #endif /* CPU_* */