From b7b5872c9d6be8daefc79f12c23e6c7fa319deab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20J=C3=A4genstedt?= <philip@foolip.org>
Date: Thu, 11 Oct 2012 11:27:12 +0200
Subject: [PATCH] Fix minor issues reported by scan-build
---
celt/celt.c | 1 -
silk/dec_API.c | 2 ++
silk/enc_API.c | 9 +++------
tests/test_opus_api.c | 2 +-
4 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/celt/celt.c b/celt/celt.c
index f7a2eeee9..4ddba9e1c 100644
--- a/celt/celt.c
+++ b/celt/celt.c
@@ -1187,7 +1187,6 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
pre[0] = _pre;
pre[1] = _pre + (N+COMBFILTER_MAXPERIOD);
- silence = 1;
c=0; do {
int count = 0;
const opus_val16 * OPUS_RESTRICT pcmp = pcm+c;
diff --git a/silk/dec_API.c b/silk/dec_API.c
index 68403b7c0..58b6b2b16 100644
--- a/silk/dec_API.c
+++ b/silk/dec_API.c
@@ -97,6 +97,8 @@ opus_int silk_Decode( /* O Returns error co
opus_int stereo_to_mono;
SAVE_STACK;
+ silk_assert( decControl->nChannelsInternal == 1 || decControl->nChannelsInternal == 2 );
+
/**********************************/
/* Test if first frame in payload */
/**********************************/
diff --git a/silk/enc_API.c b/silk/enc_API.c
index ec7915ce2..325e16ada 100644
--- a/silk/enc_API.c
+++ b/silk/enc_API.c
@@ -191,9 +191,8 @@ opus_int silk_Encode( /* O Returns error co
if( prefillFlag ) {
/* Only accept input length of 10 ms */
if( nBlocksOf10ms != 1 ) {
- ret = SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
silk_assert( 0 );
- return ret;
+ return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
}
/* Reset Encoder */
for( n = 0; n < encControl->nChannelsInternal; n++ ) {
@@ -212,15 +211,13 @@ opus_int silk_Encode( /* O Returns error co
} else {
/* Only accept input lengths that are a multiple of 10 ms */
if( nBlocksOf10ms * encControl->API_sampleRate != 100 * nSamplesIn || nSamplesIn < 0 ) {
- ret = SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
silk_assert( 0 );
- return ret;
+ return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
}
/* Make sure no more than one packet can be produced */
if( 1000 * (opus_int32)nSamplesIn > encControl->payloadSize_ms * encControl->API_sampleRate ) {
- ret = SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
silk_assert( 0 );
- return ret;
+ return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
}
}
diff --git a/tests/test_opus_api.c b/tests/test_opus_api.c
index cae8a7579..187d8c381 100644
--- a/tests/test_opus_api.c
+++ b/tests/test_opus_api.c
@@ -987,7 +987,7 @@ opus_int32 test_parse(void)
}
}
fprintf(stdout," code 3 padding (%2d cases) ............... OK.\n",cfgs);
- cfgs_total+=cfgs;cfgs=0;
+ cfgs_total+=cfgs;
fprintf(stdout," opus_packet_parse ............................ OK.\n");
fprintf(stdout," All packet parsing tests passed\n");
fprintf(stdout," (%d API invocations)\n",cfgs_total);
--
GitLab