diff options
| author | Koen Vos <koen.vos@skype.net> | 2011-10-29 03:44:26 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2011-10-29 03:44:26 +0400 |
| commit | acc7a6c78b266e3ef0e1f91ee405af92a0989dec (patch) | |
| tree | d3e32cc66cf96fecdaffc924ff0d051028b72f31 /silk/decode_frame.c | |
| parent | 2d4f61409186c7efa831387bf14e2164607a805a (diff) | |
Reformatting changes with an update to the MSVC project files
Diffstat (limited to 'silk/decode_frame.c')
| -rw-r--r-- | silk/decode_frame.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/silk/decode_frame.c b/silk/decode_frame.c index 83c92210..91adc384 100644 --- a/silk/decode_frame.c +++ b/silk/decode_frame.c @@ -36,20 +36,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. /* Decode frame */ /****************/ opus_int silk_decode_frame( - silk_decoder_state *psDec, /* I/O Pointer to Silk decoder state */ - ec_dec *psRangeDec, /* I/O Compressor data structure */ - opus_int16 pOut[], /* O Pointer to output speech frame */ - opus_int32 *pN, /* O Pointer to size of output frame */ - opus_int lostFlag, /* I 0: no loss, 1 loss, 2 decode fec */ - opus_int condCoding /* I The type of conditional coding to use */ + silk_decoder_state *psDec, /* I/O Pointer to Silk decoder state */ + ec_dec *psRangeDec, /* I/O Compressor data structure */ + opus_int16 pOut[], /* O Pointer to output speech frame */ + opus_int32 *pN, /* O Pointer to size of output frame */ + opus_int lostFlag, /* I 0: no loss, 1 loss, 2 decode fec */ + opus_int condCoding /* I The type of conditional coding to use */ ) { silk_decoder_control sDecCtrl; opus_int L, mv_len, ret = 0; opus_int pulses[ MAX_FRAME_LENGTH ]; -TIC(DECODE_FRAME) - L = psDec->frame_length; sDecCtrl.LTP_scale_Q14 = 0; @@ -62,24 +60,18 @@ TIC(DECODE_FRAME) /*********************************************/ /* Decode quantization indices of side info */ /*********************************************/ -TIC(decode_indices) silk_decode_indices( psDec, psRangeDec, psDec->nFramesDecoded, lostFlag, condCoding ); -TOC(decode_indices) /*********************************************/ /* Decode quantization indices of excitation */ /*********************************************/ -TIC(decode_pulses) silk_decode_pulses( psRangeDec, pulses, psDec->indices.signalType, psDec->indices.quantOffsetType, psDec->frame_length ); -TOC(decode_pulses) /********************************************/ /* Decode parameters and pulse signal */ /********************************************/ -TIC(decode_params) silk_decode_parameters( psDec, &sDecCtrl, condCoding ); -TOC(decode_params) /* Update length. Sampling frequency may have changed */ L = psDec->frame_length; @@ -87,9 +79,7 @@ TOC(decode_params) /********************************************************/ /* Run inverse NSQ */ /********************************************************/ -TIC(decode_core) silk_decode_core( psDec, &sDecCtrl, pOut, pulses ); -TOC(decode_core) /********************************************************/ /* Update PLC state */ @@ -131,7 +121,5 @@ TOC(decode_core) /* Set output frame length */ *pN = L; -TOC(DECODE_FRAME) - return ret; } |