diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-03-08 21:19:07 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2012-03-08 21:19:35 +0400 |
| commit | 59354a7742ff0fc182886f2f2567026e516c1eef (patch) | |
| tree | 829e4c6f578710c35d46d2df8a52b71d8e1f7950 /src | |
| parent | 8770b0709bd3c06690bb9bfb025da913d1ccd55f (diff) | |
Fixes int vs opus_int32 compile errors on C5x
Diffstat (limited to 'src')
| -rw-r--r-- | src/opus_encoder.c | 8 | ||||
| -rw-r--r-- | src/opus_private.h | 4 | ||||
| -rw-r--r-- | src/repacketizer.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c index c00bc2f8..6ab863de 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -441,7 +441,7 @@ int opus_encode(OpusEncoder *st, const opus_val16 *pcm, int frame_size, unsigned char *data, opus_int32 out_data_bytes) #else #define opus_encode_native opus_encode_float -int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size, +opus_int32 opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size, unsigned char *data, opus_int32 out_data_bytes) #endif { @@ -449,7 +449,7 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size, CELTEncoder *celt_enc; int i; int ret=0; - int nBytes; + opus_int32 nBytes; ec_enc enc; int bytes_target; int prefill=0; @@ -937,7 +937,7 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size, if (prefill) { - int zero=0; + opus_int32 zero=0; #ifdef FIXED_POINT pcm_silk = st->delay_buffer; #else @@ -1272,7 +1272,7 @@ int opus_encode_float(OpusEncoder *st, const float *pcm, int frame_size, #endif #else -int opus_encode(OpusEncoder *st, const opus_int16 *pcm, int frame_size, +opus_int32 opus_encode(OpusEncoder *st, const opus_int16 *pcm, int frame_size, unsigned char *data, opus_int32 max_data_bytes) { int i, ret; diff --git a/src/opus_private.h b/src/opus_private.h index 8e6528d6..9394bd56 100644 --- a/src/opus_private.h +++ b/src/opus_private.h @@ -71,7 +71,7 @@ struct OpusRepacketizer { int encode_size(int size, unsigned char *data); -int opus_decode_native(OpusDecoder *st, const unsigned char *data, int len, +int opus_decode_native(OpusDecoder *st, const unsigned char *data, opus_int32 len, opus_val16 *pcm, int frame_size, int decode_fec, int self_delimited, int *packet_offset); /* Make sure everything's aligned to 4 bytes (this may need to be increased @@ -81,6 +81,6 @@ static inline int align(int i) return (i+3)&-4; } -int opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen, int self_delimited); +opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int end, unsigned char *data, opus_int32 maxlen, int self_delimited); #endif /* OPUS_PRIVATE_H */ diff --git a/src/repacketizer.c b/src/repacketizer.c index dd923a21..36b8b792 100644 --- a/src/repacketizer.c +++ b/src/repacketizer.c @@ -58,7 +58,7 @@ void opus_repacketizer_destroy(OpusRepacketizer *rp) opus_free(rp); } -int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, int len) +int opus_repacketizer_cat(OpusRepacketizer *rp, const unsigned char *data, opus_int32 len) { unsigned char tmp_toc; int curr_nb_frames,ret; |