From fe367f8c73a0563c28eafbaa087266e3514a0120 Mon Sep 17 00:00:00 2001 From: Volker Fischer Date: Wed, 13 Feb 2013 17:26:25 +0000 Subject: [PATCH] rename file --- libs/celt/cc6_fixed_c5x.h | 93 +++++++++++++++++++ libs/celt/{fixed_c6x.h => cc6_fixed_c6x.h} | 0 .../{fixed_generic.h => cc6_fixed_generic.h} | 0 libs/celt/{float_cast.h => cc6_float_cast.h} | 0 libs/celt/{header.c => cc6_header.c} | 0 .../celt/{kfft_double.h => cc6_kfft_double.h} | 0 .../celt/{kfft_single.c => cc6_kfft_single.c} | 0 .../celt/{kfft_single.h => cc6_kfft_single.h} | 0 8 files changed, 93 insertions(+) create mode 100755 libs/celt/cc6_fixed_c5x.h rename libs/celt/{fixed_c6x.h => cc6_fixed_c6x.h} (100%) rename libs/celt/{fixed_generic.h => cc6_fixed_generic.h} (100%) rename libs/celt/{float_cast.h => cc6_float_cast.h} (100%) rename libs/celt/{header.c => cc6_header.c} (100%) rename libs/celt/{kfft_double.h => cc6_kfft_double.h} (100%) rename libs/celt/{kfft_single.c => cc6_kfft_single.c} (100%) rename libs/celt/{kfft_single.h => cc6_kfft_single.h} (100%) diff --git a/libs/celt/cc6_fixed_c5x.h b/libs/celt/cc6_fixed_c5x.h new file mode 100755 index 00000000..443dce23 --- /dev/null +++ b/libs/celt/cc6_fixed_c5x.h @@ -0,0 +1,93 @@ +/* Copyright (C) 2003 Jean-Marc Valin */ +/** + @file fixed_c5x.h + @brief Fixed-point operations for the TI C5x DSP family +*/ +/* + 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 the Xiph.org Foundation nor the names of its + 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 FOUNDATION 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 FIXED_C5X_H +#define FIXED_C5X_H + +#include "dsplib.h" + +#undef IMUL32 +static inline long IMUL32(long i, long j) +{ + long ac0, ac1; + ac0 = _lmpy(i>>16,j); + ac1 = ac0 + _lmpy(i,j>>16); + return _lmpyu(i,j) + (ac1<<16); +} + +#undef MAX16 +#define MAX16(a,b) _max(a,b) + +#undef MIN16 +#define MIN16(a,b) _min(a,b) + +#undef MAX32 +#define MAX32(a,b) _lmax(a,b) + +#undef MIN32 +#define MIN32(a,b) _lmin(a,b) + +#undef VSHR32 +#define VSHR32(a, shift) _lshl(a,-(shift)) + +#undef MULT16_16_Q15 +#define MULT16_16_Q15(a,b) (_smpy(a,b)) + +#undef MULT16_16SU +#define MULT16_16SU(a,b) _lmpysu(a,b) + +#undef MULT_16_16 +#define MULT_16_16(a,b) _lmpy(a,b) + +/* FIXME: This is technically incorrect and is bound to cause problems. Is there any cleaner solution? */ +#undef MULT16_32_Q15 +#define MULT16_32_Q15(a,b) ADD32(SHL(MULT16_16((a),SHR((b),16)),1), SHR(MULT16_16SU((a),(b)),15)) + + +#define celt_ilog2(x) (30 - _lnorm(x)) +#define OVERRIDE_CELT_ILOG2 + +#define celt_maxabs16(x, len) MAX16(maxval((DATA *)x, len),-minval((DATA *)x, len)) +#define OVERRIDE_CELT_MAXABS16 + +#define OVERRIDE_FIND_MAX16 +static inline int find_max16(celt_word16_t *x, int len) +{ + DATA max_corr16 = -VERY_LARGE16; + DATA pitch16 = 0; + maxvec((DATA *)x, len, &max_corr16, &pitch16); + return pitch16; +} + +#endif /* FIXED_C5X_H */ diff --git a/libs/celt/fixed_c6x.h b/libs/celt/cc6_fixed_c6x.h similarity index 100% rename from libs/celt/fixed_c6x.h rename to libs/celt/cc6_fixed_c6x.h diff --git a/libs/celt/fixed_generic.h b/libs/celt/cc6_fixed_generic.h similarity index 100% rename from libs/celt/fixed_generic.h rename to libs/celt/cc6_fixed_generic.h diff --git a/libs/celt/float_cast.h b/libs/celt/cc6_float_cast.h similarity index 100% rename from libs/celt/float_cast.h rename to libs/celt/cc6_float_cast.h diff --git a/libs/celt/header.c b/libs/celt/cc6_header.c similarity index 100% rename from libs/celt/header.c rename to libs/celt/cc6_header.c diff --git a/libs/celt/kfft_double.h b/libs/celt/cc6_kfft_double.h similarity index 100% rename from libs/celt/kfft_double.h rename to libs/celt/cc6_kfft_double.h diff --git a/libs/celt/kfft_single.c b/libs/celt/cc6_kfft_single.c similarity index 100% rename from libs/celt/kfft_single.c rename to libs/celt/cc6_kfft_single.c diff --git a/libs/celt/kfft_single.h b/libs/celt/cc6_kfft_single.h similarity index 100% rename from libs/celt/kfft_single.h rename to libs/celt/cc6_kfft_single.h