--- mbcoding.c 2003/06/09 01:17:20 1.44.2.11 +++ mbcoding.c 2003/02/24 11:15:33 1.45 @@ -51,8 +51,6 @@ #include #include -#include - #include "../portab.h" #include "../global.h" #include "bitstream.h" @@ -88,10 +86,8 @@ const int code2 = sprite_trajectory_len[len].code; const int len2 = sprite_trajectory_len[len].len; -#if 0 - printf("GMC=%d Code/Len = %d / %d ",val, code,len); - printf("Code2 / Len2 = %d / %d \n",code2,len2); -#endif +// printf("GMC=%d Code/Len = %d / %d ",val, code,len); +// printf("Code2 / Len2 = %d / %d \n",code2,len2); BitstreamPutBits(bs, code2, len2); if (len) BitstreamPutBits(bs, code, len); @@ -502,7 +498,7 @@ { if ((level = qcoeff[zigzag[i++]]) != 0) { - abs_level = abs(prev_level); + abs_level = ABS(prev_level); abs_level = abs_level < 64 ? abs_level : 0; code = coeff_VLC[1][0][abs_level][prev_run].code; len = coeff_VLC[1][0][abs_level][prev_run].len; @@ -522,7 +518,7 @@ run++; } - abs_level = abs(prev_level); + abs_level = ABS(prev_level); abs_level = abs_level < 64 ? abs_level : 0; code = coeff_VLC[1][1][abs_level][prev_run].code; len = coeff_VLC[1][1][abs_level][prev_run].len; @@ -563,7 +559,7 @@ { if ((level = qcoeff[zigzag[i++]]) != 0) { - abs_level = abs(prev_level); + abs_level = ABS(prev_level); abs_level = abs_level < 64 ? abs_level : 0; len = coeff_VLC[1][0][abs_level][prev_run].len; bits += len!=128 ? len : 30; @@ -576,7 +572,7 @@ run++; } - abs_level = abs(prev_level); + abs_level = ABS(prev_level); abs_level = abs_level < 64 ? abs_level : 0; len = coeff_VLC[1][1][abs_level][prev_run].len; bits += len!=128 ? len : 30; @@ -631,13 +627,6 @@ #endif - -static int iDQtab[5] = { - 1, 0, -1 /* no change */, 2, 3 -}; -#define DQ_VALUE2INDEX(value) iDQtab[(value)+2] - - static __inline void CodeBlockIntra(const FRAMEINFO * const frame, const MACROBLOCK * pMB, @@ -650,7 +639,7 @@ cbpy = pMB->cbp >> 2; - /* write mcbpc */ + // write mcbpc if (frame->coding_type == I_VOP) { mcbpc = ((pMB->mode >> 1) & 3) | ((pMB->cbp & 3) << 2); BitstreamPutBits(bs, mcbpc_intra_tab[mcbpc].code, @@ -661,24 +650,24 @@ mcbpc_inter_tab[mcbpc].len); } - /* ac prediction flag */ + // ac prediction flag if (pMB->acpred_directions[0]) BitstreamPutBits(bs, 1, 1); else BitstreamPutBits(bs, 0, 1); - /* write cbpy */ + // write cbpy BitstreamPutBits(bs, xvid_cbpy_tab[cbpy].code, xvid_cbpy_tab[cbpy].len); - /* write dquant */ + // write dquant if (pMB->mode == MODE_INTRA_Q) - BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2); + BitstreamPutBits(bs, pMB->dquant, 2); - /* write interlacing */ - if (frame->vol_flags & XVID_VOL_INTERLACING) { + // write interlacing + if (frame->global_flags & XVID_INTERLACING) { BitstreamPutBit(bs, pMB->field_dct); } - /* code block coeffs */ + // code block coeffs for (i = 0; i < 6; i++) { if (i < 4) BitstreamPutBits(bs, dcy_tab[qcoeff[i * 64 + 0] + 255].code, @@ -689,7 +678,7 @@ if (pMB->cbp & (1 << (5 - i))) { const uint16_t *scan_table = - frame->vop_flags & XVID_VOP_ALTERNATESCAN ? + frame->global_flags & XVID_ALTERNATESCAN ? scan_tables[2] : scan_tables[pMB->acpred_directions[i]]; bits = BitstreamPos(bs); @@ -722,40 +711,40 @@ mcbpc = (pMB->mode & 7) | ((pMB->cbp & 3) << 3); cbpy = 15 - (pMB->cbp >> 2); - /* write mcbpc */ + // write mcbpc BitstreamPutBits(bs, mcbpc_inter_tab[mcbpc].code, mcbpc_inter_tab[mcbpc].len); if ( (frame->coding_type == S_VOP) && (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) ) - BitstreamPutBit(bs, pMB->mcsel); /* mcsel: '0'=local motion, '1'=GMC */ + BitstreamPutBit(bs, pMB->mcsel); // mcsel: '0'=local motion, '1'=GMC - /* write cbpy */ + // write cbpy BitstreamPutBits(bs, xvid_cbpy_tab[cbpy].code, xvid_cbpy_tab[cbpy].len); - /* write dquant */ + // write dquant if (pMB->mode == MODE_INTER_Q) - BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2); + BitstreamPutBits(bs, pMB->dquant, 2); - /* interlacing */ - if (frame->vol_flags & XVID_VOL_INTERLACING) { + // interlacing + if (frame->global_flags & XVID_INTERLACING) { if (pMB->cbp) { BitstreamPutBit(bs, pMB->field_dct); - DPRINTF(XVID_DEBUG_MB,"codep: field_dct: %i\n", pMB->field_dct); + DPRINTF(DPRINTF_MB,"codep: field_dct: %i", pMB->field_dct); } - /* if inter block, write field ME flag */ + // if inter block, write field ME flag if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) { BitstreamPutBit(bs, pMB->field_pred); - DPRINTF(XVID_DEBUG_MB,"codep: field_pred: %i\n", pMB->field_pred); + DPRINTF(DPRINTF_MB,"codep: field_pred: %i", pMB->field_pred); - /* write field prediction references */ + // write field prediction references if (pMB->field_pred) { BitstreamPutBit(bs, pMB->field_for_top); BitstreamPutBit(bs, pMB->field_for_bot); } } } - /* code motion vector(s) if motion is local */ + // code motion vector(s) if motion is local if (!pMB->mcsel) for (i = 0; i < (pMB->mode == MODE_INTER4V ? 4 : 1); i++) { CodeVector(bs, pMB->pmvs[i].x, frame->fcode, pStat); @@ -764,12 +753,12 @@ bits = BitstreamPos(bs); - /* code block coeffs */ + // code block coeffs for (i = 0; i < 6; i++) if (pMB->cbp & (1 << (5 - i))) { const uint16_t *scan_table = - frame->vop_flags & XVID_VOP_ALTERNATESCAN ? + frame->global_flags & XVID_ALTERNATESCAN ? scan_tables[2] : scan_tables[0]; #ifdef BIGLUT @@ -792,7 +781,7 @@ Statistics * pStat) { if (frame->coding_type != I_VOP) - BitstreamPutBit(bs, 0); /* not_coded */ + BitstreamPutBit(bs, 0); // not_coded if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) CodeBlockIntra(frame, pMB, qcoeff, bs, pStat); @@ -801,15 +790,14 @@ } - -/* moved to mbcoding.h so that in can be 'static __inline' */ -#if 0 +/* +// moved to mbcoding.h so that in can be 'static __inline' void MBSkip(Bitstream * bs) { - BitstreamPutBit(bs, 1); /* not coded */ + BitstreamPutBit(bs, 1); // not coded } -#endif +*/ /*************************************************************** * bframe encoding start @@ -867,7 +855,7 @@ BitstreamPutBit(bs, 1); return; - default:; /* invalid */ + default:; // invalid } } @@ -891,16 +879,16 @@ ------------------------------------------------------------------ */ if (mb->mode == MODE_DIRECT_NONE_MV) { - BitstreamPutBit(bs, 1); /* skipped */ + BitstreamPutBit(bs, 1); // skipped return; } - BitstreamPutBit(bs, 0); /* not skipped */ + BitstreamPutBit(bs, 0); // not skipped if (mb->cbp == 0) { - BitstreamPutBit(bs, 1); /* cbp == 0 */ + BitstreamPutBit(bs, 1); // cbp == 0 } else { - BitstreamPutBit(bs, 0); /* cbp == xxx */ + BitstreamPutBit(bs, 0); // cbp == xxx } put_bvop_mbtype(bs, mb->mode); @@ -910,12 +898,12 @@ } if (mb->mode != MODE_DIRECT && mb->cbp != 0) { - put_bvop_dbquant(bs, 0); /* todo: mb->dquant = 0 */ + put_bvop_dbquant(bs, 0); // todo: mb->dquant = 0 } switch (mb->mode) { case MODE_INTERPOLATE: - CodeVector(bs, mb->pmvs[1].x, vcode, pStat); /* forward vector of interpolate mode */ + CodeVector(bs, mb->pmvs[1].x, vcode, pStat); //forward vector of interpolate mode CodeVector(bs, mb->pmvs[1].y, vcode, pStat); case MODE_BACKWARD: vcode = bcode; @@ -924,8 +912,8 @@ CodeVector(bs, mb->pmvs[0].y, vcode, pStat); break; case MODE_DIRECT: - CodeVector(bs, mb->pmvs[3].x, 1, pStat); /* fcode is always 1 for delta vector */ - CodeVector(bs, mb->pmvs[3].y, 1, pStat); /* prediction is always (0,0) */ + CodeVector(bs, mb->pmvs[3].x, 1, pStat); // fcode is always 1 for delta vector + CodeVector(bs, mb->pmvs[3].y, 1, pStat); // prediction is always (0,0) default: break; } @@ -947,12 +935,10 @@ ***************************************************************/ -/* - * for IVOP addbits == 0 - * for PVOP addbits == fcode - 1 - * for BVOP addbits == max(fcode,bcode) - 1 - * returns true or false - */ +// for IVOP addbits == 0 +// for PVOP addbits == fcode - 1 +// for BVOP addbits == max(fcode,bcode) - 1 +// returns true or false int check_resync_marker(Bitstream * bs, int addbits) { @@ -1066,7 +1052,7 @@ return data; res = BitstreamGetBits(bs, fcode - 1); - mv = ((abs(data) - 1) * scale_fac) + res + 1; + mv = ((ABS(data) - 1) * scale_fac) + res + 1; return data < 0 ? -mv : mv; @@ -1167,7 +1153,7 @@ level = BitstreamGetBits(bs, 8); if (level == 0 || level == 128) - DPRINTF(XVID_DEBUG_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d\n", level); + DPRINTF(DPRINTF_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d", level); return (level << 24) >> 24; } @@ -1223,19 +1209,17 @@ do { level = get_coeff(bs, &run, &last, 1, 0); if (run == -1) { - DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); + DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); break; } coeff += run; block[scan[coeff]] = level; - DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[coeff], level); -#if 0 - DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i %08x\n", scan[coeff], level, BitstreamShowBits(bs, 32)); -#endif + DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[coeff], level); + //DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[coeff], level, BitstreamShowBits(bs, 32)); if (level < -2047 || level > 2047) { - DPRINTF(XVID_DEBUG_ERROR,"warning: intra_overflow %i\n", level); + DPRINTF(DPRINTF_ERROR,"warning: intra_overflow %i", level); } coeff++; } while (!last); @@ -1258,25 +1242,24 @@ do { level = get_coeff(bs, &run, &last, 0, 0); if (run == -1) { - DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); + DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); break; } p += run; block[scan[p]] = level; - DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[p], level); - /* DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i %08x\n", scan[p], level, BitstreamShowBits(bs, 32)); */ + DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[p], level); + // DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[p], level, BitstreamShowBits(bs, 32)); if (level < -2047 || level > 2047) { - DPRINTF(XVID_DEBUG_ERROR,"warning: inter overflow %i\n", level); + DPRINTF(DPRINTF_ERROR,"warning: inter overflow %i", level); } p++; } while (!last); } - /***************************************************************************** * VLC tables and other constant arrays ****************************************************************************/