diff options
| author | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-03-26 13:48:39 -0400 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2018-03-27 15:13:28 -0400 |
| commit | f0cea0d23767cd1dab1dd902622aeb7efa53b669 (patch) | |
| tree | 895d90e2e38cf374876fdfd45de4cd837bfb466b /src | |
| parent | 2b249dda9a184188dc713043bdc9a367e9d1c034 (diff) | |
| download | opus-f0cea0d23767cd1dab1dd902622aeb7efa53b669.tar.gz | |
Misc assertion cleanup
Diffstat (limited to 'src')
| -rw-r--r-- | src/opus_encoder.c | 4 | ||||
| -rw-r--r-- | src/repacketizer.c | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/opus_encoder.c b/src/opus_encoder.c index 80e2e706..35a6eaa7 100644 --- a/src/opus_encoder.c +++ b/src/opus_encoder.c @@ -1737,7 +1737,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ } else if (curr_bandwidth == OPUS_BANDWIDTH_MEDIUMBAND) { st->silk_mode.desiredInternalSampleRate = 12000; } else { - silk_assert( st->mode == MODE_HYBRID || curr_bandwidth == OPUS_BANDWIDTH_WIDEBAND ); + celt_assert( st->mode == MODE_HYBRID || curr_bandwidth == OPUS_BANDWIDTH_WIDEBAND ); st->silk_mode.desiredInternalSampleRate = 16000; } if( st->mode == MODE_HYBRID ) { @@ -1843,7 +1843,7 @@ opus_int32 opus_encode_native(OpusEncoder *st, const opus_val16 *pcm, int frame_ curr_bandwidth = OPUS_BANDWIDTH_WIDEBAND; } } else { - silk_assert( st->silk_mode.internalSampleRate == 16000 ); + celt_assert( st->silk_mode.internalSampleRate == 16000 ); } st->silk_mode.opusCanSwitch = st->silk_mode.switchReady && !st->nonfinal_frame; diff --git a/src/repacketizer.c b/src/repacketizer.c index c80ee7f0..bda44a14 100644 --- a/src/repacketizer.c +++ b/src/repacketizer.c @@ -213,7 +213,8 @@ opus_int32 opus_repacketizer_out_range_impl(OpusRepacketizer *rp, int begin, int { /* Using OPUS_MOVE() instead of OPUS_COPY() in case we're doing in-place padding from opus_packet_pad or opus_packet_unpad(). */ - celt_assert(frames[i] + len[i] <= data || ptr <= frames[i]); + /* assert disabled because it's not valid in C. */ + /* celt_assert(frames[i] + len[i] <= data || ptr <= frames[i]); */ OPUS_MOVE(ptr, frames[i], len[i]); ptr += len[i]; } |