diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 16:25:58 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 17:27:52 +0200 |
commit | e88ca80dc325a0291c64e1dd3245c4943397cfa3 (patch) | |
tree | df8abbc8d6defc5bf10932ed096ec18cd979d0eb /libavcodec/atrac3.c | |
parent | 82db8ee3211014a38db6b8cae03f1c3246938eee (diff) | |
parent | bfcd4b6a1691d20aebc6d2308424c2a88334a9f0 (diff) | |
download | ffmpeg-e88ca80dc325a0291c64e1dd3245c4943397cfa3.tar.gz |
Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'
* commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0':
adpcmdec: set AVCodec.sample_fmts
twinvq: use planar sample format
ralf: use planar sample format
mpc7/8: use planar sample format
iac/imc: use planar sample format
dcadec: use float planar sample format
cook: use planar sample format
atrac3: use float planar sample format
apedec: output in planar sample format
8svx: use planar sample format
Conflicts:
libavcodec/8svx.c
libavcodec/dcadec.c
libavcodec/mpc7.c
libavcodec/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/atrac3.c')
-rw-r--r-- | libavcodec/atrac3.c | 44 |
1 files changed, 7 insertions, 37 deletions
diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 7d076bed99..b900882a7a 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -112,7 +112,6 @@ typedef struct { //@} //@{ /** data buffers */ - float *outSamples[2]; uint8_t* decoded_bytes_buffer; float tempBuf[1070]; //@} @@ -198,7 +197,7 @@ static int decode_bytes(const uint8_t* inbuffer, uint8_t* out, int bytes){ } -static av_cold int init_atrac3_transforms(ATRAC3Context *q, int is_float) { +static av_cold int init_atrac3_transforms(ATRAC3Context *q) { float enc_window[256]; int i; @@ -214,7 +213,7 @@ static av_cold int init_atrac3_transforms(ATRAC3Context *q, int is_float) { } /* Initialize the MDCT transform. */ - return ff_mdct_init(&q->mdct_ctx, 9, 1, is_float ? 1.0 / 32768 : 1.0); + return ff_mdct_init(&q->mdct_ctx, 9, 1, 1.0 / 32768); } /** @@ -227,7 +226,6 @@ static av_cold int atrac3_decode_close(AVCodecContext *avctx) av_free(q->pUnits); av_free(q->decoded_bytes_buffer); - av_freep(&q->outSamples[0]); ff_mdct_end(&q->mdct_ctx); @@ -838,8 +836,6 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, ATRAC3Context *q = avctx->priv_data; int result; const uint8_t* databuf; - float *samples_flt; - int16_t *samples_s16; if (buf_size < avctx->block_align) { av_log(avctx, AV_LOG_ERROR, @@ -853,8 +849,6 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return result; } - samples_flt = (float *)q->frame.data[0]; - samples_s16 = (int16_t *)q->frame.data[0]; /* Check if we need to descramble and what buffer to pass on. */ if (q->scrambled_stream) { @@ -864,27 +858,13 @@ static int atrac3_decode_frame(AVCodecContext *avctx, void *data, databuf = buf; } - if (q->channels == 1 && avctx->sample_fmt == AV_SAMPLE_FMT_FLT) - result = decodeFrame(q, databuf, &samples_flt); - else - result = decodeFrame(q, databuf, q->outSamples); + result = decodeFrame(q, databuf, (float **)q->frame.extended_data); if (result != 0) { av_log(NULL,AV_LOG_ERROR,"Frame decoding error!\n"); return result; } - /* interleave */ - if (q->channels == 2 && avctx->sample_fmt == AV_SAMPLE_FMT_FLT) { - q->fmt_conv.float_interleave(samples_flt, - (const float **)q->outSamples, - SAMPLES_PER_FRAME, 2); - } else if (avctx->sample_fmt == AV_SAMPLE_FMT_S16) { - q->fmt_conv.float_to_int16_interleave(samples_s16, - (const float **)q->outSamples, - SAMPLES_PER_FRAME, q->channels); - } - *got_frame_ptr = 1; *(AVFrame *)data = q->frame; @@ -1006,12 +986,9 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) vlcs_initialized = 1; } - if (avctx->request_sample_fmt == AV_SAMPLE_FMT_FLT) - avctx->sample_fmt = AV_SAMPLE_FMT_FLT; - else - avctx->sample_fmt = AV_SAMPLE_FMT_S16; + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; - if ((ret = init_atrac3_transforms(q, avctx->sample_fmt == AV_SAMPLE_FMT_FLT))) { + if ((ret = init_atrac3_transforms(q))) { av_log(avctx, AV_LOG_ERROR, "Error initializing MDCT\n"); av_freep(&q->decoded_bytes_buffer); return ret; @@ -1049,15 +1026,6 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) return AVERROR(ENOMEM); } - if (avctx->channels > 1 || avctx->sample_fmt == AV_SAMPLE_FMT_S16) { - q->outSamples[0] = av_mallocz(SAMPLES_PER_FRAME * avctx->channels * sizeof(*q->outSamples[0])); - q->outSamples[1] = q->outSamples[0] + SAMPLES_PER_FRAME; - if (!q->outSamples[0]) { - atrac3_decode_close(avctx); - return AVERROR(ENOMEM); - } - } - avcodec_get_frame_defaults(&q->frame); avctx->coded_frame = &q->frame; @@ -1076,4 +1044,6 @@ AVCodec ff_atrac3_decoder = .decode = atrac3_decode_frame, .capabilities = CODEC_CAP_SUBFRAMES | CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), + .sample_fmts = (const enum AVSampleFormat[]) { AV_SAMPLE_FMT_FLTP, + AV_SAMPLE_FMT_NONE }, }; |