diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-05-18 10:50:40 +0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2013-05-18 10:50:40 +0400 |
| commit | 359306985b69086e260bb4cc9b053ba00f3125d1 (patch) | |
| tree | e26b3f5d1c4eb91da7efe3d07b84a8ae7a593fe4 /src/opus_decoder.c | |
| parent | 918acd1564a38c61f3cb2392d3b38f1539f14eda (diff) | |
Change few remaining instances of short to opus_int16
Diffstat (limited to 'src/opus_decoder.c')
| -rw-r--r-- | src/opus_decoder.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/opus_decoder.c b/src/opus_decoder.c index 32b849b6..f0b2b6f9 100644 --- a/src/opus_decoder.c +++ b/src/opus_decoder.c @@ -558,7 +558,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data, } -static int parse_size(const unsigned char *data, opus_int32 len, short *size) +static int parse_size(const unsigned char *data, opus_int32 len, opus_int16 *size) { if (len<1) { @@ -580,7 +580,7 @@ static int parse_size(const unsigned char *data, opus_int32 len, short *size) static int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, int self_delimited, unsigned char *out_toc, - const unsigned char *frames[48], short size[48], int *payload_offset) + const unsigned char *frames[48], opus_int16 size[48], int *payload_offset) { int i, bytes; int count; @@ -615,7 +615,7 @@ static int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, return OPUS_INVALID_PACKET; last_size = len/2; /* If last_size doesn't fit in size[0], we'll catch it later */ - size[0] = (short)last_size; + size[0] = (opus_int16)last_size; } break; /* Two VBR frames */ @@ -676,7 +676,7 @@ static int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, if (last_size*count!=len) return OPUS_INVALID_PACKET; for (i=0;i<count-1;i++) - size[i] = (short)last_size; + size[i] = (opus_int16)last_size; } break; } @@ -704,7 +704,7 @@ static int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, 1275. Reject them here.*/ if (last_size > 1275) return OPUS_INVALID_PACKET; - size[count-1] = (short)last_size; + size[count-1] = (opus_int16)last_size; } if (frames) @@ -727,7 +727,7 @@ static int opus_packet_parse_impl(const unsigned char *data, opus_int32 len, int opus_packet_parse(const unsigned char *data, opus_int32 len, unsigned char *out_toc, const unsigned char *frames[48], - short size[48], int *payload_offset) + opus_int16 size[48], int *payload_offset) { return opus_packet_parse_impl(data, len, 0, out_toc, frames, size, payload_offset); @@ -743,7 +743,7 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data, int tot_offset; int packet_frame_size, packet_bandwidth, packet_mode, packet_stream_channels; /* 48 x 2.5 ms = 120 ms */ - short size[48]; + opus_int16 size[48]; if (decode_fec<0 || decode_fec>1) return OPUS_BAD_ARG; /* For FEC/PLC, frame_size has to be to have a multiple of 2.5 ms */ |