diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2016-05-03 22:32:38 -0300 |
| commit | dd69aeceac3d1798d0869d8adfb44af883b5fb93 (patch) | |
| tree | 717e9b909ada0661940f6f3d2bd5349c6424bbf1 /drivers/opus/silk/shell_coder.c | |
| parent | 567cb691ec49844101247bb9dc34bc2722f6af4f (diff) | |
| parent | b81d9e6d614a67fd58e2256e90055589205bfa30 (diff) | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'drivers/opus/silk/shell_coder.c')
| -rw-r--r-- | drivers/opus/silk/shell_coder.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/opus/silk/shell_coder.c b/drivers/opus/silk/shell_coder.c index cd18ed638b..67a5446927 100644 --- a/drivers/opus/silk/shell_coder.c +++ b/drivers/opus/silk/shell_coder.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" /* shell coder; pulse-subframe length is hardcoded */ @@ -58,8 +55,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 +114,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 ); |