diff options
author | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2011-02-03 13:40:30 -0500 |
---|---|---|
committer | Jean-Marc Valin <jean-marc.valin@usherbrooke.ca> | 2011-02-03 13:40:30 -0500 |
commit | fb45a3fac2198c2e6c57f6d8daedf1c2c5004184 (patch) | |
tree | bd05327b953ef4bbcbd7346212cde600c1096dc8 | |
parent | f54b69b7e811753a2df49c3035487da64f1fd9f1 (diff) | |
download | opus-fb45a3fac2198c2e6c57f6d8daedf1c2c5004184.tar.gz |
Build fixes
m--------- | celt | 10 | ||||
-rw-r--r-- | configure.ac | 3 | ||||
m--------- | silk | 10 | ||||
-rw-r--r-- | src/test_opus.c | 6 |
4 files changed, 14 insertions, 15 deletions
diff --git a/celt b/celt -Subproject ec6588ae149f82a182c73501abaf268e0b9a190 +Subproject d539c6b9c59d243f81a47d78b9497ea455bdea0 diff --git a/configure.ac b/configure.ac index c8e28305..844451d5 100644 --- a/configure.ac +++ b/configure.ac @@ -19,9 +19,6 @@ AC_C_INLINE AC_C_RESTRICT AC_TYPE_SIZE_T -# Checks for library functions. -AC_FUNC_MALLOC - export OPUS_BUILD=true AC_CONFIG_SUBDIRS([celt]) AC_CONFIG_SUBDIRS([silk]) diff --git a/silk b/silk -Subproject a81e6dc2bc337c25156e6e908e45cbf7a5e0f10 +Subproject 111b23f648a45d3a034050e579a531d0592dc72 diff --git a/src/test_opus.c b/src/test_opus.c index 17d66aaa..0ce6ec5f 100644 --- a/src/test_opus.c +++ b/src/test_opus.c @@ -242,6 +242,7 @@ int main(int argc, char *argv[]) while (!stop) { int write_samples; + int lost; err = fread(in, sizeof(short), frame_size*channels, fin); tot_read += err; if (err < frame_size*channels) @@ -257,7 +258,8 @@ int main(int argc, char *argv[]) return 1; } - opus_decode(dec, rand()%100<packet_loss_perc ? NULL : data, len, out, frame_size); + lost = rand()%100<packet_loss_perc; + opus_decode(dec, lost ? NULL : data, len, out, frame_size); count++; tot_written += (frame_size-skip)*channels; write_samples = frame_size; @@ -271,7 +273,7 @@ int main(int argc, char *argv[]) #if OPUS_TEST_RANGE_CODER_STATE /* compare final range encoder rng values of encoder and decoder */ - if( opus_decoder_get_final_range( dec ) != opus_encoder_get_final_range( enc ) ) { + if( !lost && opus_decoder_get_final_range( dec ) != opus_encoder_get_final_range( enc ) ) { fprintf (stderr, "Error: Range coder state mismatch between encoder and decoder.\n"); return 0; } |