September 2007 - FFmpeg-soc - lists.ffmpeg.org

[soc]: r1356 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:32:16 2007 New Revision: 1356 Log: Use s->qscale instead of r->quant Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:32:16 2007 @@ -108,7 +108,6 @@ typedef struct RV40DecContext{ int intra_types_stride; ///< stride for block types data int block_start; ///< start of slice in blocks int ptype; ///< picture type - int quant; ///< quantizer int vlc_set; ///< index of currently selected VLC set RV40VLC *cur_vlcs; ///< VLC set used for current frame decoding @@ -1640,17 +1639,17 @@ static int rv40_decode_macroblock(RV40De if(s->mb_x && !s->first_slice_line && !((s->mb_y-1)==s->resync_mb_y && s->mb_x == s->resync_mb_x)) r->avail[3] = 1; - r->quant = r->si.quant; + s->qscale = r->si.quant; cbp = cbp2 = rv40_decode_mb_header(r, intra_types); if(cbp == -1) return -1; - luma_dc_quant = r->rv30 ? rv30_luma_dc_quant[r->quant] : rv40_luma_quant[r->si.type>>1][r->quant]; + luma_dc_quant = r->rv30 ? rv30_luma_dc_quant[s->qscale] : rv40_luma_quant[r->si.type>>1][s->qscale]; if(r->is16){ memset(block16, 0, sizeof(block16)); rv40_decode_block(block16, gb, r->cur_vlcs, 3, 0); - rv40_dequant4x4_16x16(block16, 0, rv40_qscale_tab[luma_dc_quant],rv40_qscale_tab[r->quant]); + rv40_dequant4x4_16x16(block16, 0, rv40_qscale_tab[luma_dc_quant],rv40_qscale_tab[s->qscale]); rv40_intra_inv_transform_noround(block16, 0); } @@ -1661,7 +1660,7 @@ static int rv40_decode_macroblock(RV40De if(cbp & 1) rv40_decode_block(s->block[blknum] + blkoff, gb, r->cur_vlcs, r->luma_vlc, 0); if((cbp & 1) || r->is16){ - rv40_dequant4x4(s->block[blknum], blkoff, rv40_qscale_tab[luma_dc_quant],rv40_qscale_tab[r->quant]); + rv40_dequant4x4(s->block[blknum], blkoff, rv40_qscale_tab[luma_dc_quant],rv40_qscale_tab[s->qscale]); if(r->is16) //FIXME: optimize s->block[blknum][blkoff] = block16[(i & 3) | ((i & 0xC) << 1)]; rv40_intra_inv_transform(s->block[blknum], blkoff); @@ -1674,7 +1673,7 @@ static int rv40_decode_macroblock(RV40De blknum = ((i & 4) >> 2) + 4; blkoff = ((i & 1) << 2) + ((i & 2) << 4); rv40_decode_block(s->block[blknum] + blkoff, gb, r->cur_vlcs, r->chroma_vlc, 1); - rv40_dequant4x4(s->block[blknum], blkoff, rv40_qscale_tab[rv40_chroma_quant[1][r->quant]],rv40_qscale_tab[rv40_chroma_quant[0][r->quant]]); + rv40_dequant4x4(s->block[blknum], blkoff, rv40_qscale_tab[rv40_chroma_quant[1][s->qscale]],rv40_qscale_tab[rv40_chroma_quant[0][s->qscale]]); rv40_intra_inv_transform(s->block[blknum], blkoff); } if(IS_INTRA(s->current_picture_ptr->mb_type[s->mb_x + s->mb_y*s->mb_stride])) @@ -1756,7 +1755,7 @@ static int rv40_decode_slice(RV40DecCont r->si.size = size; r->si.end = end; - r->quant = r->si.quant; + s->qscale = r->si.quant; r->bits = r->si.size; r->block_start = r->si.start; s->mb_num_left = r->si.end - r->si.start; @@ -1971,9 +1970,9 @@ static void rv40_postprocess(RV40DecCont int i, j; int no_up, no_left; uint8_t *Y, *U, *V; - const int alpha = rv40_alpha_tab[r->quant], beta = rv40_beta_tab[r->quant]; + const int alpha = rv40_alpha_tab[s->qscale], beta = rv40_beta_tab[s->qscale]; //XXX these are probably not correct - const int thr = r->quant, lim0 = rv40_filter_clip_tbl[1][r->quant], lim1 = rv40_filter_clip_tbl[2][r->quant]; + const int thr = s->qscale, lim0 = rv40_filter_clip_tbl[1][s->qscale], lim1 = rv40_filter_clip_tbl[2][s->qscale]; mb_pos = s->resync_mb_x + s->resync_mb_y * s->mb_stride; memset(r->intra_types_hist, -1, r->intra_types_stride * 4 * 2 * sizeof(int));

1 0

[soc]: r1355 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:31:37 2007 New Revision: 1355 Log: Remove code duplication Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:31:37 2007 @@ -630,7 +630,7 @@ static inline int get_omega(GetBitContex */ static int rv30_decode_intra_types(RV40DecContext *r, GetBitContext *gb, int *dst) { - int i, j; + int i, j, k; int A, B; int *ptr; int code; @@ -643,19 +643,14 @@ static int rv30_decode_intra_types(RV40D av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n"); return -1; } - A = ptr[-r->intra_types_stride] + 1; - B = ptr[-1] + 1; - *ptr++ = rv30_itype_from_context[A * 90 + B * 9 + rv30_itype_code[code + 0]]; - if(ptr[-1] == 9){ - av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction mode\n"); - return -1; - } - A = ptr[-r->intra_types_stride] + 1; - B = ptr[-1] + 1; - *ptr++ = rv30_itype_from_context[A * 90 + B * 9 + rv30_itype_code[code + 1]]; - if(ptr[-1] == 9){ - av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction mode\n"); - return -1; + for(k = 0; k < 2; k++){ + A = ptr[-r->intra_types_stride] + 1; + B = ptr[-1] + 1; + *ptr++ = rv30_itype_from_context[A * 90 + B * 9 + rv30_itype_code[code + k]]; + if(ptr[-1] == 9){ + av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction mode\n"); + return -1; + } } } }

1 0

[soc]: r1354 - rv40/rv40.c
by kostya 17 Sep '07

17 Sep '07

Author: kostya Date: Mon Sep 17 08:31:00 2007 New Revision: 1354 Log: Add Doxygen comments to macroblock types Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Mon Sep 17 08:31:00 2007 @@ -44,22 +44,26 @@ static const int rv40_mb_type_to_lavc[12 MB_TYPE_16x8, MB_TYPE_8x16, MB_TYPE_DIRECT2, MB_TYPE_16x16 }; -/** RV40 Macroblock types */ +/** + * RV40 Macroblock types + * @{ + */ enum RV40BlockTypes{ - RV40_MB_TYPE_INTRA, - RV40_MB_TYPE_INTRA16x16, - RV40_MB_P_16x16, - RV40_MB_P_8x8, - RV40_MB_B_FORWARD, //XXX: maybe vice versa - RV40_MB_B_BACKWARD, - RV40_MB_SKIP, - RV40_MB_B_INTERP, - RV40_MB_P_16x8, - RV40_MB_P_8x16, - RV40_MB_B_DIRECT, - RV40_MB_P_MIX16x16, // inter 16x16 block very similar to Intra16x16 + RV40_MB_TYPE_INTRA, ///< Intra macroblock + RV40_MB_TYPE_INTRA16x16, ///< Intra macroblock with DCs in a separate 4x4 block + RV40_MB_P_16x16, ///< P-frame macroblock, one motion frame + RV40_MB_P_8x8, ///< P-frame macroblock, 8x8 motion compensation partitions + RV40_MB_B_FORWARD, ///< B-frame macroblock, forward prediction + RV40_MB_B_BACKWARD, ///< B-frame macroblock, backward prediction + RV40_MB_SKIP, ///< Skipped block + RV40_MB_B_INTERP, ///< Bidirectionally predicted B-frame macroblock, no motion vectors + RV40_MB_P_16x8, ///< P-frame macroblock, 16x8 motion compensation partitions + RV40_MB_P_8x16, ///< P-frame macroblock, 8x16 motion compensation partitions + RV40_MB_B_DIRECT, ///< Bidirectionally predicted B-frame macroblock, two motion vectors + RV40_MB_P_MIX16x16, ///< P-frame macroblock with DCs in a separate 4x4 block, one motion vector RV40_MB_TYPES }; +/** @} */ /** * VLC tables used by decoder

1 0

r1352
by Rodion Kosovsky 17 Sep '07

17 Sep '07

Kostya, Is this needed any more? 2147<http://svn.mplayerhq.hu/soc/rv40/rv40.c?annotate=1352&pathrev=1352#l2147> if(r->rv30) if(r->rv30) 2148<http://svn.mplayerhq.hu/soc/rv40/rv40.c?annotate=1352&pathrev=1352#l2148> rv30_decode_slice(r, r->si.size, r->si.end, &last); rv40_decode_slice(r, r->si.size, r->si.end, &last); 2149<http://svn.mplayerhq.hu/soc/rv40/rv40.c?annotate=1352&pathrev=1352#l2149> else else 2150<http://svn.mplayerhq.hu/soc/rv40/rv40.c?annotate=1352&pathrev=1352#l2150> rv40_decode_slice(r, r->si.size, r->si.end, &last); rv40_decode_slice(r, r->si.size, r->si.end, &last); The if statement does the same thing in both cases, can't it be changed just to rv40_decode_slice(r, r->si.size, r->si.end, &last); Rodion Kosovsky

1 0

[soc] [propchange]: r1349 - svn:log
by kostya 16 Sep '07

16 Sep '07

Author: kostya Revision: 1349 Property Name: svn:log Action: modified Property diff: --- old property value +++ new property value @@ -1 +1 @@ -Set width and heigh in RV30 slice header \ No newline at end of file +Set width and height in RV30 slice header \ No newline at end of file

1 0

[soc]: r1353 - rv40/rv40.c
by kostya 16 Sep '07

16 Sep '07

Author: kostya Date: Sun Sep 16 18:29:03 2007 New Revision: 1353 Log: Check for unknown slice headers Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Sun Sep 16 18:29:03 2007 @@ -1718,6 +1718,11 @@ static int rv40_decode_slice(RV40DecCont init_get_bits(&r->s.gb, r->slice_data, r->si.size); res = r->rv30 ? rv30_parse_slice_header(r, gb, &r->si) : rv40_parse_slice_header(r, gb, &r->si); + if((res < 0 && !s->current_picture_ptr) || (r->prev_si.type == -1 && r->si.start)){ + av_log(s->avctx, AV_LOG_ERROR, "Incorrect or unknown slice header\n"); + *last = 0; + return -1; + } if(res < 0 || (r->prev_si.type != -1 && slice_compare(&r->prev_si, &r->si))){ r->ssi.data = av_realloc(r->ssi.data, r->ssi.data_size + (size>>3)); memcpy(r->ssi.data + r->ssi.data_size, r->slice_data, size >> 3);

1 0

[soc]: r1349 - rv40/rv40.c
by kostya 16 Sep '07

16 Sep '07

Author: kostya Date: Sun Sep 16 17:10:07 2007 New Revision: 1349 Log: Set width and heigh in RV30 slice header Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Sun Sep 16 17:10:07 2007 @@ -573,6 +573,8 @@ static int rv30_parse_slice_header(RV40D t = get_bits(gb, 13); skip_bits(gb, r->rpr); si->vlc_set = 0; + si->width = w; + si->height = h; mb_size = ((w + 15) >> 4) * ((h + 15) >> 4); for(i = 0; i < 5; i++) if(rv40_mb_max_sizes[i] > mb_size)

2 1

[soc]: r1352 - rv40/rv40.c
by kostya 16 Sep '07

16 Sep '07

Author: kostya Date: Sun Sep 16 17:13:02 2007 New Revision: 1352 Log: New slice ends handling mechanism for both codecs Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Sun Sep 16 17:13:02 2007 @@ -1699,85 +1699,12 @@ static int check_slice_end(RV40DecContex return 0; } -static int rv30_decode_slice(RV40DecContext *r, int size, int end, int *last) +static inline int slice_compare(SliceInfo *si1, SliceInfo *si2) { - MpegEncContext *s = &r->s; - GetBitContext *gb = &s->gb; - int mb_pos; - *last = 1; - - init_get_bits(&r->s.gb, r->slice_data, r->si.size); - if(rv30_parse_slice_header(r, gb, &r->si) < 0){ - av_log(s->avctx, AV_LOG_ERROR, "Error parsing slice header\n"); - *last = 0; - return -1; - } - - if(r->prev_si.type != -1 && (r->si.type != r->prev_si.type || r->si.start <= r->prev_si.start || r->si.width != r->prev_si.width || r->si.height != r->prev_si.height)){ - av_log(s->avctx, AV_LOG_ERROR, "Slice headers mismatch\n"); - } - if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) { - s->pict_type = r->si.type ? r->si.type : I_TYPE; - if(MPV_frame_start(s, s->avctx) < 0) - return -1; - ff_er_frame_start(s); - s->current_picture_ptr = &s->current_picture; - s->mb_x = s->mb_y = 0; - } - - r->si.size = size; - r->si.end = end; - r->quant = r->si.quant; - r->bits = r->si.size; - r->block_start = r->si.start; - s->mb_num_left = r->si.end - r->si.start; - r->skip_blocks = 0; - - r->prev_si = r->si; - mb_pos = s->mb_x + s->mb_y * s->mb_width; - if(r->block_start != mb_pos){ - av_log(s->avctx, AV_LOG_ERROR, "Slice indicates MB offset %d, got %d\n", r->block_start, mb_pos); - s->mb_x = r->block_start % s->mb_width; - s->mb_y = r->block_start / s->mb_width; - } - memset(r->intra_types_hist, -1, r->intra_types_stride * 4 * 2 * sizeof(int)); - s->first_slice_line = 1; - s->resync_mb_x= s->mb_x; - s->resync_mb_y= s->mb_y; - - ff_init_block_index(s); - while(!check_slice_end(r, s) && s->mb_num_left-- && s->mb_y < s->mb_height) { - ff_update_block_index(s); - s->dsp.clear_blocks(s->block[0]); - - /* save information about decoded position in case of truncated slice */ - if(r->bits > get_bits_count(gb)){ - r->ssi.bits_used = get_bits_count(gb); - r->ssi.mb_x = s->mb_x; - r->ssi.mb_y = s->mb_y; - } - - if(rv40_decode_macroblock(r, r->intra_types + (s->mb_x + 1) * 4) < 0) - break; - if (++s->mb_x == s->mb_width) { - s->mb_x = 0; - s->mb_y++; - ff_init_block_index(s); - - memmove(r->intra_types_hist, r->intra_types, r->intra_types_stride * 4 * sizeof(int)); - memset(r->intra_types, -1, r->intra_types_stride * 4 * sizeof(int)); - } - if(s->mb_x == s->resync_mb_x) - s->first_slice_line=0; - } - ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END); - *last = 0; - if(s->mb_y >= s->mb_height || r->bits < get_bits_count(gb)) - *last = 1; - if(r->bits > get_bits_count(gb) && show_bits(gb, r->bits-get_bits_count(gb))) - *last = 1; - - return 0; + return si1->type != si2->type || + si1->start >= si2->start || + si1->width != si2->width || + si1->height != si2->height; } static int rv40_decode_slice(RV40DecContext *r, int size, int end, int *last) @@ -1785,32 +1712,26 @@ static int rv40_decode_slice(RV40DecCont MpegEncContext *s = &r->s; GetBitContext *gb = &s->gb; int mb_pos; + int res; + int old_mb_x = r->ssi.mb_x, old_mb_y = r->ssi.mb_y; *last = 1; init_get_bits(&r->s.gb, r->slice_data, r->si.size); - if(rv40_parse_slice_header(r, gb, &r->si) < 0){ - if(!r->truncated){ - av_log(s->avctx, AV_LOG_ERROR, "Error parsing slice header\n"); - *last = 0; - return -1; - }else{ - r->ssi.data = av_realloc(r->ssi.data, r->ssi.data_size + (size>>3)); - memcpy(r->ssi.data + r->ssi.data_size, r->slice_data, size >> 3); - r->ssi.data_size += size >> 3; // XXX: overflow check? - size = r->ssi.data_size * 8; - init_get_bits(&r->s.gb, r->ssi.data, r->ssi.data_size * 8); - r->si = r->prev_si; - skip_bits(gb, r->ssi.bits_used); - s->mb_x = r->ssi.mb_x; - s->mb_y = r->ssi.mb_y; - r->si.start = s->mb_x + s->mb_y * s->mb_width; - } - }else - r->truncated = 0; - - if(!r->truncated && r->prev_si.type != -1 && (r->si.type != r->prev_si.type || r->si.start <= r->prev_si.start || r->si.width != r->prev_si.width || r->si.height != r->prev_si.height)){ - av_log(s->avctx, AV_LOG_ERROR, "Slice headers mismatch\n"); + res = r->rv30 ? rv30_parse_slice_header(r, gb, &r->si) : rv40_parse_slice_header(r, gb, &r->si); + if(res < 0 || (r->prev_si.type != -1 && slice_compare(&r->prev_si, &r->si))){ + r->ssi.data = av_realloc(r->ssi.data, r->ssi.data_size + (size>>3)); + memcpy(r->ssi.data + r->ssi.data_size, r->slice_data, size >> 3); + r->ssi.data_size += size >> 3; // XXX: overflow check? + size = r->ssi.data_size * 8; + init_get_bits(&r->s.gb, r->ssi.data, r->ssi.data_size * 8); + r->si = r->prev_si; + skip_bits(gb, r->ssi.bits_used); + s->mb_x = r->ssi.mb_x; + s->mb_y = r->ssi.mb_y; + r->si.start = s->mb_x + s->mb_y * s->mb_width; + r->truncated = 1; } + if ((s->mb_x == 0 && s->mb_y == 0) || s->current_picture_ptr==NULL) { if(s->width != r->si.width || s->height != r->si.height /*&& avcodec_check_dimensions(s->avctx, r->si.width, r->si.height) >= 0 */){ av_log(s->avctx, AV_LOG_DEBUG, "Changing dimensions to %dx%d\n", r->si.width,r->si.height); @@ -1876,20 +1797,20 @@ static int rv40_decode_slice(RV40DecCont if(s->mb_x == s->resync_mb_x) s->first_slice_line=0; } + if(!r->truncated) + ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END); + else // add only additionally decoded blocks + ff_er_add_slice(s, old_mb_x+1, old_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END); r->truncated = 0; - ff_er_add_slice(s, s->resync_mb_x, s->resync_mb_y, s->mb_x-1, s->mb_y, AC_END|DC_END|MV_END); *last = 0; - if(s->mb_y >= s->mb_height || r->bits < get_bits_count(gb)) + if(s->mb_y >= s->mb_height) *last = 1; if(r->bits > get_bits_count(gb) && show_bits(gb, r->bits-get_bits_count(gb))) *last = 1; - if(r->bits < get_bits_count(gb)){ - r->truncated = 1; - r->ssi.data = av_realloc(r->ssi.data, r->bits >> 3); - memcpy(r->ssi.data, r->slice_data, r->bits >> 3); - *last = 0; - } + r->ssi.data = av_realloc(r->ssi.data, r->bits >> 3); + r->ssi.data_size = r->bits >> 3; + memcpy(r->ssi.data, r->slice_data, r->bits >> 3); return 0; } @@ -2224,7 +2145,7 @@ static int rv40_decode_frame(AVCodecCont } r->slice_data = buf + offset; if(r->rv30) - rv30_decode_slice(r, r->si.size, r->si.end, &last); + rv40_decode_slice(r, r->si.size, r->si.end, &last); else rv40_decode_slice(r, r->si.size, r->si.end, &last); if(last)

1 0

[soc]: r1351 - rv40/rv40.c
by kostya 16 Sep '07

16 Sep '07

Author: kostya Date: Sun Sep 16 17:11:50 2007 New Revision: 1351 Log: Fix slice end check Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Sun Sep 16 17:11:50 2007 @@ -1689,7 +1689,7 @@ static int rv40_decode_macroblock(RV40De static int check_slice_end(RV40DecContext *r, MpegEncContext *s) { int bits; - if(r->skip_blocks) + if(r->skip_blocks > 1) return 0; if(s->mb_y >= s->mb_height) return 1;

1 0

[soc]: r1350 - rv40/rv40.c
by kostya 16 Sep '07

16 Sep '07

Author: kostya Date: Sun Sep 16 17:11:22 2007 New Revision: 1350 Log: Reinitialize quantizer for each macroblock (in case of dquant) Modified: rv40/rv40.c Modified: rv40/rv40.c ============================================================================== --- rv40/rv40.c (original) +++ rv40/rv40.c Sun Sep 16 17:11:22 2007 @@ -1641,6 +1641,7 @@ static int rv40_decode_macroblock(RV40De if(s->mb_x && !s->first_slice_line && !((s->mb_y-1)==s->resync_mb_y && s->mb_x == s->resync_mb_x)) r->avail[3] = 1; + r->quant = r->si.quant; cbp = cbp2 = rv40_decode_mb_header(r, intra_types); if(cbp == -1)

1 0