rename files
This commit is contained in:
parent
14f1b04119
commit
0bd2171b0e
23 changed files with 101 additions and 101 deletions
|
@ -23,9 +23,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
|
||||||
#include "cc6__kiss_fft_guts.h"
|
#include "cc6__kiss_fft_guts.h"
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "mathops.h"
|
#include "cc6_mathops.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
|
|
||||||
/* The guts header contains all the multiplication and addition macros that are defined for
|
/* The guts header contains all the multiplication and addition macros that are defined for
|
||||||
complex numbers. It also delares the kf_ internal functions.
|
complex numbers. It also delares the kf_ internal functions.
|
||||||
|
|
|
@ -18,11 +18,11 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
#define MIN(a,b) ((a)<(b) ? (a):(b))
|
#define MIN(a,b) ((a)<(b) ? (a):(b))
|
||||||
#define MAX(a,b) ((a)>(b) ? (a):(b))
|
#define MAX(a,b) ((a)>(b) ? (a):(b))
|
||||||
|
|
||||||
/* kiss_fft.h
|
/* cc6_kiss_fft.h
|
||||||
defines kiss_fft_scalar as either short or a float type
|
defines kiss_fft_scalar as either short or a float type
|
||||||
and defines
|
and defines
|
||||||
typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
|
typedef struct { kiss_fft_scalar r; kiss_fft_scalar i; }kiss_fft_cpx; */
|
||||||
#include "kiss_fft.h"
|
#include "cc6_kiss_fft.h"
|
||||||
|
|
||||||
#define MAXFACTORS 32
|
#define MAXFACTORS 32
|
||||||
/* e.g. an fft of length 128 has 4 factors
|
/* e.g. an fft of length 128 has 4 factors
|
||||||
|
|
|
@ -22,9 +22,9 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "mathops.h"
|
#include "cc6_mathops.h"
|
||||||
#include "kiss_fftr.h"
|
#include "cc6_kiss_fftr.h"
|
||||||
#include "cc6__kiss_fft_guts.h"
|
#include "cc6__kiss_fft_guts.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -35,13 +35,13 @@
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "cc6_bands.h"
|
#include "cc6_bands.h"
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
#include "vq.h"
|
#include "cc6_vq.h"
|
||||||
#include "cc6_cwrs.h"
|
#include "cc6_cwrs.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "mathops.h"
|
#include "cc6_mathops.h"
|
||||||
#include "rate.h"
|
#include "cc6_rate.h"
|
||||||
|
|
||||||
const celt_word16_t sqrtC_1[2] = {QCONST16(1.f, 14), QCONST16(1.414214f, 14)};
|
const celt_word16_t sqrtC_1[2] = {QCONST16(1.f, 14), QCONST16(1.414214f, 14)};
|
||||||
|
|
||||||
|
|
|
@ -33,10 +33,10 @@
|
||||||
#define BANDS_H
|
#define BANDS_H
|
||||||
|
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
#include "cc6_entenc.h"
|
#include "cc6_entenc.h"
|
||||||
#include "cc6_entdec.h"
|
#include "cc6_entdec.h"
|
||||||
#include "rate.h"
|
#include "cc6_rate.h"
|
||||||
|
|
||||||
/** Compute the amplitude (sqrt energy) in each of the bands
|
/** Compute the amplitude (sqrt energy) in each of the bands
|
||||||
* @param m Mode data
|
* @param m Mode data
|
||||||
|
|
|
@ -35,20 +35,20 @@
|
||||||
|
|
||||||
#define CELT_C
|
#define CELT_C
|
||||||
|
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "mdct.h"
|
#include "cc6_mdct.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "cc6_celt.h"
|
#include "cc6_celt.h"
|
||||||
#include "pitch.h"
|
#include "cc6_pitch.h"
|
||||||
#include "kiss_fftr.h"
|
#include "cc6_kiss_fftr.h"
|
||||||
#include "cc6_bands.h"
|
#include "cc6_bands.h"
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
#include "cc6_entcode.h"
|
#include "cc6_entcode.h"
|
||||||
#include "quant_bands.h"
|
#include "cc6_quant_bands.h"
|
||||||
#include "psy.h"
|
#include "cc6_psy.h"
|
||||||
#include "rate.h"
|
#include "cc6_rate.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
#include "mathops.h"
|
#include "cc6_mathops.h"
|
||||||
#include "cc6_float_cast.h"
|
#include "cc6_float_cast.h"
|
||||||
#include <stdarg.h>
|
#include <stdarg.h>
|
||||||
|
|
||||||
|
|
|
@ -33,11 +33,11 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "cc6_cwrs.h"
|
#include "cc6_cwrs.h"
|
||||||
#include "mathops.h"
|
#include "cc6_mathops.h"
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
|
|
||||||
/*Guaranteed to return a conservatively large estimate of the binary logarithm
|
/*Guaranteed to return a conservatively large estimate of the binary logarithm
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
#define CWRS_H
|
#define CWRS_H
|
||||||
|
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
#include "cc6_entenc.h"
|
#include "cc6_entenc.h"
|
||||||
#include "cc6_entdec.h"
|
#include "cc6_entdec.h"
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include "cc6_entdec.h"
|
#include "cc6_entdec.h"
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "cc6_entenc.h"
|
#include "cc6_entenc.h"
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
|
|
||||||
|
|
|
@ -34,8 +34,8 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include "cc6_celt_header.h"
|
#include "cc6_celt_header.h"
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
|
|
||||||
/*typedef struct {
|
/*typedef struct {
|
||||||
char codec_id[8];
|
char codec_id[8];
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
|
|
||||||
#else /* ENABLE_TI_DSPLIB */
|
#else /* ENABLE_TI_DSPLIB */
|
||||||
|
|
||||||
#include "kiss_fft.h"
|
#include "cc6_kiss_fft.h"
|
||||||
#include "cc6__kiss_fft_guts.h"
|
#include "cc6__kiss_fft_guts.h"
|
||||||
|
|
||||||
#define cpx32_fft_alloc(length) kiss_fft_alloc(length, 0, 0);
|
#define cpx32_fft_alloc(length) kiss_fft_alloc(length, 0, 0);
|
||||||
|
|
|
@ -69,8 +69,8 @@
|
||||||
|
|
||||||
#endif /* FIXED_POINT */
|
#endif /* FIXED_POINT */
|
||||||
|
|
||||||
#include "kiss_fft.h"
|
#include "cc6_kiss_fft.h"
|
||||||
#include "kiss_fftr.h"
|
#include "cc6_kiss_fftr.h"
|
||||||
#include "cc6__kiss_fft_guts.h"
|
#include "cc6__kiss_fft_guts.h"
|
||||||
|
|
||||||
#define real16_fft_alloc(length) kiss_fftr_alloc_celt_single(length, 0, 0);
|
#define real16_fft_alloc(length) kiss_fftr_alloc_celt_single(length, 0, 0);
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
|
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "cc6_entcode.h"
|
#include "cc6_entcode.h"
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
|
|
||||||
#ifndef OVERRIDE_CELT_ILOG2
|
#ifndef OVERRIDE_CELT_ILOG2
|
||||||
/** Integer log in base2. Undefined for zero and negative numbers */
|
/** Integer log in base2. Undefined for zero and negative numbers */
|
||||||
|
@ -163,7 +163,7 @@ static inline float celt_exp2(float x)
|
||||||
|
|
||||||
#ifdef FIXED_POINT
|
#ifdef FIXED_POINT
|
||||||
|
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
|
|
||||||
#ifndef OVERRIDE_CELT_MAXABS16
|
#ifndef OVERRIDE_CELT_MAXABS16
|
||||||
static inline celt_word16_t celt_maxabs16(celt_word16_t *x, int len)
|
static inline celt_word16_t celt_maxabs16(celt_word16_t *x, int len)
|
||||||
|
|
|
@ -49,9 +49,9 @@
|
||||||
#include "mdct.h"
|
#include "mdct.h"
|
||||||
#include "cc6_kfft_double.h"
|
#include "cc6_kfft_double.h"
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "os_support.h"
|
#include "cc6_os_support.h"
|
||||||
#include "mathops.h"
|
#include "mathops.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
|
|
||||||
#ifndef M_PI
|
#ifndef M_PI
|
||||||
#define M_PI 3.141592653
|
#define M_PI 3.141592653
|
||||||
|
|
|
@ -47,8 +47,8 @@
|
||||||
#include "psy.h"
|
#include "psy.h"
|
||||||
#include "os_support.h"
|
#include "os_support.h"
|
||||||
#include "mathops.h"
|
#include "mathops.h"
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
|
|
||||||
kiss_fftr_cfg pitch_state_alloc(int max_lag)
|
kiss_fftr_cfg pitch_state_alloc(int max_lag)
|
||||||
{
|
{
|
||||||
|
|
|
@ -1,53 +1,53 @@
|
||||||
/* (C) 2007-2008 Jean-Marc Valin, CSIRO
|
/* (C) 2007-2008 Jean-Marc Valin, CSIRO
|
||||||
*/
|
*/
|
||||||
/**
|
/**
|
||||||
@file pitch.h
|
@file pitch.h
|
||||||
@brief Pitch analysis
|
@brief Pitch analysis
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
modification, are permitted provided that the following conditions
|
modification, are permitted provided that the following conditions
|
||||||
are met:
|
are met:
|
||||||
|
|
||||||
- Redistributions of source code must retain the above copyright
|
- Redistributions of source code must retain the above copyright
|
||||||
notice, this list of conditions and the following disclaimer.
|
notice, this list of conditions and the following disclaimer.
|
||||||
|
|
||||||
- Redistributions in binary form must reproduce the above copyright
|
- Redistributions in binary form must reproduce the above copyright
|
||||||
notice, this list of conditions and the following disclaimer in the
|
notice, this list of conditions and the following disclaimer in the
|
||||||
documentation and/or other materials provided with the distribution.
|
documentation and/or other materials provided with the distribution.
|
||||||
|
|
||||||
- Neither the name of the Xiph.org Foundation nor the names of its
|
- Neither the name of the Xiph.org Foundation nor the names of its
|
||||||
contributors may be used to endorse or promote products derived from
|
contributors may be used to endorse or promote products derived from
|
||||||
this software without specific prior written permission.
|
this software without specific prior written permission.
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR
|
||||||
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||||||
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||||
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
||||||
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||||
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
|
||||||
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#ifndef _PITCH_H
|
#ifndef _PITCH_H
|
||||||
#define _PITCH_H
|
#define _PITCH_H
|
||||||
|
|
||||||
#include "kiss_fftr.h"
|
#include "kiss_fftr.h"
|
||||||
#include "psy.h"
|
#include "psy.h"
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
|
|
||||||
kiss_fftr_cfg pitch_state_alloc(int max_lag);
|
kiss_fftr_cfg pitch_state_alloc(int max_lag);
|
||||||
void pitch_state_free(kiss_fftr_cfg st);
|
void pitch_state_free(kiss_fftr_cfg st);
|
||||||
|
|
||||||
/** Find the optimal delay for the pitch prediction. Computation is
|
/** Find the optimal delay for the pitch prediction. Computation is
|
||||||
done in the frequency domain, both to save time and to make it
|
done in the frequency domain, both to save time and to make it
|
||||||
easier to apply psychoacoustic weighting */
|
easier to apply psychoacoustic weighting */
|
||||||
void find_spectral_pitch(const CELTMode *m, kiss_fftr_cfg fft, const struct PsyDecay *decay, const celt_sig_t *x, const celt_sig_t *y, const celt_word16_t *window, celt_word16_t * __restrict X, int len, int max_pitch, int *pitch);
|
void find_spectral_pitch(const CELTMode *m, kiss_fftr_cfg fft, const struct PsyDecay *decay, const celt_sig_t *x, const celt_sig_t *y, const celt_word16_t *window, celt_word16_t * __restrict X, int len, int max_pitch, int *pitch);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -37,7 +37,7 @@
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "os_support.h"
|
#include "os_support.h"
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
#include "mathops.h"
|
#include "mathops.h"
|
||||||
|
|
||||||
/* The Vorbis freq<->Bark mapping */
|
/* The Vorbis freq<->Bark mapping */
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
#include "os_support.h"
|
#include "os_support.h"
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "mathops.h"
|
#include "mathops.h"
|
||||||
#include "stack_alloc.h"
|
#include "cc6_stack_alloc.h"
|
||||||
|
|
||||||
#ifdef FIXED_POINT
|
#ifdef FIXED_POINT
|
||||||
const celt_word16_t eMeans[24] = {1920, -341, -512, -107, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
const celt_word16_t eMeans[24] = {1920, -341, -512, -107, 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
|
||||||
|
|
|
@ -33,7 +33,7 @@
|
||||||
#define QUANT_BANDS
|
#define QUANT_BANDS
|
||||||
|
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
#include "cc6_entenc.h"
|
#include "cc6_entenc.h"
|
||||||
#include "cc6_entdec.h"
|
#include "cc6_entdec.h"
|
||||||
#include "mathops.h"
|
#include "mathops.h"
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "cc6_entdec.h"
|
#include "cc6_entdec.h"
|
||||||
#include "mfrngcod.h"
|
#include "cc6_mfrngcod.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "cc6_entenc.h"
|
#include "cc6_entenc.h"
|
||||||
#include "mfrngcod.h"
|
#include "cc6_mfrngcod.h"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <math.h>
|
#include <math.h>
|
||||||
#include "modes.h"
|
#include "cc6_modes.h"
|
||||||
#include "cc6_cwrs.h"
|
#include "cc6_cwrs.h"
|
||||||
#include "cc6_arch.h"
|
#include "cc6_arch.h"
|
||||||
#include "os_support.h"
|
#include "os_support.h"
|
||||||
|
|
Loading…
Reference in a new issue