X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Featqi.c;h=256b6b4acb88b13a7a6fe5dc45956a308581c9fb;hb=88c612e3a4d5b584e2d9f6e2541de78d67bdfb9f;hp=4c0732785e9e6c463b780fa9e77703085f26abf3;hpb=716d413c13981da15323c7a3821860536eefdbbb;p=ffmpeg diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 4c0732785e9..256b6b4acb8 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -27,19 +27,22 @@ */ #include "avcodec.h" +#include "blockdsp.h" +#include "bswapdsp.h" #include "get_bits.h" -#include "dsputil.h" #include "aandcttab.h" #include "eaidct.h" +#include "idctdsp.h" +#include "internal.h" #include "mpeg12.h" #include "mpegvideo.h" typedef struct TqiContext { MpegEncContext s; - AVFrame frame; + BswapDSPContext bsdsp; void *bitstream_buf; unsigned int bitstream_buf_size; - DECLARE_ALIGNED(16, DCTELEM, block)[6][64]; + DECLARE_ALIGNED(16, int16_t, block)[6][64]; } TqiContext; static av_cold int tqi_decode_init(AVCodecContext *avctx) @@ -47,20 +50,22 @@ static av_cold int tqi_decode_init(AVCodecContext *avctx) TqiContext *t = avctx->priv_data; MpegEncContext *s = &t->s; s->avctx = avctx; - ff_dsputil_init(&s->dsp, avctx); - ff_init_scantable_permutation(s->dsp.idct_permutation, FF_NO_IDCT_PERM); - ff_init_scantable(s->dsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct); + ff_blockdsp_init(&s->bdsp, avctx); + ff_bswapdsp_init(&t->bsdsp); + ff_idctdsp_init(&s->idsp, avctx); + ff_init_scantable_permutation(s->idsp.idct_permutation, FF_IDCT_PERM_NONE); + ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_zigzag_direct); s->qscale = 1; - avctx->time_base = (AVRational){1, 15}; + avctx->framerate = (AVRational){ 15, 1 }; avctx->pix_fmt = AV_PIX_FMT_YUV420P; ff_mpeg12_init_vlcs(); return 0; } -static int tqi_decode_mb(MpegEncContext *s, DCTELEM (*block)[64]) +static int tqi_decode_mb(MpegEncContext *s, int16_t (*block)[64]) { int n; - s->dsp.clear_blocks(block[0]); + s->bdsp.clear_blocks(block[0]); for (n=0; n<6; n++) if (ff_mpeg1_decode_block_intra(s, block[n], n) < 0) return -1; @@ -68,21 +73,21 @@ static int tqi_decode_mb(MpegEncContext *s, DCTELEM (*block)[64]) return 0; } -static inline void tqi_idct_put(TqiContext *t, DCTELEM (*block)[64]) +static inline void tqi_idct_put(TqiContext *t, AVFrame *frame, int16_t (*block)[64]) { MpegEncContext *s = &t->s; - int linesize= t->frame.linesize[0]; - uint8_t *dest_y = t->frame.data[0] + (s->mb_y * 16* linesize ) + s->mb_x * 16; - uint8_t *dest_cb = t->frame.data[1] + (s->mb_y * 8 * t->frame.linesize[1]) + s->mb_x * 8; - uint8_t *dest_cr = t->frame.data[2] + (s->mb_y * 8 * t->frame.linesize[2]) + s->mb_x * 8; + int linesize = frame->linesize[0]; + uint8_t *dest_y = frame->data[0] + (s->mb_y * 16* linesize ) + s->mb_x * 16; + uint8_t *dest_cb = frame->data[1] + (s->mb_y * 8 * frame->linesize[1]) + s->mb_x * 8; + uint8_t *dest_cr = frame->data[2] + (s->mb_y * 8 * frame->linesize[2]) + s->mb_x * 8; ff_ea_idct_put_c(dest_y , linesize, block[0]); ff_ea_idct_put_c(dest_y + 8, linesize, block[1]); ff_ea_idct_put_c(dest_y + 8*linesize , linesize, block[2]); ff_ea_idct_put_c(dest_y + 8*linesize + 8, linesize, block[3]); if(!(s->avctx->flags&CODEC_FLAG_GRAY)) { - ff_ea_idct_put_c(dest_cb, t->frame.linesize[1], block[4]); - ff_ea_idct_put_c(dest_cr, t->frame.linesize[2], block[5]); + ff_ea_idct_put_c(dest_cb, frame->linesize[1], block[4]); + ff_ea_idct_put_c(dest_cr, frame->linesize[2], block[5]); } } @@ -96,7 +101,7 @@ static void tqi_calculate_qtable(MpegEncContext *s, int quant) } static int tqi_decode_frame(AVCodecContext *avctx, - void *data, int *data_size, + void *data, int *got_frame, AVPacket *avpkt) { const uint8_t *buf = avpkt->data; @@ -104,28 +109,29 @@ static int tqi_decode_frame(AVCodecContext *avctx, const uint8_t *buf_end = buf+buf_size; TqiContext *t = avctx->priv_data; MpegEncContext *s = &t->s; + AVFrame *frame = data; + int ret; s->width = AV_RL16(&buf[0]); s->height = AV_RL16(&buf[2]); tqi_calculate_qtable(s, buf[4]); buf += 8; - if (t->frame.data[0]) - avctx->release_buffer(avctx, &t->frame); + ret = ff_set_dimensions(s->avctx, s->width, s->height); + if (ret < 0) + return ret; - if (s->avctx->width!=s->width || s->avctx->height!=s->height) - avcodec_set_dimensions(s->avctx, s->width, s->height); - - if(avctx->get_buffer(avctx, &t->frame) < 0) { + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); - return -1; + return ret; } av_fast_padded_malloc(&t->bitstream_buf, &t->bitstream_buf_size, buf_end - buf); if (!t->bitstream_buf) return AVERROR(ENOMEM); - s->dsp.bswap_buf(t->bitstream_buf, (const uint32_t*)buf, (buf_end-buf)/4); + t->bsdsp.bswap_buf(t->bitstream_buf, (const uint32_t *) buf, + (buf_end - buf) / 4); init_get_bits(&s->gb, t->bitstream_buf, 8*(buf_end-buf)); s->last_dc[0] = s->last_dc[1] = s->last_dc[2] = 0; @@ -134,25 +140,23 @@ static int tqi_decode_frame(AVCodecContext *avctx, { if (tqi_decode_mb(s, t->block) < 0) break; - tqi_idct_put(t, t->block); + tqi_idct_put(t, frame, t->block); } - *data_size = sizeof(AVFrame); - *(AVFrame*)data = t->frame; + *got_frame = 1; return buf_size; } static av_cold int tqi_decode_end(AVCodecContext *avctx) { TqiContext *t = avctx->priv_data; - if(t->frame.data[0]) - avctx->release_buffer(avctx, &t->frame); av_free(t->bitstream_buf); return 0; } AVCodec ff_eatqi_decoder = { .name = "eatqi", + .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_TQI, .priv_data_size = sizeof(TqiContext), @@ -160,5 +164,4 @@ AVCodec ff_eatqi_decoder = { .close = tqi_decode_end, .decode = tqi_decode_frame, .capabilities = CODEC_CAP_DR1, - .long_name = NULL_IF_CONFIG_SMALL("Electronic Arts TQI Video"), };