summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Marc Valin <jean-marc.valin@octasic.com>2011-03-11 17:49:10 -0500
committerJean-Marc Valin <jean-marc.valin@octasic.com>2011-03-11 17:49:10 -0500
commit8ea67049c2e0e4dd7a9bd083b1ba874b37099b3d (patch)
tree43fb7b80761f245eeaeae418818dc502870c9587
parent5012e4f36dd89a986ef63078cea615e509b496d7 (diff)
downloadopus-8ea67049c2e0e4dd7a9bd083b1ba874b37099b3d.tar.gz
Disable newly introduced CELT signalling
m---------celt10
-rw-r--r--src/opus_decoder.c2
-rw-r--r--src/opus_encoder.c2
3 files changed, 9 insertions, 5 deletions
diff --git a/celt b/celt
-Subproject 3e7f22d45b285186e28b3bde54db0ce9126ca07
+Subproject dd2973dd6c440c3e48d18e9b010bbb2e916f528
diff --git a/src/opus_decoder.c b/src/opus_decoder.c
index a69cb8ed..27ff1ff0 100644
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
+#include "celt.h"
#include "opus_decoder.h"
#include "entdec.h"
#include "modes.h"
@@ -66,6 +67,7 @@ OpusDecoder *opus_decoder_create(int Fs, int channels)
/* Initialize CELT decoder */
st->celt_dec = celt_decoder_init(st->celt_dec, Fs, channels, NULL);
+ celt_decoder_ctl(st->celt_dec, CELT_SET_SIGNALLING(0));
st->prev_mode = 0;
return st;
diff --git a/src/opus_encoder.c b/src/opus_encoder.c
index aa4a8f52..ae36b857 100644
--- a/src/opus_encoder.c
+++ b/src/opus_encoder.c
@@ -32,6 +32,7 @@
#include <stdlib.h>
#include <stdio.h>
#include <stdarg.h>
+#include "celt.h"
#include "opus_encoder.h"
#include "entenc.h"
#include "modes.h"
@@ -76,6 +77,7 @@ OpusEncoder *opus_encoder_create(int Fs, int channels)
/* Create CELT encoder */
/* Initialize CELT encoder */
st->celt_enc = celt_encoder_init(st->celt_enc, Fs, channels, &err);
+ celt_encoder_ctl(st->celt_enc, CELT_SET_SIGNALLING(0));
st->mode = MODE_HYBRID;
st->bandwidth = BANDWIDTH_FULLBAND;