--- trunk/xvidcore/src/bitstream/mbcoding.c 2004/03/18 16:11:28 1381 +++ trunk/xvidcore/src/bitstream/mbcoding.c 2004/03/22 22:36:25 1382 @@ -1,56 +1,32 @@ - /****************************************************************************** - * * - * This file is part of XviD, a free MPEG-4 video encoder/decoder * - * * - * XviD is an implementation of a part of one or more MPEG-4 Video tools * - * as specified in ISO/IEC 14496-2 standard. Those intending to use this * - * software module in hardware or software products are advised that its * - * use may infringe existing patents or copyrights, and any such use * - * would be at such party's own risk. The original developer of this * - * software module and his/her company, and subsequent editors and their * - * companies, will have no liability for use of this software or * - * modifications or derivatives thereof. * - * * - * XviD is free software; you can redistribute it and/or modify it * - * under the terms of the GNU General Public License as published by * - * the Free Software Foundation; either version 2 of the License, or * - * (at your option) any later version. * - * * - * XviD is distributed in the hope that it will be useful, but * - * WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program; if not, write to the Free Software * - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * mbcoding.c * - * * - * Copyright (C) 2002 - Michael Militzer * - * * - * For more information visit the XviD homepage: http://www.xvid.org * - * * - ******************************************************************************/ - - /****************************************************************************** - * * - * Revision history: * - * * - * 28.10.2002 GMC support - gruel * - * 28.06.2002 added check_resync_marker() * - * 14.04.2002 bframe encoding * - * 08.03.2002 initial version; isibaar * - * * - ******************************************************************************/ - +/***************************************************************************** + * + * XVID MPEG-4 VIDEO CODEC + * - MB coding - + * + * Copyright (C) 2002 Michael Militzer + * + * This program is free software ; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation ; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY ; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program ; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * $Id: mbcoding.c,v 1.46 2004-03-22 22:36:23 edgomez Exp $ + * + ****************************************************************************/ #include #include +#include + #include "../portab.h" #include "../global.h" #include "bitstream.h" @@ -60,23 +36,10 @@ #include "../utils/mbfunctions.h" -/* #define BIGLUT */ - -#ifdef BIGLUT -#define LEVELOFFSET 2048 -#else #define LEVELOFFSET 32 -#endif static REVERSE_EVENT DCT3D[2][4096]; - -#ifdef BIGLUT -static VLC coeff_VLC[2][2][4096][64]; -VLC *intra_table; -static VLC *inter_table; -#else static VLC coeff_VLC[2][2][64][64]; -#endif /* not really MB related, but VLCs are only available here */ void bs_put_spritetrajectory(Bitstream * bs, const int val) @@ -86,8 +49,10 @@ const int code2 = sprite_trajectory_len[len].code; const int len2 = sprite_trajectory_len[len].len; -// printf("GMC=%d Code/Len = %d / %d ",val, code,len); -// printf("Code2 / Len2 = %d / %d \n",code2,len2); +#if 0 + printf("GMC=%d Code/Len = %d / %d ",val, code,len); + printf("Code2 / Len2 = %d / %d \n",code2,len2); +#endif BitstreamPutBits(bs, code2, len2); if (len) BitstreamPutBits(bs, code, len); @@ -113,41 +78,26 @@ uint32_t i, j, k, intra, last, run, run_esc, level, level_esc, escape, escape_len, offset; int32_t l; -#ifdef BIGLUT - intra_table = coeff_VLC[1]; - inter_table = coeff_VLC[0]; -#endif - - for (intra = 0; intra < 2; intra++) for (i = 0; i < 4096; i++) DCT3D[intra][i].event.level = 0; - for (intra = 0; intra < 2; intra++) - for (last = 0; last < 2; last++) - { - for (run = 0; run < 63 + last; run++) - for (level = 0; level < (uint32_t)(32 << intra); level++) - { -#ifdef BIGLUT - offset = LEVELOFFSET; -#else + for (intra = 0; intra < 2; intra++) { + for (last = 0; last < 2; last++) { + for (run = 0; run < 63 + last; run++) { + for (level = 0; level < (uint32_t)(32 << intra); level++) { offset = !intra * LEVELOFFSET; -#endif coeff_VLC[intra][last][level + offset][run].len = 128; } + } } + } - for (intra = 0; intra < 2; intra++) - for (i = 0; i < 102; i++) - { -#ifdef BIGLUT - offset = LEVELOFFSET; -#else + for (intra = 0; intra < 2; intra++) { + for (i = 0; i < 102; i++) { offset = !intra * LEVELOFFSET; -#endif - for (j = 0; j < (uint32_t)(1 << (12 - coeff_tab[intra][i].vlc.len)); j++) - { + + for (j = 0; j < (uint32_t)(1 << (12 - coeff_tab[intra][i].vlc.len)); j++) { DCT3D[intra][(coeff_tab[intra][i].vlc.code << (12 - coeff_tab[intra][i].vlc.len)) | j].len = coeff_tab[intra][i].vlc.len; DCT3D[intra][(coeff_tab[intra][i].vlc.code << (12 - coeff_tab[intra][i].vlc.len)) | j].event = coeff_tab[intra][i].event; } @@ -156,58 +106,39 @@ = coeff_tab[intra][i].vlc.code << 1; coeff_VLC[intra][coeff_tab[intra][i].event.last][coeff_tab[intra][i].event.level + offset][coeff_tab[intra][i].event.run].len = coeff_tab[intra][i].vlc.len + 1; -#ifndef BIGLUT - if (!intra) -#endif - { + + if (!intra) { coeff_VLC[intra][coeff_tab[intra][i].event.last][offset - coeff_tab[intra][i].event.level][coeff_tab[intra][i].event.run].code = (coeff_tab[intra][i].vlc.code << 1) | 1; coeff_VLC[intra][coeff_tab[intra][i].event.last][offset - coeff_tab[intra][i].event.level][coeff_tab[intra][i].event.run].len = coeff_tab[intra][i].vlc.len + 1; } } + } + + for (intra = 0; intra < 2; intra++) { + for (last = 0; last < 2; last++) { + for (run = 0; run < 63 + last; run++) { + for (level = 1; level < (uint32_t)(32 << intra); level++) { - for (intra = 0; intra < 2; intra++) - for (last = 0; last < 2; last++) - for (run = 0; run < 63 + last; run++) - { - for (level = 1; level < (uint32_t)(32 << intra); level++) - { if (level <= max_level[intra][last][run] && run <= max_run[intra][last][level]) continue; -#ifdef BIGLUT - offset = LEVELOFFSET; -#else offset = !intra * LEVELOFFSET; -#endif level_esc = level - max_level[intra][last][run]; run_esc = run - 1 - max_run[intra][last][level]; - /*use this test to use shorter esc2 codes when possible - if (level_esc <= max_level[intra][last][run] && run <= max_run[intra][last][level_esc] - && !(coeff_VLC[intra][last][level_esc + offset][run].len + 7 + 1 - > coeff_VLC[intra][last][level + offset][run_esc].code + 7 + 2))*/ - if (level_esc <= max_level[intra][last][run] && run <= max_run[intra][last][level_esc]) - { + if (level_esc <= max_level[intra][last][run] && run <= max_run[intra][last][level_esc]) { escape = ESCAPE1; escape_len = 7 + 1; run_esc = run; - } - else - { - if (run_esc <= max_run[intra][last][level] && level <= max_level[intra][last][run_esc]) - { + } else { + if (run_esc <= max_run[intra][last][level] && level <= max_level[intra][last][run_esc]) { escape = ESCAPE2; escape_len = 7 + 2; level_esc = level; - } - else - { -#ifndef BIGLUT - if (!intra) -#endif - { + } else { + if (!intra) { coeff_VLC[intra][last][level + offset][run].code = (ESCAPE3 << 21) | (last << 20) | (run << 14) | (1 << 13) | ((level & 0xfff) << 1) | 1; coeff_VLC[intra][last][level + offset][run].len = 30; @@ -224,10 +155,8 @@ | coeff_VLC[intra][last][level_esc + offset][run_esc].code; coeff_VLC[intra][last][level + offset][run].len = coeff_VLC[intra][last][level_esc + offset][run_esc].len + escape_len; -#ifndef BIGLUT - if (!intra) -#endif - { + + if (!intra) { coeff_VLC[intra][last][offset - level][run].code = (escape << coeff_VLC[intra][last][level_esc + offset][run_esc].len) | coeff_VLC[intra][last][level_esc + offset][run_esc].code | 1; @@ -236,44 +165,30 @@ } } -#ifdef BIGLUT - for (level = 32 << intra; level < 2048; level++) - { - coeff_VLC[intra][last][level + offset][run].code - = (ESCAPE3 << 21) | (last << 20) | (run << 14) | (1 << 13) | ((level & 0xfff) << 1) | 1; - coeff_VLC[intra][last][level + offset][run].len = 30; - - coeff_VLC[intra][last][offset - level][run].code - = (ESCAPE3 << 21) | (last << 20) | (run << 14) | (1 << 13) | ((-level & 0xfff) << 1) | 1; - coeff_VLC[intra][last][offset - level][run].len = 30; - } -#else - if (!intra) - { + if (!intra) { coeff_VLC[intra][last][0][run].code = (ESCAPE3 << 21) | (last << 20) | (run << 14) | (1 << 13) | ((-32 & 0xfff) << 1) | 1; coeff_VLC[intra][last][0][run].len = 30; } -#endif } -/* init sprite_trajectory tables */ -/* even if GMC is not specified (it might be used later...) */ + } + } + + /* init sprite_trajectory tables + * even if GMC is not specified (it might be used later...) */ sprite_trajectory_code[0+16384].code = 0; sprite_trajectory_code[0+16384].len = 0; - for (k=0;k<14;k++) - { + for (k=0;k<14;k++) { int limit = (1<code, vlc->len); - } else { - vlc += 64 * 4096; - BitstreamPutBits(bs, vlc->code, vlc->len); - break; - } - } while (1); - -} - - - -/* returns the number of bits required to encode qcoeff */ -int -CodeCoeff_CalcBits(const int16_t qcoeff[64], - VLC * table, - const uint16_t * zigzag, - uint16_t intra) -{ - int bits = 0; - uint32_t j, last; - short v; - VLC *vlc; - - j = intra; - last = intra; - - while (j < 64 && (v = qcoeff[zigzag[j]]) == 0) - j++; - - if (j >= 64) return 0; /* empty block */ - - do { - vlc = table + 64 * 2048 + (v << 6) + j - last; - last = ++j; - - /* count zeroes */ - while (j < 64 && (v = qcoeff[zigzag[j]]) == 0) - j++; - - /* write code */ - if (j != 64) { - bits += vlc->len; - } else { - vlc += 64 * 4096; - bits += vlc->len; - break; - } - } while (1); - - return bits; -} - - -#else - static __inline void CodeCoeffInter(Bitstream * bs, const int16_t qcoeff[64], @@ -498,7 +327,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 +347,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; @@ -536,7 +365,7 @@ /* returns the number of bits required to encode qcoeff */ -int +int CodeCoeffIntra_CalcBits(const int16_t qcoeff[64], const uint16_t * zigzag) { int bits = 0; @@ -559,7 +388,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 +401,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; @@ -624,8 +453,11 @@ return bits; } +static int iDQtab[5] = { + 1, 0, -1 /* no change */, 2, 3 +}; +#define DQ_VALUE2INDEX(value) iDQtab[(value)+2] -#endif static __inline void CodeBlockIntra(const FRAMEINFO * const frame, @@ -639,7 +471,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, @@ -650,24 +482,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, pMB->dquant, 2); + BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2); - // write interlacing - if (frame->global_flags & XVID_INTERLACING) { + /* write interlacing */ + if (frame->vol_flags & XVID_VOL_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, @@ -678,16 +510,12 @@ 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); -#ifdef BIGLUT - CodeCoeff(bs, &qcoeff[i * 64], intra_table, scan_table, 1); -#else CodeCoeffIntra(bs, &qcoeff[i * 64], scan_table); -#endif bits = BitstreamPos(bs) - bits; pStat->iTextBits += bits; @@ -711,40 +539,42 @@ 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, pMB->dquant, 2); + BitstreamPutBits(bs, DQ_VALUE2INDEX(pMB->dquant), 2); - // interlacing - if (frame->global_flags & XVID_INTERLACING) { + /* 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); + /* if inter block, write field ME flag */ + if ((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) && (pMB->mcsel == 0)) { + BitstreamPutBit(bs, 0 /*pMB->field_pred*/); /* not implemented yet */ + DPRINTF(XVID_DEBUG_MB,"codep: field_pred: %i\n", pMB->field_pred); - // write field prediction references + /* write field prediction references */ +#if 0 /* Remove the #if once field_pred is supported */ if (pMB->field_pred) { BitstreamPutBit(bs, pMB->field_for_top); BitstreamPutBit(bs, pMB->field_for_bot); } +#endif } } - // 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); @@ -753,19 +583,14 @@ bits = BitstreamPos(bs); - // code block coeffs + /* code block coeffs */ for (i = 0; i < 6; i++) - if (pMB->cbp & (1 << (5 - i))) - { + 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 - CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_table, 0); -#else CodeCoeffInter(bs, &qcoeff[i * 64], scan_table); -#endif } bits = BitstreamPos(bs) - bits; @@ -780,9 +605,9 @@ Bitstream * bs, Statistics * pStat) { - if (frame->coding_type != I_VOP) - BitstreamPutBit(bs, 0); // not_coded - + if (frame->coding_type != I_VOP) + BitstreamPutBit(bs, 0); /* not_coded */ + if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) CodeBlockIntra(frame, pMB, qcoeff, bs, pStat); else @@ -790,15 +615,6 @@ } -/* -// moved to mbcoding.h so that in can be 'static __inline' -void -MBSkip(Bitstream * bs) -{ - BitstreamPutBit(bs, 1); // not coded -} -*/ - /*************************************************************** * bframe encoding start ***************************************************************/ @@ -855,40 +671,46 @@ BitstreamPutBit(bs, 1); return; - default:; // invalid + default:; /* invalid */ } } void -MBCodingBVOP(const MACROBLOCK * mb, +MBCodingBVOP(const FRAMEINFO * const frame, + const MACROBLOCK * mb, const int16_t qcoeff[6 * 64], const int32_t fcode, const int32_t bcode, Bitstream * bs, - Statistics * pStat, - int direction) + Statistics * pStat) { int vcode = fcode; unsigned int i; + const uint16_t *scan_table = + frame->vop_flags & XVID_VOP_ALTERNATESCAN ? + scan_tables[2] : scan_tables[0]; + int bits; + + /* ------------------------------------------------------------------ when a block is skipped it is decoded DIRECT(0,0) hence is interpolated from forward & backward frames ------------------------------------------------------------------ */ 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); @@ -898,12 +720,33 @@ } 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 */ } + if (frame->vol_flags & XVID_VOL_INTERLACING) { + if (mb->cbp) { + BitstreamPutBit(bs, mb->field_dct); + DPRINTF(XVID_DEBUG_MB,"codep: field_dct: %i\n", mb->field_dct); + } + + /* if not direct block, write field ME flag */ + if (mb->mode != MODE_DIRECT) { + BitstreamPutBit(bs, 0 /*mb->field_pred*/); /* field ME not implemented */ + + /* write field prediction references */ +#if 0 /* Remove the #if once field_pred is supported */ + if (mb->field_pred) { + BitstreamPutBit(bs, mb->field_for_top); + BitstreamPutBit(bs, mb->field_for_bot); + } +#endif + } + } + + 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; @@ -912,20 +755,18 @@ 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; } + bits = BitstreamPos(bs); for (i = 0; i < 6; i++) { if (mb->cbp & (1 << (5 - i))) { -#ifdef BIGLUT - CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_tables[0], 0); -#else - CodeCoeffInter(bs, &qcoeff[i * 64], scan_tables[0]); -#endif + CodeCoeffInter(bs, &qcoeff[i * 64], scan_table); } } + pStat->iTextBits += BitstreamPos(bs) - bits; } @@ -935,11 +776,13 @@ ***************************************************************/ -// for IVOP addbits == 0 -// for PVOP addbits == fcode - 1 -// for BVOP addbits == max(fcode,bcode) - 1 -// returns true or false -int +/* + * 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) { uint32_t nbits; @@ -979,7 +822,7 @@ { uint32_t index; - + index = MIN(BitstreamShowBits(bs, 9), 256); BitstreamSkip(bs, mcbpc_inter_table[index].len); @@ -1052,7 +895,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 +996,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 +1052,19 @@ 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); +#if 0 + DPRINTF(XVID_DEBUG_COEFF,"block[%i] %i %08x\n", scan[coeff], level, BitstreamShowBits(bs, 32)); +#endif 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 +1087,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 ****************************************************************************/ @@ -1544,7 +1390,7 @@ 0, 0, 0, 0, 0, 0, 0, 0, }, /* intra = 0, last = 1 */ - { + { 0, 40, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -1588,9 +1434,9 @@ VLC sprite_trajectory_code[32768]; VLC sprite_trajectory_len[15] = { - { 0x00 , 2}, - { 0x02 , 3}, { 0x03, 3}, { 0x04, 3}, { 0x05, 3}, { 0x06, 3}, - { 0x0E , 4}, { 0x1E, 5}, { 0x3E, 6}, { 0x7F, 7}, { 0xFE, 8}, + { 0x00 , 2}, + { 0x02 , 3}, { 0x03, 3}, { 0x04, 3}, { 0x05, 3}, { 0x06, 3}, + { 0x0E , 4}, { 0x1E, 5}, { 0x3E, 6}, { 0x7E, 7}, { 0xFE, 8}, { 0x1FE, 9}, {0x3FE,10}, {0x7FE,11}, {0xFFE,12} };