ref: 04465630101689dce30193ecc0476490a20116e5
parent: ec8008b086d39901c469386c0506c61ffd8a9ae4
author: Jean-Marc Valin <[email protected]>
date: Tue Aug 30 14:01:06 EDT 2011
Implements OPUS_RESET_STATE for the decoder (untested)
--- a/src/opus.h
+++ b/src/opus.h
@@ -157,6 +157,8 @@
#define OPUS_GET_LOOKAHEAD_REQUEST 27
#define OPUS_GET_LOOKAHEAD(x) OPUS_GET_LOOKAHEAD_REQUEST, __opus_check_int_ptr(x)
+#define OPUS_RESET_STATE 28
+
/* For testing purposes: the encoder and decoder state should
always be identical after coding a payload */
#define OPUS_GET_FINAL_RANGE_REQUEST 29
--- a/src/opus_decoder.c
+++ b/src/opus_decoder.c
@@ -50,17 +50,19 @@
int celt_dec_offset;
int silk_dec_offset;
int channels;
+ int Fs; /** Sampling rate (at the API level) */
+
+ /* Everything beyond this point gets cleared on a reset */
+#define OPUS_DECODER_RESET_START stream_channels
int stream_channels;
- int bandwidth;
- /* Sampling rate (at the API level) */
- int Fs;
- int mode;
- int prev_mode;
- int frame_size;
- int prev_redundancy;
+ int bandwidth;
+ int mode;
+ int prev_mode;
+ int frame_size;
+ int prev_redundancy;
- int rangeFinal;
+ int rangeFinal;
};
#ifdef FIXED_POINT
@@ -216,7 +218,6 @@
{data = NULL;
/* In that case, don't conceal more than what the ToC says */
- /* FIXME: What if st->frame_size has never been set? */
frame_size = IMIN(frame_size, st->frame_size);
}
if (data != NULL)
@@ -757,6 +758,24 @@
{opus_uint32 *value = va_arg(ap, opus_uint32*);
*value = st->rangeFinal;
+ }
+ break;
+ case OPUS_RESET_STATE:
+ {+ void *silk_dec;
+ CELTDecoder *celt_dec;
+
+ silk_dec = (char*)st+st->silk_dec_offset;
+ celt_dec = (CELTDecoder*)((char*)st+st->celt_dec_offset);
+
+ OPUS_CLEAR((char*)&st->OPUS_DECODER_RESET_START,
+ opus_decoder_get_size(st->channels)-
+ ((char*)&st->OPUS_DECODER_RESET_START - (char*)st));
+
+ celt_decoder_ctl(celt_dec, CELT_RESET_STATE);
+ silk_InitDecoder( silk_dec );
+ st->stream_channels = st->channels;
+ st->frame_size = st->Fs/400;
}
break;
default: