*/
/**
- * @file nellymoserdec.c
+ * @file libavcodec/nellymoserdec.c
* The 3 alphanumeric copyright notices are md5summed they are from the original
* implementors. The original code is available from http://code.google.com/p/nelly2pcm/
*/
#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]);
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_tmp[NELLY_BUF_LEN]);
DECLARE_ALIGNED_16(float,imdct_out[NELLY_BUF_LEN * 2]);
} NellyMoserDecodeContext;
-static DECLARE_ALIGNED_16(float,sine_window[128]);
-
static void overlap_and_window(NellyMoserDecodeContext *s, float *state, float *audio, float *a_in)
{
int bot, top;
top = NELLY_BUF_LEN-1;
while (bot < NELLY_BUF_LEN) {
- audio[bot] = a_in [bot]*sine_window[bot]
- +state[bot]*sine_window[top] + s->add_bias;
+ audio[bot] = a_in [bot]*ff_sine_128[bot]
+ +state[bot]*ff_sine_128[top] + s->add_bias;
bot++;
top--;
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]);
memset(&aptr[NELLY_FILL_LEN], 0,
(NELLY_BUF_LEN - NELLY_FILL_LEN) * sizeof(float));
- s->imdct_ctx.fft.imdct_calc(&s->imdct_ctx, s->imdct_out,
- aptr, s->imdct_tmp);
+ ff_imdct_calc(&s->imdct_ctx, s->imdct_out, aptr);
/* XXX: overlapping and windowing should be part of a more
generic imdct function */
overlap_and_window(s, s->state, aptr, s->imdct_out);
NellyMoserDecodeContext *s = avctx->priv_data;
s->avctx = avctx;
- av_init_random(0, &s->random_state);
+ av_lfg_init(&s->random_state, ff_random_get_seed());
ff_mdct_init(&s->imdct_ctx, 8, 1);
dsputil_init(&s->dsp, avctx);
}
/* Generate overlap window */
- if (!sine_window[0])
- ff_sine_window_init(sine_window, 128);
+ if (!ff_sine_128[127])
+ ff_sine_window_init(ff_sine_128, 128);
+ avctx->sample_fmt = SAMPLE_FMT_S16;
+ avctx->channel_layout = CH_LAYOUT_MONO;
return 0;
}
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