eden-emu/opus
17
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adds explicit valgrind checks when ENABLE_VALGRIND is defined

Browse source
This commit is contained in:
Jean-Marc Valin 2012-12-05 00:50:53 -05:00
parent d0fd9d4baa
commit 9283114fa1
2 changed files with 41 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

22
celt/stack_alloc.h
View file

@ -146,4 +146,26 @@ extern char *global_stack_top;
#endif /* VAR_ARRAYS */ #endif /* VAR_ARRAYS */
#ifdef ENABLE_VALGRIND
#include <valgrind/memcheck.h>
#define OPUS_CHECK_ARRAY(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
#define OPUS_CHECK_VALUE(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
#define OPUS_CHECK_ARRAY_COND(ptr, len) VALGRIND_CHECK_MEM_IS_DEFINED(ptr, len*sizeof(*ptr))
#define OPUS_CHECK_VALUE_COND(value) VALGRIND_CHECK_VALUE_IS_DEFINED(value)
#define OPUS_PRINT_INT(value) do {fprintf(stderr, #value " = %d at %s:%d\n", value, __FILE__, __LINE__);}while(0)
#define OPUS_FPRINTF fprintf
#else
static inline int _opus_false(void) {return 0;}
#define OPUS_CHECK_ARRAY(ptr, len) _opus_false()
#define OPUS_CHECK_VALUE(value) _opus_false()
#define OPUS_PRINT_INT(value) do{}while(0)
#define OPUS_FPRINTF (void)
#endif
#endif /* STACK_ALLOC_H */ #endif /* STACK_ALLOC_H */

24
src/opus_decoder.c
View file

@ -543,6 +543,13 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
st->prev_mode = mode; st->prev_mode = mode;
st->prev_redundancy = redundancy && !celt_to_silk; st->prev_redundancy = redundancy && !celt_to_silk;
if (celt_ret>=0)
{
if (OPUS_CHECK_ARRAY(pcm, audiosize*st->channels))
OPUS_PRINT_INT(audiosize);
}
RESTORE_STACK; RESTORE_STACK;
return celt_ret < 0 ? celt_ret : audiosize; return celt_ret < 0 ? celt_ret : audiosize;
@ -744,12 +751,14 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
int pcm_count=0; int pcm_count=0;
do { do {
int ret; int ret;
ret = opus_decode_frame(st, NULL, 0, pcm, frame_size-pcm_count, 0); ret = opus_decode_frame(st, NULL, 0, pcm+pcm_count*st->channels, frame_size-pcm_count, 0);
if (ret<0) if (ret<0)
return ret; return ret;
pcm += st->channels*ret;
pcm_count += ret; pcm_count += ret;
} while (pcm_count < frame_size); } while (pcm_count < frame_size);
celt_assert(pcm_count == frame_size);
if (OPUS_CHECK_ARRAY(pcm, pcm_count*st->channels))
OPUS_PRINT_INT(pcm_count);
return pcm_count; return pcm_count;
} else if (len<0) } else if (len<0)
return OPUS_BAD_ARG; return OPUS_BAD_ARG;
@ -782,8 +791,11 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
packet_frame_size, 1); packet_frame_size, 1);
if (ret<0) if (ret<0)
return ret; return ret;
else else {
if (OPUS_CHECK_ARRAY(pcm, frame_size*st->channels))
OPUS_PRINT_INT(frame_size);
return frame_size; return frame_size;
}
} }
tot_offset = 0; tot_offset = 0;
if (count < 0) if (count < 0)
@ -804,17 +816,19 @@ int opus_decode_native(OpusDecoder *st, const unsigned char *data,
for (i=0;i<count;i++) for (i=0;i<count;i++)
{ {
int ret; int ret;
ret = opus_decode_frame(st, data, size[i], pcm, frame_size-nb_samples, decode_fec); ret = opus_decode_frame(st, data, size[i], pcm+nb_samples*st->channels, frame_size-nb_samples, 0);
if (ret<0) if (ret<0)
return ret; return ret;
celt_assert(ret==packet_frame_size);
data += size[i]; data += size[i];
tot_offset += size[i]; tot_offset += size[i];
pcm += ret*st->channels;
nb_samples += ret; nb_samples += ret;
} }
if (packet_offset != NULL) if (packet_offset != NULL)
*packet_offset = tot_offset; *packet_offset = tot_offset;
st->last_packet_duration = nb_samples; st->last_packet_duration = nb_samples;
if (OPUS_CHECK_ARRAY(pcm, nb_samples*st->channels))
OPUS_PRINT_INT(nb_samples);
return nb_samples; return nb_samples;
} }