diff options
| author | Felicia Lim <flim@google.com> | 2018-11-06 12:35:39 -0800 |
|---|---|---|
| committer | Ray Essick <essick@google.com> | 2018-11-14 21:29:18 +0000 |
| commit | 0efcc2be1f988603f8239310e88da2a9623347c8 (patch) | |
| tree | 13c7c0f8e05918858ebaa13510d80f8369884b57 /silk/process_NLSFs.c | |
| parent | cf168b63a5c4766bcb663d9ddb16dadbc080e103 (diff) | |
| download | libopus-0efcc2be1f988603f8239310e88da2a9623347c8.tar.gz | |
Upgrade Opus to v1.3android-wear-8.0.0_r2android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r40.1Jandroid-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r39android-o-mr1-iot-release-smart-display-r30android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-cube_r2android-o-mr1-iot-release-cube-fsiandroid-o-mr1-iot-release-cube-fcsandroid-n-iot-release-ihome-igv1nougat-iot-release
Bug: 63932386
Test: - verified builds for arm*/x86*
- checked functionality using an emulator and stagefright
Change-Id: I10c4b267be1c846d8992e3c5f6d2576c2cb258a9
Signed-off-by: Felicia Lim <flim@google.com>
Diffstat (limited to 'silk/process_NLSFs.c')
| -rw-r--r-- | silk/process_NLSFs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/silk/process_NLSFs.c b/silk/process_NLSFs.c index 2f10f8df..d1308095 100644 --- a/silk/process_NLSFs.c +++ b/silk/process_NLSFs.c @@ -48,7 +48,7 @@ void silk_process_NLSFs( silk_assert( psEncC->speech_activity_Q8 >= 0 ); silk_assert( psEncC->speech_activity_Q8 <= SILK_FIX_CONST( 1.0, 8 ) ); - silk_assert( psEncC->useInterpolatedNLSFs == 1 || psEncC->indices.NLSFInterpCoef_Q2 == ( 1 << 2 ) ); + celt_assert( psEncC->useInterpolatedNLSFs == 1 || psEncC->indices.NLSFInterpCoef_Q2 == ( 1 << 2 ) ); /***********************/ /* Calculate mu values */ @@ -60,7 +60,7 @@ void silk_process_NLSFs( NLSF_mu_Q20 = silk_ADD_RSHIFT( NLSF_mu_Q20, NLSF_mu_Q20, 1 ); } - silk_assert( NLSF_mu_Q20 > 0 ); + celt_assert( NLSF_mu_Q20 > 0 ); silk_assert( NLSF_mu_Q20 <= SILK_FIX_CONST( 0.005, 20 ) ); /* Calculate NLSF weights */ @@ -101,7 +101,7 @@ void silk_process_NLSFs( } else { /* Copy LPC coefficients for first half from second half */ - silk_assert( psEncC->predictLPCOrder <= MAX_LPC_ORDER ); + celt_assert( psEncC->predictLPCOrder <= MAX_LPC_ORDER ); silk_memcpy( PredCoef_Q12[ 0 ], PredCoef_Q12[ 1 ], psEncC->predictLPCOrder * sizeof( opus_int16 ) ); } } |