#include "fft.h"
#include "fmtconvert.h"
#include "get_bits.h"
+#include "internal.h"
#include "atrac.h"
#include "atrac3data.h"
} ChannelUnit;
typedef struct ATRAC3Context {
- AVFrame frame;
GetBitContext gb;
//@{
/** stream data */
int coding_mode;
- int sample_rate;
ChannelUnit *units;
//@}
static av_cold void init_atrac3_window(void)
{
- float enc_window[256];
- int i;
+ int i, j;
/* generate the mdct window, for details see
* http://wiki.multimedia.cx/index.php?title=RealAudio_atrc#Windows */
- for (i = 0; i < 256; i++)
- enc_window[i] = (sin(((i + 0.5) / 256.0 - 0.5) * M_PI) + 1.0) * 0.5;
-
- for (i = 0; i < 256; i++) {
- mdct_window[i] = enc_window[i] /
- (enc_window[ i] * enc_window[ i] +
- enc_window[255 - i] * enc_window[255 - i]);
- mdct_window[511 - i] = mdct_window[i];
+ for (i = 0, j = 255; i < 128; i++, j--) {
+ float wi = sin(((i + 0.5) / 256.0 - 0.5) * M_PI) + 1.0;
+ float wj = sin(((j + 0.5) / 256.0 - 0.5) * M_PI) + 1.0;
+ float w = 0.5 * (wi * wi + wj * wj);
+ mdct_window[i] = mdct_window[511 - i] = wi / w;
+ mdct_window[j] = mdct_window[511 - j] = wj / w;
}
}
output[first] = mantissas[j] * scale_factor;
} else {
/* this subband was not coded, so zero the entire subband */
- memset(output + first, 0, subband_size * sizeof(float));
+ memset(output + first, 0, subband_size * sizeof(*output));
}
}
/* clear the subbands that were not coded */
first = subband_tab[i];
- memset(output + first, 0, (SAMPLES_PER_FRAME - first) * sizeof(float));
+ memset(output + first, 0, (SAMPLES_PER_FRAME - first) * sizeof(*output));
return num_subbands;
}
}
/* Delay for the overlapping part. */
- memcpy(prev, &input[256], 256 * sizeof(float));
+ memcpy(prev, &input[256], 256 * sizeof(*prev));
}
/*
output = &spectrum[components[i].pos];
for (j = 0; j < components[i].num_coefs; j++)
- output[i] += input[i];
+ output[j] += input[j];
}
return last_pos;
if (band <= num_bands)
imlt(q, &snd->spectrum[band * 256], snd->imdct_buf, band & 1);
else
- memset(snd->imdct_buf, 0, 512 * sizeof(float));
+ memset(snd->imdct_buf, 0, 512 * sizeof(*snd->imdct_buf));
/* gain compensation and overlapping */
gain_compensate_and_overlap(snd->imdct_buf,
init_get_bits(&q->gb, ptr1, avctx->block_align * 8);
/* Fill the Weighting coeffs delay buffer */
- memmove(q->weighting_delay, &q->weighting_delay[2], 4 * sizeof(int));
+ memmove(q->weighting_delay, &q->weighting_delay[2],
+ 4 * sizeof(*q->weighting_delay));
q->weighting_delay[4] = get_bits1(&q->gb);
q->weighting_delay[5] = get_bits(&q->gb, 3);
static int atrac3_decode_frame(AVCodecContext *avctx, void *data,
int *got_frame_ptr, AVPacket *avpkt)
{
+ AVFrame *frame = data;
const uint8_t *buf = avpkt->data;
int buf_size = avpkt->size;
ATRAC3Context *q = avctx->priv_data;
}
/* get output buffer */
- q->frame.nb_samples = SAMPLES_PER_FRAME;
- if ((ret = avctx->get_buffer(avctx, &q->frame)) < 0) {
+ frame->nb_samples = SAMPLES_PER_FRAME;
+ if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) {
av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n");
return ret;
}
databuf = buf;
}
- ret = decode_frame(avctx, databuf, (float **)q->frame.extended_data);
+ ret = decode_frame(avctx, databuf, (float **)frame->extended_data);
if (ret) {
av_log(NULL, AV_LOG_ERROR, "Frame decoding error!\n");
return ret;
}
- *got_frame_ptr = 1;
- *(AVFrame *)data = q->frame;
+ *got_frame_ptr = 1;
return avctx->block_align;
}
const uint8_t *edata_ptr = avctx->extradata;
ATRAC3Context *q = avctx->priv_data;
- /* Take data from the AVCodecContext (RM container). */
- q->sample_rate = avctx->sample_rate;
-
if (avctx->channels <= 0 || avctx->channels > 2) {
av_log(avctx, AV_LOG_ERROR, "Channel configuration error!\n");
return AVERROR(EINVAL);
} else {
av_log(NULL, AV_LOG_ERROR, "Unknown extradata size %d.\n",
avctx->extradata_size);
+ return AVERROR(EINVAL);
}
/* Check the extradata */
if (avctx->block_align >= UINT_MAX / 2)
return AVERROR(EINVAL);
- q->decoded_bytes_buffer = av_mallocz(avctx->block_align +
- (4 - avctx->block_align % 4) +
+ q->decoded_bytes_buffer = av_mallocz(FFALIGN(avctx->block_align, 4) +
FF_INPUT_BUFFER_PADDING_SIZE);
if (q->decoded_bytes_buffer == NULL)
return AVERROR(ENOMEM);
avpriv_float_dsp_init(&q->fdsp, avctx->flags & CODEC_FLAG_BITEXACT);
ff_fmt_convert_init(&q->fmt_conv, avctx);
- q->units = av_mallocz(sizeof(ChannelUnit) * avctx->channels);
+ q->units = av_mallocz(sizeof(*q->units) * avctx->channels);
if (!q->units) {
atrac3_decode_close(avctx);
return AVERROR(ENOMEM);
}
- avcodec_get_frame_defaults(&q->frame);
- avctx->coded_frame = &q->frame;
-
return 0;
}