diff options
author | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
---|---|---|
committer | tetsuo55 <tetsuo55@users.sourceforge.net> | 2010-04-09 01:14:58 +0400 |
commit | a9b7bf3fb3e1334d8defd05ca4cfae870b4912e5 (patch) | |
tree | 2dab453d94d5e003379a6cc895eceb84c80e23ec /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c | |
parent | aafd49a91f7c2fa9c7103971c16fa6e1b29e8bfd (diff) |
astyle formatting cleanup to make the sourcecode more accessible
switch used: astyle --style=ansi --min-conditional-indent=0 --pad=oper --unpad=paren
http://astyle.sourceforge.net/
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1783 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c')
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c | 103 |
1 files changed, 64 insertions, 39 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c index f97c326f8..6b1a4ab98 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/rv30.c @@ -51,7 +51,8 @@ static int rv30_parse_slice_header(RV34DecContext *r, GetBitContext *gb, SliceIn skip_bits1(gb); si->pts = get_bits(gb, 13); rpr = get_bits(gb, r->rpr); - if(rpr){ + if(rpr) + { w = r->s.avctx->extradata[6 + rpr*2] << 2; h = r->s.avctx->extradata[7 + rpr*2] << 2; } @@ -71,18 +72,23 @@ static int rv30_decode_intra_types(RV34DecContext *r, GetBitContext *gb, int8_t { int i, j, k; - for(i = 0; i < 4; i++, dst += r->intra_types_stride - 4){ - for(j = 0; j < 4; j+= 2){ + for(i = 0; i < 4; i++, dst += r->intra_types_stride - 4) + { + for(j = 0; j < 4; j += 2) + { int code = svq3_get_ue_golomb(gb) << 1; - if(code >= 81*2){ + if(code >= 81 * 2) + { av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction code\n"); return -1; } - for(k = 0; k < 2; k++){ + for(k = 0; k < 2; k++) + { int A = dst[-r->intra_types_stride] + 1; int B = dst[-1] + 1; *dst++ = rv30_itype_from_context[A * 90 + B * 9 + rv30_itype_code[code + k]]; - if(dst[-1] == 9){ + if(dst[-1] == 9) + { av_log(r->s.avctx, AV_LOG_ERROR, "Incorrect intra prediction mode\n"); return -1; } @@ -103,11 +109,13 @@ static int rv30_decode_mb_info(RV34DecContext *r) GetBitContext *gb = &s->gb; int code = svq3_get_ue_golomb(gb); - if(code > 11){ + if(code > 11) + { av_log(s->avctx, AV_LOG_ERROR, "Incorrect MB type code\n"); return -1; } - if(code > 5){ + if(code > 5) + { av_log(s->avctx, AV_LOG_ERROR, "dquant needed\n"); code -= 6; } @@ -118,13 +126,14 @@ static int rv30_decode_mb_info(RV34DecContext *r) } static inline void rv30_weak_loop_filter(uint8_t *src, const int step, - const int stride, const int lim) + 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; + 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]; @@ -141,7 +150,8 @@ static void rv30_loop_filter(RV34DecContext *r, int row) 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++){ + 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; @@ -153,40 +163,46 @@ static void rv30_loop_filter(RV34DecContext *r, int row) * 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++){ + 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){ + 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))) + 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++){ + for(k = 0; k < 2; k++) + { int cur_cbp, left_cbp = 0; - cur_cbp = (r->cbp_chroma[mb_pos] >> (k*4)) & 0xF; + 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){ + 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))) + 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); @@ -195,40 +211,46 @@ static void rv30_loop_filter(RV34DecContext *r, int row) } } mb_pos = row * s->mb_stride; - for(mb_x = 0; mb_x < s->mb_width; mb_x++, mb_pos++){ + 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){ + 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))) + 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++){ + for(k = 0; k < 2; k++) + { int cur_cbp, top_cbp = 0; - cur_cbp = (r->cbp_chroma[mb_pos] >> (k*4)) & 0xF; + 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){ + 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))) + 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); @@ -247,13 +269,15 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) r->rv30 = 1; ff_rv34_decode_init(avctx); - if(avctx->extradata_size < 2){ + if(avctx->extradata_size < 2) + { av_log(avctx, AV_LOG_ERROR, "Extradata is too small.\n"); return -1; } r->rpr = (avctx->extradata[1] & 7) >> 1; r->rpr = FFMIN(r->rpr + 1, 3); - if(avctx->extradata_size - 8 < (r->rpr - 1) * 2){ + 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); } @@ -266,7 +290,8 @@ static av_cold int rv30_decode_init(AVCodecContext *avctx) return 0; } -AVCodec rv30_decoder = { +AVCodec rv30_decoder = +{ "rv30", CODEC_TYPE_VIDEO, CODEC_ID_RV30, |