diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-11-20 22:39:23 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-11-20 22:39:23 +0400 |
| commit | 854e9bd499dcb368c0a25e2b41ae7ebef0498547 (patch) | |
| tree | 604a010487fd59cee075e9d855af59b493a4a159 /silk/VQ_WMat_EC.c | |
| parent | c63fb978be59fd09179abe9d714ee598d888e789 (diff) | |
Using the maximum frequency response of pitch taps instead of maxabs
Diffstat (limited to 'silk/VQ_WMat_EC.c')
| -rw-r--r-- | silk/VQ_WMat_EC.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/silk/VQ_WMat_EC.c b/silk/VQ_WMat_EC.c index 4b53c149..13d5d34e 100644 --- a/silk/VQ_WMat_EC.c +++ b/silk/VQ_WMat_EC.c @@ -39,6 +39,7 @@ void silk_VQ_WMat_EC( const opus_int16 *in_Q14, /* I input vector to be quantized */ const opus_int32 *W_Q18, /* I weighting matrix */ const opus_int8 *cb_Q7, /* I codebook */ + const opus_uint8 *cb_gain_Q7, /* I codebook effective gain */ const opus_uint8 *cl_Q5, /* I code length for each codebook vector */ const opus_int mu_Q9, /* I tradeoff betw. weighted error and rate */ const opus_int32 max_gain_Q7, /* I maximum sum of absolute LTP coefficients */ @@ -54,11 +55,7 @@ void silk_VQ_WMat_EC( *rate_dist_Q14 = silk_int32_MAX; cb_row_Q7 = cb_Q7; for( k = 0; k < L; k++ ) { - gain_tmp_Q7 = silk_abs( cb_row_Q7[ 0 ] ) + - silk_abs( cb_row_Q7[ 1 ] ) + - silk_abs( cb_row_Q7[ 2 ] ) + - silk_abs( cb_row_Q7[ 3 ] ) + - silk_abs( cb_row_Q7[ 4 ] ); + gain_tmp_Q7 = cb_gain_Q7[k]; diff_Q14[ 0 ] = in_Q14[ 0 ] - silk_LSHIFT( cb_row_Q7[ 0 ], 7 ); diff_Q14[ 1 ] = in_Q14[ 1 ] - silk_LSHIFT( cb_row_Q7[ 1 ], 7 ); |