*/
#include "libavutil/channel_layout.h"
-#include "avcodec.h"
+#include "libavutil/intfloat.h"
+
#define BITSTREAM_READER_LE
-#include "get_bits.h"
-#include "dsputil.h"
+#include "avcodec.h"
+#include "bitstream.h"
#include "dct.h"
+#include "decode.h"
+#include "internal.h"
#include "rdft.h"
-#include "fmtconvert.h"
-#include "libavutil/intfloat.h"
-
-extern const uint16_t ff_wma_critical_freqs[25];
+#include "wma_freqs.h"
static float quant_table[96];
#define MAX_CHANNELS 2
#define BINK_BLOCK_MAX_SIZE (MAX_CHANNELS << 11)
-typedef struct {
- AVFrame frame;
- GetBitContext gb;
+typedef struct BinkAudioContext {
+ BitstreamContext bc;
int version_b; ///< Bink version 'b'
int first;
int channels;
float root;
DECLARE_ALIGNED(32, FFTSample, coeffs)[BINK_BLOCK_MAX_SIZE];
float previous[MAX_CHANNELS][BINK_BLOCK_MAX_SIZE / 16]; ///< coeffs from previous audio block
- uint8_t *packet_buffer;
+ AVPacket *pkt;
union {
RDFTContext rdft;
DCTContext dct;
else
return -1;
- avcodec_get_frame_defaults(&s->frame);
- avctx->coded_frame = &s->frame;
+ s->pkt = av_packet_alloc();
+ if (!s->pkt)
+ return AVERROR(ENOMEM);
return 0;
}
-static float get_float(GetBitContext *gb)
+static float get_float(BitstreamContext *bc)
{
- int power = get_bits(gb, 5);
- float f = ldexpf(get_bits_long(gb, 23), power - 23);
- if (get_bits1(gb))
+ int power = bitstream_read(bc, 5);
+ float f = ldexpf(bitstream_read(bc, 23), power - 23);
+ if (bitstream_read_bit(bc))
f = -f;
return f;
}
int ch, i, j, k;
float q, quant[25];
int width, coeff;
- GetBitContext *gb = &s->gb;
+ BitstreamContext *bc = &s->bc;
if (use_dct)
- skip_bits(gb, 2);
+ bitstream_skip(bc, 2);
for (ch = 0; ch < s->channels; ch++) {
FFTSample *coeffs = out[ch];
if (s->version_b) {
- if (get_bits_left(gb) < 64)
+ if (bitstream_bits_left(bc) < 64)
return AVERROR_INVALIDDATA;
- coeffs[0] = av_int2float(get_bits_long(gb, 32)) * s->root;
- coeffs[1] = av_int2float(get_bits_long(gb, 32)) * s->root;
+ coeffs[0] = av_int2float(bitstream_read(bc, 32)) * s->root;
+ coeffs[1] = av_int2float(bitstream_read(bc, 32)) * s->root;
} else {
- if (get_bits_left(gb) < 58)
+ if (bitstream_bits_left(bc) < 58)
return AVERROR_INVALIDDATA;
- coeffs[0] = get_float(gb) * s->root;
- coeffs[1] = get_float(gb) * s->root;
+ coeffs[0] = get_float(bc) * s->root;
+ coeffs[1] = get_float(bc) * s->root;
}
- if (get_bits_left(gb) < s->num_bands * 8)
+ if (bitstream_bits_left(bc) < s->num_bands * 8)
return AVERROR_INVALIDDATA;
for (i = 0; i < s->num_bands; i++) {
- int value = get_bits(gb, 8);
+ int value = bitstream_read(bc, 8);
quant[i] = quant_table[FFMIN(value, 95)];
}
if (s->version_b) {
j = i + 16;
} else {
- int v = get_bits1(gb);
+ int v = bitstream_read_bit(bc);
if (v) {
- v = get_bits(gb, 4);
+ v = bitstream_read(bc, 4);
j = i + rle_length_tab[v] * 8;
} else {
j = i + 8;
j = FFMIN(j, s->frame_len);
- width = get_bits(gb, 4);
+ width = bitstream_read(bc, 4);
if (width == 0) {
memset(coeffs + i, 0, (j - i) * sizeof(*coeffs));
i = j;
while (i < j) {
if (s->bands[k] == i)
q = quant[k++];
- coeff = get_bits(gb, width);
+ coeff = bitstream_read(bc, width);
if (coeff) {
int v;
- v = get_bits1(gb);
+ v = bitstream_read_bit(bc);
if (v)
coeffs[i] = -q * coeff;
else
{
BinkAudioContext * s = avctx->priv_data;
av_freep(&s->bands);
- av_freep(&s->packet_buffer);
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);
+ av_packet_free(&s->pkt);
+
return 0;
}
-static void get_bits_align32(GetBitContext *s)
+static void get_bits_align32(BitstreamContext *s)
{
- int n = (-get_bits_count(s)) & 31;
- if (n) skip_bits(s, n);
+ int n = (-bitstream_tell(s)) & 31;
+ if (n)
+ bitstream_skip(s, n);
}
-static int decode_frame(AVCodecContext *avctx, void *data,
- int *got_frame_ptr, AVPacket *avpkt)
+static int binkaudio_receive_frame(AVCodecContext *avctx, AVFrame *frame)
{
BinkAudioContext *s = avctx->priv_data;
- GetBitContext *gb = &s->gb;
- int ret, consumed = 0;
-
- if (!get_bits_left(gb)) {
- uint8_t *buf;
- /* handle end-of-stream */
- if (!avpkt->size) {
- *got_frame_ptr = 0;
- return 0;
- }
- if (avpkt->size < 4) {
+ BitstreamContext *bc = &s->bc;
+ int ret;
+
+ if (!s->pkt->data) {
+ ret = ff_decode_get_packet(avctx, s->pkt);
+ if (ret < 0)
+ return ret;
+
+ if (s->pkt->size < 4) {
av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
- return AVERROR_INVALIDDATA;
+ ret = AVERROR_INVALIDDATA;
+ goto fail;
}
- buf = av_realloc(s->packet_buffer, avpkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
- if (!buf)
- return AVERROR(ENOMEM);
- s->packet_buffer = buf;
- memcpy(s->packet_buffer, avpkt->data, avpkt->size);
- init_get_bits(gb, s->packet_buffer, avpkt->size * 8);
- consumed = avpkt->size;
+
+ ret = bitstream_init8(bc, s->pkt->data, s->pkt->size);
+ if (ret < 0)
+ goto fail;
/* skip reported size */
- skip_bits_long(gb, 32);
+ bitstream_skip(bc, 32);
}
/* get output buffer */
- s->frame.nb_samples = s->frame_len;
- 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;
}
- if (decode_block(s, (float **)s->frame.extended_data,
+ 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);
+ get_bits_align32(bc);
+ if (!bitstream_bits_left(bc)) {
+ memset(bc, 0, sizeof(*bc));
+ av_packet_unref(s->pkt);
+ }
- s->frame.nb_samples = s->block_size / avctx->channels;
- *got_frame_ptr = 1;
- *(AVFrame *)data = s->frame;
+ frame->nb_samples = s->block_size / avctx->channels;
- return consumed;
+ return 0;
+fail:
+ av_packet_unref(s->pkt);
+ return ret;
}
AVCodec ff_binkaudio_rdft_decoder = {
.name = "binkaudio_rdft",
+ .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (RDFT)"),
.type = AVMEDIA_TYPE_AUDIO,
.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)")
+ .receive_frame = binkaudio_receive_frame,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
};
AVCodec ff_binkaudio_dct_decoder = {
.name = "binkaudio_dct",
+ .long_name = NULL_IF_CONFIG_SMALL("Bink Audio (DCT)"),
.type = AVMEDIA_TYPE_AUDIO,
.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)")
+ .receive_frame = binkaudio_receive_frame,
+ .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
};
projects / ffmpeg / blobdiff