diff options
Diffstat (limited to 'firmware/pcm_mixer.c')
-rw-r--r-- | firmware/pcm_mixer.c | 104 |
1 files changed, 2 insertions, 102 deletions
diff --git a/firmware/pcm_mixer.c b/firmware/pcm_mixer.c index 25c41c2586..0038b0f5e7 100644 --- a/firmware/pcm_mixer.c +++ b/firmware/pcm_mixer.c @@ -70,108 +70,8 @@ static struct mixer_channel * active_channels[PCM_MIXER_NUM_CHANNELS+1] IBSS_ATT #define MAX_IDLE_FRAMES (NATIVE_FREQUENCY*3 / MIX_FRAME_SAMPLES) static unsigned int idle_counter = 0; -#if (CONFIG_PLATFORM & PLATFORM_NATIVE) - -/* Include any implemented CPU-optimized mixdown routines */ -#if defined(CPU_ARM) -#if ARM_ARCH >= 6 -#include "pcm-mixer-armv6.c" -#elif ARM_ARCH >= 5 -#include "pcm-mixer-armv5.c" -#else -#include "pcm-mixer-armv4.c" -#endif /* ARM_ARCH */ -#elif defined (CPU_COLDFIRE) -#include "pcm-mixer-coldfire.c" -#endif /* CPU_* */ - -#endif /* CONFIG_PLATFORM */ - -/** Generic mixing routines **/ - -#ifndef MIXER_OPTIMIZED_MIX_SAMPLES -#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); - } -} -#endif /* MIXER_OPTIMIZED_MIX_SAMPLES */ - -#ifndef MIXER_OPTIMIZED_WRITE_SAMPLES -/* 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 /* MIXER_OPTIMIZED_WRITE_SAMPLES */ - +/** Mixing routines, CPU optmized **/ +#include "asm/pcm-mixer.c" /** Private generic routines **/ |