9b7ec42403
Sync to commit bb4b6885a139644cf3ac14e7deda9f633ec2d93c This brings in a bunch of optimizations to decode speed and memory usage. Allocations are switched from using the pseudostack to using the real stack. Enabled hacks to reduce stack usage. This should fix crashes on sansa clip, although some files will not play due to failing allocations in the codec buffer. Speeds up decoding of the following test files: H300 (cf) C200 (arm7tdmi) ipod classic (arm9e) 16 kbps (silk) 14.28 MHz 4.00 MHz 2.61 MHz 64 kbps (celt) 4.09 MHz 8.08 MHz 6.24 MHz 128 kbps (celt) 1.93 MHz 8.83 MHz 6.53 MHz Change-Id: I851733a8a5824b61feb363a173091bc7e6629b58
126 lines
5.4 KiB
C
126 lines
5.4 KiB
C
/***********************************************************************
|
|
Copyright (c) 2006-2011, Skype Limited. All rights reserved.
|
|
Redistribution and use in source and binary forms, with or without
|
|
modification, are permitted provided that the following conditions
|
|
are met:
|
|
- Redistributions of source code must retain the above copyright notice,
|
|
this list of conditions and the following disclaimer.
|
|
- Redistributions in binary form must reproduce the above copyright
|
|
notice, this list of conditions and the following disclaimer in the
|
|
documentation and/or other materials provided with the distribution.
|
|
- Neither the name of Internet Society, IETF or IETF Trust, nor the
|
|
names of specific contributors, may be used to endorse or promote
|
|
products derived from this software without specific prior written
|
|
permission.
|
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
|
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
|
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
|
ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
|
|
LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
|
CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
|
|
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
|
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
|
|
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
|
|
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
POSSIBILITY OF SUCH DAMAGE.
|
|
***********************************************************************/
|
|
|
|
#ifndef SILK_MACROS_H
|
|
#define SILK_MACROS_H
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
#include "config.h"
|
|
#endif
|
|
|
|
#include "opus_types.h"
|
|
#include "opus_defines.h"
|
|
|
|
/* This is an OPUS_INLINE header file for general platform. */
|
|
|
|
/* (a32 * (opus_int32)((opus_int16)(b32))) >> 16 output have to be 32bit int */
|
|
#define silk_SMULWB(a32, b32) ((((a32) >> 16) * (opus_int32)((opus_int16)(b32))) + ((((a32) & 0x0000FFFF) * (opus_int32)((opus_int16)(b32))) >> 16))
|
|
|
|
/* a32 + (b32 * (opus_int32)((opus_int16)(c32))) >> 16 output have to be 32bit int */
|
|
#define silk_SMLAWB(a32, b32, c32) ((a32) + ((((b32) >> 16) * (opus_int32)((opus_int16)(c32))) + ((((b32) & 0x0000FFFF) * (opus_int32)((opus_int16)(c32))) >> 16)))
|
|
|
|
/* (a32 * (b32 >> 16)) >> 16 */
|
|
#define silk_SMULWT(a32, b32) (((a32) >> 16) * ((b32) >> 16) + ((((a32) & 0x0000FFFF) * ((b32) >> 16)) >> 16))
|
|
|
|
/* a32 + (b32 * (c32 >> 16)) >> 16 */
|
|
#define silk_SMLAWT(a32, b32, c32) ((a32) + (((b32) >> 16) * ((c32) >> 16)) + ((((b32) & 0x0000FFFF) * ((c32) >> 16)) >> 16))
|
|
|
|
/* (opus_int32)((opus_int16)(a3))) * (opus_int32)((opus_int16)(b32)) output have to be 32bit int */
|
|
#define silk_SMULBB(a32, b32) ((opus_int32)((opus_int16)(a32)) * (opus_int32)((opus_int16)(b32)))
|
|
|
|
/* a32 + (opus_int32)((opus_int16)(b32)) * (opus_int32)((opus_int16)(c32)) output have to be 32bit int */
|
|
#define silk_SMLABB(a32, b32, c32) ((a32) + ((opus_int32)((opus_int16)(b32))) * (opus_int32)((opus_int16)(c32)))
|
|
|
|
/* (opus_int32)((opus_int16)(a32)) * (b32 >> 16) */
|
|
#define silk_SMULBT(a32, b32) ((opus_int32)((opus_int16)(a32)) * ((b32) >> 16))
|
|
|
|
/* a32 + (opus_int32)((opus_int16)(b32)) * (c32 >> 16) */
|
|
#define silk_SMLABT(a32, b32, c32) ((a32) + ((opus_int32)((opus_int16)(b32))) * ((c32) >> 16))
|
|
|
|
/* a64 + (b32 * c32) */
|
|
#define silk_SMLAL(a64, b32, c32) (silk_ADD64((a64), ((opus_int64)(b32) * (opus_int64)(c32))))
|
|
|
|
/* (a32 * b32) >> 16 */
|
|
#define silk_SMULWW(a32, b32) silk_MLA(silk_SMULWB((a32), (b32)), (a32), silk_RSHIFT_ROUND((b32), 16))
|
|
|
|
/* a32 + ((b32 * c32) >> 16) */
|
|
#define silk_SMLAWW(a32, b32, c32) silk_MLA(silk_SMLAWB((a32), (b32), (c32)), (b32), silk_RSHIFT_ROUND((c32), 16))
|
|
|
|
/* add/subtract with output saturated */
|
|
#define silk_ADD_SAT32(a, b) ((((opus_uint32)(a) + (opus_uint32)(b)) & 0x80000000) == 0 ? \
|
|
((((a) & (b)) & 0x80000000) != 0 ? silk_int32_MIN : (a)+(b)) : \
|
|
((((a) | (b)) & 0x80000000) == 0 ? silk_int32_MAX : (a)+(b)) )
|
|
|
|
#define silk_SUB_SAT32(a, b) ((((opus_uint32)(a)-(opus_uint32)(b)) & 0x80000000) == 0 ? \
|
|
(( (a) & ((b)^0x80000000) & 0x80000000) ? silk_int32_MIN : (a)-(b)) : \
|
|
((((a)^0x80000000) & (b) & 0x80000000) ? silk_int32_MAX : (a)-(b)) )
|
|
|
|
#if defined(MIPSr1_ASM)
|
|
#include "mips/macros_mipsr1.h"
|
|
#endif
|
|
|
|
#include "ecintrin.h"
|
|
#ifndef OVERRIDE_silk_CLZ16
|
|
static OPUS_INLINE opus_int32 silk_CLZ16(opus_int16 in16)
|
|
{
|
|
return 32 - EC_ILOG(in16<<16|0x8000);
|
|
}
|
|
#endif
|
|
|
|
#ifndef OVERRIDE_silk_CLZ32
|
|
static OPUS_INLINE opus_int32 silk_CLZ32(opus_int32 in32)
|
|
{
|
|
return in32 ? 32 - EC_ILOG(in32) : 32;
|
|
}
|
|
#endif
|
|
|
|
/* Row based */
|
|
#define matrix_ptr(Matrix_base_adr, row, column, N) \
|
|
(*((Matrix_base_adr) + ((row)*(N)+(column))))
|
|
#define matrix_adr(Matrix_base_adr, row, column, N) \
|
|
((Matrix_base_adr) + ((row)*(N)+(column)))
|
|
|
|
/* Column based */
|
|
#ifndef matrix_c_ptr
|
|
# define matrix_c_ptr(Matrix_base_adr, row, column, M) \
|
|
(*((Matrix_base_adr) + ((row)+(M)*(column))))
|
|
#endif
|
|
|
|
#ifdef OPUS_ARM_INLINE_ASM
|
|
#include "arm/macros_armv4.h"
|
|
#endif
|
|
|
|
#ifdef OPUS_ARM_INLINE_EDSP
|
|
#include "arm/macros_armv5e.h"
|
|
#endif
|
|
|
|
#ifdef OPUS_CF_INLINE_ASM
|
|
#include "cf/macros_cf.h"
|
|
#endif
|
|
|
|
#endif /* SILK_MACROS_H */
|
|
|