--- motion_comp.c 2002/11/19 13:04:35 1.11.2.10 +++ motion_comp.c 2002/12/11 11:03:37 1.11.2.15 @@ -6,61 +6,80 @@ #include "../encoder.h" #include "../utils/mbfunctions.h" #include "../image/interpolate8x8.h" +#include "../image/reduced.h" #include "../utils/timer.h" #include "motion.h" #define ABS(X) (((X)>0)?(X):-(X)) #define SIGN(X) (((X)>0)?1:-1) + static __inline void compensate16x16_interpolate(int16_t * const dct_codes, uint8_t * const cur, const uint8_t * const ref, const uint8_t * const refh, - const uint8_t * const refv, + uint8_t * const refv, const uint8_t * const refhv, - const uint32_t x, - const uint32_t y, + uint32_t x, + uint32_t y, const int32_t dx, const int32_t dy, const uint32_t stride, const uint32_t quarterpel, - const uint32_t rounding) + const int reduced_resolution, + const uint32_t rounding) { - if(quarterpel) { - interpolate16x16_quarterpel((uint8_t *) refv, (uint8_t *) ref, (uint8_t *) refh, - (uint8_t *) refh + 64, (uint8_t *) refhv, x, y, dx, dy, stride, rounding); - - transfer_8to16sub(dct_codes, cur + y*stride + x, - refv + y*stride + x, stride); - transfer_8to16sub(dct_codes+64, cur + y*stride + x + 8, - refv + y*stride + x + 8, stride); - transfer_8to16sub(dct_codes+128, cur + y*stride + x + 8*stride, - refv + y*stride + x + 8*stride, stride); - transfer_8to16sub(dct_codes+192, cur + y*stride + x + 8*stride + 8, - refv + y*stride + x + 8*stride+8, stride); - - } - else + + if (reduced_resolution) { const uint8_t * reference; + x*=2; y*=2; - switch (((dx & 1) << 1) + (dy & 1)) // ((dx%2)?2:0)+((dy%2)?1:0) + reference = get_ref(ref, refh, refv, refhv, x, y, 1, dx, dy, stride); + + filter_18x18_to_8x8(dct_codes, cur+y*stride + x, stride); + filter_diff_18x18_to_8x8(dct_codes, reference, stride); + + filter_18x18_to_8x8(dct_codes+64, cur+y*stride + x + 16, stride); + filter_diff_18x18_to_8x8(dct_codes+64, reference + 16, stride); + + filter_18x18_to_8x8(dct_codes+128, cur+(y+16)*stride + x, stride); + filter_diff_18x18_to_8x8(dct_codes+128, reference + 16*stride, stride); + + filter_18x18_to_8x8(dct_codes+192, cur+(y+16)*stride + x + 16, stride); + filter_diff_18x18_to_8x8(dct_codes+192, reference + 16*stride + 16, stride); + + transfer32x32_copy(cur + y*stride + x, reference, stride); + + }else{ + if(quarterpel) { + interpolate16x16_quarterpel((uint8_t *) refv, (uint8_t *) ref, (uint8_t *) refh, + (uint8_t *) refh + 64, (uint8_t *) refhv, x, y, dx, dy, stride, rounding); + + transfer_8to16sub(dct_codes, cur + y*stride + x, + refv + y*stride + x, stride); + transfer_8to16sub(dct_codes+64, cur + y*stride + x + 8, + refv + y*stride + x + 8, stride); + transfer_8to16sub(dct_codes+128, cur + y*stride + x + 8*stride, + refv + y*stride + x + 8*stride, stride); + transfer_8to16sub(dct_codes+192, cur + y*stride + x + 8*stride + 8, + refv + y*stride + x + 8*stride+8, stride); + + } + else { - case 0: reference = ref + ((y + dy / 2) * stride + x + dx / 2); break; - case 1: reference = refv + ((y + (dy-1) / 2) * stride + x + dx / 2); break; - case 2: reference = refh + ((y + dy / 2) * stride + x + (dx-1) / 2); break; - default: // case 3: - reference = refhv + ((y + (dy-1) / 2) * stride + x + (dx-1) / 2); break; - } - transfer_8to16sub(dct_codes, cur + y * stride + x, - reference, stride); - transfer_8to16sub(dct_codes+64, cur + y * stride + x + 8, - reference + 8, stride); - transfer_8to16sub(dct_codes+128, cur + y * stride + x + 8*stride, - reference + 8*stride, stride); - transfer_8to16sub(dct_codes+192, cur + y * stride + x + 8*stride+8, - reference + 8*stride + 8, stride); + const uint8_t * reference = get_ref(ref, refh, refv, refhv, x, y, 1, dx, dy, stride); + + transfer_8to16sub(dct_codes, cur + y * stride + x, + reference, stride); + transfer_8to16sub(dct_codes+64, cur + y * stride + x + 8, + reference + 8, stride); + transfer_8to16sub(dct_codes+128, cur + y * stride + x + 8*stride, + reference + 8*stride, stride); + transfer_8to16sub(dct_codes+192, cur + y * stride + x + 8*stride+8, + reference + 8*stride + 8, stride); + } } } @@ -71,38 +90,73 @@ const uint8_t * const refh, const uint8_t * const refv, const uint8_t * const refhv, - const uint32_t x, - const uint32_t y, + uint32_t x, + uint32_t y, const int32_t dx, const int32_t dy, const uint32_t stride, const uint32_t quarterpel, + const int reduced_resolution, const uint32_t rounding) { - if(quarterpel) { - interpolate8x8_quarterpel((uint8_t *) refv, (uint8_t *) ref, (uint8_t *) refh, - (uint8_t *) refh + 64, (uint8_t *) refhv, x, y, dx, dy, stride, rounding); - - transfer_8to16sub(dct_codes, cur + y*stride + x, - refv + y*stride + x, stride); - } - else + if (reduced_resolution) { const uint8_t * reference; + x*=2; y*=2; - switch (((dx & 1) << 1) + (dy & 1)) // ((dx%2)?2:0)+((dy%2)?1:0) + reference = get_ref(ref, refh, refv, refhv, x, y, 1, dx, dy, stride); + + filter_18x18_to_8x8(dct_codes, cur+y*stride + x, stride); + filter_diff_18x18_to_8x8(dct_codes, reference, stride); + + transfer16x16_copy(cur + y*stride + x, reference, stride); + + } else { + + if(quarterpel) { + interpolate8x8_quarterpel((uint8_t *) refv, (uint8_t *) ref, (uint8_t *) refh, + (uint8_t *) refh + 64, (uint8_t *) refhv, x, y, dx, dy, stride, rounding); + + transfer_8to16sub(dct_codes, cur + y*stride + x, + refv + y*stride + x, stride); + } + else { - case 0: reference = ref + ((y + dy / 2) * stride + x + dx / 2); break; - case 1: reference = refv + ((y + (dy-1) / 2) * stride + x + dx / 2); break; - case 2: reference = refh + ((y + dy / 2) * stride + x + (dx-1) / 2); break; - default: // case 3: - reference = refhv + ((y + (dy-1) / 2) * stride + x + (dx-1) / 2); break; + const uint8_t * reference = get_ref(ref, refh, refv, refhv, x, y, 1, dx, dy, stride); + + transfer_8to16sub(dct_codes, cur + y * stride + x, + reference, stride); } - transfer_8to16sub(dct_codes, cur + y * stride + x, - reference, stride); } } + + +/* XXX: slow, inelegant... */ +static void +interpolate18x18_switch(uint8_t * const cur, + const uint8_t * const refn, + const uint32_t x, + const uint32_t y, + const int32_t dx, + const int dy, + const uint32_t stride, + const uint32_t rounding) +{ + interpolate8x8_switch(cur, refn, x-1, y-1, dx, dy, stride, rounding); + interpolate8x8_switch(cur, refn, x+7, y-1, dx, dy, stride, rounding); + interpolate8x8_switch(cur, refn, x+9, y-1, dx, dy, stride, rounding); + + interpolate8x8_switch(cur, refn, x-1, y+7, dx, dy, stride, rounding); + interpolate8x8_switch(cur, refn, x+7, y+7, dx, dy, stride, rounding); + interpolate8x8_switch(cur, refn, x+9, y+7, dx, dy, stride, rounding); + + interpolate8x8_switch(cur, refn, x-1, y+9, dx, dy, stride, rounding); + interpolate8x8_switch(cur, refn, x+7, y+9, dx, dy, stride, rounding); + interpolate8x8_switch(cur, refn, x+9, y+9, dx, dy, stride, rounding); +} + + void MBMotionCompensation(MACROBLOCK * const mb, const uint32_t i, @@ -117,26 +171,19 @@ const uint32_t height, const uint32_t edged_width, const uint32_t quarterpel, + const int reduced_resolution, const uint32_t rounding) { + if (mb->mode == MODE_NOT_CODED || mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { int32_t dx = (quarterpel ? mb->qmvs[0].x : mb->mvs[0].x); int32_t dy = (quarterpel ? mb->qmvs[0].y : mb->mvs[0].y); - if ( (mb->mode == MODE_NOT_CODED) && (dx==0) && (dy==0) ) { /* quick copy */ - transfer8x8_copy(cur->y + 16 * (i + j * edged_width), - ref->y + 16 * (i + j * edged_width), - edged_width); - transfer8x8_copy(cur->y + 16 * (i + j * edged_width) + 8, - ref->y + 16 * (i + j * edged_width) + 8, - edged_width); - transfer8x8_copy(cur->y + 16 * (i + j * edged_width) + 8 * edged_width, - ref->y + 16 * (i + j * edged_width) + 8 * edged_width, - edged_width); - transfer8x8_copy(cur->y + 16 * (i + j * edged_width) + 8 * (edged_width+1), - ref->y + 16 * (i + j * edged_width) + 8 * (edged_width+1), - edged_width); + if ( (!reduced_resolution) && (mb->mode == MODE_NOT_CODED) && (dx==0) && (dy==0) ) { /* quick copy */ + transfer16x16_copy(cur->y + 16 * (i + j * edged_width), + ref->y + 16 * (i + j * edged_width), + edged_width); transfer8x8_copy(cur->u + 8 * (i + j * edged_width/2), ref->u + 8 * (i + j * edged_width/2), @@ -148,9 +195,15 @@ } /* quick MODE_NOT_CODED for GMC with MV!=(0,0) is still needed */ + if (reduced_resolution) + { + dx = RRV_MV_SCALEUP(dx); + dy = RRV_MV_SCALEUP(dy); + } + compensate16x16_interpolate(&dct_codes[0 * 64], cur->y, ref->y, refh->y, - refv->y, refhv->y, 16 * i, 16 * j, dx, - dy, edged_width, quarterpel, rounding); + refv->y, refhv->y, 16 * i, 16 * j, dx, dy, + edged_width, quarterpel, reduced_resolution, rounding); if (quarterpel) { @@ -162,39 +215,69 @@ dy = (dy >> 1) + roundtab_79[dy & 0x3]; /* uv-block-based compensation */ - transfer_8to16sub(&dct_codes[4 * 64], - cur->u + 8 * j * edged_width / 2 + 8 * i, - interpolate8x8_switch2(refv->u, ref->u, 8 * i, 8 * j, - dx, dy, edged_width / 2, rounding), - edged_width / 2); + if (reduced_resolution) + { + const stride = edged_width/2; + uint8_t * current, * reference; + + current = cur->u + 16*j*stride + 16*i; + reference = refv->u + 16*j*stride + 16*i; + interpolate18x18_switch(refv->u, ref->u, 16*i, 16*j, dx, dy, stride, rounding); + filter_18x18_to_8x8(dct_codes + 4*64, current, stride); + filter_diff_18x18_to_8x8(dct_codes + 4*64, reference, stride); + transfer16x16_copy(current, reference, stride); + + current = cur->v + 16*j*stride + 16*i; + reference = refv->v + 16*j*stride + 16*i; + interpolate18x18_switch(refv->v, ref->v, 16*i, 16*j, dx, dy, stride, rounding); + filter_18x18_to_8x8(dct_codes + 5*64, current, stride); + filter_diff_18x18_to_8x8(dct_codes + 5*64, reference, stride); + transfer16x16_copy(current, reference, stride); + }else{ + transfer_8to16sub(&dct_codes[4 * 64], + cur->u + 8 * j * edged_width / 2 + 8 * i, + interpolate8x8_switch2(refv->u, ref->u, 8 * i, 8 * j, + dx, dy, edged_width / 2, rounding), + edged_width / 2); - transfer_8to16sub(&dct_codes[5 * 64], - cur->v + 8 * j * edged_width / 2 + 8 * i, - interpolate8x8_switch2(refv->u, ref->v, 8 * i, 8 * j, - dx, dy, edged_width / 2, rounding), - edged_width / 2); + transfer_8to16sub(&dct_codes[5 * 64], + cur->v + 8 * j * edged_width / 2 + 8 * i, + interpolate8x8_switch2(refv->u, ref->v, 8 * i, 8 * j, + dx, dy, edged_width / 2, rounding), + edged_width / 2); + } } else { // mode == MODE_INTER4V + int k; int32_t sum, dx, dy; - VECTOR *mvs; + VECTOR mvs[4]; if(quarterpel) - mvs = mb->qmvs; + for (k = 0; k < 4; k++) mvs[k] = mb->qmvs[k]; else - mvs = mb->mvs; + for (k = 0; k < 4; k++) mvs[k] = mb->mvs[k]; + + if (reduced_resolution) + { + for (k = 0; k < 4; k++) + { + mvs[k].x = RRV_MV_SCALEUP(mvs[k].x); + mvs[k].y = RRV_MV_SCALEUP(mvs[k].y); + } + } compensate8x8_interpolate(&dct_codes[0 * 64], cur->y, ref->y, refh->y, - refv->y, refhv->y, 16 * i, 16 * j, mvs[0].x, - mvs[0].y, edged_width, quarterpel, rounding); + refv->y, refhv->y, 16 * i, 16 * j, mvs[0].x, + mvs[0].y, edged_width, quarterpel, reduced_resolution, rounding); compensate8x8_interpolate(&dct_codes[1 * 64], cur->y, ref->y, refh->y, refv->y, refhv->y, 16 * i + 8, 16 * j, - mvs[1].x, mvs[1].y, edged_width, quarterpel, rounding); + mvs[1].x, mvs[1].y, edged_width, quarterpel, reduced_resolution, rounding); compensate8x8_interpolate(&dct_codes[2 * 64], cur->y, ref->y, refh->y, refv->y, refhv->y, 16 * i, 16 * j + 8, - mvs[2].x, mvs[2].y, edged_width, quarterpel, rounding); + mvs[2].x, mvs[2].y, edged_width, quarterpel, reduced_resolution, rounding); compensate8x8_interpolate(&dct_codes[3 * 64], cur->y, ref->y, refh->y, refv->y, refhv->y, 16 * i + 8, 16 * j + 8, - mvs[3].x, mvs[3].y, edged_width, quarterpel, rounding); + mvs[3].x, mvs[3].y, edged_width, quarterpel, reduced_resolution, rounding); if(quarterpel) sum = (mvs[0].x / 2) + (mvs[1].x / 2) + (mvs[2].x / 2) + (mvs[3].x / 2); @@ -210,18 +293,40 @@ dy = (sum >> 3) + roundtab_76[sum & 0xf]; + /* uv-block-based compensation */ - transfer_8to16sub(&dct_codes[4 * 64], - cur->u + 8 * j * edged_width / 2 + 8 * i, - interpolate8x8_switch2(refv->u, ref->u, 8 * i, 8 * j, - dx, dy, edged_width / 2, rounding), - edged_width / 2); + if (reduced_resolution) + { + const stride = edged_width/2; + uint8_t * current, * reference; + + current = cur->u + 16*j*stride + 16*i; + reference = refv->u + 16*j*stride + 16*i; + interpolate18x18_switch(refv->u, ref->u, 16*i, 16*j, dx, dy, stride, rounding); + filter_18x18_to_8x8(dct_codes + 4*64, current, stride); + filter_diff_18x18_to_8x8(dct_codes + 4*64, reference, stride); + transfer16x16_copy(current, reference, stride); + + current = cur->v + 16*j*stride + 16*i; + reference = refv->v + 16*j*stride + 16*i; + interpolate18x18_switch(refv->v, ref->v, 16*i, 16*j, dx, dy, stride, rounding); + filter_18x18_to_8x8(dct_codes + 5*64, current, stride); + filter_diff_18x18_to_8x8(dct_codes + 5*64, reference, stride); + transfer16x16_copy(current, reference, stride); + + }else{ + transfer_8to16sub(&dct_codes[4 * 64], + cur->u + 8 * j * edged_width / 2 + 8 * i, + interpolate8x8_switch2(refv->u, ref->u, 8 * i, 8 * j, + dx, dy, edged_width / 2, rounding), + edged_width / 2); - transfer_8to16sub(&dct_codes[5 * 64], - cur->v + 8 * j * edged_width / 2 + 8 * i, - interpolate8x8_switch2(refv->u, ref->v, 8 * i, 8 * j, - dx, dy, edged_width / 2, rounding), - edged_width / 2); + transfer_8to16sub(&dct_codes[5 * 64], + cur->v + 8 * j * edged_width / 2 + 8 * i, + interpolate8x8_switch2(refv->u, ref->v, 8 * i, 8 * j, + dx, dy, edged_width / 2, rounding), + edged_width / 2); + } } } @@ -266,7 +371,7 @@ compensate16x16_interpolate(&dct_codes[0 * 64], cur->y, f_ref->y, f_refh->y, f_refv->y, f_refhv->y, 16 * i, 16 * j, dx, - dy, edged_width, quarterpel, 0); + dy, edged_width, quarterpel, 0 /*reduced_resolution*/, 0); if (quarterpel) { dx /= 2; @@ -304,7 +409,7 @@ compensate16x16_interpolate(&dct_codes[0 * 64], cur->y, b_ref->y, b_refh->y, b_refv->y, b_refhv->y, 16 * i, 16 * j, b_dx, - b_dy, edged_width, quarterpel, 0); + b_dy, edged_width, quarterpel, 0 /*reduced_resolution*/, 0); if (quarterpel) { b_dx /= 2;