Fixes warnings

This commit is contained in:
Jean-Marc Valin 2011-08-29 16:25:54 -04:00
parent 85b8e62065
commit 9bcfdb0d50
2 changed files with 1 additions and 14 deletions

View file

@ -263,7 +263,6 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
int ret=0; int ret=0;
int nBytes; int nBytes;
ec_enc enc; ec_enc enc;
int silk_internal_bandwidth=-1;
int bytes_target; int bytes_target;
int prefill=0; int prefill=0;
int start_band = 0; int start_band = 0;
@ -557,18 +556,6 @@ int opus_encode_float(OpusEncoder *st, const opus_val16 *pcm, int frame_size,
data[-1] = gen_toc(st->mode, st->Fs/frame_size, st->bandwidth, st->stream_channels); data[-1] = gen_toc(st->mode, st->Fs/frame_size, st->bandwidth, st->stream_channels);
return 1; return 1;
} }
/* Extract SILK internal bandwidth for signaling in first byte */
if( st->mode == MODE_SILK_ONLY ) {
if( st->silk_mode.internalSampleRate == 8000 ) {
silk_internal_bandwidth = OPUS_BANDWIDTH_NARROWBAND;
} else if( st->silk_mode.internalSampleRate == 12000 ) {
silk_internal_bandwidth = OPUS_BANDWIDTH_MEDIUMBAND;
} else if( st->silk_mode.internalSampleRate == 16000 ) {
silk_internal_bandwidth = OPUS_BANDWIDTH_WIDEBAND;
}
} else {
SKP_assert( st->silk_mode.internalSampleRate == 16000 );
}
} }
/* CELT processing */ /* CELT processing */

View file

@ -60,7 +60,7 @@ OpusRepacketizer *opus_repacketizer_init(OpusRepacketizer *rp)
OpusRepacketizer *opus_repacketizer_create(void) OpusRepacketizer *opus_repacketizer_create(void)
{ {
return opus_repacketizer_init(opus_alloc(opus_repacketizer_get_size())); return opus_repacketizer_init((OpusRepacketizer *)opus_alloc(opus_repacketizer_get_size()));
} }
void opus_repacketizer_destroy(OpusRepacketizer *rp) void opus_repacketizer_destroy(OpusRepacketizer *rp)