Signed-off-by: Vittorio Giovara <[email protected]>
---
configure | 2 +-
libavcodec/Makefile | 2 +-
libavcodec/eatqi.c | 179 +++++++++++++++++++++++++++++++++++++++----------
libavcodec/mpeg12.h | 1 -
libavcodec/mpeg12dec.c | 5 --
5 files changed, 145 insertions(+), 44 deletions(-)
diff --git a/configure b/configure
index 8518e69..2d0573a 100755
--- a/configure
+++ b/configure
@@ -1913,7 +1913,7 @@ eac3_decoder_select="ac3_decoder"
eac3_encoder_select="ac3_encoder"
eamad_decoder_select="aandcttables blockdsp bswapdsp idctdsp mpegvideo"
eatgq_decoder_select="aandcttables idctdsp"
-eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp
mpeg1video_decoder"
+eatqi_decoder_select="aandcttables blockdsp bswapdsp idctdsp"
exr_decoder_deps="zlib"
ffv1_decoder_select="golomb rangecoder"
ffv1_encoder_select="rangecoder"
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 4800779..0fbe56d 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -208,7 +208,7 @@ OBJS-$(CONFIG_EAMAD_DECODER) += eamad.o eaidct.o
mpeg12.o \
mpeg12data.o
OBJS-$(CONFIG_EATGQ_DECODER) += eatgq.o eaidct.o
OBJS-$(CONFIG_EATGV_DECODER) += eatgv.o
-OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o
+OBJS-$(CONFIG_EATQI_DECODER) += eatqi.o eaidct.o mpeg12.o
mpeg12data.o
OBJS-$(CONFIG_EIGHTBPS_DECODER) += 8bps.o
OBJS-$(CONFIG_EIGHTSVX_EXP_DECODER) += 8svx.o
OBJS-$(CONFIG_EIGHTSVX_FIB_DECODER) += 8svx.o
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index f5dcb53..4f879df 100644
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -35,69 +35,177 @@
#include "idctdsp.h"
#include "internal.h"
#include "mpeg12.h"
-#include "mpegvideo.h"
typedef struct TqiContext {
- MpegEncContext s;
+ GetBitContext gb;
+ BlockDSPContext bdsp;
BswapDSPContext bsdsp;
+ IDCTDSPContext idsp;
+ ScanTable intra_scantable;
+
void *bitstream_buf;
unsigned int bitstream_buf_size;
+
+ int mb_x, mb_y;
+ uint16_t intra_matrix[64];
+ int last_dc[3];
+
DECLARE_ALIGNED(16, int16_t, block)[6][64];
} TqiContext;
static av_cold int tqi_decode_init(AVCodecContext *avctx)
{
TqiContext *t = avctx->priv_data;
- MpegEncContext *s = &t->s;
- s->avctx = avctx;
- ff_blockdsp_init(&s->bdsp, avctx);
+
+ ff_blockdsp_init(&t->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;
+ ff_idctdsp_init(&t->idsp, avctx);
+ ff_init_scantable_permutation(t->idsp.idct_permutation, FF_IDCT_PERM_NONE);
+ ff_init_scantable(t->idsp.idct_permutation, &t->intra_scantable,
ff_zigzag_direct);
+
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, int16_t (*block)[64])
+/* Based off mpeg1_decode_block_intra from mpeg12dec.c */
+static inline int decode_intra_block(AVCodecContext *avctx, int16_t *block,
+ int index)
{
+ TqiContext *t = avctx->priv_data;
+ int dc, diff, component;
+ int i, j, ret = 0;
+ const uint16_t *quant_matrix = t->intra_matrix;
+
+ /* DC coefficient */
+ component = index <= 3 ? 0 : index - 4 + 1;
+
+ diff = decode_dc(&t->gb, component);
+ if (diff >= 0xffff)
+ return AVERROR_INVALIDDATA;
+
+ dc = t->last_dc[component];
+ dc += diff;
+ t->last_dc[component] = dc;
+
+ block[0] = dc * quant_matrix[0];
+ ff_dlog(avctx, "dc=%d diff=%d\n", dc, diff);
+ i = 0;
+
+ /* now quantify & encode AC coefficients */
+ OPEN_READER(re, &t->gb);
+ while (1) {
+ int level, run;
+ uint8_t *const scantable = t->intra_scantable.permutated;
+ RLTable *rl = &ff_rl_mpeg1;
+
+ UPDATE_CACHE(re, &t->gb);
+ GET_RL_VLC(level, run, re, &t->gb, rl->rl_vlc[0], TEX_VLC_BITS, 2, 0);
+
+ if (level == 127) {
+ break;
+ } else if (level != 0) {
+ i += run;
+ if (i > 63) {
+ av_log(avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n",
+ t->mb_x, t->mb_y);
+ ret = AVERROR_INVALIDDATA;
+ break;
+ }
+
+ j = scantable[i];
+ level = (level * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
+ level = (level ^ SHOW_SBITS(re, &t->gb, 1)) -
+ SHOW_SBITS(re, &t->gb, 1);
+ LAST_SKIP_BITS(re, &t->gb, 1);
+ } else {
+ /* escape */
+ run = SHOW_UBITS(re, &t->gb, 6) + 1;
+ LAST_SKIP_BITS(re, &t->gb, 6);
+ UPDATE_CACHE(re, &t->gb);
+ level = SHOW_SBITS(re, &t->gb, 8);
+ SKIP_BITS(re, &t->gb, 8);
+ if (level == -128) {
+ level = SHOW_UBITS(re, &t->gb, 8) - 256;
+ LAST_SKIP_BITS(re, &t->gb, 8);
+ } else if (level == 0) {
+ level = SHOW_UBITS(re, &t->gb, 8);
+ LAST_SKIP_BITS(re, &t->gb, 8);
+ }
+
+ i += run;
+ if (i > 63) {
+ av_log(avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n",
+ t->mb_x, t->mb_y);
+ ret = AVERROR_INVALIDDATA;
+ break;
+ }
+
+ j = scantable[i];
+ if (level < 0) {
+ level = -level;
+ level = (level * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
+ level = -level;
+ } else {
+ level = (level * quant_matrix[j]) >> 4;
+ level = (level - 1) | 1;
+ }
+ }
+
+ block[j] = level;
+ }
+ CLOSE_READER(re, &t->gb);
+
+ return ret;
+}
+
+static int tqi_decode_mb(AVCodecContext *avctx, int16_t (*block)[64])
+{
+ TqiContext *t = avctx->priv_data;
int n;
- s->bdsp.clear_blocks(block[0]);
- for (n=0; n<6; n++)
- if (ff_mpeg1_decode_block_intra(s, block[n], n) < 0)
+
+ t->bdsp.clear_blocks(block[0]);
+ for (n = 0; n < 6; n++) {
+ int ret = decode_intra_block(avctx, block[n], n);
+ if (ret < 0)
return -1;
+ }
return 0;
}
-static inline void tqi_idct_put(TqiContext *t, AVFrame *frame, int16_t
(*block)[64])
+static inline void tqi_idct_put(AVCodecContext *avctx, AVFrame *frame,
+ int16_t (*block)[64])
{
- MpegEncContext *s = &t->s;
+ TqiContext *t = avctx->priv_data;
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;
+ uint8_t *dest_y = frame->data[0] + (t->mb_y * 16 * linesize ) +
t->mb_x * 16;
+ uint8_t *dest_cb = frame->data[1] + (t->mb_y * 8 * frame->linesize[1]) +
t->mb_x * 8;
+ uint8_t *dest_cr = frame->data[2] + (t->mb_y * 8 * frame->linesize[2]) +
t->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 & AV_CODEC_FLAG_GRAY)) {
+
+ if (!(avctx->flags & AV_CODEC_FLAG_GRAY)) {
ff_ea_idct_put_c(dest_cb, frame->linesize[1], block[4]);
ff_ea_idct_put_c(dest_cr, frame->linesize[2], block[5]);
}
}
-static void tqi_calculate_qtable(MpegEncContext *s, int quant)
+static void tqi_calculate_qtable(AVCodecContext *avctx, int quant)
{
+ TqiContext *t = avctx->priv_data;
const int qscale = (215 - 2*quant)*5;
int i;
- s->intra_matrix[0] =
(ff_inv_aanscales[0]*ff_mpeg1_default_intra_matrix[0])>>11;
+
+ t->intra_matrix[0] = (ff_inv_aanscales[0] *
ff_mpeg1_default_intra_matrix[0]) >> 11;
for(i=1; i<64; i++)
- s->intra_matrix[i] =
(ff_inv_aanscales[i]*ff_mpeg1_default_intra_matrix[i]*qscale + 32)>>14;
+ t->intra_matrix[i] = (ff_inv_aanscales[i] *
ff_mpeg1_default_intra_matrix[i] * qscale + 32) >> 14;
}
static int tqi_decode_frame(AVCodecContext *avctx,
@@ -108,16 +216,15 @@ static int tqi_decode_frame(AVCodecContext *avctx,
int buf_size = avpkt->size;
const uint8_t *buf_end = buf+buf_size;
TqiContext *t = avctx->priv_data;
- MpegEncContext *s = &t->s;
AVFrame *frame = data;
- int ret;
+ int ret, w, h;
- s->width = AV_RL16(&buf[0]);
- s->height = AV_RL16(&buf[2]);
- tqi_calculate_qtable(s, buf[4]);
+ w = AV_RL16(&buf[0]);
+ h = AV_RL16(&buf[2]);
+ tqi_calculate_qtable(avctx, buf[4]);
buf += 8;
- ret = ff_set_dimensions(s->avctx, s->width, s->height);
+ ret = ff_set_dimensions(avctx, w, h);
if (ret < 0)
return ret;
@@ -132,15 +239,15 @@ static int tqi_decode_frame(AVCodecContext *avctx,
return AVERROR(ENOMEM);
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));
+ init_get_bits(&t->gb, t->bitstream_buf, 8 * (buf_end - buf));
- s->last_dc[0] = s->last_dc[1] = s->last_dc[2] = 0;
- for (s->mb_y=0; s->mb_y<(avctx->height+15)/16; s->mb_y++)
- for (s->mb_x=0; s->mb_x<(avctx->width+15)/16; s->mb_x++)
- {
- if (tqi_decode_mb(s, t->block) < 0)
- break;
- tqi_idct_put(t, frame, t->block);
+ t->last_dc[0] = t->last_dc[1] = t->last_dc[2] = 0;
+ for (t->mb_y = 0; t->mb_y < (h + 15) / 16; t->mb_y++) {
+ for (t->mb_x = 0; t->mb_x < (w + 15) / 16; t->mb_x++) {
+ if (tqi_decode_mb(avctx, t->block) < 0)
+ break;
+ tqi_idct_put(avctx, frame, t->block);
+ }
}
*got_frame = 1;
diff --git a/libavcodec/mpeg12.h b/libavcodec/mpeg12.h
index fda1a53..7353e3e 100644
--- a/libavcodec/mpeg12.h
+++ b/libavcodec/mpeg12.h
@@ -50,7 +50,6 @@ static inline int decode_dc(GetBitContext *gb, int component)
return diff;
}
-int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n);
void ff_mpeg1_clean_buffers(MpegEncContext *s);
int ff_mpeg1_find_frame_end(ParseContext *pc, const uint8_t *buf, int
buf_size, AVCodecParserContext *s);
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 711b310..8b8aed7 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -213,11 +213,6 @@ static inline int mpeg1_decode_block_intra(MpegEncContext
*s,
return 0;
}
-int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
-{
- return mpeg1_decode_block_intra(s, block, n);
-}
-
static inline int mpeg1_decode_block_inter(MpegEncContext *s,
int16_t *block, int n)
{
--
2.6.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
