Removes opus_encoder.h and opus_decoder.h

Moves opaque structs directly to .c files
This commit is contained in:
Jean-Marc Valin 2011-08-19 13:00:49 -04:00
parent 7954065c77
commit d9920f34e9
5 changed files with 59 additions and 129 deletions

View file

@ -34,7 +34,7 @@
#include <stdio.h>
#include <stdarg.h>
#include "celt.h"
#include "opus_decoder.h"
#include "opus.h"
#include "entdec.h"
#include "modes.h"
#include "silk_API.h"
@ -47,6 +47,29 @@
#define celt_decode_native celt_decode_float
#endif
struct OpusDecoder {
int celt_dec_offset;
int silk_dec_offset;
int 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 rangeFinal;
};
#ifdef FIXED_POINT
static inline opus_int16 SAT16(opus_int32 x) {
return x > 32767 ? 32767 : x < -32768 ? -32768 : (opus_int16)x;
};
#endif
/* Make sure everything's aligned to 4 bytes (this may need to be increased
on really weird architectures) */
static inline int align(int i)
@ -161,6 +184,7 @@ static int opus_decode_frame(OpusDecoder *st, const unsigned char *data,
opus_int32 silk_frame_size;
VARDECL(opus_int16, pcm_silk);
VARDECL(opus_val16, pcm_transition);
VARDECL(opus_val16, redundant_audio);
int audiosize;
int mode;