diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2016-05-03 19:14:24 +0200 |
|---|---|---|
| committer | Rémi Verschelde <remi@verschelde.fr> | 2016-05-03 19:14:24 +0200 |
| commit | c90bc695447b5d74227ed7c0d0bc19b7141dc835 (patch) | |
| tree | 808af09d82e51698b9b7ba18795ba3a210a1d8f0 /drivers/opus/silk/code_signs.c | |
| parent | 4e23ba5f37e21021c47e3aecf544afc9485e311b (diff) | |
| parent | 7c59d819a7ebb936d51ca032e66a2489e4080d08 (diff) | |
Merge pull request #4532 from vnen/pr-update-opus-1.1.2
Update Opus driver to 1.1.2
Diffstat (limited to 'drivers/opus/silk/code_signs.c')
| -rw-r--r-- | drivers/opus/silk/code_signs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/opus/silk/code_signs.c b/drivers/opus/silk/code_signs.c index e2f671d7ca..79c1893514 100644 --- a/drivers/opus/silk/code_signs.c +++ b/drivers/opus/silk/code_signs.c @@ -24,12 +24,9 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ***********************************************************************/ - -#ifdef OPUS_ENABLED #include "opus/opus_config.h" -#endif -#include "opus/silk/silk_main.h" +#include "opus/silk/main.h" /*#define silk_enc_map(a) ((a) > 0 ? 1 : 0)*/ /*#define silk_dec_map(a) ((a) > 0 ? 1 : -1)*/ @@ -74,7 +71,7 @@ void silk_encode_signs( /* Decodes signs of excitation */ void silk_decode_signs( ec_dec *psRangeDec, /* I/O Compressor data structure */ - opus_int pulses[], /* I/O pulse signal */ + opus_int16 pulses[], /* I/O pulse signal */ opus_int length, /* I length of input */ const opus_int signalType, /* I Signal type */ const opus_int quantOffsetType, /* I Quantization offset type */ @@ -83,7 +80,7 @@ void silk_decode_signs( { opus_int i, j, p; opus_uint8 icdf[ 2 ]; - opus_int *q_ptr; + opus_int16 *q_ptr; const opus_uint8 *icdf_ptr; icdf[ 1 ] = 0; |