eden-emu/opus
14
0
Fork 0
mirror of https://github.com/xiph/opus.git synced 2025-05-16 00:18:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix minor issues reported by scan-build

Browse source
This commit is contained in:
Philip Jägenstedt 2012-10-11 11:27:12 +02:00 • committed by Gregory Maxwell
parent 96480adaff
commit b7b5872c9d
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
celt/celt.c
View file

@ -1187,7 +1187,6 @@ int celt_encode_with_ec(CELTEncoder * OPUS_RESTRICT st, const opus_val16 * pcm,
pre[0] = _pre; pre[0] = _pre;
pre[1] = _pre + (N+COMBFILTER_MAXPERIOD); pre[1] = _pre + (N+COMBFILTER_MAXPERIOD);
silence = 1;
c=0; do { c=0; do {
int count = 0; int count = 0;
const opus_val16 * OPUS_RESTRICT pcmp = pcm+c; const opus_val16 * OPUS_RESTRICT pcmp = pcm+c;

2
silk/dec_API.c
View file

@ -97,6 +97,8 @@ opus_int silk_Decode( /* O Returns error co
opus_int stereo_to_mono; opus_int stereo_to_mono;
SAVE_STACK; SAVE_STACK;
silk_assert( decControl->nChannelsInternal == 1 || decControl->nChannelsInternal == 2 );
/**********************************/ /**********************************/
/* Test if first frame in payload */ /* Test if first frame in payload */
/**********************************/ /**********************************/

9
silk/enc_API.c
View file

@ -191,9 +191,8 @@ opus_int silk_Encode( /* O Returns error co
if( prefillFlag ) { if( prefillFlag ) {
/* Only accept input length of 10 ms */ /* Only accept input length of 10 ms */
if( nBlocksOf10ms != 1 ) { if( nBlocksOf10ms != 1 ) {
ret = SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
silk_assert( 0 ); silk_assert( 0 );
return ret; return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
} }
/* Reset Encoder */ /* Reset Encoder */
for( n = 0; n < encControl->nChannelsInternal; n++ ) { for( n = 0; n < encControl->nChannelsInternal; n++ ) {
@ -212,15 +211,13 @@ opus_int silk_Encode( /* O Returns error co
} else { } else {
/* Only accept input lengths that are a multiple of 10 ms */ /* Only accept input lengths that are a multiple of 10 ms */
if( nBlocksOf10ms * encControl->API_sampleRate != 100 * nSamplesIn || nSamplesIn < 0 ) { if( nBlocksOf10ms * encControl->API_sampleRate != 100 * nSamplesIn || nSamplesIn < 0 ) {
ret = SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
silk_assert( 0 ); silk_assert( 0 );
return ret; return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
} }
/* Make sure no more than one packet can be produced */ /* Make sure no more than one packet can be produced */
if( 1000 * (opus_int32)nSamplesIn > encControl->payloadSize_ms * encControl->API_sampleRate ) { if( 1000 * (opus_int32)nSamplesIn > encControl->payloadSize_ms * encControl->API_sampleRate ) {
ret = SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
silk_assert( 0 ); silk_assert( 0 );
return ret; return SILK_ENC_INPUT_INVALID_NO_OF_SAMPLES;
} }
} }

2
tests/test_opus_api.c
View file

@ -987,7 +987,7 @@ opus_int32 test_parse(void)
} }
} }
fprintf(stdout," code 3 padding (%2d cases) ............... OK.\n",cfgs); 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," opus_packet_parse ............................ OK.\n");
fprintf(stdout," All packet parsing tests passed\n"); fprintf(stdout," All packet parsing tests passed\n");
fprintf(stdout," (%d API invocations)\n",cfgs_total); fprintf(stdout," (%d API invocations)\n",cfgs_total);