#include "mathops.h"
#include "mpeg12data.h"
-#define VLC_BITS 6
+#define VLC_BITS 6
#define ASV2_LEVEL_VLC_BITS 10
static VLC ccp_vlc;
}
}
-//FIXME write a reversed bitstream reader to avoid the double reverse
-static inline int asv2_get_bits(GetBitContext *gb, int n)
+// FIXME write a reversed bitstream reader to avoid the double reverse
+static inline int asv2_get_bits(BitstreamContext *bc, int n)
{
- return ff_reverse[get_bits(gb, n) << (8-n)];
+ return ff_reverse[bitstream_read(bc, n) << (8 - n)];
}
-static inline int asv1_get_level(GetBitContext *gb)
+static inline int asv1_get_level(BitstreamContext *bc)
{
- int code = get_vlc2(gb, level_vlc.table, VLC_BITS, 1);
+ int code = bitstream_read_vlc(bc, level_vlc.table, VLC_BITS, 1);
if (code == 3)
- return get_sbits(gb, 8);
+ return bitstream_read_signed(bc, 8);
else
return code - 3;
}
-static inline int asv2_get_level(GetBitContext *gb)
+static inline int asv2_get_level(BitstreamContext *bc)
{
- int code = get_vlc2(gb, asv2_level_vlc.table, ASV2_LEVEL_VLC_BITS, 1);
+ int code = bitstream_read_vlc(bc, asv2_level_vlc.table, ASV2_LEVEL_VLC_BITS, 1);
if (code == 31)
- return (int8_t)asv2_get_bits(gb, 8);
+ return (int8_t) asv2_get_bits(bc, 8);
else
return code - 31;
}
{
int i;
- block[0] = 8 * get_bits(&a->gb, 8);
+ block[0] = 8 * bitstream_read(&a->bc, 8);
for (i = 0; i < 11; i++) {
- const int ccp = get_vlc2(&a->gb, ccp_vlc.table, VLC_BITS, 1);
+ const int ccp = bitstream_read_vlc(&a->bc, ccp_vlc.table, VLC_BITS, 1);
if (ccp) {
if (ccp == 16)
}
if (ccp & 8)
- block[a->scantable.permutated[4 * i + 0]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 0]) >> 4;
+ block[a->scantable.permutated[4 * i + 0]] = (asv1_get_level(&a->bc) * a->intra_matrix[4 * i + 0]) >> 4;
if (ccp & 4)
- block[a->scantable.permutated[4 * i + 1]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 1]) >> 4;
+ block[a->scantable.permutated[4 * i + 1]] = (asv1_get_level(&a->bc) * a->intra_matrix[4 * i + 1]) >> 4;
if (ccp & 2)
- block[a->scantable.permutated[4 * i + 2]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 2]) >> 4;
+ block[a->scantable.permutated[4 * i + 2]] = (asv1_get_level(&a->bc) * a->intra_matrix[4 * i + 2]) >> 4;
if (ccp & 1)
- block[a->scantable.permutated[4 * i + 3]] = (asv1_get_level(&a->gb) * a->intra_matrix[4 * i + 3]) >> 4;
+ block[a->scantable.permutated[4 * i + 3]] = (asv1_get_level(&a->bc) * a->intra_matrix[4 * i + 3]) >> 4;
}
}
{
int i, count, ccp;
- count = asv2_get_bits(&a->gb, 4);
+ count = asv2_get_bits(&a->bc, 4);
- block[0] = 8 * asv2_get_bits(&a->gb, 8);
+ block[0] = 8 * asv2_get_bits(&a->bc, 8);
- ccp = get_vlc2(&a->gb, dc_ccp_vlc.table, VLC_BITS, 1);
+ ccp = bitstream_read_vlc(&a->bc, dc_ccp_vlc.table, VLC_BITS, 1);
if (ccp) {
if (ccp & 4)
- block[a->scantable.permutated[1]] = (asv2_get_level(&a->gb) * a->intra_matrix[1]) >> 4;
+ block[a->scantable.permutated[1]] = (asv2_get_level(&a->bc) * a->intra_matrix[1]) >> 4;
if (ccp & 2)
- block[a->scantable.permutated[2]] = (asv2_get_level(&a->gb) * a->intra_matrix[2]) >> 4;
+ block[a->scantable.permutated[2]] = (asv2_get_level(&a->bc) * a->intra_matrix[2]) >> 4;
if (ccp & 1)
- block[a->scantable.permutated[3]] = (asv2_get_level(&a->gb) * a->intra_matrix[3]) >> 4;
+ block[a->scantable.permutated[3]] = (asv2_get_level(&a->bc) * a->intra_matrix[3]) >> 4;
}
for (i = 1; i < count + 1; i++) {
- const int ccp = get_vlc2(&a->gb, ac_ccp_vlc.table, VLC_BITS, 1);
+ const int ccp = bitstream_read_vlc(&a->bc, ac_ccp_vlc.table, VLC_BITS, 1);
if (ccp) {
if (ccp & 8)
- block[a->scantable.permutated[4*i + 0]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 0]) >> 4;
+ block[a->scantable.permutated[4 * i + 0]] = (asv2_get_level(&a->bc) * a->intra_matrix[4 * i + 0]) >> 4;
if (ccp & 4)
- block[a->scantable.permutated[4*i + 1]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 1]) >> 4;
+ block[a->scantable.permutated[4 * i + 1]] = (asv2_get_level(&a->bc) * a->intra_matrix[4 * i + 1]) >> 4;
if (ccp & 2)
- block[a->scantable.permutated[4*i + 2]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 2]) >> 4;
+ block[a->scantable.permutated[4 * i + 2]] = (asv2_get_level(&a->bc) * a->intra_matrix[4 * i + 2]) >> 4;
if (ccp & 1)
- block[a->scantable.permutated[4*i + 3]] = (asv2_get_level(&a->gb) * a->intra_matrix[4*i + 3]) >> 4;
+ block[a->scantable.permutated[4 * i + 3]] = (asv2_get_level(&a->bc) * a->intra_matrix[4 * i + 3]) >> 4;
}
}
static inline void idct_put(ASV1Context *a, AVFrame *frame, int mb_x, int mb_y)
{
- int16_t (*block)[64] = a->block;
- int linesize = frame->linesize[0];
+ int16_t(*block)[64] = a->block;
+ int linesize = frame->linesize[0];
- uint8_t *dest_y = frame->data[0] + (mb_y * 16* linesize ) + mb_x * 16;
- uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
- uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
+ uint8_t *dest_y = frame->data[0] + (mb_y * 16 * linesize) + mb_x * 16;
+ uint8_t *dest_cb = frame->data[1] + (mb_y * 8 * frame->linesize[1]) + mb_x * 8;
+ uint8_t *dest_cr = frame->data[2] + (mb_y * 8 * frame->linesize[2]) + mb_x * 8;
a->idsp.idct_put(dest_y, linesize, block[0]);
a->idsp.idct_put(dest_y + 8, linesize, block[1]);
a->idsp.idct_put(dest_y + 8 * linesize, linesize, block[2]);
a->idsp.idct_put(dest_y + 8 * linesize + 8, linesize, block[3]);
- if (!(a->avctx->flags&CODEC_FLAG_GRAY)) {
+ if (!(a->avctx->flags & AV_CODEC_FLAG_GRAY)) {
a->idsp.idct_put(dest_cb, frame->linesize[1], block[4]);
a->idsp.idct_put(dest_cr, frame->linesize[2], block[5]);
}
}
-static int decode_frame(AVCodecContext *avctx,
- void *data, int *got_frame,
+static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
AVPacket *avpkt)
{
- ASV1Context * const a = avctx->priv_data;
- const uint8_t *buf = avpkt->data;
- int buf_size = avpkt->size;
- AVFrame * const p = data;
+ ASV1Context *const a = avctx->priv_data;
+ const uint8_t *buf = avpkt->data;
+ int buf_size = avpkt->size;
+ AVFrame *const p = data;
int mb_x, mb_y, ret;
if ((ret = ff_get_buffer(avctx, p, 0)) < 0) {
if (!a->bitstream_buffer)
return AVERROR(ENOMEM);
- if (avctx->codec_id == AV_CODEC_ID_ASV1)
+ if (avctx->codec_id == AV_CODEC_ID_ASV1) {
a->bbdsp.bswap_buf((uint32_t *) a->bitstream_buffer,
(const uint32_t *) buf, buf_size / 4);
- else {
+ } else {
int i;
for (i = 0; i < buf_size; i++)
a->bitstream_buffer[i] = ff_reverse[buf[i]];
}
- init_get_bits(&a->gb, a->bitstream_buffer, buf_size*8);
+ bitstream_init(&a->bc, a->bitstream_buffer, buf_size * 8);
for (mb_y = 0; mb_y < a->mb_height2; mb_y++) {
for (mb_x = 0; mb_x < a->mb_width2; mb_x++) {
emms_c();
- return (get_bits_count(&a->gb) + 31) / 32 * 4;
+ return (bitstream_tell(&a->bc) + 31) / 32 * 4;
}
static av_cold int decode_init(AVCodecContext *avctx)
{
- ASV1Context * const a = avctx->priv_data;
- const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2;
+ ASV1Context *const a = avctx->priv_data;
+ const int scale = avctx->codec_id == AV_CODEC_ID_ASV1 ? 1 : 2;
int i;
if (avctx->extradata_size < 1) {
for (i = 0; i < 64; i++) {
int index = ff_asv_scantab[i];
- a->intra_matrix[i] = 64 * scale * ff_mpeg1_default_intra_matrix[index] / a->inv_qscale;
+ a->intra_matrix[i] = 64 * scale * ff_mpeg1_default_intra_matrix[index] /
+ a->inv_qscale;
}
return 0;
static av_cold int decode_end(AVCodecContext *avctx)
{
- ASV1Context * const a = avctx->priv_data;
+ ASV1Context *const a = avctx->priv_data;
av_freep(&a->bitstream_buffer);
a->bitstream_buffer_size = 0;
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
AVCodec ff_asv2_decoder = {
.init = decode_init,
.close = decode_end,
.decode = decode_frame,
- .capabilities = CODEC_CAP_DR1,
+ .capabilities = AV_CODEC_CAP_DR1,
};
-
projects / ffmpeg / blobdiff