#include "libavutil/imgutils.h"
#include "libavutil/intreadwrite.h"
#include "avcodec.h"
+#include "blockdsp.h"
+#include "bswapdsp.h"
#include "bytestream.h"
-#include "dsputil.h"
#include "get_bits.h"
#include "internal.h"
typedef struct FourXContext {
AVCodecContext *avctx;
- DSPContext dsp;
+ BlockDSPContext bdsp;
+ BswapDSPContext bbdsp;
uint16_t *frame_buffer;
uint16_t *last_frame_buffer;
GetBitContext pre_gb; ///< ac/dc prefix
bitstream_size);
if (!f->bitstream_buffer)
return AVERROR(ENOMEM);
- f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)(buf + extra),
- bitstream_size / 4);
+ f->bbdsp.bswap_buf(f->bitstream_buffer, (const uint32_t *) (buf + extra),
+ bitstream_size / 4);
init_get_bits(&f->gb, f->bitstream_buffer, 8 * bitstream_size);
wordstream_offset = extra + bitstream_size;
int ret;
int i;
- f->dsp.clear_blocks(f->block[0]);
+ f->bdsp.clear_blocks(f->block[0]);
for (i = 0; i < 6; i++)
if ((ret = decode_i_block(f, f->block[i])) < 0)
prestream_size);
if (!f->bitstream_buffer)
return AVERROR(ENOMEM);
- f->dsp.bswap_buf(f->bitstream_buffer, (const uint32_t*)prestream,
- prestream_size / 4);
+ f->bbdsp.bswap_buf(f->bitstream_buffer, (const uint32_t *) prestream,
+ prestream_size / 4);
init_get_bits(&f->pre_gb, f->bitstream_buffer, 8 * prestream_size);
f->last_dc = 0 * 128 * 8 * 8;
}
f->version = AV_RL32(avctx->extradata) >> 16;
- ff_dsputil_init(&f->dsp, avctx);
+ ff_blockdsp_init(&f->bdsp, avctx);
+ ff_bswapdsp_init(&f->bbdsp);
f->avctx = avctx;
init_vlcs(f);