eden-emu/opus
15
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-05-30 23:27:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Using SSAT in SIG2WORD16() on ARMv6

Browse source
This commit is contained in:
Jean-Marc Valin 2014-01-22 19:22:05 -05:00
parent 9b3a3ad7ff
commit 2e6876c07a
4 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
celt/arch.h
View file

@ -226,6 +226,8 @@ static OPUS_INLINE int celt_isnan(float x)
#define SCALEIN(a) ((a)*CELT_SIG_SCALE) #define SCALEIN(a) ((a)*CELT_SIG_SCALE)
#define SCALEOUT(a) ((a)*(1/CELT_SIG_SCALE)) #define SCALEOUT(a) ((a)*(1/CELT_SIG_SCALE))
#define SIG2WORD16(x) (x)
#endif /* !FIXED_POINT */ #endif /* !FIXED_POINT */
#ifndef GLOBAL_STACK_SIZE #ifndef GLOBAL_STACK_SIZE

18
celt/arm/fixed_armv5e.h
View file

@ -130,4 +130,22 @@ static OPUS_INLINE opus_val32 MULT16_16_armv5e(opus_val16 a, opus_val16 b)
} }
#define MULT16_16(a, b) (MULT16_16_armv5e(a, b)) #define MULT16_16(a, b) (MULT16_16_armv5e(a, b))
#ifdef OPUS_ARM_INLINE_MEDIA
#undef SIG2WORD16
static OPUS_INLINE opus_val16 SIG2WORD16_armv6(opus_val32 x)
{
celt_sig res;
__asm__(
"#SIG2WORD16\n\t"
"ssat %0, #16, %1, ASR #12\n\t"
: "=r"(res)
: "r"(x+2048)
);
return EXTRACT16(res);
}
#define SIG2WORD16(x) (SIG2WORD16_armv6(x))
#endif /* OPUS_ARM_INLINE_MEDIA */
#endif #endif

11
celt/celt_decoder.c
View file

@ -178,17 +178,6 @@ void opus_custom_decoder_destroy(CELTDecoder *st)
} }
#endif /* CUSTOM_MODES */ #endif /* CUSTOM_MODES */
static OPUS_INLINE opus_val16 SIG2WORD16(celt_sig x)
{
#ifdef FIXED_POINT
x = PSHR32(x, SIG_SHIFT);
x = MAX32(x, -32768);
x = MIN32(x, 32767);
return EXTRACT16(x);
#else
return (opus_val16)x;
#endif
}
#ifndef RESYNTH #ifndef RESYNTH
static static

9
celt/fixed_generic.h
View file

@ -135,4 +135,13 @@
/** Divide a 32-bit value by a 32-bit value. Result fits in 32 bits */ /** Divide a 32-bit value by a 32-bit value. Result fits in 32 bits */
#define DIV32(a,b) (((opus_val32)(a))/((opus_val32)(b))) #define DIV32(a,b) (((opus_val32)(a))/((opus_val32)(b)))
static OPUS_INLINE opus_val16 SIG2WORD16_generic(celt_sig x)
{
x = PSHR32(x, SIG_SHIFT);
x = MAX32(x, -32768);
x = MIN32(x, 32767);
return EXTRACT16(x);
}
#define SIG2WORD16(x) (SIG2WORD16_generic(x))
#endif #endif