Mercurial > libavcodec.hg
changeset 8037:b6d93bef844a libavcodec
RV3 and RV4 decoders set some deblocking coefs for each macroblock,
so store them in the context and register a function to calculate them.
| author | kostya |
|---|---|
| date | Mon, 20 Oct 2008 05:58:05 +0000 |
| parents | 9b98b2261938 |
| children | efc935702bce |
| files | rv34.c rv34.h |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/rv34.c Mon Oct 20 05:54:31 2008 +0000 +++ b/rv34.c Mon Oct 20 05:58:05 2008 +0000 @@ -1039,6 +1039,8 @@ cbp = cbp2 = rv34_decode_mb_header(r, intra_types); r->cbp_luma [s->mb_x + s->mb_y * s->mb_stride] = cbp; r->cbp_chroma[s->mb_x + s->mb_y * s->mb_stride] = cbp >> 16; + if(r->set_deblock_coef) + r->deblock_coefs[s->mb_x + s->mb_y * s->mb_stride] = r->set_deblock_coef(r); s->current_picture.qscale_table[s->mb_x + s->mb_y * s->mb_stride] = s->qscale; if(cbp == -1) @@ -1132,6 +1134,7 @@ r->mb_type = av_realloc(r->mb_type, r->s.mb_stride * r->s.mb_height * sizeof(*r->mb_type)); r->cbp_luma = av_realloc(r->cbp_luma, r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_luma)); r->cbp_chroma = av_realloc(r->cbp_chroma, r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_chroma)); + r->deblock_coefs = av_realloc(r->deblock_coefs, r->s.mb_stride * r->s.mb_height * sizeof(*r->deblock_coefs)); } s->pict_type = r->si.type ? r->si.type : FF_I_TYPE; if(MPV_frame_start(s, s->avctx) < 0) @@ -1226,6 +1229,7 @@ r->cbp_luma = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_luma)); r->cbp_chroma = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->cbp_chroma)); + r->deblock_coefs = av_malloc(r->s.mb_stride * r->s.mb_height * sizeof(*r->deblock_coefs)); if(!intra_vlcs[0].cbppattern[0].bits) rv34_init_tables();
--- a/rv34.h Mon Oct 20 05:54:31 2008 +0000 +++ b/rv34.h Mon Oct 20 05:58:05 2008 +0000 @@ -107,6 +107,7 @@ uint16_t *cbp_luma; ///< CBP values for luma subblocks uint8_t *cbp_chroma; ///< CBP values for chroma subblocks + int *deblock_coefs; ///< deblock coefficients for each macroblock /** 8x8 block available flags (for MV prediction) */ DECLARE_ALIGNED_8(uint32_t, avail_cache[3*4]); @@ -114,6 +115,7 @@ int (*parse_slice_header)(struct RV34DecContext *r, GetBitContext *gb, SliceInfo *si); int (*decode_mb_info)(struct RV34DecContext *r); int (*decode_intra_types)(struct RV34DecContext *r, GetBitContext *gb, int8_t *dst); + int (*set_deblock_coef)(struct RV34DecContext *r); void (*loop_filter)(struct RV34DecContext *r); }RV34DecContext;