diff options
author | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
---|---|---|
committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2010-04-09 18:12:59 +0400 |
commit | efbc9d9043ff8ff92716ddd00a5f61412d535593 (patch) | |
tree | 8f3e621f756cf1f5b4d64d97964c7e7abd8aaf08 /src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.c | |
parent | df6b139a6d9027156f614b68687e039e3a5854db (diff) |
revert r1783
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@1785 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.c')
-rw-r--r-- | src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.c | 541 |
1 files changed, 241 insertions, 300 deletions
diff --git a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.c b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.c index 181071c7e..a4baf23d2 100644 --- a/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.c +++ b/src/filters/transform/MPCVideoDec/ffmpeg/libavcodec/vp56.c @@ -39,30 +39,28 @@ static int vp56_get_vectors_predictors(VP56Context *s, int row, int col, VP56Frame ref_frame) { int nb_pred = 0; - VP56mv vect[2] = {{0, 0}, {0, 0}}; + VP56mv vect[2] = {{0,0}, {0,0}}; int pos, offset; VP56mv mvp; - for(pos = 0; pos < 12; pos++) - { + for (pos=0; pos<12; pos++) { mvp.x = col + vp56_candidate_predictor_pos[pos][0]; mvp.y = row + vp56_candidate_predictor_pos[pos][1]; - if(mvp.x < 0 || mvp.x >= s->mb_width || - mvp.y < 0 || mvp.y >= s->mb_height) + if (mvp.x < 0 || mvp.x >= s->mb_width || + mvp.y < 0 || mvp.y >= s->mb_height) continue; - offset = mvp.x + s->mb_width * mvp.y; + offset = mvp.x + s->mb_width*mvp.y; - if(vp56_reference_frame[s->macroblocks[offset].type] != ref_frame) + if (vp56_reference_frame[s->macroblocks[offset].type] != ref_frame) continue; - if((s->macroblocks[offset].mv.x == vect[0].x && - s->macroblocks[offset].mv.y == vect[0].y) || - (s->macroblocks[offset].mv.x == 0 && - s->macroblocks[offset].mv.y == 0)) + if ((s->macroblocks[offset].mv.x == vect[0].x && + s->macroblocks[offset].mv.y == vect[0].y) || + (s->macroblocks[offset].mv.x == 0 && + s->macroblocks[offset].mv.y == 0)) continue; vect[nb_pred++] = s->macroblocks[offset].mv; - if(nb_pred > 1) - { + if (nb_pred > 1) { nb_pred = -1; break; } @@ -72,7 +70,7 @@ static int vp56_get_vectors_predictors(VP56Context *s, int row, int col, s->vector_candidate[0] = vect[0]; s->vector_candidate[1] = vect[1]; - return nb_pred + 1; + return nb_pred+1; } static void vp56_parse_mb_type_models(VP56Context *s) @@ -81,28 +79,22 @@ static void vp56_parse_mb_type_models(VP56Context *s) VP56Model *model = s->modelp; int i, ctx, type; - for(ctx = 0; ctx < 3; ctx++) - { - if(vp56_rac_get_prob(c, 174)) - { + for (ctx=0; ctx<3; ctx++) { + if (vp56_rac_get_prob(c, 174)) { int idx = vp56_rac_gets(c, 4); memcpy(model->mb_types_stats[ctx], - vp56_pre_def_mb_type_stats[idx][ctx], - sizeof(model->mb_types_stats[ctx])); + vp56_pre_def_mb_type_stats[idx][ctx], + sizeof(model->mb_types_stats[ctx])); } - if(vp56_rac_get_prob(c, 254)) - { - for(type = 0; type < 10; type++) - { - for(i = 0; i < 2; i++) - { - if(vp56_rac_get_prob(c, 205)) - { + if (vp56_rac_get_prob(c, 254)) { + for (type=0; type<10; type++) { + for(i=0; i<2; i++) { + if (vp56_rac_get_prob(c, 205)) { int delta, sign = vp56_rac_get(c); delta = vp56_rac_get_tree(c, vp56_pmbtm_tree, - vp56_mb_type_model_model); - if(!delta) + vp56_mb_type_model_model); + if (!delta) delta = 4 * vp56_rac_gets(c, 7); model->mb_types_stats[ctx][type][i] += (delta ^ -sign) + sign; } @@ -112,15 +104,13 @@ static void vp56_parse_mb_type_models(VP56Context *s) } /* compute MB type probability tables based on previous MB type */ - for(ctx = 0; ctx < 3; ctx++) - { + for (ctx=0; ctx<3; ctx++) { int p[10]; - for(type = 0; type < 10; type++) + for (type=0; type<10; type++) p[type] = 100 * model->mb_types_stats[ctx][type][1]; - for(type = 0; type < 10; type++) - { + for (type=0; type<10; type++) { int p02, p34, p0234, p17, p56, p89, p5689, p156789; /* conservative MB type probability */ @@ -138,15 +128,15 @@ static void vp56_parse_mb_type_models(VP56Context *s) p5689 = p56 + p89; p156789 = p17 + p5689; - model->mb_type[ctx][type][1] = 1 + 255 * p0234 / (1 + p0234 + p156789); - model->mb_type[ctx][type][2] = 1 + 255 * p02 / (1 + p0234); - model->mb_type[ctx][type][3] = 1 + 255 * p17 / (1 + p156789); - model->mb_type[ctx][type][4] = 1 + 255 * p[0] / (1 + p02); - model->mb_type[ctx][type][5] = 1 + 255 * p[3] / (1 + p34); - model->mb_type[ctx][type][6] = 1 + 255 * p[1] / (1 + p17); - model->mb_type[ctx][type][7] = 1 + 255 * p56 / (1 + p5689); - model->mb_type[ctx][type][8] = 1 + 255 * p[5] / (1 + p56); - model->mb_type[ctx][type][9] = 1 + 255 * p[8] / (1 + p89); + model->mb_type[ctx][type][1] = 1 + 255 * p0234/(1+p0234+p156789); + model->mb_type[ctx][type][2] = 1 + 255 * p02 / (1+p0234); + model->mb_type[ctx][type][3] = 1 + 255 * p17 / (1+p156789); + model->mb_type[ctx][type][4] = 1 + 255 * p[0] / (1+p02); + model->mb_type[ctx][type][5] = 1 + 255 * p[3] / (1+p34); + model->mb_type[ctx][type][6] = 1 + 255 * p[1] / (1+p17); + model->mb_type[ctx][type][7] = 1 + 255 * p56 / (1+p5689); + model->mb_type[ctx][type][8] = 1 + 255 * p[5] / (1+p56); + model->mb_type[ctx][type][9] = 1 + 255 * p[8] / (1+p89); /* restore initial value */ p[type] = 100 * model->mb_types_stats[ctx][type][1]; @@ -155,12 +145,12 @@ static void vp56_parse_mb_type_models(VP56Context *s) } static VP56mb vp56_parse_mb_type(VP56Context *s, -VP56mb prev_type, int ctx) + VP56mb prev_type, int ctx) { uint8_t *mb_type_model = s->modelp->mb_type[ctx][prev_type]; VP56RangeCoder *c = &s->c; - if(vp56_rac_get_prob(c, mb_type_model[0])) + if (vp56_rac_get_prob(c, mb_type_model[0])) return prev_type; else return vp56_rac_get_tree(c, vp56_pmbt_tree, mb_type_model); @@ -168,36 +158,32 @@ VP56mb prev_type, int ctx) static void vp56_decode_4mv(VP56Context *s, int row, int col) { - VP56mv mv = {0, 0}; + VP56mv mv = {0,0}; int type[4]; int b; /* parse each block type */ - for(b = 0; b < 4; b++) - { + for (b=0; b<4; b++) { type[b] = vp56_rac_gets(&s->c, 2); - if(type[b]) + if (type[b]) type[b]++; /* only returns 0, 2, 3 or 4 (all INTER_PF) */ } /* get vectors */ - for(b = 0; b < 4; b++) - { - switch(type[b]) - { - case VP56_MB_INTER_NOVEC_PF: - s->mv[b].x = 0; - s->mv[b].y = 0; - break; - case VP56_MB_INTER_DELTA_PF: - s->parse_vector_adjustment(s, &s->mv[b]); - break; - case VP56_MB_INTER_V1_PF: - s->mv[b] = s->vector_candidate[0]; - break; - case VP56_MB_INTER_V2_PF: - s->mv[b] = s->vector_candidate[1]; - break; + for (b=0; b<4; b++) { + switch (type[b]) { + case VP56_MB_INTER_NOVEC_PF: + s->mv[b].x=0;s->mv[b].y=0; + break; + case VP56_MB_INTER_DELTA_PF: + s->parse_vector_adjustment(s, &s->mv[b]); + break; + case VP56_MB_INTER_V1_PF: + s->mv[b] = s->vector_candidate[0]; + break; + case VP56_MB_INTER_V2_PF: + s->mv[b] = s->vector_candidate[1]; + break; } mv.x += s->mv[b].x; mv.y += s->mv[b].y; @@ -207,71 +193,66 @@ static void vp56_decode_4mv(VP56Context *s, int row, int col) s->macroblocks[row * s->mb_width + col].mv = s->mv[3]; /* chroma vectors are average luma vectors */ - if(s->avctx->codec->id == CODEC_ID_VP5) - { - s->mv[4].x = s->mv[5].x = RSHIFT(mv.x, 2); - s->mv[4].y = s->mv[5].y = RSHIFT(mv.y, 2); - } - else - { - s->mv[4].x = s->mv[5].x = mv.x / 4; - s->mv[4].y = s->mv[5].y = mv.y / 4; + if (s->avctx->codec->id == CODEC_ID_VP5) { + s->mv[4].x = s->mv[5].x = RSHIFT(mv.x,2); + s->mv[4].y = s->mv[5].y = RSHIFT(mv.y,2); + } else { + s->mv[4].x = s->mv[5].x = mv.x/4; s->mv[4].y = s->mv[5].y = mv.y/4; } } static VP56mb vp56_decode_mv(VP56Context *s, int row, int col) { - VP56mv *mv, vect = {0, 0}; + VP56mv *mv, vect = {0,0}; int ctx, b; ctx = vp56_get_vectors_predictors(s, row, col, VP56_FRAME_PREVIOUS); s->mb_type = vp56_parse_mb_type(s, s->mb_type, ctx); s->macroblocks[row * s->mb_width + col].type = s->mb_type; - switch(s->mb_type) - { - case VP56_MB_INTER_V1_PF: - mv = &s->vector_candidate[0]; - break; - - case VP56_MB_INTER_V2_PF: - mv = &s->vector_candidate[1]; - break; - - case VP56_MB_INTER_V1_GF: - vp56_get_vectors_predictors(s, row, col, VP56_FRAME_GOLDEN); - mv = &s->vector_candidate[0]; - break; - - case VP56_MB_INTER_V2_GF: - vp56_get_vectors_predictors(s, row, col, VP56_FRAME_GOLDEN); - mv = &s->vector_candidate[1]; - break; - - case VP56_MB_INTER_DELTA_PF: - s->parse_vector_adjustment(s, &vect); - mv = &vect; - break; - - case VP56_MB_INTER_DELTA_GF: - vp56_get_vectors_predictors(s, row, col, VP56_FRAME_GOLDEN); - s->parse_vector_adjustment(s, &vect); - mv = &vect; - break; - - case VP56_MB_INTER_4V: - vp56_decode_4mv(s, row, col); - return s->mb_type; - - default: - mv = &vect; - break; + switch (s->mb_type) { + case VP56_MB_INTER_V1_PF: + mv = &s->vector_candidate[0]; + break; + + case VP56_MB_INTER_V2_PF: + mv = &s->vector_candidate[1]; + break; + + case VP56_MB_INTER_V1_GF: + vp56_get_vectors_predictors(s, row, col, VP56_FRAME_GOLDEN); + mv = &s->vector_candidate[0]; + break; + + case VP56_MB_INTER_V2_GF: + vp56_get_vectors_predictors(s, row, col, VP56_FRAME_GOLDEN); + mv = &s->vector_candidate[1]; + break; + + case VP56_MB_INTER_DELTA_PF: + s->parse_vector_adjustment(s, &vect); + mv = &vect; + break; + + case VP56_MB_INTER_DELTA_GF: + vp56_get_vectors_predictors(s, row, col, VP56_FRAME_GOLDEN); + s->parse_vector_adjustment(s, &vect); + mv = &vect; + break; + + case VP56_MB_INTER_4V: + vp56_decode_4mv(s, row, col); + return s->mb_type; + + default: + mv = &vect; + break; } s->macroblocks[row*s->mb_width + col].mv = *mv; /* same vector for all blocks */ - for(b = 0; b < 6; b++) + for (b=0; b<6; b++) s->mv[b] = *mv; return s->mb_type; @@ -282,34 +263,30 @@ static void vp56_add_predictors_dc(VP56Context *s, VP56Frame ref_frame) int idx = s->scantable.permutated[0]; int b; - for(b = 0; b < 6; b++) - { + for (b=0; b<6; b++) { VP56RefDc *ab = &s->above_blocks[s->above_block_idx[b]]; VP56RefDc *lb = &s->left_block[vp56_b6to4[b]]; int count = 0; int dc = 0; int i; - if(ref_frame == lb->ref_frame) - { + if (ref_frame == lb->ref_frame) { dc += lb->dc_coeff; count++; } - if(ref_frame == ab->ref_frame) - { + if (ref_frame == ab->ref_frame) { dc += ab->dc_coeff; count++; } - if(s->avctx->codec->id == CODEC_ID_VP5) - for(i = 0; i < 2; i++) - if(count < 2 && ref_frame == ab[-1+2*i].ref_frame) - { + if (s->avctx->codec->id == CODEC_ID_VP5) + for (i=0; i<2; i++) + if (count < 2 && ref_frame == ab[-1+2*i].ref_frame) { dc += ab[-1+2*i].dc_coeff; count++; } - if(count == 0) + if (count == 0) dc = s->prev_dc[vp56_b2p[b]][ref_frame]; - else if(count == 2) + else if (count == 2) dc /= 2; s->block_coeff[b][idx] += dc; @@ -323,14 +300,13 @@ static void vp56_add_predictors_dc(VP56Context *s, VP56Frame ref_frame) } static void vp56_edge_filter(VP56Context *s, uint8_t *yuv, -int pix_inc, int line_inc, int t) + int pix_inc, int line_inc, int t) { int pix2_inc = 2 * pix_inc; int i, v; - for(i = 0; i < 12; i++) - { - v = (yuv[-pix2_inc] + 3 * (yuv[0] - yuv[-pix_inc]) - yuv[pix_inc] + 4) >> 3; + for (i=0; i<12; i++) { + v = (yuv[-pix2_inc] + 3*(yuv[0]-yuv[-pix_inc]) - yuv[pix_inc] + 4) >>3; v = s->adjust(v, t); yuv[-pix_inc] = av_clip_uint8(yuv[-pix_inc] + v); yuv[0] = av_clip_uint8(yuv[0] - v); @@ -339,17 +315,17 @@ int pix_inc, int line_inc, int t) } static void vp56_deblock_filter(VP56Context *s, uint8_t *yuv, -int stride, int dx, int dy) + int stride, int dx, int dy) { int t = vp56_filter_threshold[s->quantizer]; - if(dx) vp56_edge_filter(s, yuv + 10 - dx , 1, stride, t); - if(dy) vp56_edge_filter(s, yuv + stride*(10 - dy), stride, 1, t); + if (dx) vp56_edge_filter(s, yuv + 10-dx , 1, stride, t); + if (dy) vp56_edge_filter(s, yuv + stride*(10-dy), stride, 1, t); } static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src, -int stride, int x, int y) + int stride, int x, int y) { - uint8_t *dst = s->framep[VP56_FRAME_CURRENT]->data[plane] + s->block_offset[b]; + uint8_t *dst=s->framep[VP56_FRAME_CURRENT]->data[plane]+s->block_offset[b]; uint8_t *src_block; int src_offset; int overlap_offset = 0; @@ -358,70 +334,61 @@ int stride, int x, int y) int dx; int dy; - if(s->avctx->skip_loop_filter >= AVDISCARD_ALL || - (s->avctx->skip_loop_filter >= AVDISCARD_NONKEY - && !s->framep[VP56_FRAME_CURRENT]->key_frame)) + if (s->avctx->skip_loop_filter >= AVDISCARD_ALL || + (s->avctx->skip_loop_filter >= AVDISCARD_NONKEY + && !s->framep[VP56_FRAME_CURRENT]->key_frame)) deblock_filtering = 0; dx = s->mv[b].x / s->vp56_coord_div[b]; dy = s->mv[b].y / s->vp56_coord_div[b]; - if(b >= 4) - { + if (b >= 4) { x /= 2; y /= 2; } x += dx - 2; y += dy - 2; - if(x < 0 || x + 12 >= s->plane_width[plane] || - y < 0 || y + 12 >= s->plane_height[plane]) - { + if (x<0 || x+12>=s->plane_width[plane] || + y<0 || y+12>=s->plane_height[plane]) { ff_emulated_edge_mc(s->edge_emu_buffer, - src + s->block_offset[b] + (dy - 2)*stride + (dx - 2), - stride, 12, 12, x, y, - s->plane_width[plane], - s->plane_height[plane]); + src + s->block_offset[b] + (dy-2)*stride + (dx-2), + stride, 12, 12, x, y, + s->plane_width[plane], + s->plane_height[plane]); src_block = s->edge_emu_buffer; - src_offset = 2 + 2 * stride; - } - else if(deblock_filtering) - { + src_offset = 2 + 2*stride; + } else if (deblock_filtering) { /* only need a 12x12 block, but there is no such dsp function, */ /* so copy a 16x12 block */ s->dsp.put_pixels_tab[0][0](s->edge_emu_buffer, - src + s->block_offset[b] + (dy - 2)*stride + (dx - 2), - stride, 12); + src + s->block_offset[b] + (dy-2)*stride + (dx-2), + stride, 12); src_block = s->edge_emu_buffer; - src_offset = 2 + 2 * stride; - } - else - { + src_offset = 2 + 2*stride; + } else { src_block = src; - src_offset = s->block_offset[b] + dy * stride + dx; + src_offset = s->block_offset[b] + dy*stride + dx; } - if(deblock_filtering) - vp56_deblock_filter(s, src_block, stride, dx & 7, dy & 7); + if (deblock_filtering) + vp56_deblock_filter(s, src_block, stride, dx&7, dy&7); - if(s->mv[b].x & mask) + if (s->mv[b].x & mask) overlap_offset += (s->mv[b].x > 0) ? 1 : -1; - if(s->mv[b].y & mask) + if (s->mv[b].y & mask) overlap_offset += (s->mv[b].y > 0) ? stride : -stride; - if(overlap_offset) - { - if(s->filter) - s->filter(s, dst, src_block, src_offset, src_offset + overlap_offset, - stride, s->mv[b], mask, s->filter_selection, b < 4); + if (overlap_offset) { + if (s->filter) + s->filter(s, dst, src_block, src_offset, src_offset+overlap_offset, + stride, s->mv[b], mask, s->filter_selection, b<4); else - s->dsp.put_no_rnd_pixels_l2[1](dst, src_block + src_offset, - src_block + src_offset + overlap_offset, - stride, 8); - } - else - { - s->dsp.put_pixels_tab[1][0](dst, src_block + src_offset, stride, 8); + s->dsp.put_no_rnd_pixels_l2[1](dst, src_block+src_offset, + src_block+src_offset+overlap_offset, + stride, 8); + } else { + s->dsp.put_pixels_tab[1][0](dst, src_block+src_offset, stride, 8); } } @@ -432,7 +399,7 @@ static void vp56_decode_mb(VP56Context *s, int row, int col, int is_alpha) VP56Frame ref_frame; int b, ab, b_max, plane, off; - if(s->framep[VP56_FRAME_CURRENT]->key_frame) + if (s->framep[VP56_FRAME_CURRENT]->key_frame) mb_type = VP56_MB_INTRA; else mb_type = vp56_decode_mv(s, row, col); @@ -447,52 +414,48 @@ static void vp56_decode_mb(VP56Context *s, int row, int col, int is_alpha) frame_current = s->framep[VP56_FRAME_CURRENT]; frame_ref = s->framep[ref_frame]; - ab = 6 * is_alpha; - b_max = 6 - 2 * is_alpha; - - switch(mb_type) - { - case VP56_MB_INTRA: - for(b = 0; b < b_max; b++) - { - plane = vp56_b2p[b+ab]; - s->dsp.idct_put(frame_current->data[plane] + s->block_offset[b], - s->stride[plane], s->block_coeff[b]); - } - break; - - case VP56_MB_INTER_NOVEC_PF: - case VP56_MB_INTER_NOVEC_GF: - for(b = 0; b < b_max; b++) - { - plane = vp56_b2p[b+ab]; - off = s->block_offset[b]; - s->dsp.put_pixels_tab[1][0](frame_current->data[plane] + off, - frame_ref->data[plane] + off, - s->stride[plane], 8); - s->dsp.idct_add(frame_current->data[plane] + off, - s->stride[plane], s->block_coeff[b]); - } - break; - - case VP56_MB_INTER_DELTA_PF: - case VP56_MB_INTER_V1_PF: - case VP56_MB_INTER_V2_PF: - case VP56_MB_INTER_DELTA_GF: - case VP56_MB_INTER_4V: - case VP56_MB_INTER_V1_GF: - case VP56_MB_INTER_V2_GF: - for(b = 0; b < b_max; b++) - { - int x_off = b == 1 || b == 3 ? 8 : 0; - int y_off = b == 2 || b == 3 ? 8 : 0; - plane = vp56_b2p[b+ab]; - vp56_mc(s, b, plane, frame_ref->data[plane], s->stride[plane], - 16 * col + x_off, 16 * row + y_off); - s->dsp.idct_add(frame_current->data[plane] + s->block_offset[b], - s->stride[plane], s->block_coeff[b]); - } - break; + ab = 6*is_alpha; + b_max = 6 - 2*is_alpha; + + switch (mb_type) { + case VP56_MB_INTRA: + for (b=0; b<b_max; b++) { + plane = vp56_b2p[b+ab]; + s->dsp.idct_put(frame_current->data[plane] + s->block_offset[b], + s->stride[plane], s->block_coeff[b]); + } + break; + + case VP56_MB_INTER_NOVEC_PF: + case VP56_MB_INTER_NOVEC_GF: + for (b=0; b<b_max; b++) { + plane = vp56_b2p[b+ab]; + off = s->block_offset[b]; + s->dsp.put_pixels_tab[1][0](frame_current->data[plane] + off, + frame_ref->data[plane] + off, + s->stride[plane], 8); + s->dsp.idct_add(frame_current->data[plane] + off, + s->stride[plane], s->block_coeff[b]); + } + break; + + case VP56_MB_INTER_DELTA_PF: + case VP56_MB_INTER_V1_PF: + case VP56_MB_INTER_V2_PF: + case VP56_MB_INTER_DELTA_GF: + case VP56_MB_INTER_4V: + case VP56_MB_INTER_V1_GF: + case VP56_MB_INTER_V2_GF: + for (b=0; b<b_max; b++) { + int x_off = b==1 || b==3 ? 8 : 0; + int y_off = b==2 || b==3 ? 8 : 0; + plane = vp56_b2p[b+ab]; + vp56_mc(s, b, plane, frame_ref->data[plane], s->stride[plane], + 16*col+x_off, 16*row+y_off); + s->dsp.idct_add(frame_current->data[plane] + s->block_offset[b], + s->stride[plane], s->block_coeff[b]); + } + break; } } @@ -503,51 +466,48 @@ static int vp56_size_changed(AVCodecContext *avctx) int i; s->plane_width[0] = s->plane_width[3] = avctx->coded_width; - s->plane_width[1] = s->plane_width[2] = avctx->coded_width / 2; + s->plane_width[1] = s->plane_width[2] = avctx->coded_width/2; s->plane_height[0] = s->plane_height[3] = avctx->coded_height; - s->plane_height[1] = s->plane_height[2] = avctx->coded_height / 2; + s->plane_height[1] = s->plane_height[2] = avctx->coded_height/2; - for(i = 0; i < 4; i++) + for (i=0; i<4; i++) s->stride[i] = s->flip * s->framep[VP56_FRAME_CURRENT]->linesize[i]; - s->mb_width = (avctx->coded_width + 15) / 16; - s->mb_height = (avctx->coded_height + 15) / 16; + s->mb_width = (avctx->coded_width +15) / 16; + s->mb_height = (avctx->coded_height+15) / 16; - if(s->mb_width > 1000 || s->mb_height > 1000) - { + if (s->mb_width > 1000 || s->mb_height > 1000) { av_log(avctx, AV_LOG_ERROR, "picture too big\n"); return -1; } s->above_blocks = av_realloc(s->above_blocks, - (4 * s->mb_width + 6) * sizeof(*s->above_blocks)); + (4*s->mb_width+6) * sizeof(*s->above_blocks)); s->macroblocks = av_realloc(s->macroblocks, - s->mb_width * s->mb_height * sizeof(*s->macroblocks)); + s->mb_width*s->mb_height*sizeof(*s->macroblocks)); av_free(s->edge_emu_buffer_alloc); - s->edge_emu_buffer_alloc = av_malloc(16 * stride); + s->edge_emu_buffer_alloc = av_malloc(16*stride); s->edge_emu_buffer = s->edge_emu_buffer_alloc; - if(s->flip < 0) + if (s->flip < 0) s->edge_emu_buffer += 15 * stride; return 0; } int vp56_decode_frame(AVCodecContext *avctx, void *data, int *data_size, -const uint8_t *buf, int buf_size) + const uint8_t *buf, int buf_size) { VP56Context *s = avctx->priv_data; AVFrame *const p = s->framep[VP56_FRAME_CURRENT]; int remaining_buf_size = buf_size; int is_alpha, av_uninit(alpha_offset); - if(s->has_alpha) - { + if (s->has_alpha) { alpha_offset = bytestream_get_be24(&buf); remaining_buf_size -= 3; } - for(is_alpha = 0; is_alpha < 1 + s->has_alpha; is_alpha++) - { + for (is_alpha=0; is_alpha < 1+s->has_alpha; is_alpha++) { int mb_row, mb_col, mb_row_flip, mb_offset = 0; int block, y, uv, stride_y, stride_uv; int golden_frame = 0; @@ -556,35 +516,29 @@ const uint8_t *buf, int buf_size) s->modelp = &s->models[is_alpha]; res = s->parse_header(s, buf, remaining_buf_size, &golden_frame); - if(!res) + if (!res) return -1; - if(!is_alpha) - { + if (!is_alpha) { p->reference = 1; - if(avctx->get_buffer(avctx, p) < 0) - { + if (avctx->get_buffer(avctx, p) < 0) { av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); return -1; } - if(res == 2) - if(vp56_size_changed(avctx)) - { + if (res == 2) + if (vp56_size_changed(avctx)) { avctx->release_buffer(avctx, p); return -1; } } - if(p->key_frame) - { + if (p->key_frame) { p->pict_type = FF_I_TYPE; s->default_models_init(s); - for(block = 0; block < s->mb_height * s->mb_width; block++) + for (block=0; block<s->mb_height*s->mb_width; block++) s->macroblocks[block].type = VP56_MB_INTRA; - } - else - { + } else { p->pict_type = FF_P_TYPE; vp56_parse_mb_type_models(s); s->parse_vector_models(s); @@ -597,8 +551,7 @@ const uint8_t *buf, int buf_size) s->prev_dc[1][VP56_FRAME_CURRENT] = 128; s->prev_dc[2][VP56_FRAME_CURRENT] = 128; - for(block = 0; block < 4 * s->mb_width + 6; block++) - { + for (block=0; block < 4*s->mb_width+6; block++) { s->above_blocks[block].ref_frame = VP56_FRAME_NONE; s->above_blocks[block].dc_coeff = 0; s->above_blocks[block].not_null_dc = 0; @@ -609,19 +562,17 @@ const uint8_t *buf, int buf_size) stride_y = p->linesize[0]; stride_uv = p->linesize[1]; - if(s->flip < 0) + if (s->flip < 0) mb_offset = 7; /* main macroblocks loop */ - for(mb_row = 0; mb_row < s->mb_height; mb_row++) - { - if(s->flip < 0) + for (mb_row=0; mb_row<s->mb_height; mb_row++) { + if (s->flip < 0) mb_row_flip = s->mb_height - mb_row - 1; else mb_row_flip = mb_row; - for(block = 0; block < 4; block++) - { + for (block=0; block<4; block++) { s->left_block[block].ref_frame = VP56_FRAME_NONE; s->left_block[block].dc_coeff = 0; s->left_block[block].not_null_dc = 0; @@ -633,66 +584,59 @@ const uint8_t *buf, int buf_size) s->above_block_idx[1] = 2; s->above_block_idx[2] = 1; s->above_block_idx[3] = 2; - s->above_block_idx[4] = 2 * s->mb_width + 2 + 1; - s->above_block_idx[5] = 3 * s->mb_width + 4 + 1; + s->above_block_idx[4] = 2*s->mb_width + 2 + 1; + s->above_block_idx[5] = 3*s->mb_width + 4 + 1; - s->block_offset[s->frbi] = (mb_row_flip * 16 + mb_offset) * stride_y; - s->block_offset[s->srbi] = s->block_offset[s->frbi] + 8 * stride_y; + s->block_offset[s->frbi] = (mb_row_flip*16 + mb_offset) * stride_y; + s->block_offset[s->srbi] = s->block_offset[s->frbi] + 8*stride_y; s->block_offset[1] = s->block_offset[0] + 8; s->block_offset[3] = s->block_offset[2] + 8; - s->block_offset[4] = (mb_row_flip * 8 + mb_offset) * stride_uv; + s->block_offset[4] = (mb_row_flip*8 + mb_offset) * stride_uv; s->block_offset[5] = s->block_offset[4]; - for(mb_col = 0; mb_col < s->mb_width; mb_col++) - { + for (mb_col=0; mb_col<s->mb_width; mb_col++) { vp56_decode_mb(s, mb_row, mb_col, is_alpha); - for(y = 0; y < 4; y++) - { + for (y=0; y<4; y++) { s->above_block_idx[y] += 2; s->block_offset[y] += 16; } - for(uv = 4; uv < 6; uv++) - { + for (uv=4; uv<6; uv++) { s->above_block_idx[uv] += 1; s->block_offset[uv] += 8; } } } - if(p->key_frame || golden_frame) - { - if(s->framep[VP56_FRAME_GOLDEN]->data[0] && - s->framep[VP56_FRAME_GOLDEN] != s->framep[VP56_FRAME_GOLDEN2]) + if (p->key_frame || golden_frame) { + if (s->framep[VP56_FRAME_GOLDEN]->data[0] && + s->framep[VP56_FRAME_GOLDEN] != s->framep[VP56_FRAME_GOLDEN2]) avctx->release_buffer(avctx, s->framep[VP56_FRAME_GOLDEN]); s->framep[VP56_FRAME_GOLDEN] = p; } - if(s->has_alpha) - { + if (s->has_alpha) { FFSWAP(AVFrame *, s->framep[VP56_FRAME_GOLDEN], - s->framep[VP56_FRAME_GOLDEN2]); + s->framep[VP56_FRAME_GOLDEN2]); buf += alpha_offset; remaining_buf_size -= alpha_offset; } } - if(s->framep[VP56_FRAME_PREVIOUS] == s->framep[VP56_FRAME_GOLDEN] || - s->framep[VP56_FRAME_PREVIOUS] == s->framep[VP56_FRAME_GOLDEN2]) - { - if(s->framep[VP56_FRAME_UNUSED] != s->framep[VP56_FRAME_GOLDEN] && - s->framep[VP56_FRAME_UNUSED] != s->framep[VP56_FRAME_GOLDEN2]) + if (s->framep[VP56_FRAME_PREVIOUS] == s->framep[VP56_FRAME_GOLDEN] || + s->framep[VP56_FRAME_PREVIOUS] == s->framep[VP56_FRAME_GOLDEN2]) { + if (s->framep[VP56_FRAME_UNUSED] != s->framep[VP56_FRAME_GOLDEN] && + s->framep[VP56_FRAME_UNUSED] != s->framep[VP56_FRAME_GOLDEN2]) FFSWAP(AVFrame *, s->framep[VP56_FRAME_PREVIOUS], - s->framep[VP56_FRAME_UNUSED]); + s->framep[VP56_FRAME_UNUSED]); else FFSWAP(AVFrame *, s->framep[VP56_FRAME_PREVIOUS], - s->framep[VP56_FRAME_UNUSED2]); - } - else if(s->framep[VP56_FRAME_PREVIOUS]->data[0]) + s->framep[VP56_FRAME_UNUSED2]); + } else if (s->framep[VP56_FRAME_PREVIOUS]->data[0]) avctx->release_buffer(avctx, s->framep[VP56_FRAME_PREVIOUS]); FFSWAP(AVFrame *, s->framep[VP56_FRAME_CURRENT], - s->framep[VP56_FRAME_PREVIOUS]); + s->framep[VP56_FRAME_PREVIOUS]); *(AVFrame*)data = *p; *data_size = sizeof(AVFrame); @@ -709,11 +653,11 @@ av_cold void vp56_init(AVCodecContext *avctx, int flip, int has_alpha) avctx->pix_fmt = has_alpha ? PIX_FMT_YUVA420P : PIX_FMT_YUV420P; /* always use the VP3 IDCT */ - avctx->idct_algo = FF_IDCT_VP3; + avctx->idct_algo = FF_IDCT_VP3; dsputil_init(&s->dsp, avctx); - ff_init_scantable(s->dsp.idct_permutation, &s->scantable, ff_zigzag_direct); + ff_init_scantable(s->dsp.idct_permutation, &s->scantable,ff_zigzag_direct); - for(i = 0; i < 4; i++) + for (i=0; i<4; i++) s->framep[i] = &s->frames[i]; s->framep[VP56_FRAME_UNUSED] = s->framep[VP56_FRAME_GOLDEN]; s->framep[VP56_FRAME_UNUSED2] = s->framep[VP56_FRAME_GOLDEN2]; @@ -727,14 +671,11 @@ av_cold void vp56_init(AVCodecContext *avctx, int flip, int has_alpha) s->filter = NULL; s->has_alpha = has_alpha; - if(flip) - { + if (flip) { s->flip = -1; s->frbi = 2; s->srbi = 0; - } - else - { + } else { s->flip = 1; s->frbi = 0; s->srbi = 2; @@ -748,11 +689,11 @@ av_cold int vp56_free(AVCodecContext *avctx) av_freep(&s->above_blocks); av_freep(&s->macroblocks); av_freep(&s->edge_emu_buffer_alloc); - if(s->framep[VP56_FRAME_GOLDEN]->data[0]) + if (s->framep[VP56_FRAME_GOLDEN]->data[0]) avctx->release_buffer(avctx, s->framep[VP56_FRAME_GOLDEN]); - if(s->framep[VP56_FRAME_GOLDEN2]->data[0]) + if (s->framep[VP56_FRAME_GOLDEN2]->data[0]) avctx->release_buffer(avctx, s->framep[VP56_FRAME_GOLDEN2]); - if(s->framep[VP56_FRAME_PREVIOUS]->data[0]) + if (s->framep[VP56_FRAME_PREVIOUS]->data[0]) avctx->release_buffer(avctx, s->framep[VP56_FRAME_PREVIOUS]); return 0; } |