X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Frv30.c;h=e1b3ad1db6d128def6fd296c04c79c43d7d1c1a5;hb=437f884da6ae8faddb4ba88582a28397f5e8a753;hp=5bfc4d68580e1e85203a573d501eef6429e90883;hpb=a660c52a7e5075a5ba0c617613e933b4e51933f0;p=ffmpeg diff --git a/libavcodec/rv30.c b/libavcodec/rv30.c index 5bfc4d68580..e1b3ad1db6d 100644 --- a/libavcodec/rv30.c +++ b/libavcodec/rv30.c @@ -20,13 +20,14 @@ */ /** - * @file rv30.c + * @file libavcodec/rv30.c * RV30 decoder */ #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" +#include "golomb.h" #include "rv34.h" #include "rv30data.h" @@ -37,17 +38,23 @@ static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceIn int mb_bits; int w = r->s.width, h = r->s.height; int mb_size; + int rpr; memset(si, 0, sizeof(SliceInfo)); - skip_bits(gb, 3); + if(get_bits(gb, 3)) + return -1; si->type = get_bits(gb, 2); if(si->type == 1) si->type = 0; if(get_bits1(gb)) return -1; si->quant = get_bits(gb, 5); skip_bits1(gb); - skip_bits(gb, 13); // timestamp - skip_bits(gb, r->rpr); + si->pts = get_bits(gb, 13); + rpr = get_bits(gb, r->rpr); + if(rpr){ + w = r->s.avctx->extradata[6 + rpr*2] << 2; + h = r->s.avctx->extradata[7 + rpr*2] << 2; + } si->width = w; si->height = h; mb_size = ((w + 15) >> 4) * ((h + 15) >> 4); @@ -60,13 +67,13 @@ static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceIn /** * Decode 4x4 intra types array. */ -static int rv30_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int *dst) +static int rv30_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t *dst) { int i, j, k; for(i = 0; i < 4; i++, dst += r->s.b4_stride - 4){ for(j = 0; j < 4; j+= 2){ - int code = (ff_rv34_get_gamma(gb) - 1) << 1; + int code = svq3_get_ue_golomb(gb) << 1; if(code >= 81*2){ av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n"); return -1; @@ -94,7 +101,7 @@ static int rv30_decode_mb_info(RV34DecContext *r) static const int rv30_b_types[6] = { RV34_MB_SKIP, RV34_MB_B_DIRECT, RV34_MB_B_FORWARD, RV34_MB_B_BACKWARD, RV34_MB_TYPE_INTRA, RV34_MB_TYPE_INTRA16x16 }; MpegEncContext *s = &r->s; GetBitContext *gb = &s->gb; - int code = ff_rv34_get_gamma(gb) - 1; + int code = svq3_get_ue_golomb(gb); if(code > 11){ av_log(s->avctx, AV_LOG_ERROR, "Incorrect MB type code\n"); @@ -104,16 +111,137 @@ static int rv30_decode_mb_info(RV34DecContext *r) av_log(s->avctx, AV_LOG_ERROR, "dquant needed\n"); code -= 6; } - if(s->pict_type != B_TYPE) + if(s->pict_type != FF_B_TYPE) return rv30_p_types[code]; else return rv30_b_types[code]; } +static inline void rv30_weak_loop_filter(uint8_t *src, const int step, + const int stride, const int lim) +{ + uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; + int i, diff; + + for(i = 0; i < 4; i++){ + diff = ((src[-2*step] - src[1*step]) - (src[-1*step] - src[0*step])*4) >> 3; + diff = av_clip(diff, -lim, lim); + src[-1*step] = cm[src[-1*step] + diff]; + src[ 0*step] = cm[src[ 0*step] - diff]; + src += stride; + } +} + +static void rv30_loop_filter(RV34DecContext *r, int row) +{ + MpegEncContext *s = &r->s; + int mb_pos, mb_x; + int i, j, k; + uint8_t *Y, *C; + int loc_lim, cur_lim, left_lim = 0, top_lim = 0; + + mb_pos = row * s->mb_stride; + for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){ + int mbtype = s->current_picture_ptr->mb_type[mb_pos]; + if(IS_INTRA(mbtype) || IS_SEPARATE_DC(mbtype)) + r->deblock_coefs[mb_pos] = 0xFFFF; + if(IS_INTRA(mbtype)) + r->cbp_chroma[mb_pos] = 0xFF; + } + + /* all vertical edges are filtered first + * and horizontal edges are filtered on the next iteration + */ + mb_pos = row * s->mb_stride; + for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){ + cur_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos]]; + if(mb_x) + left_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos - 1]]; + for(j = 0; j < 16; j += 4){ + Y = s->current_picture_ptr->data[0] + mb_x*16 + (row*16 + j) * s->linesize + 4 * !mb_x; + for(i = !mb_x; i < 4; i++, Y += 4){ + int ij = i + j; + loc_lim = 0; + if(r->deblock_coefs[mb_pos] & (1 << ij)) + loc_lim = cur_lim; + else if(!i && r->deblock_coefs[mb_pos - 1] & (1 << (ij + 3))) + loc_lim = left_lim; + else if( i && r->deblock_coefs[mb_pos] & (1 << (ij - 1))) + loc_lim = cur_lim; + if(loc_lim) + rv30_weak_loop_filter(Y, 1, s->linesize, loc_lim); + } + } + for(k = 0; k < 2; k++){ + int cur_cbp, left_cbp = 0; + cur_cbp = (r->cbp_chroma[mb_pos] >> (k*4)) & 0xF; + if(mb_x) + left_cbp = (r->cbp_chroma[mb_pos - 1] >> (k*4)) & 0xF; + for(j = 0; j < 8; j += 4){ + C = s->current_picture_ptr->data[k+1] + mb_x*8 + (row*8 + j) * s->uvlinesize + 4 * !mb_x; + for(i = !mb_x; i < 2; i++, C += 4){ + int ij = i + (j >> 1); + loc_lim = 0; + if(cur_cbp && (1 << ij)) + loc_lim = cur_lim; + else if(!i && left_cbp & (1 << (ij + 1))) + loc_lim = left_lim; + else if( i && cur_cbp & (1 << (ij - 1))) + loc_lim = cur_lim; + if(loc_lim) + rv30_weak_loop_filter(C, 1, s->uvlinesize, loc_lim); + } + } + } + } + mb_pos = row * s->mb_stride; + for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){ + cur_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos]]; + if(row) + top_lim = rv30_loop_filt_lim[s->current_picture_ptr->qscale_table[mb_pos - s->mb_stride]]; + for(j = 4*!row; j < 16; j += 4){ + Y = s->current_picture_ptr->data[0] + mb_x*16 + (row*16 + j) * s->linesize; + for(i = 0; i < 4; i++, Y += 4){ + int ij = i + j; + loc_lim = 0; + if(r->deblock_coefs[mb_pos] & (1 << ij)) + loc_lim = cur_lim; + else if(!j && r->deblock_coefs[mb_pos - s->mb_stride] & (1 << (ij + 12))) + loc_lim = top_lim; + else if( j && r->deblock_coefs[mb_pos] & (1 << (ij - 4))) + loc_lim = cur_lim; + if(loc_lim) + rv30_weak_loop_filter(Y, s->linesize, 1, loc_lim); + } + } + for(k = 0; k < 2; k++){ + int cur_cbp, top_cbp = 0; + cur_cbp = (r->cbp_chroma[mb_pos] >> (k*4)) & 0xF; + if(row) + top_cbp = (r->cbp_chroma[mb_pos - s->mb_stride] >> (k*4)) & 0xF; + for(j = 4*!row; j < 8; j += 4){ + C = s->current_picture_ptr->data[k+1] + mb_x*8 + (row*8 + j) * s->uvlinesize; + for(i = 0; i < 2; i++, C += 4){ + int ij = i + (j >> 1); + loc_lim = 0; + if(r->cbp_chroma[mb_pos] && (1 << ij)) + loc_lim = cur_lim; + else if(!j && top_cbp & (1 << (ij + 2))) + loc_lim = top_lim; + else if( j && cur_cbp & (1 << (ij - 2))) + loc_lim = cur_lim; + if(loc_lim) + rv30_weak_loop_filter(C, s->uvlinesize, 1, loc_lim); + } + } + } + } +} + /** * Initialize decoder. */ -static int rv30_decode_init(AVCodecContext *avctx) +static av_cold int rv30_decode_init(AVCodecContext *avctx) { RV34DecContext *r = avctx->priv_data; @@ -125,9 +253,14 @@ static int rv30_decode_init(AVCodecContext *avctx) } r->rpr = (avctx->extradata[1] & 7) >> 1; r->rpr = FFMIN(r->rpr + 1, 3); + if(avctx->extradata_size - 8 < (r->rpr - 1) * 2){ + av_log(avctx, AV_LOG_ERROR, "Insufficient extradata - need at least %d bytes, got %d\n", + 6 + r->rpr * 2, avctx->extradata_size); + } r->parse_slice_header = rv30_parse_slice_header; r->decode_intra_types = rv30_decode_intra_types; r->decode_mb_info = rv30_decode_mb_info; + r->loop_filter = rv30_loop_filter; r->luma_dc_quant_i = rv30_luma_dc_quant; r->luma_dc_quant_p = rv30_luma_dc_quant; return 0; @@ -142,4 +275,8 @@ AVCodec rv30_decoder = { NULL, ff_rv34_decode_end, ff_rv34_decode_frame, + CODEC_CAP_DR1 | CODEC_CAP_DELAY, + .flush = ff_mpeg_flush, + .long_name = NULL_IF_CONFIG_SMALL("RealVideo 3.0"), + .pix_fmts= ff_pixfmt_list_420, };