diff options
| author | flim <flim@google.com> | 2016-01-26 14:33:44 +0100 |
|---|---|---|
| committer | flim <flim@google.com> | 2016-03-04 17:40:32 +0100 |
| commit | c91ee5b5642fcc4969150f73d5f6848f88bf1638 (patch) | |
| tree | 900cb39b975dfed729e37e5810fef61fd92d7a70 /silk/shell_coder.c | |
| parent | 1391dbf0ccd121ce7a49d30e2142d36c8d404990 (diff) | |
| download | libopus-c91ee5b5642fcc4969150f73d5f6848f88bf1638.tar.gz | |
Upgrade Opus to v1.1.2android-wear-n-preview-3android-wear-n-preview-1android-n-preview-3
Change-Id: I8211751bab026ab236a612c6e0873f8bdbcd6c98
Diffstat (limited to 'silk/shell_coder.c')
| -rw-r--r-- | silk/shell_coder.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/silk/shell_coder.c b/silk/shell_coder.c index 796f57d6..4af34147 100644 --- a/silk/shell_coder.c +++ b/silk/shell_coder.c @@ -58,8 +58,8 @@ static OPUS_INLINE void encode_split( } static OPUS_INLINE void decode_split( - opus_int *p_child1, /* O pulse amplitude of first child subframe */ - opus_int *p_child2, /* O pulse amplitude of second child subframe */ + opus_int16 *p_child1, /* O pulse amplitude of first child subframe */ + opus_int16 *p_child2, /* O pulse amplitude of second child subframe */ ec_dec *psRangeDec, /* I/O Compressor data structure */ const opus_int p, /* I pulse amplitude of current subframe */ const opus_uint8 *shell_table /* I table of shell cdfs */ @@ -117,12 +117,12 @@ void silk_shell_encoder( /* Shell decoder, operates on one shell code frame of 16 pulses */ void silk_shell_decoder( - opus_int *pulses0, /* O data: nonnegative pulse amplitudes */ + opus_int16 *pulses0, /* O data: nonnegative pulse amplitudes */ ec_dec *psRangeDec, /* I/O Compressor data structure */ const opus_int pulses4 /* I number of pulses per pulse-subframe */ ) { - opus_int pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ]; + opus_int16 pulses3[ 2 ], pulses2[ 4 ], pulses1[ 8 ]; /* this function operates on one shell code frame of 16 pulses */ silk_assert( SHELL_CODEC_FRAME_LENGTH == 16 ); |