diff options
author | William Wilgus <me.theuser@yahoo.com> | 2019-01-04 02:01:18 -0600 |
---|---|---|
committer | Solomon Peachy <pizza@shaftnet.org> | 2021-04-23 14:23:04 +0000 |
commit | 14c6bb798d6bebc80f07e863236adbaf8d156a9c (patch) | |
tree | 551a4b641906c2626af844fa3239c1b2b1ff0ad3 /lib/rbcodec/codecs/libopus/silk/define.h | |
parent | 75d93937965ec4df70d37df6d4feea04577c996b (diff) | |
download | rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.tar.gz rockbox-14c6bb798d6bebc80f07e863236adbaf8d156a9c.zip |
Sync opus codec to upstream git
Change-Id: I0cfcc0005c4ad7bfbb1aaf454188ce70fb043dc1
Diffstat (limited to 'lib/rbcodec/codecs/libopus/silk/define.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/define.h | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/define.h b/lib/rbcodec/codecs/libopus/silk/define.h index c47aca9f58..247cb0bf71 100644 --- a/lib/rbcodec/codecs/libopus/silk/define.h +++ b/lib/rbcodec/codecs/libopus/silk/define.h | |||
@@ -46,7 +46,6 @@ extern "C" | |||
46 | /* Limits on bitrate */ | 46 | /* Limits on bitrate */ |
47 | #define MIN_TARGET_RATE_BPS 5000 | 47 | #define MIN_TARGET_RATE_BPS 5000 |
48 | #define MAX_TARGET_RATE_BPS 80000 | 48 | #define MAX_TARGET_RATE_BPS 80000 |
49 | #define TARGET_RATE_TAB_SZ 8 | ||
50 | 49 | ||
51 | /* LBRR thresholds */ | 50 | /* LBRR thresholds */ |
52 | #define LBRR_NB_MIN_RATE_BPS 12000 | 51 | #define LBRR_NB_MIN_RATE_BPS 12000 |
@@ -56,6 +55,12 @@ extern "C" | |||
56 | /* DTX settings */ | 55 | /* DTX settings */ |
57 | #define NB_SPEECH_FRAMES_BEFORE_DTX 10 /* eq 200 ms */ | 56 | #define NB_SPEECH_FRAMES_BEFORE_DTX 10 /* eq 200 ms */ |
58 | #define MAX_CONSECUTIVE_DTX 20 /* eq 400 ms */ | 57 | #define MAX_CONSECUTIVE_DTX 20 /* eq 400 ms */ |
58 | #define DTX_ACTIVITY_THRESHOLD 0.1f | ||
59 | |||
60 | /* VAD decision */ | ||
61 | #define VAD_NO_DECISION -1 | ||
62 | #define VAD_NO_ACTIVITY 0 | ||
63 | #define VAD_ACTIVITY 1 | ||
59 | 64 | ||
60 | /* Maximum sampling frequency */ | 65 | /* Maximum sampling frequency */ |
61 | #define MAX_FS_KHZ 16 | 66 | #define MAX_FS_KHZ 16 |
@@ -147,7 +152,7 @@ extern "C" | |||
147 | #define USE_HARM_SHAPING 1 | 152 | #define USE_HARM_SHAPING 1 |
148 | 153 | ||
149 | /* Max LPC order of noise shaping filters */ | 154 | /* Max LPC order of noise shaping filters */ |
150 | #define MAX_SHAPE_LPC_ORDER 16 | 155 | #define MAX_SHAPE_LPC_ORDER 24 |
151 | 156 | ||
152 | #define HARM_SHAPE_FIR_TAPS 3 | 157 | #define HARM_SHAPE_FIR_TAPS 3 |
153 | 158 | ||
@@ -157,8 +162,7 @@ extern "C" | |||
157 | #define LTP_BUF_LENGTH 512 | 162 | #define LTP_BUF_LENGTH 512 |
158 | #define LTP_MASK ( LTP_BUF_LENGTH - 1 ) | 163 | #define LTP_MASK ( LTP_BUF_LENGTH - 1 ) |
159 | 164 | ||
160 | #define DECISION_DELAY 32 | 165 | #define DECISION_DELAY 40 |
161 | #define DECISION_DELAY_MASK ( DECISION_DELAY - 1 ) | ||
162 | 166 | ||
163 | /* Number of subframes for excitation entropy coding */ | 167 | /* Number of subframes for excitation entropy coding */ |
164 | #define SHELL_CODEC_FRAME_LENGTH 16 | 168 | #define SHELL_CODEC_FRAME_LENGTH 16 |
@@ -169,15 +173,11 @@ extern "C" | |||
169 | #define N_RATE_LEVELS 10 | 173 | #define N_RATE_LEVELS 10 |
170 | 174 | ||
171 | /* Maximum sum of pulses per shell coding frame */ | 175 | /* Maximum sum of pulses per shell coding frame */ |
172 | #define MAX_PULSES 16 | 176 | #define SILK_MAX_PULSES 16 |
173 | 177 | ||
174 | #define MAX_MATRIX_SIZE MAX_LPC_ORDER /* Max of LPC Order and LTP order */ | 178 | #define MAX_MATRIX_SIZE MAX_LPC_ORDER /* Max of LPC Order and LTP order */ |
175 | 179 | ||
176 | #if( MAX_LPC_ORDER > DECISION_DELAY ) | ||
177 | # define NSQ_LPC_BUF_LENGTH MAX_LPC_ORDER | 180 | # define NSQ_LPC_BUF_LENGTH MAX_LPC_ORDER |
178 | #else | ||
179 | # define NSQ_LPC_BUF_LENGTH DECISION_DELAY | ||
180 | #endif | ||
181 | 181 | ||
182 | /***************************/ | 182 | /***************************/ |
183 | /* Voice activity detector */ | 183 | /* Voice activity detector */ |
@@ -205,7 +205,6 @@ extern "C" | |||
205 | /******************/ | 205 | /******************/ |
206 | #define NLSF_W_Q 2 | 206 | #define NLSF_W_Q 2 |
207 | #define NLSF_VQ_MAX_VECTORS 32 | 207 | #define NLSF_VQ_MAX_VECTORS 32 |
208 | #define NLSF_VQ_MAX_SURVIVORS 32 | ||
209 | #define NLSF_QUANT_MAX_AMPLITUDE 4 | 208 | #define NLSF_QUANT_MAX_AMPLITUDE 4 |
210 | #define NLSF_QUANT_MAX_AMPLITUDE_EXT 10 | 209 | #define NLSF_QUANT_MAX_AMPLITUDE_EXT 10 |
211 | #define NLSF_QUANT_LEVEL_ADJ 0.1 | 210 | #define NLSF_QUANT_LEVEL_ADJ 0.1 |