*/
#include "nellymoser.h"
-#include "libavutil/random.h"
+#include "libavutil/lfg.h"
+#include "libavutil/random_seed.h"
#include "avcodec.h"
#include "dsputil.h"
#define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx;
- DECLARE_ALIGNED_16(float,float_buf[NELLY_SAMPLES]);
+ DECLARE_ALIGNED_16(float,float_buf)[NELLY_SAMPLES];
float state[128];
- AVRandomState random_state;
+ AVLFG random_state;
GetBitContext gb;
int add_bias;
float scale_bias;
DSPContext dsp;
- MDCTContext imdct_ctx;
- DECLARE_ALIGNED_16(float,imdct_out[NELLY_BUF_LEN * 2]);
+ FFTContext imdct_ctx;
+ DECLARE_ALIGNED_16(float,imdct_out)[NELLY_BUF_LEN * 2];
} NellyMoserDecodeContext;
static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *audio, float *a_in)
aptr = audio + i * NELLY_BUF_LEN;
init_get_bits(&s->gb, block, NELLY_BLOCK_LEN * 8);
- skip_bits(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS);
+ skip_bits_long(&s->gb, NELLY_HEADER_BITS + i*NELLY_DETAIL_BITS);
for (j = 0; j < NELLY_FILL_LEN; j++) {
if (bits[j] <= 0) {
aptr[j] = M_SQRT1_2*pows[j];
- if (av_random(&s->random_state) & 1)
+ if (av_lfg_get(&s->random_state) & 1)
aptr[j] *= -1.0;
} else {
v = get_bits(&s->gb, bits[j]);
NellyMoserDecodeContext *s = avctx->priv_data;
s->avctx = avctx;
- av_random_init(&s->random_state, 0);
- ff_mdct_init(&s->imdct_ctx, 8, 1);
+ av_lfg_init(&s->random_state, 0);
+ ff_mdct_init(&s->imdct_ctx, 8, 1, 1.0);
dsputil_init(&s->dsp, avctx);
/* Generate overlap window */
if (!ff_sine_128[127])
- ff_sine_window_init(ff_sine_128, 128);
+ ff_init_ff_sine_windows(7);
avctx->sample_fmt = SAMPLE_FMT_S16;
avctx->channel_layout = CH_LAYOUT_MONO;
static int decode_tag(AVCodecContext * avctx,
void *data, int *data_size,
- const uint8_t * buf, int buf_size) {
+ AVPacket *avpkt) {
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
NellyMoserDecodeContext *s = avctx->priv_data;
int blocks, i;
int16_t* samples;
blocks = 1; break;
case 128: // 11025Hz
blocks = 2; break;
+ case 192: // 16000Hz
+ blocks = 3; break;
case 256: // 22050Hz
blocks = 4; break;
case 512: // 44100Hz