--- decoder.c 2002/10/10 12:16:00 1.37.2.3 +++ decoder.c 2002/10/30 23:11:48 1.37.2.7 @@ -55,7 +55,7 @@ * 22.12.2001 lock based interpolation * 01.12.2001 inital version; (c)2001 peter ross * - * $Id: decoder.c,v 1.37.2.3 2002/10/10 12:16:00 Isibaar Exp $ + * $Id: decoder.c,v 1.37.2.7 2002/10/30 23:11:48 Isibaar Exp $ * *************************************************************************/ @@ -84,6 +84,7 @@ #include "prediction/mbprediction.h" #include "utils/timer.h" #include "utils/emms.h" +#include "motion/motion.h" #include "image/image.h" #include "image/colorspace.h" @@ -325,9 +326,6 @@ #define SIGN(X) (((X)>0)?1:-1) #define ABS(X) (((X)>0)?(X):-(X)) -static const uint32_t roundtab[16] = - { 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2 }; - // decode an inter macroblock @@ -364,12 +362,12 @@ if (dec->quarterpel) { - uv_dx = (uv_dx >> 1) | (uv_dx & 1); - uv_dy = (uv_dy >> 1) | (uv_dy & 1); + uv_dx /= 2; + uv_dy /= 2; } - uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; - uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; + uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3]; + uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3]; start_timer(); if(dec->quarterpel) { @@ -396,23 +394,20 @@ } else { int sum; - sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; - - if (dec->quarterpel) - { - sum /= 2; - } + + if(dec->quarterpel) + sum = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2); + else + sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; + + uv_dx = (sum >> 3) + roundtab_76[sum & 0xf]; + + if(dec->quarterpel) + sum = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2); + else + sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y; - uv_dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2)); - - sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y; - - if (dec->quarterpel) - { - sum /= 2; - } - - uv_dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2)); + uv_dy = (sum >> 3) + roundtab_76[sum & 0xf]; start_timer(); if(dec->quarterpel) { @@ -749,7 +744,6 @@ rounding); } else // not coded { - DEBUG2("P-frame MB at (X,Y)=",x,y); mb->mode = MODE_NOT_CODED; mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = 0; mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0; @@ -964,7 +958,6 @@ stop_transfer_timer(); } - // add by MinChen // decode an B-frame direct & inter macroblock void @@ -1082,24 +1075,24 @@ dec->refn[2].y + (16 * y_pos * stride) + 16 * x_pos + 8, stride, 0); - interpolate8x8_avg2(dec->cur.y + (16 * (y_pos + 8) * stride) + 16 * x_pos, - dec->cur.y + (16 * (y_pos + 8) * stride) + 16 * x_pos, - dec->refn[2].y + (16 * (y_pos + 8) * stride) + 16 * x_pos, + interpolate8x8_avg2(dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos, + dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos, + dec->refn[2].y + ((16 * y_pos + 8) * stride) + 16 * x_pos, stride, 0); - interpolate8x8_avg2(dec->cur.y + (16 * (y_pos + 8) * stride) + 16 * x_pos + 8, - dec->cur.y + (16 * (y_pos + 8) * stride) + 16 * x_pos + 8, - dec->refn[2].y + (16 * (y_pos + 8) * stride) + 16 * x_pos + 8, + interpolate8x8_avg2(dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, + dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, + dec->refn[2].y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, stride, 0); - interpolate8x8_avg2(dec->cur.u + (8 * y_pos * stride) + 8 * x_pos, - dec->cur.u + (8 * y_pos * stride) + 8 * x_pos, - dec->refn[2].u + (8 * y_pos * stride) + 8 * x_pos, + interpolate8x8_avg2(dec->cur.u + (8 * y_pos * stride2) + 8 * x_pos, + dec->cur.u + (8 * y_pos * stride2) + 8 * x_pos, + dec->refn[2].u + (8 * y_pos * stride2) + 8 * x_pos, stride2, 0); - interpolate8x8_avg2(dec->cur.v + (8 * y_pos * stride) + 8 * x_pos, - dec->cur.v + (8 * y_pos * stride) + 8 * x_pos, - dec->refn[2].v + (8 * y_pos * stride) + 8 * x_pos, + interpolate8x8_avg2(dec->cur.v + (8 * y_pos * stride2) + 8 * x_pos, + dec->cur.v + (8 * y_pos * stride2) + 8 * x_pos, + dec->refn[2].v + (8 * y_pos * stride2) + 8 * x_pos, stride2, 0); stop_comp_timer(); @@ -1387,6 +1380,9 @@ BitstreamInit(&bs, frame->bitstream, frame->length); + if(BitstreamShowBits(&bs, 8) == 0x7f) + return XVID_ERR_OK; + // add by chenm001 // for support B-frame to reference last 2 frame dec->frames++; @@ -1428,6 +1424,9 @@ case N_VOP: // vop not coded // when low_delay==0, N_VOP's should interpolate between the past and future frames image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); +#ifdef BFRAMES_DEC + DEBUG1("N_VOP Time=", dec->time); +#endif break; default: