ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add volume control to NEON ASM.

This commit is contained in:
Themaister 2013-12-29 12:59:57 +01:00
parent 2be201ecf3
commit 92753e8b8a
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
audio/utils.c
View File

@ -140,19 +140,17 @@ void audio_convert_float_to_s16_altivec(int16_t *out,
audio_convert_float_to_s16_C(out, in, samples); audio_convert_float_to_s16_C(out, in, samples);
} }
#elif defined(HAVE_NEON) #elif defined(HAVE_NEON)
void audio_convert_s16_float_asm(float *out, const int16_t *in, size_t samples); void audio_convert_s16_float_asm(float *out, const int16_t *in, size_t samples, const float *gain); // Avoid potential hard-float/soft-float ABI issues.
static void audio_convert_s16_to_float_neon(float *out, const int16_t *in, size_t samples, static void audio_convert_s16_to_float_neon(float *out, const int16_t *in, size_t samples,
float gain) float gain)
{ {
(void)gain; // gain is ignored for now.
size_t aligned_samples = samples & ~7; size_t aligned_samples = samples & ~7;
if (aligned_samples) if (aligned_samples)
audio_convert_s16_float_asm(out, in, aligned_samples); audio_convert_s16_float_asm(out, in, aligned_samples, &gain);
// Could do all conversion in ASM, but keep it simple for now. // Could do all conversion in ASM, but keep it simple for now.
audio_convert_s16_to_float_C(out + aligned_samples, in + aligned_samples, audio_convert_s16_to_float_C(out + aligned_samples, in + aligned_samples,
samples - aligned_samples, 1.0f); samples - aligned_samples, gain);
} }
void audio_convert_float_s16_asm(int16_t *out, const float *in, size_t samples); void audio_convert_float_s16_asm(int16_t *out, const float *in, size_t samples);

6
audio/utils_neon.S
View File

@ -17,7 +17,7 @@
.align 4 .align 4
.globl audio_convert_s16_float_asm .globl audio_convert_s16_float_asm
# audio_convert_s16_float_asm(float *out, const int16_t *in, size_t samples) # audio_convert_s16_float_asm(float *out, const int16_t *in, size_t samples, const float *gain)
audio_convert_s16_float_asm: audio_convert_s16_float_asm:
# Hacky way to get a constant of 2^-15. # Hacky way to get a constant of 2^-15.
# Might be faster to just load a constant from memory. # Might be faster to just load a constant from memory.
@ -28,6 +28,10 @@ audio_convert_s16_float_asm:
vmul.f32 q8, q8, q8 vmul.f32 q8, q8, q8
vadd.f32 q8, q8, q8 vadd.f32 q8, q8, q8
# Apply gain
vld1.f32 {d6[0]}, [r3]
vmul.f32 q8, q8, d6[0]
1: 1:
# Preload here? # Preload here?
vld1.s16 {q0}, [r1]! vld1.s16 {q0}, [r1]!