X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbinkaudio.c;h=ddaa613ae45b1b45c3b85a2aa988268790056f06;hb=53abe32409f13687c864b3cda077a1aa906a2459;hp=adffc6b2b6962aa3c7219de2e832b867ca75a209;hpb=3383a53e7d0abb9639c3ea3481f0eda9dca61a26;p=ffmpeg diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index adffc6b2b69..ddaa613ae45 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -28,27 +28,24 @@ * http://wiki.multimedia.cx/index.php?title=Bink_Audio */ +#include "libavutil/channel_layout.h" #include "avcodec.h" -#define ALT_BITSTREAM_READER_LE +#define BITSTREAM_READER_LE #include "get_bits.h" -#include "dsputil.h" #include "dct.h" #include "rdft.h" #include "fmtconvert.h" +#include "internal.h" +#include "wma.h" #include "libavutil/intfloat.h" -extern const uint16_t ff_wma_critical_freqs[25]; - static float quant_table[96]; #define MAX_CHANNELS 2 #define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11) typedef struct { - AVFrame frame; GetBitContext gb; - DSPContext dsp; - FmtConvertContext fmt_conv; int version_b; ///< Bink version 'b' int first; int channels; @@ -59,10 +56,7 @@ typedef struct { unsigned int *bands; float root; DECLARE_ALIGNED(32, FFTSample, coeffs)[BINK_BLOCK_MAX_SIZE]; - DECLARE_ALIGNED(16, int16_t, previous)[BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block - DECLARE_ALIGNED(16, int16_t, current)[BINK_BLOCK_MAX_SIZE / 16]; - float *coeffs_ptr[MAX_CHANNELS]; ///< pointers to the coeffs arrays for float_to_int16_interleave - float *prev_ptr[MAX_CHANNELS]; ///< pointers to the overlap points in the coeffs array + float previous[MAX_CHANNELS][BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block uint8_t *packet_buffer; union { RDFTContext rdft; @@ -79,9 +73,6 @@ static av_cold int decode_init(AVCodecContext *avctx) int i; int frame_len_bits; - dsputil_init(&s->dsp, avctx); - ff_fmt_convert_init(&s->fmt_conv, avctx); - /* determine frame length */ if (avctx->sample_rate < 22050) { frame_len_bits = 9; @@ -95,24 +86,31 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "too many channels: %d\n", avctx->channels); return -1; } + avctx->channel_layout = avctx->channels == 1 ? AV_CH_LAYOUT_MONO : + AV_CH_LAYOUT_STEREO; s->version_b = avctx->extradata && avctx->extradata[3] == 'b'; - if (avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) { + if (avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT) { // audio is already interleaved for the RDFT format variant + avctx->sample_fmt = AV_SAMPLE_FMT_FLT; sample_rate *= avctx->channels; s->channels = 1; if (!s->version_b) frame_len_bits += av_log2(avctx->channels); } else { s->channels = avctx->channels; + avctx->sample_fmt = AV_SAMPLE_FMT_FLTP; } s->frame_len = 1 << frame_len_bits; s->overlap_len = s->frame_len / 16; s->block_size = (s->frame_len - s->overlap_len) * s->channels; sample_rate_half = (sample_rate + 1) / 2; - s->root = 2.0 / sqrt(s->frame_len); + if (avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT) + s->root = 2.0 / (sqrt(s->frame_len) * 32768.0); + else + s->root = s->frame_len / (sqrt(s->frame_len) * 32768.0); for (i = 0; i < 96; i++) { /* constant is result of 0.066399999/log10(M_E) */ quant_table[i] = expf(i * 0.15289164787221953823f) * s->root; @@ -134,23 +132,14 @@ static av_cold int decode_init(AVCodecContext *avctx) s->bands[s->num_bands] = s->frame_len; s->first = 1; - avctx->sample_fmt = AV_SAMPLE_FMT_S16; - for (i = 0; i < s->channels; i++) { - s->coeffs_ptr[i] = s->coeffs + i * s->frame_len; - s->prev_ptr[i] = s->coeffs_ptr[i] + s->frame_len - s->overlap_len; - } - - if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) + if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT) ff_rdft_init(&s->trans.rdft, frame_len_bits, DFT_C2R); else if (CONFIG_BINKAUDIO_DCT_DECODER) ff_dct_init(&s->trans.dct, frame_len_bits, DCT_III); else return -1; - avcodec_get_frame_defaults(&s->frame); - avctx->coded_frame = &s->frame; - return 0; } @@ -167,18 +156,12 @@ static const uint8_t rle_length_tab[16] = { 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 14, 15, 16, 32, 64 }; -#define GET_BITS_SAFE(out, nbits) do { \ - if (get_bits_left(gb) < nbits) \ - return AVERROR_INVALIDDATA; \ - out = get_bits(gb, nbits); \ -} while (0) - /** * Decode Bink Audio block * @param[out] out Output buffer (must contain s->block_size elements) * @return 0 on success, negative error code on failure */ -static int decode_block(BinkAudioContext *s, int16_t *out, int use_dct) +static int decode_block(BinkAudioContext *s, float **out, int use_dct) { int ch, i, j, k; float q, quant[25]; @@ -189,7 +172,8 @@ static int decode_block(BinkAudioContext *s, int16_t *out, int use_dct) skip_bits(gb, 2); for (ch = 0; ch < s->channels; ch++) { - FFTSample *coeffs = s->coeffs_ptr[ch]; + FFTSample *coeffs = out[ch]; + if (s->version_b) { if (get_bits_left(gb) < 64) return AVERROR_INVALIDDATA; @@ -218,10 +202,9 @@ static int decode_block(BinkAudioContext *s, int16_t *out, int use_dct) if (s->version_b) { j = i + 16; } else { - int v; - GET_BITS_SAFE(v, 1); + int v = get_bits1(gb); if (v) { - GET_BITS_SAFE(v, 4); + v = get_bits(gb, 4); j = i + rle_length_tab[v] * 8; } else { j = i + 8; @@ -230,7 +213,7 @@ static int decode_block(BinkAudioContext *s, int16_t *out, int use_dct) j = FFMIN(j, s->frame_len); - GET_BITS_SAFE(width, 4); + width = get_bits(gb, 4); if (width == 0) { memset(coeffs + i, 0, (j - i) * sizeof(*coeffs)); i = j; @@ -240,10 +223,10 @@ static int decode_block(BinkAudioContext *s, int16_t *out, int use_dct) while (i < j) { if (s->bands[k] == i) q = quant[k++]; - GET_BITS_SAFE(coeff, width); + coeff = get_bits(gb, width); if (coeff) { int v; - GET_BITS_SAFE(v, 1); + v = get_bits1(gb); if (v) coeffs[i] = -q * coeff; else @@ -259,30 +242,24 @@ static int decode_block(BinkAudioContext *s, int16_t *out, int use_dct) if (CONFIG_BINKAUDIO_DCT_DECODER && use_dct) { coeffs[0] /= 0.5; s->trans.dct.dct_calc(&s->trans.dct, coeffs); - s->dsp.vector_fmul_scalar(coeffs, coeffs, s->frame_len / 2, s->frame_len); } else if (CONFIG_BINKAUDIO_RDFT_DECODER) s->trans.rdft.rdft_calc(&s->trans.rdft, coeffs); } - s->fmt_conv.float_to_int16_interleave(s->current, - (const float **)s->prev_ptr, - s->overlap_len, s->channels); - s->fmt_conv.float_to_int16_interleave(out, (const float **)s->coeffs_ptr, - s->frame_len - s->overlap_len, - s->channels); - - if (!s->first) { + for (ch = 0; ch < s->channels; ch++) { + int j; int count = s->overlap_len * s->channels; - int shift = av_log2(count); - for (i = 0; i < count; i++) { - out[i] = (s->previous[i] * (count - i) + out[i] * i) >> shift; + if (!s->first) { + j = ch; + for (i = 0; i < s->overlap_len; i++, j += s->channels) + out[ch][i] = (s->previous[ch][i] * (count - j) + + out[ch][i] * j) / count; } + memcpy(s->previous[ch], &out[ch][s->frame_len - s->overlap_len], + s->overlap_len * sizeof(*s->previous[ch])); } - memcpy(s->previous, s->current, - s->overlap_len * s->channels * sizeof(*s->previous)); - s->first = 0; return 0; @@ -293,7 +270,7 @@ static av_cold int decode_end(AVCodecContext *avctx) BinkAudioContext * s = avctx->priv_data; av_freep(&s->bands); av_freep(&s->packet_buffer); - if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == CODEC_ID_BINKAUDIO_RDFT) + if (CONFIG_BINKAUDIO_RDFT_DECODER && avctx->codec->id == AV_CODEC_ID_BINKAUDIO_RDFT) ff_rdft_end(&s->trans.rdft); else if (CONFIG_BINKAUDIO_DCT_DECODER) ff_dct_end(&s->trans.dct); @@ -311,7 +288,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame_ptr, AVPacket *avpkt) { BinkAudioContext *s = avctx->priv_data; - int16_t *samples; + AVFrame *frame = data; GetBitContext *gb = &s->gb; int ret, consumed = 0; @@ -339,45 +316,45 @@ static int decode_frame(AVCodecContext *avctx, void *data, } /* get output buffer */ - s->frame.nb_samples = s->block_size / avctx->channels; - if ((ret = avctx->get_buffer(avctx, &s->frame)) < 0) { + frame->nb_samples = s->frame_len; + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return ret; } - samples = (int16_t *)s->frame.data[0]; - if (decode_block(s, samples, avctx->codec->id == CODEC_ID_BINKAUDIO_DCT)) { + if (decode_block(s, (float **)frame->extended_data, + avctx->codec->id == AV_CODEC_ID_BINKAUDIO_DCT)) { av_log(avctx, AV_LOG_ERROR, "Incomplete packet\n"); return AVERROR_INVALIDDATA; } get_bits_align32(gb); - *got_frame_ptr = 1; - *(AVFrame *)data = s->frame; + frame->nb_samples = s->block_size / avctx->channels; + *got_frame_ptr = 1; return consumed; } AVCodec ff_binkaudio_rdft_decoder = { .name = "binkaudio_rdft", + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"), .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_BINKAUDIO_RDFT, + .id = AV_CODEC_ID_BINKAUDIO_RDFT, .priv_data_size = sizeof(BinkAudioContext), .init = decode_init, .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)") }; AVCodec ff_binkaudio_dct_decoder = { .name = "binkaudio_dct", + .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)"), .type = AVMEDIA_TYPE_AUDIO, - .id = CODEC_ID_BINKAUDIO_DCT, + .id = AV_CODEC_ID_BINKAUDIO_DCT, .priv_data_size = sizeof(BinkAudioContext), .init = decode_init, .close = decode_end, .decode = decode_frame, .capabilities = CODEC_CAP_DELAY | CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)") };