diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-11-18 10:11:49 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-18 10:11:49 +0100 |
| commit | 84761ca106df2ae9d06116cc5237524438ebad76 (patch) | |
| tree | 16402c6d5edd0f5fc754d49d5b7aff573fbd69de /thirdparty/opus/silk/decoder_set_fs.c | |
| parent | 5c13db0150168c14d81bd320540d2d541be72dcb (diff) | |
| parent | 46ae64cd60166ead412bacc1bf03e9c8f8965e2c (diff) | |
Merge pull request #33698 from akien-mga/revert-opus-1.3.1-pr33311
Revert "Update opus to 1.3.1 and opusfile to 0.11"
Diffstat (limited to 'thirdparty/opus/silk/decoder_set_fs.c')
| -rw-r--r-- | thirdparty/opus/silk/decoder_set_fs.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/thirdparty/opus/silk/decoder_set_fs.c b/thirdparty/opus/silk/decoder_set_fs.c index d9a13d0f0c..eef0fd25e1 100644 --- a/thirdparty/opus/silk/decoder_set_fs.c +++ b/thirdparty/opus/silk/decoder_set_fs.c @@ -40,8 +40,8 @@ opus_int silk_decoder_set_fs( { opus_int frame_length, ret = 0; - celt_assert( fs_kHz == 8 || fs_kHz == 12 || fs_kHz == 16 ); - celt_assert( psDec->nb_subfr == MAX_NB_SUBFR || psDec->nb_subfr == MAX_NB_SUBFR/2 ); + silk_assert( fs_kHz == 8 || fs_kHz == 12 || fs_kHz == 16 ); + silk_assert( psDec->nb_subfr == MAX_NB_SUBFR || psDec->nb_subfr == MAX_NB_SUBFR/2 ); /* New (sub)frame length */ psDec->subfr_length = silk_SMULBB( SUB_FRAME_LENGTH_MS, fs_kHz ); @@ -86,7 +86,7 @@ opus_int silk_decoder_set_fs( psDec->pitch_lag_low_bits_iCDF = silk_uniform4_iCDF; } else { /* unsupported sampling rate */ - celt_assert( 0 ); + silk_assert( 0 ); } psDec->first_frame_after_reset = 1; psDec->lagPrev = 100; @@ -101,7 +101,7 @@ opus_int silk_decoder_set_fs( } /* Check that settings are valid */ - celt_assert( psDec->frame_length > 0 && psDec->frame_length <= MAX_FRAME_LENGTH ); + silk_assert( psDec->frame_length > 0 && psDec->frame_length <= MAX_FRAME_LENGTH ); return ret; } |