Mercurial > libavcodec.hg
changeset 11473:8b6722b58f15 libavcodec
vp3: Make fragment_width _height by plane
| author | conrad |
|---|---|
| date | Sat, 13 Mar 2010 05:56:15 +0000 |
| parents | 258d773b8feb |
| children | 66b2c909d530 |
| files | vp3.c |
| diffstat | 1 files changed, 24 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/vp3.c Sat Mar 13 05:56:11 2010 +0000 +++ b/vp3.c Sat Mar 13 05:56:15 2010 +0000 @@ -158,8 +158,8 @@ int macroblock_height; int fragment_count; - int fragment_width; - int fragment_height; + int fragment_width[2]; + int fragment_height[2]; Vp3Fragment *all_fragments; int fragment_start[3]; @@ -266,8 +266,8 @@ for (plane = 0; plane < 3; plane++) { int sb_width = plane ? s->c_superblock_width : s->y_superblock_width; int sb_height = plane ? s->c_superblock_height : s->y_superblock_height; - int frag_width = s->fragment_width >> !!plane; - int frag_height = s->fragment_height >> !!plane; + int frag_width = s->fragment_width[!!plane]; + int frag_height = s->fragment_height[!!plane]; for (sb_y = 0; sb_y < sb_height; sb_y++) for (sb_x = 0; sb_x < sb_width; sb_x++) @@ -559,7 +559,7 @@ /* coding modes are only stored if the macroblock has at least one * luma block coded, otherwise it must be INTER_NO_MV */ for (k = 0; k < 4; k++) { - current_fragment = BLOCK_Y*s->fragment_width + BLOCK_X; + current_fragment = BLOCK_Y*s->fragment_width[0] + BLOCK_X; if (s->all_fragments[current_fragment].coding_method != MODE_COPY) break; } @@ -578,7 +578,7 @@ s->macroblock_coding[current_macroblock] = coding_mode; for (k = 0; k < 4; k++) { current_fragment = - BLOCK_Y*s->fragment_width + BLOCK_X; + BLOCK_Y*s->fragment_width[0] + BLOCK_X; if (s->all_fragments[current_fragment].coding_method != MODE_COPY) s->all_fragments[current_fragment].coding_method = @@ -586,7 +586,7 @@ } for (k = 0; k < 2; k++) { current_fragment = s->fragment_start[k+1] + - mb_y*(s->fragment_width>>1) + mb_x; + mb_y*s->fragment_width[1] + mb_x; if (s->all_fragments[current_fragment].coding_method != MODE_COPY) s->all_fragments[current_fragment].coding_method = @@ -668,7 +668,7 @@ /* fetch 4 vectors from the bitstream, one for each * Y fragment, then average for the C fragment vectors */ for (k = 0; k < 4; k++) { - current_fragment = BLOCK_Y*s->fragment_width + BLOCK_X; + current_fragment = BLOCK_Y*s->fragment_width[0] + BLOCK_X; if (s->all_fragments[current_fragment].coding_method != MODE_COPY) { if (coding_mode == 0) { motion_x[k] = motion_vector_table[get_vlc2(gb, s->motion_vector_vlc.table, 6, 2)]; @@ -720,7 +720,7 @@ /* assign the motion vectors to the correct fragments */ for (k = 0; k < 4; k++) { current_fragment = - BLOCK_Y*s->fragment_width + BLOCK_X; + BLOCK_Y*s->fragment_width[0] + BLOCK_X; if (s->macroblock_coding[current_macroblock] == MODE_INTER_FOURMV) { s->all_fragments[current_fragment].motion_x = motion_x[k]; s->all_fragments[current_fragment].motion_y = motion_y[k]; @@ -735,7 +735,7 @@ } for (k = 0; k < 2; k++) { current_fragment = s->fragment_start[k+1] + - mb_y*(s->fragment_width>>1) + mb_x; + mb_y*s->fragment_width[1] + mb_x; s->all_fragments[current_fragment].motion_x = motion_x[0]; s->all_fragments[current_fragment].motion_y = motion_y[0]; } @@ -941,7 +941,7 @@ 0, residual_eob_run); /* reverse prediction of the Y-plane DC coefficients */ - reverse_dc_prediction(s, 0, s->fragment_width, s->fragment_height); + reverse_dc_prediction(s, 0, s->fragment_width[0], s->fragment_height[0]); /* unpack the C plane DC coefficients */ residual_eob_run = unpack_vlcs(s, gb, &s->dc_vlc[dc_c_table], 0, @@ -953,9 +953,9 @@ if (!(s->avctx->flags & CODEC_FLAG_GRAY)) { reverse_dc_prediction(s, s->fragment_start[1], - s->fragment_width / 2, s->fragment_height / 2); + s->fragment_width[1], s->fragment_height[1]); reverse_dc_prediction(s, s->fragment_start[2], - s->fragment_width / 2, s->fragment_height / 2); + s->fragment_width[1], s->fragment_height[1]); } /* fetch the AC table indexes */ @@ -1158,8 +1158,8 @@ int x, y; int *bounding_values= s->bounding_values_array+127; - int width = s->fragment_width >> !!plane; - int height = s->fragment_height >> !!plane; + int width = s->fragment_width[!!plane]; + int height = s->fragment_height[!!plane]; int fragment = s->fragment_start [plane] + ystart * width; int stride = s->current_frame.linesize[plane]; uint8_t *plane_data = s->current_frame.data [plane]; @@ -1316,8 +1316,8 @@ int slice_height = sb_y + (plane ? 1 : 2); int slice_width = plane ? s->c_superblock_width : s->y_superblock_width; - int fragment_width = s->fragment_width >> !!plane; - int fragment_height = s->fragment_height >> !!plane; + int fragment_width = s->fragment_width[!!plane]; + int fragment_height = s->fragment_height[!!plane]; int fragment_start = s->fragment_start[plane]; if (!s->flipped_image) stride = -stride; @@ -1510,13 +1510,15 @@ s->macroblock_height = (s->height + 15) / 16; s->macroblock_count = s->macroblock_width * s->macroblock_height; - s->fragment_width = s->width / FRAGMENT_PIXELS; - s->fragment_height = s->height / FRAGMENT_PIXELS; + s->fragment_width[0] = s->width / FRAGMENT_PIXELS; + s->fragment_height[0] = s->height / FRAGMENT_PIXELS; + s->fragment_width[1] = s->fragment_width[0] >> 1; + s->fragment_height[1] = s->fragment_height[0] >> 1; /* fragment count covers all 8x8 blocks for all 3 planes */ - s->fragment_count = s->fragment_width * s->fragment_height * 3 / 2; - s->fragment_start[1] = s->fragment_width * s->fragment_height; - s->fragment_start[2] = s->fragment_width * s->fragment_height * 5 / 4; + s->fragment_count = s->fragment_width[0] * s->fragment_height[0] * 3 / 2; + s->fragment_start[1] = s->fragment_width[0] * s->fragment_height[0]; + s->fragment_start[2] = s->fragment_width[0] * s->fragment_height[0] * 5 / 4; s->all_fragments = av_malloc(s->fragment_count * sizeof(Vp3Fragment)); s->coded_fragment_list[0] = av_malloc(s->fragment_count * sizeof(int));