--- mbcoding.c 2003/02/21 08:32:34 1.44 +++ mbcoding.c 2003/05/22 16:35:38 1.44.2.10 @@ -51,6 +51,8 @@ #include #include +#include + #include "../portab.h" #include "../global.h" #include "bitstream.h" @@ -498,7 +500,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; @@ -518,7 +520,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; @@ -559,7 +561,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; @@ -572,7 +574,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; @@ -627,6 +629,13 @@ #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, @@ -657,14 +666,14 @@ BitstreamPutBits(bs, 0, 1); // write cbpy - BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len); + BitstreamPutBits(bs, xvid_cbpy_tab[cbpy].code, xvid_cbpy_tab[cbpy].len); // write dquant if (pMB->mode == MODE_INTRA_Q) - BitstreamPutBits(bs, pMB->dquant, 2); + BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2); // write interlacing - if (frame->global_flags & XVID_INTERLACING) { + if (frame->vol_flags & XVID_VOL_INTERLACING) { BitstreamPutBit(bs, pMB->field_dct); } // code block coeffs @@ -678,7 +687,7 @@ if (pMB->cbp & (1 << (5 - i))) { const uint16_t *scan_table = - frame->global_flags & XVID_ALTERNATESCAN ? + frame->vop_flags & XVID_VOP_ALTERNATESCAN ? scan_tables[2] : scan_tables[pMB->acpred_directions[i]]; bits = BitstreamPos(bs); @@ -719,23 +728,23 @@ BitstreamPutBit(bs, pMB->mcsel); // mcsel: '0'=local motion, '1'=GMC // write cbpy - BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len); + BitstreamPutBits(bs, xvid_cbpy_tab[cbpy].code, xvid_cbpy_tab[cbpy].len); // write dquant if (pMB->mode == MODE_INTER_Q) - BitstreamPutBits(bs, pMB->dquant, 2); + BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2); // interlacing - if (frame->global_flags & XVID_INTERLACING) { + if (frame->vol_flags & XVID_VOL_INTERLACING) { if (pMB->cbp) { BitstreamPutBit(bs, pMB->field_dct); - DPRINTF(DPRINTF_MB,"codep: field_dct: %i", pMB->field_dct); + DPRINTF(XVID_DEBUG_MB,"codep: field_dct: %i\n", pMB->field_dct); } // if inter block, write field ME flag if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) { BitstreamPutBit(bs, pMB->field_pred); - DPRINTF(DPRINTF_MB,"codep: field_pred: %i", pMB->field_pred); + DPRINTF(XVID_DEBUG_MB,"codep: field_pred: %i\n", pMB->field_pred); // write field prediction references if (pMB->field_pred) { @@ -758,7 +767,7 @@ if (pMB->cbp & (1 << (5 - i))) { const uint16_t *scan_table = - frame->global_flags & XVID_ALTERNATESCAN ? + frame->vop_flags & XVID_VOP_ALTERNATESCAN ? scan_tables[2] : scan_tables[0]; #ifdef BIGLUT @@ -1052,7 +1061,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; @@ -1153,7 +1162,7 @@ level = BitstreamGetBits(bs, 8); if (level == 0 || level == 128) - DPRINTF(DPRINTF_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d", level); + DPRINTF(XVID_DEBUG_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d\n", level); return (level << 24) >> 24; } @@ -1209,17 +1218,17 @@ do { level = get_coeff(bs, &run, &last, 1, 0); if (run == -1) { - DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); + DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); break; } coeff += run; block[scan[coeff]] = level; - DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[coeff], level); - //DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[coeff], level, BitstreamShowBits(bs, 32)); + DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i\n", scan[coeff], level); + //DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i %08x\n", scan[coeff], level, BitstreamShowBits(bs, 32)); if (level < -2047 || level > 2047) { - DPRINTF(DPRINTF_ERROR,"warning: intra_overflow %i", level); + DPRINTF(XVID_DEBUG_ERROR,"warning: intra_overflow %i\n", level); } coeff++; } while (!last); @@ -1242,24 +1251,25 @@ do { level = get_coeff(bs, &run, &last, 0, 0); if (run == -1) { - DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); + DPRINTF(XVID_DEBUG_ERROR,"fatal: invalid run"); break; } p += run; block[scan[p]] = level; - DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[p], level); - // DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[p], level, BitstreamShowBits(bs, 32)); + 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)); if (level < -2047 || level > 2047) { - DPRINTF(DPRINTF_ERROR,"warning: inter overflow %i", level); + DPRINTF(XVID_DEBUG_ERROR,"warning: inter overflow %i\n", level); } p++; } while (!last); } + /***************************************************************************** * VLC tables and other constant arrays ****************************************************************************/ @@ -1618,7 +1628,7 @@ {5, 6}, {5, 9}, {5, 8}, {3, 7}, {2, 9} }; -const VLC cbpy_tab[16] = { +const VLC xvid_cbpy_tab[16] = { {3, 4}, {5, 5}, {4, 5}, {9, 4}, {3, 5}, {7, 4}, {2, 6}, {11, 4}, {2, 5}, {3, 6}, {5, 4}, {10, 4}, {4, 4}, {8, 4}, {6, 4}, {3, 2} };