580b307fd7
Sync opus codec to upstream commit
02fed471a4568852d6618e041c4f2af0d7730ee2 (August 30 2013)
This brings in a lot of optimizations but also makes the diff
between our codec and the upstream much smaller as most of our
optimizations have been upstreamed or supeceded.
Speedups across the board for CELT mode files:
64kbps 128kbps
H300 9.82MHz 15.48MHz
c200 4.86MHz 9.63MHz
fuze v1 10.32MHz 15.92MHz
For the silk mode test file (16kbps) arm targets get a speedup
of about 2MHz while the H300 is 7.8MHz slower, likely because it's
now using the pseudostack more rather than the real stack which
is in iram. Patches to get around that are upcomming.
Change-Id: Ifecf963e461c51ac42e09dac1e91bc4bc3b12fa3
213 lines
6.7 KiB
C
213 lines
6.7 KiB
C
/* Copyright (c) 2007-2008 CSIRO
|
|
Copyright (c) 2007-2009 Xiph.Org Foundation
|
|
Copyright (c) 2008 Gregory Maxwell
|
|
Written by Jean-Marc Valin and Gregory Maxwell */
|
|
/**
|
|
@file celt.h
|
|
@brief Contains all the functions for encoding and decoding audio
|
|
*/
|
|
|
|
/*
|
|
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.
|
|
|
|
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 CELT_H
|
|
#define CELT_H
|
|
|
|
#include "opus_types.h"
|
|
#include "opus_defines.h"
|
|
#include "opus_custom.h"
|
|
#include "entenc.h"
|
|
#include "entdec.h"
|
|
#include "arch.h"
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
#define CELTEncoder OpusCustomEncoder
|
|
#define CELTDecoder OpusCustomDecoder
|
|
#define CELTMode OpusCustomMode
|
|
|
|
typedef struct {
|
|
int valid;
|
|
opus_val16 tonality;
|
|
opus_val16 tonality_slope;
|
|
opus_val16 noisiness;
|
|
opus_val16 activity;
|
|
opus_val16 music_prob;
|
|
int bandwidth;
|
|
}AnalysisInfo;
|
|
|
|
#define __celt_check_mode_ptr_ptr(ptr) ((ptr) + ((ptr) - (const CELTMode**)(ptr)))
|
|
|
|
#define __celt_check_analysis_ptr(ptr) ((ptr) + ((ptr) - (const AnalysisInfo*)(ptr)))
|
|
|
|
/* Encoder/decoder Requests */
|
|
|
|
#define CELT_SET_PREDICTION_REQUEST 10002
|
|
/** Controls the use of interframe prediction.
|
|
0=Independent frames
|
|
1=Short term interframe prediction allowed
|
|
2=Long term prediction allowed
|
|
*/
|
|
#define CELT_SET_PREDICTION(x) CELT_SET_PREDICTION_REQUEST, __opus_check_int(x)
|
|
|
|
#define CELT_SET_INPUT_CLIPPING_REQUEST 10004
|
|
#define CELT_SET_INPUT_CLIPPING(x) CELT_SET_INPUT_CLIPPING_REQUEST, __opus_check_int(x)
|
|
|
|
#define CELT_GET_AND_CLEAR_ERROR_REQUEST 10007
|
|
#define CELT_GET_AND_CLEAR_ERROR(x) CELT_GET_AND_CLEAR_ERROR_REQUEST, __opus_check_int_ptr(x)
|
|
|
|
#define CELT_SET_CHANNELS_REQUEST 10008
|
|
#define CELT_SET_CHANNELS(x) CELT_SET_CHANNELS_REQUEST, __opus_check_int(x)
|
|
|
|
|
|
/* Internal */
|
|
#define CELT_SET_START_BAND_REQUEST 10010
|
|
#define CELT_SET_START_BAND(x) CELT_SET_START_BAND_REQUEST, __opus_check_int(x)
|
|
|
|
#define CELT_SET_END_BAND_REQUEST 10012
|
|
#define CELT_SET_END_BAND(x) CELT_SET_END_BAND_REQUEST, __opus_check_int(x)
|
|
|
|
#define CELT_GET_MODE_REQUEST 10015
|
|
/** Get the CELTMode used by an encoder or decoder */
|
|
#define CELT_GET_MODE(x) CELT_GET_MODE_REQUEST, __celt_check_mode_ptr_ptr(x)
|
|
|
|
#define CELT_SET_SIGNALLING_REQUEST 10016
|
|
#define CELT_SET_SIGNALLING(x) CELT_SET_SIGNALLING_REQUEST, __opus_check_int(x)
|
|
|
|
#define CELT_SET_TONALITY_REQUEST 10018
|
|
#define CELT_SET_TONALITY(x) CELT_SET_TONALITY_REQUEST, __opus_check_int(x)
|
|
#define CELT_SET_TONALITY_SLOPE_REQUEST 10020
|
|
#define CELT_SET_TONALITY_SLOPE(x) CELT_SET_TONALITY_SLOPE_REQUEST, __opus_check_int(x)
|
|
|
|
#define CELT_SET_ANALYSIS_REQUEST 10022
|
|
#define CELT_SET_ANALYSIS(x) CELT_SET_ANALYSIS_REQUEST, __celt_check_analysis_ptr(x)
|
|
|
|
#define OPUS_SET_LFE_REQUEST 10024
|
|
#define OPUS_SET_LFE(x) OPUS_SET_LFE_REQUEST, __opus_check_int(x)
|
|
|
|
#define OPUS_SET_ENERGY_SAVE_REQUEST 10026
|
|
#define OPUS_SET_ENERGY_SAVE(x) OPUS_SET_ENERGY_SAVE_REQUEST, __opus_check_val16_ptr(x)
|
|
|
|
#define OPUS_SET_ENERGY_MASK_REQUEST 10028
|
|
#define OPUS_SET_ENERGY_MASK(x) OPUS_SET_ENERGY_MASK_REQUEST, __opus_check_val16_ptr(x)
|
|
|
|
/* Encoder stuff */
|
|
|
|
int celt_encoder_get_size(int channels);
|
|
|
|
int celt_encode_with_ec(OpusCustomEncoder * OPUS_RESTRICT st, const opus_val16 * pcm, int frame_size, unsigned char *compressed, int nbCompressedBytes, ec_enc *enc);
|
|
|
|
int celt_encoder_init(CELTEncoder *st, opus_int32 sampling_rate, int channels);
|
|
|
|
|
|
|
|
/* Decoder stuff */
|
|
|
|
int celt_decoder_get_size(int channels);
|
|
|
|
|
|
int celt_decoder_init(CELTDecoder *st, opus_int32 sampling_rate, int channels);
|
|
|
|
int celt_decode_with_ec(OpusCustomDecoder * OPUS_RESTRICT st, const unsigned char *data, int len, opus_val16 * OPUS_RESTRICT pcm, int frame_size, ec_dec *dec);
|
|
|
|
#define celt_encoder_ctl opus_custom_encoder_ctl
|
|
#define celt_decoder_ctl opus_custom_decoder_ctl
|
|
|
|
|
|
#ifdef CUSTOM_MODES
|
|
#define OPUS_CUSTOM_NOSTATIC
|
|
#else
|
|
#define OPUS_CUSTOM_NOSTATIC static inline
|
|
#endif
|
|
|
|
static const unsigned char trim_icdf[11] = {126, 124, 119, 109, 87, 41, 19, 9, 4, 2, 0};
|
|
/* Probs: NONE: 21.875%, LIGHT: 6.25%, NORMAL: 65.625%, AGGRESSIVE: 6.25% */
|
|
static const unsigned char spread_icdf[4] = {25, 23, 2, 0};
|
|
|
|
static const unsigned char tapset_icdf[3]={2,1,0};
|
|
|
|
#ifdef CUSTOM_MODES
|
|
static const unsigned char toOpusTable[20] = {
|
|
0xE0, 0xE8, 0xF0, 0xF8,
|
|
0xC0, 0xC8, 0xD0, 0xD8,
|
|
0xA0, 0xA8, 0xB0, 0xB8,
|
|
0x00, 0x00, 0x00, 0x00,
|
|
0x80, 0x88, 0x90, 0x98,
|
|
};
|
|
|
|
static const unsigned char fromOpusTable[16] = {
|
|
0x80, 0x88, 0x90, 0x98,
|
|
0x40, 0x48, 0x50, 0x58,
|
|
0x20, 0x28, 0x30, 0x38,
|
|
0x00, 0x08, 0x10, 0x18
|
|
};
|
|
|
|
static inline int toOpus(unsigned char c)
|
|
{
|
|
int ret=0;
|
|
if (c<0xA0)
|
|
ret = toOpusTable[c>>3];
|
|
if (ret == 0)
|
|
return -1;
|
|
else
|
|
return ret|(c&0x7);
|
|
}
|
|
|
|
static inline int fromOpus(unsigned char c)
|
|
{
|
|
if (c<0x80)
|
|
return -1;
|
|
else
|
|
return fromOpusTable[(c>>3)-16] | (c&0x7);
|
|
}
|
|
#endif /* CUSTOM_MODES */
|
|
|
|
#define COMBFILTER_MAXPERIOD 1024
|
|
#define COMBFILTER_MINPERIOD 15
|
|
|
|
extern const signed char tf_select_table[4][8];
|
|
|
|
int resampling_factor(opus_int32 rate);
|
|
|
|
void comb_filter(opus_val32 *y, opus_val32 *x, int T0, int T1, int N,
|
|
opus_val16 g0, opus_val16 g1, int tapset0, int tapset1,
|
|
const opus_val16 *window, int overlap);
|
|
|
|
void init_caps(const CELTMode *m,int *cap,int LM,int C);
|
|
|
|
#ifdef RESYNTH
|
|
void deemphasis(celt_sig *in[], opus_val16 *pcm, int N, int C, int downsample, const opus_val16 *coef, celt_sig *mem, celt_sig * OPUS_RESTRICT scratch);
|
|
|
|
void compute_inv_mdcts(const CELTMode *mode, int shortBlocks, celt_sig *X,
|
|
celt_sig * OPUS_RESTRICT out_mem[], int C, int LM);
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* CELT_H */
|