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/float/main_FLP.h | |
| 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/float/main_FLP.h')
| -rw-r--r-- | silk/float/main_FLP.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/silk/float/main_FLP.h b/silk/float/main_FLP.h index dbd34ae..fb553b6 100644 --- a/silk/float/main_FLP.h +++ b/silk/float/main_FLP.h @@ -71,7 +71,8 @@ opus_int silk_encode_frame_FLP( /* Initializes the Silk encoder state */ opus_int silk_init_encoder( - silk_encoder_state_FLP *psEnc /* I/O Encoder state FLP */ + silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ + int arch /* I Run-tim architecture */ ); /* Control the Silk encoder */ @@ -129,7 +130,8 @@ void silk_find_pitch_lags_FLP( silk_encoder_state_FLP *psEnc, /* I/O Encoder state FLP */ silk_encoder_control_FLP *psEncCtrl, /* I/O Encoder control FLP */ silk_float res[], /* O Residual */ - const silk_float x[] /* I Speech signal */ + const silk_float x[], /* I Speech signal */ + int arch /* I Run-time architecture */ ); /* Find LPC and LTP coefficients */ @@ -199,6 +201,7 @@ void silk_quant_LTP_gains_FLP( silk_float B[ MAX_NB_SUBFR * LTP_ORDER ], /* I/O (Un-)quantized LTP gains */ opus_int8 cbk_index[ MAX_NB_SUBFR ], /* O Codebook index */ opus_int8 *periodicity_index, /* O Periodicity index */ + opus_int32 *sum_log_gain_Q7, /* I/O Cumulative max prediction gain */ const silk_float W[ MAX_NB_SUBFR * LTP_ORDER * LTP_ORDER ], /* I Error weights */ const opus_int mu_Q10, /* I Mu value (R/D tradeoff) */ const opus_int lowComplexity, /* I Flag for low complexity */ |