diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-08-31 05:58:02 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-08-31 05:58:02 +0400 |
| commit | fdceae89bff3bbdcb8cb720ef6f6c735da1aae7b (patch) | |
| tree | c14e1cd3e1a7d049b7708d7c12c0b428add9e235 /celt/celt.h | |
| parent | 02fed471a4568852d6618e041c4f2af0d7730ee2 (diff) | |
Surround masking rewrite
The channel energy is now computed using an MDCT in the multi-stream
encoder rather than computing the energy of the stereo downmix.
Diffstat (limited to 'celt/celt.h')
| -rw-r--r-- | celt/celt.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/celt/celt.h b/celt/celt.h index 0911c72f..1c504d19 100644 --- a/celt/celt.h +++ b/celt/celt.h @@ -109,10 +109,7 @@ typedef struct { #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_REQUEST 10026 #define OPUS_SET_ENERGY_MASK(x) OPUS_SET_ENERGY_MASK_REQUEST, __opus_check_val16_ptr(x) /* Encoder stuff */ @@ -193,6 +190,9 @@ extern const signed char tf_select_table[4][8]; int resampling_factor(opus_int32 rate); +void preemphasis(const opus_val16 * OPUS_RESTRICT pcmp, celt_sig * OPUS_RESTRICT inp, + int N, int CC, int upsample, const opus_val16 *coef, celt_sig *mem, int clip); + 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); |