--- decoder.c 2002/06/12 20:38:39 1.19 +++ decoder.c 2002/07/09 01:37:22 1.26 @@ -32,6 +32,9 @@ * * History: * + * 28.06.2002 added basic resync support to iframe/pframe_decode() + * 22.06.2002 added primative N_VOP support + * #define BFRAMES_DEC now enables Minchenm's bframe decoder * 08.05.2002 add low_delay support for B_VOP decode * MinChen * 05.05.2002 fix some B-frame decode problem @@ -47,7 +50,7 @@ * 22.12.2001 lock based interpolation * 01.12.2001 inital version; (c)2001 peter ross * - * $Id: decoder.c,v 1.19 2002/06/12 20:38:39 edgomez Exp $ + * $Id: decoder.c,v 1.26 2002/07/09 01:37:22 chenm001 Exp $ * *************************************************************************/ @@ -96,6 +99,7 @@ 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); @@ -134,6 +138,9 @@ xvid_free(dec); return XVID_ERR_MEMORY; } + + memset(dec->mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); + // add by chenm001 // for skip MB flag dec->last_mbs = @@ -149,6 +156,8 @@ return XVID_ERR_MEMORY; } + memset(dec->last_mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); + init_timer(); // add by chenm001 @@ -195,7 +204,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); @@ -221,7 +231,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; } @@ -240,6 +250,8 @@ block[i * 64 + 0] = dc_dif; start_coeff = 1; + + DPRINTF(DPRINTF_COEFF,"block[0] %i", dc_dif); } else { start_coeff = 0; } @@ -414,30 +426,39 @@ int quant, int intra_dc_threshold) { - + uint32_t bound; uint32_t x, y; + bound = 0; + 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]; - + 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, 0, &quant); + 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; @@ -457,7 +478,7 @@ } decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, - intra_dc_threshold); + intra_dc_threshold, bound); } } @@ -471,7 +492,8 @@ int y, int k, VECTOR * mv, - int fcode) + int fcode, + const int bound) { int scale_fac = 1 << (fcode - 1); @@ -479,23 +501,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; @@ -525,15 +542,32 @@ { uint32_t x, y; + uint32_t bound; start_timer(); image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height, dec->width, dec->height, dec->interlacing); stop_edges_timer(); + bound = 0; + 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]; + 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, fcode - 1, &quant); + 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 @@ -548,6 +582,9 @@ 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); @@ -556,21 +593,21 @@ acpred_flag = BitstreamGetBit(bs); } - if (mb->mode == MODE_STUFFING) { - DEBUG("-- STUFFING ?"); - continue; - } - 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; @@ -594,12 +631,12 @@ if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { 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 = @@ -607,10 +644,10 @@ } } 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); + 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 = @@ -618,7 +655,7 @@ 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; } @@ -1092,7 +1129,7 @@ if (quant > 31) { quant = 31; - } else if (mb->quant < 1) { + } else if (quant < 1) { quant = 1; } } else { @@ -1235,26 +1272,34 @@ case P_VOP: decoder_pframe(dec, &bs, rounding, quant, fcode_forward, intra_dc_threshold); +#ifdef BFRAMES_DEC DEBUG1("P_VOP Time=", dec->time); +#endif break; case I_VOP: decoder_iframe(dec, &bs, quant, intra_dc_threshold); +#ifdef BFRAMES_DEC DEBUG1("I_VOP Time=", dec->time); +#endif break; case B_VOP: -#ifdef BFRAMES +#ifdef BFRAMES_DEC if (dec->time_pp > dec->time_bp) { DEBUG1("B_VOP Time=", dec->time); decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward); } else { DEBUG("broken B-frame!"); } +#else + image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); #endif 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); break; default: @@ -1263,13 +1308,13 @@ frame->length = BitstreamPos(&bs) / 8; -#ifdef BFRAMES +#ifdef BFRAMES_DEC // test if no B_VOP if (dec->low_delay) { #endif image_output(&dec->cur, dec->width, dec->height, dec->edged_width, frame->image, frame->stride, frame->colorspace); -#ifdef BFRAMES +#ifdef BFRAMES_DEC } else { if (dec->frames >= 1) { start_timer();