summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jean-marc.valin@octasic.com>2011-02-28 16:29:02 -0500
committerJean-Marc Valin <jean-marc.valin@octasic.com>2011-02-28 16:29:02 -0500
commitd3dc19ba3dbcfa6fb8438a106917f01d758dd339 (patch)
tree958602b76abc616275ccacab8ba60522d542766b
parent3acddca243060b9340f5cd0a9f602474ac4fb178 (diff)
downloadopus-d3dc19ba3dbcfa6fb8438a106917f01d758dd339.tar.gz
SILK/CELT update
m---------celt10
m---------silk20
-rw-r--r--src/opus_encoder.c4
3 files changed, 17 insertions, 17 deletions
diff --git a/celt b/celt
-Subproject e3d39fec7c44d1841e817d3b1986bfdc4d0863a
+Subproject c79c4e3bc7270b08a2800a2dd9d9a5f02767024
diff --git a/silk b/silk
-Subproject 8930d2fa66a775040b264d9d2c5950fd403bb26
+Subproject 1bf4f9715a93209f681664f2c46cb5a25ee7aaf
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index 257eca6f..2334aa2b 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -155,9 +155,9 @@ int opus_encode(OpusEncoder *st, const short *pcm, int frame_size,
/* Call SILK encoder for the low band */
nBytes = max_data_bytes-1;
if (prefill)
- SKP_Silk_SDK_Encoder_prefill_buffer(st->silk_enc, &st->silk_mode, st->delay_buffer, ENCODER_BUFFER);
+ SKP_Silk_SDK_Encode( st->silk_enc, &st->silk_mode, st->delay_buffer, ENCODER_BUFFER, NULL, 0, 1 );
- ret = SKP_Silk_SDK_Encode( st->silk_enc, &st->silk_mode, pcm, frame_size, &enc, &nBytes );
+ ret = SKP_Silk_SDK_Encode( st->silk_enc, &st->silk_mode, pcm, frame_size, &enc, &nBytes, 0 );
if( ret ) {
fprintf (stderr, "SILK encode error: %d\n", ret);
/* Handle error */