--- decoder.c 2002/07/09 01:09:33 1.25 +++ decoder.c 2002/11/20 22:28:25 1.37.2.14 @@ -32,8 +32,14 @@ * * History: * - * 22.06.2002 added primative N_VOP support - * #define BFRAMES_DEC now enables Minchenm's bframe decoder + * 15.07.2002 fix a bug in B-frame decode at DIRECT mode + * MinChen + * 10.07.2002 added BFRAMES_DEC_DEBUG support + * Fix a little bug for low_delay flage + * MinChen + * 28.06.2002 added basic resync support to iframe/pframe_decode() + * 22.06.2002 added primative N_VOP support + * #define BFRAMES_DEC now enables Minchen's bframe decoder * 08.05.2002 add low_delay support for B_VOP decode * MinChen * 05.05.2002 fix some B-frame decode problem @@ -49,13 +55,17 @@ * 22.12.2001 lock based interpolation * 01.12.2001 inital version; (c)2001 peter ross * - * $Id: decoder.c,v 1.25 2002/07/09 01:09:33 chenm001 Exp $ + * $Id: decoder.c,v 1.37.2.14 2002/11/20 22:28:25 Isibaar Exp $ * *************************************************************************/ #include #include +#ifdef BFRAMES_DEC_DEBUG + #define BFRAMES_DEC +#endif + #include "xvid.h" #include "portab.h" @@ -74,31 +84,35 @@ #include "prediction/mbprediction.h" #include "utils/timer.h" #include "utils/emms.h" +#include "motion/motion.h" #include "image/image.h" #include "image/colorspace.h" #include "utils/mem_align.h" int -decoder_create(XVID_DEC_PARAM * param) +decoder_resize(DECODER * dec) { - DECODER *dec; + /* free existing */ - dec = xvid_malloc(sizeof(DECODER), CACHE_LINE); - if (dec == NULL) { - return XVID_ERR_MEMORY; - } - param->handle = dec; + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + image_destroy(&dec->refh, dec->edged_width, dec->edged_height); + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); - dec->width = param->width; - dec->height = param->height; + if (dec->last_mbs) + xvid_free(dec->last_mbs); + if (dec->mbs) + xvid_free(dec->mbs); + + /* realloc */ dec->mb_width = (dec->width + 15) / 16; dec->mb_height = (dec->height + 15) / 16; dec->edged_width = 16 * dec->mb_width + 2 * EDGE_SIZE; dec->edged_height = 16 * dec->mb_height + 2 * EDGE_SIZE; - dec->low_delay = 0; if (image_create(&dec->cur, dec->edged_width, dec->edged_height)) { xvid_free(dec); @@ -110,6 +124,7 @@ xvid_free(dec); return XVID_ERR_MEMORY; } + // add by chenm001 // for support B-frame to reference last 2 frame if (image_create(&dec->refn[1], dec->edged_width, dec->edged_height)) { @@ -126,6 +141,15 @@ return XVID_ERR_MEMORY; } + if (image_create(&dec->refh, dec->edged_width, dec->edged_height)) { + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + dec->mbs = xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, CACHE_LINE); @@ -134,10 +158,10 @@ image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + image_destroy(&dec->refh, dec->edged_width, dec->edged_height); xvid_free(dec); return XVID_ERR_MEMORY; } - memset(dec->mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); // add by chenm001 @@ -151,125 +175,41 @@ image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + image_destroy(&dec->refh, dec->edged_width, dec->edged_height); xvid_free(dec); return XVID_ERR_MEMORY; } memset(dec->last_mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); - init_timer(); - - // add by chenm001 - // for support B-frame to save reference frame's time - dec->frames = -1; - dec->time = dec->time_base = dec->last_time_base = 0; - return XVID_ERR_OK; } - -/* **************************************************************** -NIC 28.06.2002 - riscritta la 'decoder_create' per cambiarne l'interfaccia e poterla - usare nella dll caricata dall'IM1 player - IM1_decoder_create(XVID_DEC_PARAM * param,XVID_DEC_FRAME * frame) -**************************************************************** */ -//XVID_DEC_FRAME * frame - int -IM1_decoder_create(XVID_DEC_PARAM * param,XVID_DEC_FRAME * frame) +decoder_create(XVID_DEC_PARAM * param) { DECODER *dec; - Bitstream bs; - uint32_t rounding; - uint32_t quant; - uint32_t fcode_forward; - uint32_t fcode_backward; - uint32_t intra_dc_threshold; dec = xvid_malloc(sizeof(DECODER), CACHE_LINE); if (dec == NULL) { return XVID_ERR_MEMORY; } - param->handle = dec; - - - BitstreamInit(&bs, frame->bitstream, frame->length);//NIC - - //NIC - BitstreamReadHeaders(&bs, dec, &rounding, &quant, &fcode_forward, - &fcode_backward, &intra_dc_threshold); - - - param->width = dec->width; //NIC added - param->height = dec->height; //NIC added - //dec->width = param->width; //NIC commentate - //dec->height = param->height; //NIC commentate - - dec->mb_width = (dec->width + 15) / 16; - dec->mb_height = (dec->height + 15) / 16; - - dec->edged_width = 16 * dec->mb_width + 2 * EDGE_SIZE; - dec->edged_height = 16 * dec->mb_height + 2 * EDGE_SIZE; - dec->low_delay = 0; - - if (image_create(&dec->cur, dec->edged_width, dec->edged_height)) { - xvid_free(dec); - return XVID_ERR_MEMORY; - } + memset(dec, 0, sizeof(DECODER)); - if (image_create(&dec->refn[0], dec->edged_width, dec->edged_height)) { - image_destroy(&dec->cur, dec->edged_width, dec->edged_height); - xvid_free(dec); - return XVID_ERR_MEMORY; - } - // add by chenm001 - // for support B-frame to reference last 2 frame - if (image_create(&dec->refn[1], dec->edged_width, dec->edged_height)) { - image_destroy(&dec->cur, dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); - xvid_free(dec); - return XVID_ERR_MEMORY; - } - if (image_create(&dec->refn[2], dec->edged_width, dec->edged_height)) { - image_destroy(&dec->cur, dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); - xvid_free(dec); - return XVID_ERR_MEMORY; - } + param->handle = dec; - dec->mbs = - xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, - CACHE_LINE); - if (dec->mbs == NULL) { - image_destroy(&dec->cur, dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); - xvid_free(dec); - return XVID_ERR_MEMORY; - } + dec->width = param->width; + dec->height = param->height; - memset(dec->mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); + image_null(&dec->cur); + image_null(&dec->refn[0]); + image_null(&dec->refn[1]); + image_null(&dec->refn[2]); + image_null(&dec->refh); - // add by chenm001 - // for skip MB flag - dec->last_mbs = - xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, - CACHE_LINE); - if (dec->last_mbs == NULL) { - xvid_free(dec->mbs); - image_destroy(&dec->cur, dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); - image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); - xvid_free(dec); - return XVID_ERR_MEMORY; - } - - memset(dec->last_mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); + dec->mbs = NULL; + dec->last_mbs = NULL; init_timer(); @@ -277,12 +217,16 @@ // for support B-frame to save reference frame's time dec->frames = -1; dec->time = dec->time_base = dec->last_time_base = 0; + dec->low_delay = 0; - return XVID_ERR_OK; + dec->fixed_dimensions = (dec->width > 0 && dec->height > 0); + + if (dec->fixed_dimensions) + return decoder_resize(dec); + else + return XVID_ERR_OK; } -/* **************************************************************** - END NIC -**************************************************************** */ + int decoder_destroy(DECODER * dec) @@ -292,6 +236,7 @@ image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + image_destroy(&dec->refh, dec->edged_width, dec->edged_height); image_destroy(&dec->cur, dec->edged_width, dec->edged_height); xvid_free(dec); @@ -319,7 +264,8 @@ const uint32_t cbp, Bitstream * bs, const uint32_t quant, - const uint32_t intra_dc_threshold) + const uint32_t intra_dc_threshold, + const unsigned int bound) { DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE); @@ -345,7 +291,7 @@ start_timer(); predict_acdc(dec->mbs, x_pos, y_pos, dec->mb_width, i, &block[i * 64], - iQuant, iDcScaler, predictors); + iQuant, iDcScaler, predictors, bound); if (!acpred_flag) { pMB->acpred_directions[i] = 0; } @@ -364,6 +310,8 @@ block[i * 64 + 0] = dc_dif; start_coeff = 1; + + DPRINTF(DPRINTF_COEFF,"block[0] %i", dc_dif); } else { start_coeff = 0; } @@ -371,8 +319,10 @@ start_timer(); if (cbp & (1 << (5 - i))) // coded { - get_intra_block(bs, &block[i * 64], pMB->acpred_directions[i], - start_coeff); + int direction = dec->alternate_vertical_scan ? + 2 : pMB->acpred_directions[i]; + + get_intra_block(bs, &block[i * 64], direction, start_coeff); } stop_coding_timer(); @@ -414,9 +364,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 @@ -451,49 +398,97 @@ uv_dx = pMB->mvs[0].x; uv_dy = pMB->mvs[0].y; - uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; - uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; + if (dec->quarterpel) + { + uv_dx /= 2; + 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) { + interpolate16x16_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); + } + else { + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos, + pMB->mvs[1].x, pMB->mvs[1].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos + 8, + pMB->mvs[2].x, pMB->mvs[2].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos + 8, + pMB->mvs[3].x, pMB->mvs[3].y, stride, rounding); + } + + interpolate8x8_switch(dec->cur.u, dec->refn[0].u, 8 * x_pos, 8 * y_pos, + uv_dx, uv_dy, stride2, rounding); + interpolate8x8_switch(dec->cur.v, dec->refn[0].v, 8 * x_pos, 8 * y_pos, + uv_dx, uv_dy, stride2, rounding); + stop_comp_timer(); + } else { int sum; + + 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; - sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; - 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; - 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(); - interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16 * x_pos, 16 * y_pos, - pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); - interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16 * x_pos + 8, - 16 * y_pos, pMB->mvs[1].x, pMB->mvs[1].y, stride, - rounding); - interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16 * x_pos, - 16 * y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, - rounding); - interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16 * x_pos + 8, - 16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, - rounding); - interpolate8x8_switch(dec->cur.u, dec->refn[0].u, 8 * x_pos, 8 * y_pos, - uv_dx, uv_dy, stride2, rounding); - interpolate8x8_switch(dec->cur.v, dec->refn[0].v, 8 * x_pos, 8 * y_pos, - uv_dx, uv_dy, stride2, rounding); - stop_comp_timer(); + start_timer(); + if(dec->quarterpel) { + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos + 8, 16*y_pos, + pMB->mvs[1].x, pMB->mvs[1].y, stride, rounding); + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos + 8, + pMB->mvs[2].x, pMB->mvs[2].y, stride, rounding); + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos + 8, 16*y_pos + 8, + pMB->mvs[3].x, pMB->mvs[3].y, stride, rounding); + } + else { + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos, + pMB->mvs[1].x, pMB->mvs[1].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos + 8, + pMB->mvs[2].x, pMB->mvs[2].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos + 8, + pMB->mvs[3].x, pMB->mvs[3].y, stride, rounding); + } + + interpolate8x8_switch(dec->cur.u, dec->refn[0].u, 8 * x_pos, 8 * y_pos, + uv_dx, uv_dy, stride2, rounding); + interpolate8x8_switch(dec->cur.v, dec->refn[0].v, 8 * x_pos, 8 * y_pos, + uv_dx, uv_dy, stride2, rounding); + stop_comp_timer(); + } for (i = 0; i < 6; i++) { + int direction = dec->alternate_vertical_scan ? 2 : 0; + if (cbp & (1 << (5 - i))) // coded { memset(&block[i * 64], 0, 64 * sizeof(int16_t)); // clear start_timer(); - get_inter_block(bs, &block[i * 64]); + get_inter_block(bs, &block[i * 64], direction); stop_coding_timer(); start_timer(); @@ -535,33 +530,52 @@ void decoder_iframe(DECODER * dec, Bitstream * bs, + int reduced_resolution, int quant, int intra_dc_threshold) { - + uint32_t bound; uint32_t x, y; + int mb_width = dec->mb_width; + int mb_height = dec->mb_height; + + if (reduced_resolution) + { + mb_width /= 2; + mb_height /= 2; + } - for (y = 0; y < dec->mb_height; y++) { - for (x = 0; x < dec->mb_width; x++) { - MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x]; - + bound = 0; + + for (y = 0; y < mb_height; y++) { + for (x = 0; x < mb_width; x++) { + MACROBLOCK *mb; uint32_t mcbpc; uint32_t cbpc; uint32_t acpred_flag; uint32_t cbpy; uint32_t cbp; + while (BitstreamShowBits(bs, 9) == 1) + BitstreamSkip(bs, 9); + + if (check_resync_marker(bs, 0)) + { + bound = read_video_packet_header(bs, dec, 0, + &quant, NULL, NULL, &intra_dc_threshold); + x = bound % dec->mb_width; + y = bound / dec->mb_width; + } + mb = &dec->mbs[y * dec->mb_width + x]; + + DPRINTF(DPRINTF_MB, "macroblock (%i,%i) %08x", x, y, BitstreamShowBits(bs, 32)); + mcbpc = get_mcbpc_intra(bs); mb->mode = mcbpc & 7; cbpc = (mcbpc >> 4); acpred_flag = BitstreamGetBit(bs); - if (mb->mode == MODE_STUFFING) { - DEBUG("-- STUFFING ?"); - continue; - } - cbpy = get_cbpy(bs, 1); cbp = (cbpy << 2) | cbpc; @@ -574,6 +588,10 @@ } } mb->quant = quant; + mb->mvs[0].x = mb->mvs[0].y = + mb->mvs[1].x = mb->mvs[1].y = + mb->mvs[2].x = mb->mvs[2].y = + mb->mvs[3].x = mb->mvs[3].y =0; if (dec->interlacing) { mb->field_dct = BitstreamGetBit(bs); @@ -581,8 +599,11 @@ } decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, - intra_dc_threshold); + intra_dc_threshold, bound); + } + if(dec->out_frm) + output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,0,y,dec->mb_width); } } @@ -595,7 +616,8 @@ int y, int k, VECTOR * mv, - int fcode) + int fcode, + const int bound) { int scale_fac = 1 << (fcode - 1); @@ -603,23 +625,18 @@ int low = ((-32) * scale_fac); int range = (64 * scale_fac); - VECTOR pmv[4]; - int32_t psad[4]; - + VECTOR pmv; int mv_x, mv_y; - int pmv_x, pmv_y; - - get_pmvdata(dec->mbs, x, y, dec->mb_width, k, pmv, psad); - - pmv_x = pmv[0].x; - pmv_y = pmv[0].y; + pmv = get_pmv2(dec->mbs, dec->mb_width, bound, x, y, k); mv_x = get_mv(bs, fcode); mv_y = get_mv(bs, fcode); - mv_x += pmv_x; - mv_y += pmv_y; + DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i)", mv_x, mv_y, pmv.x, pmv.y); + + mv_x += pmv.x; + mv_y += pmv.y; if (mv_x < low) { mv_x += range; @@ -635,29 +652,66 @@ mv->x = mv_x; mv->y = mv_y; +} + + + +static __inline int gmc_sanitize(int value, int quarterpel, int fcode) +{ + int length = 1 << (fcode+4); + + if (quarterpel) value *= 2; + if (value < -length) + return -length; + else if (value >= length) + return length-1; + else return value; } +/* for P_VOP set gmc_mv to NULL */ void decoder_pframe(DECODER * dec, Bitstream * bs, int rounding, + int reduced_resolution, int quant, int fcode, - int intra_dc_threshold) + int intra_dc_threshold, + VECTOR * gmc_mv) { uint32_t x, y; + uint32_t bound; + int cp_mb, st_mb; start_timer(); image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height, - dec->width, dec->height, dec->interlacing); + dec->width, dec->height); stop_edges_timer(); + bound = 0; + for (y = 0; y < dec->mb_height; y++) { + cp_mb = st_mb = 0; for (x = 0; x < dec->mb_width; x++) { - MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x]; + MACROBLOCK *mb; + + // skip stuffing + while (BitstreamShowBits(bs, 10) == 1) + BitstreamSkip(bs, 10); + + if (check_resync_marker(bs, fcode - 1)) + { + bound = read_video_packet_header(bs, dec, fcode - 1, + &quant, &fcode, NULL, &intra_dc_threshold); + x = bound % dec->mb_width; + y = bound / dec->mb_width; + } + mb = &dec->mbs[y * dec->mb_width + x]; + + DPRINTF(DPRINTF_MB, "macroblock (%i,%i) %08x", x, y, BitstreamShowBits(bs, 32)); //if (!(dec->mb_skip[y*dec->mb_width + x]=BitstreamGetBit(bs))) // not_coded if (!(BitstreamGetBit(bs))) // not_coded @@ -668,10 +722,15 @@ uint32_t cbpy; uint32_t cbp; uint32_t intra; + int mcsel = 0; // mcsel: '0'=local motion, '1'=GMC + cp_mb++; mcbpc = get_mcbpc_inter(bs); mb->mode = mcbpc & 7; cbpc = (mcbpc >> 4); + + DPRINTF(DPRINTF_MB, "mode %i", mb->mode); + DPRINTF(DPRINTF_MB, "cbpc %i", cbpc); acpred_flag = 0; intra = (mb->mode == MODE_INTRA || mb->mode == MODE_INTRA_Q); @@ -680,27 +739,34 @@ acpred_flag = BitstreamGetBit(bs); } - if (mb->mode == MODE_STUFFING) { - DEBUG("-- STUFFING ?"); - continue; + if (gmc_mv && (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q)) + { + mcsel = BitstreamGetBit(bs); } cbpy = get_cbpy(bs, intra); + DPRINTF(DPRINTF_MB, "cbpy %i", cbpy); + cbp = (cbpy << 2) | cbpc; if (mb->mode == MODE_INTER_Q || mb->mode == MODE_INTRA_Q) { - quant += dquant_table[BitstreamGetBits(bs, 2)]; + int dquant = dquant_table[BitstreamGetBits(bs, 2)]; + DPRINTF(DPRINTF_MB, "dquant %i", dquant); + quant += dquant; if (quant > 31) { quant = 31; - } else if (mb->quant < 1) { + } else if (quant < 1) { quant = 1; } + DPRINTF(DPRINTF_MB, "quant %i", quant); } mb->quant = quant; if (dec->interlacing) { - mb->field_dct = BitstreamGetBit(bs); - DEBUG1("decp: field_dct: ", mb->field_dct); + if (cbp || intra) { + mb->field_dct = BitstreamGetBit(bs); + DEBUG1("decp: field_dct: ", mb->field_dct); + } if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { mb->field_pred = BitstreamGetBit(bs); @@ -716,25 +782,31 @@ } if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { - if (dec->interlacing && mb->field_pred) { + + if (mcsel) + { + mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = gmc_sanitize(gmc_mv[0].x, dec->quarterpel, fcode); + mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = gmc_sanitize(gmc_mv[0].y, dec->quarterpel, fcode); + + } else if (dec->interlacing && mb->field_pred) { get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], - fcode); + fcode, bound); get_motion_vector(dec, bs, x, y, 0, &mb->mvs[1], - fcode); + fcode, bound); } else { get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], - fcode); + fcode, bound); mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = mb->mvs[0].y; } - } else if (mb->mode == - MODE_INTER4V /* || mb->mode == MODE_INTER4V_Q */ ) { - get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode); - get_motion_vector(dec, bs, x, y, 1, &mb->mvs[1], fcode); - get_motion_vector(dec, bs, x, y, 2, &mb->mvs[2], fcode); - get_motion_vector(dec, bs, x, y, 3, &mb->mvs[3], fcode); + } else if (mb->mode == MODE_INTER4V ) { + + get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode, bound); + get_motion_vector(dec, bs, x, y, 1, &mb->mvs[1], fcode, bound); + get_motion_vector(dec, bs, x, y, 2, &mb->mvs[2], fcode, bound); + get_motion_vector(dec, bs, x, y, 3, &mb->mvs[3], fcode, bound); } else // MODE_INTRA, MODE_INTRA_Q { mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = @@ -742,19 +814,26 @@ mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0; decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, - intra_dc_threshold); + intra_dc_threshold, bound); continue; } decoder_mbinter(dec, mb, x, y, acpred_flag, cbp, bs, quant, rounding); - } else // not coded + + } + else if (gmc_mv) /* not coded S_VOP macroblock */ + { + mb->mode = MODE_NOT_CODED; + mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = gmc_sanitize(gmc_mv[0].x, dec->quarterpel, fcode); + mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = gmc_sanitize(gmc_mv[0].y, dec->quarterpel, fcode); + decoder_mbinter(dec, mb, x, y, 0, 0, bs, quant, rounding); + } + else /* not coded P_VOP macroblock */ { - //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; - // copy macroblock directly from ref to cur start_timer(); @@ -792,10 +871,18 @@ dec->refn[0].v + (8 * y) * dec->edged_width / 2 + (8 * x), dec->edged_width / 2); - + stop_transfer_timer(); + + if(dec->out_frm && cp_mb > 0) { + output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,st_mb,y,cp_mb); + cp_mb = 0; + } + st_mb = x+1; } } + if(dec->out_frm && cp_mb > 0) + output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,st_mb,y,cp_mb); } } @@ -873,39 +960,54 @@ pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3); pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3); + if (!(pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) { uv_dx = pMB->mvs[0].x; uv_dy = pMB->mvs[0].y; - uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; - uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; + if (dec->quarterpel) + { + uv_dx /= 2; + uv_dy /= 2; + } + + uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3]; + uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3]; } else { int sum; - sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; - 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; - uv_dy = - (sum == - 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + - (ABS(sum) / 16) * 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_dy = (sum >> 3) + roundtab_76[sum & 0xf]; } start_timer(); - interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos, 16 * y_pos, - pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); - interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos + 8, - 16 * y_pos, pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); - interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos, - 16 * y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, - 0); - interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16 * x_pos + 8, - 16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, - 0); + if(dec->quarterpel) { + interpolate16x16_quarterpel(dec->cur.y, dec->refn[ref].y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + } + else { + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos + 8, 16*y_pos, + pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos, 16*y_pos + 8, + pMB->mvs[2].x, pMB->mvs[2].y, stride, 0); + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos + 8, 16*y_pos + 8, + pMB->mvs[3].x, pMB->mvs[3].y, stride, 0); + } + interpolate8x8_switch(dec->cur.u, dec->refn[ref].u, 8 * x_pos, 8 * y_pos, uv_dx, uv_dy, stride2, 0); interpolate8x8_switch(dec->cur.v, dec->refn[ref].v, 8 * x_pos, 8 * y_pos, @@ -913,12 +1015,14 @@ stop_comp_timer(); for (i = 0; i < 6; i++) { + int direction = dec->alternate_vertical_scan ? 2 : 0; + if (cbp & (1 << (5 - i))) // coded { memset(&block[i * 64], 0, 64 * sizeof(int16_t)); // clear start_timer(); - get_inter_block(bs, &block[i * 64]); + get_inter_block(bs, &block[i * 64], direction); stop_coding_timer(); start_timer(); @@ -956,7 +1060,6 @@ stop_transfer_timer(); } - // add by MinChen // decode an B-frame direct & inter macroblock void @@ -966,7 +1069,6 @@ const MACROBLOCK * pMB, const uint32_t x_pos, const uint32_t y_pos, - const uint32_t cbp, Bitstream * bs) { @@ -981,110 +1083,187 @@ int b_uv_dx, b_uv_dy; uint32_t i; uint8_t *pY_Cur, *pU_Cur, *pV_Cur; + const uint32_t cbp = pMB->cbp; pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4); pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3); pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3); + if ((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) { uv_dx = pMB->mvs[0].x; uv_dy = pMB->mvs[0].y; - uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; - uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; - b_uv_dx = pMB->b_mvs[0].x; b_uv_dy = pMB->b_mvs[0].y; - b_uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; - b_uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; + if (dec->quarterpel) + { + uv_dx /= 2; + uv_dy /= 2; + + b_uv_dx /= 2; + b_uv_dy /= 2; + } + + uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3]; + uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3]; + + b_uv_dx = (b_uv_dx >> 1) + roundtab_79[b_uv_dx & 0x3]; + b_uv_dy = (b_uv_dy >> 1) + roundtab_79[b_uv_dy & 0x3]; } else { int sum; - sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; - 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; - uv_dy = - (sum == - 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + - (ABS(sum) / 16) * 2)); - - sum = - pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + - pMB->b_mvs[3].x; - b_uv_dx = - (sum == - 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + - (ABS(sum) / 16) * 2)); - - sum = - pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + - pMB->b_mvs[3].y; - b_uv_dy = - (sum == - 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + - (ABS(sum) / 16) * 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_dy = (sum >> 3) + roundtab_76[sum & 0xf]; + + + if(dec->quarterpel) + sum = (pMB->b_mvs[0].x / 2) + (pMB->b_mvs[1].x / 2) + (pMB->b_mvs[2].x / 2) + (pMB->b_mvs[3].x / 2); + else + sum = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x; + + b_uv_dx = (sum >> 3) + roundtab_76[sum & 0xf]; + + if(dec->quarterpel) + sum = (pMB->b_mvs[0].y / 2) + (pMB->b_mvs[1].y / 2) + (pMB->b_mvs[2].y / 2) + (pMB->b_mvs[3].y / 2); + else + sum = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y; + + b_uv_dy = (sum >> 3) + roundtab_76[sum & 0xf]; } start_timer(); - interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos, - pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); - interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8, 16 * y_pos, - pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); - interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos + 8, - pMB->mvs[2].x, pMB->mvs[2].y, stride, 0); - interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8, - 16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, - 0); + if(dec->quarterpel) { + if((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) + interpolate16x16_quarterpel(dec->cur.y, forward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + else { + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos + 8, 16*y_pos, + pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos + 8, + pMB->mvs[2].x, pMB->mvs[2].y, stride, 0); + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos + 8, 16*y_pos + 8, + pMB->mvs[3].x, pMB->mvs[3].y, stride, 0); + } + } + else { + interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8, 16 * y_pos, + pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); + interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos, 16 * y_pos + 8, + pMB->mvs[2].x, pMB->mvs[2].y, stride, 0); + interpolate8x8_switch(dec->cur.y, forward.y, 16 * x_pos + 8, + 16 * y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, + 0); + } + interpolate8x8_switch(dec->cur.u, forward.u, 8 * x_pos, 8 * y_pos, uv_dx, uv_dy, stride2, 0); interpolate8x8_switch(dec->cur.v, forward.v, 8 * x_pos, 8 * y_pos, uv_dx, uv_dy, stride2, 0); - interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos, 16 * y_pos, - pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); - interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos + 8, - 16 * y_pos, pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, - 0); - interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos, - 16 * y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y, - stride, 0); - interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos + 8, - 16 * y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y, - stride, 0); + if(dec->quarterpel) { + if((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) + interpolate16x16_quarterpel(dec->refn[2].y, backward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos, + pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); + else { + interpolate8x8_quarterpel(dec->refn[2].y, backward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos, + pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); + interpolate8x8_quarterpel(dec->refn[2].y, backward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos + 8, 16*y_pos, + pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, 0); + interpolate8x8_quarterpel(dec->refn[2].y, backward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos, 16*y_pos + 8, + pMB->b_mvs[2].x, pMB->b_mvs[2].y, stride, 0); + interpolate8x8_quarterpel(dec->refn[2].y, backward.y, dec->refh.y, dec->refh.y + 64, + dec->refh.y + 128, 16*x_pos + 8, 16*y_pos + 8, + pMB->b_mvs[3].x, pMB->b_mvs[3].y, stride, 0); + } + } + else { + interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos, 16 * y_pos, + pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); + interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos + 8, + 16 * y_pos, pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, + 0); + interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos, + 16 * y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y, + stride, 0); + interpolate8x8_switch(dec->refn[2].y, backward.y, 16 * x_pos + 8, + 16 * y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y, + stride, 0); + } + interpolate8x8_switch(dec->refn[2].u, backward.u, 8 * x_pos, 8 * y_pos, b_uv_dx, b_uv_dy, stride2, 0); interpolate8x8_switch(dec->refn[2].v, backward.v, 8 * x_pos, 8 * y_pos, b_uv_dx, b_uv_dy, stride2, 0); - interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos, 16 * y_pos, - stride); - interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos + 8, 16 * y_pos, - stride); - interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos, 16 * y_pos + 8, - stride); - interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16 * x_pos + 8, - 16 * y_pos + 8, stride); - interpolate8x8_c(dec->cur.u, dec->refn[2].u, 8 * x_pos, 8 * y_pos, - stride2); - interpolate8x8_c(dec->cur.v, dec->refn[2].v, 8 * x_pos, 8 * y_pos, - stride2); + interpolate8x8_avg2(dec->cur.y + (16 * y_pos * stride) + 16 * x_pos, + dec->cur.y + (16 * y_pos * stride) + 16 * x_pos, + dec->refn[2].y + (16 * y_pos * stride) + 16 * x_pos, + stride, 1, 8); + + interpolate8x8_avg2(dec->cur.y + (16 * y_pos * stride) + 16 * x_pos + 8, + dec->cur.y + (16 * y_pos * stride) + 16 * x_pos + 8, + dec->refn[2].y + (16 * y_pos * stride) + 16 * x_pos + 8, + stride, 1, 8); + + 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, 1, 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, 1, 8); + + 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, 1, 8); + + 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, 1, 8); stop_comp_timer(); for (i = 0; i < 6; i++) { + int direction = dec->alternate_vertical_scan ? 2 : 0; + if (cbp & (1 << (5 - i))) // coded { memset(&block[i * 64], 0, 64 * sizeof(int16_t)); // clear start_timer(); - get_inter_block(bs, &block[i * 64]); + get_inter_block(bs, &block[i * 64], direction); stop_coding_timer(); start_timer(); @@ -1166,40 +1345,57 @@ int fcode_forward, int fcode_backward) { - uint32_t x, y; - VECTOR mv, zeromv; + VECTOR mv; + const VECTOR zeromv = {0,0}; +#ifdef BFRAMES_DEC_DEBUG + FILE *fp; + static char first=0; +#define BFRAME_DEBUG if (!first && fp){ \ + fprintf(fp,"Y=%3d X=%3d MB=%2d CBP=%02X\n",y,x,mb->mb_type,mb->cbp); \ + } +#endif start_timer(); image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height, - dec->width, dec->height, dec->interlacing); - //image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height, dec->width, dec->height, dec->interlacing); + dec->width, dec->height); + image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height, + dec->width, dec->height); stop_edges_timer(); +#ifdef BFRAMES_DEC_DEBUG + if (!first){ + fp=fopen("C:\\XVIDDBG.TXT","w"); + } +#endif for (y = 0; y < dec->mb_height; y++) { // Initialize Pred Motion Vector - dec->p_fmv.x = dec->p_fmv.y = dec->p_bmv.x = dec->p_bmv.y = 0; + dec->p_fmv = dec->p_bmv = zeromv; for (x = 0; x < dec->mb_width; x++) { MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x]; MACROBLOCK *last_mb = &dec->last_mbs[y * dec->mb_width + x]; - mb->mvs[0].x = mb->mvs[0].y = zeromv.x = zeromv.y = mv.x = mv.y = - 0; + mv = + mb->b_mvs[0] = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] = + mb->mvs[0] = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = zeromv; // the last P_VOP is skip macroblock ? if (last_mb->mode == MODE_NOT_CODED) { //DEBUG2("Skip MB in B-frame at (X,Y)=!",x,y); - mb->mb_type = MODE_FORWARD; mb->cbp = 0; - mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; - mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = mb->mvs[0].y; - mb->quant = 8; +#ifdef BFRAMES_DEC_DEBUG + mb->mb_type = MODE_NOT_CODED; + BFRAME_DEBUG +#endif + mb->mb_type = MODE_FORWARD; + mb->quant = last_mb->quant; + //mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; + //mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = mb->mvs[0].y; - decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, quant, 1); + decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, mb->quant, 1); continue; } - //t=BitstreamShowBits(bs,32); if (!BitstreamGetBit(bs)) { // modb=='0' const uint8_t modb2 = BitstreamGetBit(bs); @@ -1216,84 +1412,73 @@ if (quant > 31) { quant = 31; - } else if (mb->quant < 1) { + } else if (quant < 1) { quant = 1; } - } else { - quant = 8; } - mb->quant = quant; } else { mb->mb_type = MODE_DIRECT_NONE_MV; mb->cbp = 0; } - mb->mode = MODE_INTER; + mb->quant = quant; + mb->mode = MODE_INTER4V; //DEBUG1("Switch bm_type=",mb->mb_type); +#ifdef BFRAMES_DEC_DEBUG + BFRAME_DEBUG +#endif + switch (mb->mb_type) { case MODE_DIRECT: - get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], 1, zeromv); + get_b_motion_vector(dec, bs, x, y, &mv, 1, zeromv); case MODE_DIRECT_NONE_MV: - { // Because this file is a C file not C++ so I use '{' to define var - const int64_t TRB = dec->time_pp - dec->time_bp, TRD = - dec->time_pp; + { + const int64_t TRB = dec->time_pp - dec->time_bp, TRD = dec->time_pp; int i; for (i = 0; i < 4; i++) { - mb->mvs[i].x = - (int32_t) ((TRB * last_mb->mvs[i].x) / TRD + - mb->mvs[0].x); - mb->b_mvs[i].x = - (int32_t) ((mb->mvs[0].x == - 0) ? ((TRB - - TRD) * last_mb->mvs[i].x) / - TRD : mb->mvs[i].x - last_mb->mvs[i].x); - mb->mvs[i].y = - (int32_t) ((TRB * last_mb->mvs[i].y) / TRD + - mb->mvs[0].y); - mb->b_mvs[i].y = - (int32_t) ((mb->mvs[0].y == - 0) ? ((TRB - - TRD) * last_mb->mvs[i].y) / - TRD : mb->mvs[i].y - last_mb->mvs[i].y); + mb->mvs[i].x = (int32_t) ((TRB * last_mb->mvs[i].x) + / TRD + mv.x); + mb->b_mvs[i].x = (int32_t) ((mv.x == 0) + ? ((TRB - TRD) * last_mb->mvs[i].x) + / TRD + : mb->mvs[i].x - last_mb->mvs[i].x); + mb->mvs[i].y = (int32_t) ((TRB * last_mb->mvs[i].y) + / TRD + mv.y); + mb->b_mvs[i].y = (int32_t) ((mv.y == 0) + ? ((TRB - TRD) * last_mb->mvs[i].y) + / TRD + : mb->mvs[i].y - last_mb->mvs[i].y); } //DEBUG("B-frame Direct!\n"); } - mb->mode = MODE_INTER4V; decoder_bf_interpolate_mbinter(dec, dec->refn[1], dec->refn[0], - mb, x, y, mb->cbp, bs); + mb, x, y, bs); break; case MODE_INTERPOLATE: get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], fcode_forward, dec->p_fmv); - dec->p_fmv.x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = - mb->mvs[0].x; - dec->p_fmv.y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = - mb->mvs[0].y; + dec->p_fmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0]; get_b_motion_vector(dec, bs, x, y, &mb->b_mvs[0], fcode_backward, dec->p_bmv); - dec->p_bmv.x = mb->b_mvs[1].x = mb->b_mvs[2].x = - mb->b_mvs[3].x = mb->b_mvs[0].x; - dec->p_bmv.y = mb->b_mvs[1].y = mb->b_mvs[2].y = - mb->b_mvs[3].y = mb->b_mvs[0].y; + dec->p_bmv = mb->b_mvs[1] = mb->b_mvs[2] = + mb->b_mvs[3] = mb->b_mvs[0]; decoder_bf_interpolate_mbinter(dec, dec->refn[1], dec->refn[0], - mb, x, y, mb->cbp, bs); + mb, x, y, bs); //DEBUG("B-frame Bidir!\n"); break; case MODE_BACKWARD: get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], fcode_backward, dec->p_bmv); - dec->p_bmv.x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = - mb->mvs[0].x; - dec->p_bmv.y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = - mb->mvs[0].y; + dec->p_bmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0]; + mb->mode = MODE_INTER; decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, quant, 0); //DEBUG("B-frame Backward!\n"); break; @@ -1301,11 +1486,9 @@ case MODE_FORWARD: get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], fcode_forward, dec->p_fmv); - dec->p_fmv.x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = - mb->mvs[0].x; - dec->p_fmv.y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = - mb->mvs[0].y; + dec->p_fmv = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0]; + mb->mode = MODE_INTER; decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, quant, 1); //DEBUG("B-frame Forward!\n"); break; @@ -1316,6 +1499,13 @@ } // end of FOR } +#ifdef BFRAMES_DEC_DEBUG + if (!first){ + first=1; + if (fp) + fclose(fp); + } +#endif } // swap two MACROBLOCK array @@ -1331,103 +1521,186 @@ int decoder_decode(DECODER * dec, - XVID_DEC_FRAME * frame) + XVID_DEC_FRAME * frame, XVID_DEC_STATS * stats) { Bitstream bs; uint32_t rounding; + uint32_t reduced_resolution; uint32_t quant; uint32_t fcode_forward; uint32_t fcode_backward; uint32_t intra_dc_threshold; + VECTOR gmc_mv[5]; uint32_t vop_type; + int success = 0; start_global_timer(); + dec->out_frm = (frame->colorspace == XVID_CSP_EXTERN) ? frame->image : NULL; + BitstreamInit(&bs, frame->bitstream, frame->length); + // XXX: 0x7f is only valid whilst decoding vfw xvid/divx5 avi's + if(frame->length == 1 && BitstreamShowBits(&bs, 8) == 0x7f) + { + if (stats) + stats->notify = XVID_DEC_VOP; + frame->length = 1; + image_output(&dec->refn[0], dec->width, dec->height, dec->edged_width, + frame->image, frame->stride, frame->colorspace, dec->interlacing); + emms(); + return XVID_ERR_OK; + } + +start: // add by chenm001 // for support B-frame to reference last 2 frame dec->frames++; + +xxx: vop_type = - BitstreamReadHeaders(&bs, dec, &rounding, &quant, &fcode_forward, - &fcode_backward, &intra_dc_threshold); + BitstreamReadHeaders(&bs, dec, &rounding, &reduced_resolution, + &quant, &fcode_forward, &fcode_backward, &intra_dc_threshold, gmc_mv); + + DPRINTF(DPRINTF_HEADER, "vop_type=%i", vop_type); + + if (vop_type == -1 && success) + goto done; + + if (vop_type == -2 || vop_type == -3) + { + if (vop_type == -3) + decoder_resize(dec); + + if (stats) + { + stats->notify = XVID_DEC_VOL; + stats->data.vol.general = 0; + if (dec->interlacing) + stats->data.vol.general |= XVID_INTERLACING; + stats->data.vol.width = dec->width; + stats->data.vol.height = dec->height; + stats->data.vol.aspect_ratio = dec->aspect_ratio; + stats->data.vol.par_width = dec->par_width; + stats->data.vol.par_height = dec->par_height; + frame->length = BitstreamPos(&bs) / 8; + return XVID_ERR_OK; + } + goto xxx; + } dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0; // init pred vector to 0 switch (vop_type) { case P_VOP: - decoder_pframe(dec, &bs, rounding, quant, fcode_forward, - intra_dc_threshold); - printf("P_VOP Time=%ld\n",dec->time); + decoder_pframe(dec, &bs, rounding, reduced_resolution, quant, + fcode_forward, intra_dc_threshold, NULL); +#ifdef BFRAMES_DEC DEBUG1("P_VOP Time=", dec->time); +#endif break; case I_VOP: - decoder_iframe(dec, &bs, quant, intra_dc_threshold); - printf("I_VOP Time=%ld\n",dec->time); + decoder_iframe(dec, &bs, reduced_resolution, quant, intra_dc_threshold); +#ifdef BFRAMES_DEC DEBUG1("I_VOP Time=", dec->time); +#endif break; case B_VOP: #ifdef BFRAMES_DEC if (dec->time_pp > dec->time_bp) { - printf("I_VOP Time=%ld\n",dec->time); DEBUG1("B_VOP Time=", dec->time); decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward); } else { DEBUG("broken B-frame!"); } #else - printf("Che minchia ne so\n"); image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); #endif break; + case S_VOP : + decoder_pframe(dec, &bs, rounding, reduced_resolution, quant, + fcode_forward, intra_dc_threshold, gmc_mv); + break; + 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); - printf("N_VOP vop not coded\n"); +#ifdef BFRAMES_DEC + DEBUG1("N_VOP Time=", dec->time); +#endif break; default: + if (stats) + stats->notify = 0; + + emms(); return XVID_ERR_FAIL; } - frame->length = BitstreamPos(&bs) / 8; + BitstreamByteAlign(&bs); #ifdef BFRAMES_DEC // test if no B_VOP - if (dec->low_delay) { + if (dec->low_delay || dec->frames == 0 || ((dec->packed_mode) && !(frame->length > BitstreamPos(&bs) / 8))) { #endif image_output(&dec->cur, dec->width, dec->height, dec->edged_width, - frame->image, frame->stride, frame->colorspace); + frame->image, frame->stride, frame->colorspace, dec->interlacing); + #ifdef BFRAMES_DEC } else { - if (dec->frames >= 1) { + if (dec->frames >= 1 && !(dec->packed_mode)) { start_timer(); - if ((vop_type == I_VOP || vop_type == P_VOP)) { + if ((vop_type == I_VOP || vop_type == P_VOP || vop_type == S_VOP)) { image_output(&dec->refn[0], dec->width, dec->height, dec->edged_width, frame->image, frame->stride, - frame->colorspace); + frame->colorspace, dec->interlacing); } else if (vop_type == B_VOP) { image_output(&dec->cur, dec->width, dec->height, dec->edged_width, frame->image, frame->stride, - frame->colorspace); + frame->colorspace, dec->interlacing); } stop_conv_timer(); } } #endif - if (vop_type == I_VOP || vop_type == P_VOP) { + if (vop_type == I_VOP || vop_type == P_VOP || vop_type == S_VOP) { image_swap(&dec->refn[0], &dec->refn[1]); image_swap(&dec->cur, &dec->refn[0]); + // swap MACROBLOCK - if (dec->low_delay && vop_type == P_VOP) + // the Divx will not set the low_delay flage some times + // so follow code will wrong to not swap at that time + // this will broken bitstream! so I'm change it, + // But that is not the best way! can anyone tell me how + // to do another way? + // 18-07-2002 MinChen + //if (!dec->low_delay && vop_type == P_VOP) + if (vop_type == P_VOP) mb_swap(&dec->mbs, &dec->last_mbs); } + success = 1; + + if (frame->length > BitstreamPos(&bs) / 8) // multiple vops packed together + goto start; + +done : + + frame->length = BitstreamPos(&bs) / 8; + + if (stats) + { + stats->notify = XVID_DEC_VOP; + stats->data.vop.time_base = (int)dec->time_base; + stats->data.vop.time_increment = 0; //XXX: todo + } + emms(); stop_global_timer();