diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-03-24 02:18:17 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-03-24 02:18:17 +0000 |
| commit | 29a0dda797b58108d148e7f25371f892f84205d4 (patch) | |
| tree | 93db20ddff9e7822901fbef37f2a352e48426a3f /silk/init_encoder.c | |
| parent | 3ff27560eb001d23e76aaae0f24f80e598fa2c8e (diff) | |
| parent | 36fa2621472ebf5b859fd16bbdb749019c68cc69 (diff) | |
| download | src-29a0dda797b58108d148e7f25371f892f84205d4.tar.gz | |
Merge third_party/opus/src from https://chromium.googlesource.com/chromium/deps/opus.git at 36fa2621472ebf5b859fd16bbdb749019c68cc69
This commit was generated by merge_from_chromium.py.
Change-Id: Iddd0018e3d3bcc14f0ceb6cdb5ddbb570ea92cec
Diffstat (limited to 'silk/init_encoder.c')
| -rw-r--r-- | silk/init_encoder.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/silk/init_encoder.c b/silk/init_encoder.c index 7a4d918..65995c3 100644 --- a/silk/init_encoder.c +++ b/silk/init_encoder.c @@ -34,12 +34,14 @@ POSSIBILITY OF SUCH DAMAGE. #include "main_FLP.h" #endif #include "tuning_parameters.h" +#include "cpu_support.h" /*********************************/ /* Initialize Silk Encoder state */ /*********************************/ opus_int silk_init_encoder( - silk_encoder_state_Fxx *psEnc /* I/O Pointer to Silk FIX encoder state */ + silk_encoder_state_Fxx *psEnc, /* I/O Pointer to Silk FIX encoder state */ + int arch /* I Run-time architecture */ ) { opus_int ret = 0; @@ -47,6 +49,8 @@ opus_int silk_init_encoder( /* Clear the entire encoder state */ silk_memset( psEnc, 0, sizeof( silk_encoder_state_Fxx ) ); + psEnc->sCmn.arch = arch; + psEnc->sCmn.variable_HP_smth1_Q15 = silk_LSHIFT( silk_lin2log( SILK_FIX_CONST( VARIABLE_HP_MIN_CUTOFF_HZ, 16 ) ) - ( 16 << 7 ), 8 ); psEnc->sCmn.variable_HP_smth2_Q15 = psEnc->sCmn.variable_HP_smth1_Q15; |