--- mbcoding.c 2002/09/04 03:23:28 1.25 +++ mbcoding.c 2003/01/17 16:05:27 1.25.2.12 @@ -41,6 +41,7 @@ * * * 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 * @@ -48,9 +49,10 @@ ******************************************************************************/ - +#include #include #include "../portab.h" +#include "../global.h" #include "bitstream.h" #include "zigzag.h" #include "vlc_codes.h" @@ -58,131 +60,222 @@ #include "../utils/mbfunctions.h" -#define ABS(X) (((X)>0)?(X):-(X)) -#define CLIP(X,A) (X > A) ? (A) : (X) +/* #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]; +static VLC *intra_table, *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) +{ + const int code = sprite_trajectory_code[val+16384].code; + const int len = sprite_trajectory_code[val+16384].len; + 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); -VLC intra_table[524032]; -VLC inter_table[524032]; + BitstreamPutBits(bs, code2, len2); + if (len) BitstreamPutBits(bs, code, len); +} -VLC DCT3Dintra[4096]; -VLC DCT3Dinter[4096]; +int bs_get_spritetrajectory(Bitstream * bs) +{ + int i; + for (i = 0; i < 12; i++) + { + if (BitstreamShowBits(bs, sprite_trajectory_len[i].len) == sprite_trajectory_len[i].code) + { + BitstreamSkip(bs, sprite_trajectory_len[i].len); + return i; + } + } + return -1; +} void init_vlc_tables(void) { + uint32_t i, j, k, intra, last, run, run_esc, level, level_esc, escape, escape_len, offset, limit; + int32_t l; - int32_t k, l, i, intra, last; - VLC *vlc[2]; - VLC **coeff_ptr; - VLC *vlc1, *vlc2; - - vlc1 = DCT3Dintra; - vlc2 = DCT3Dinter; - - vlc[0] = intra_table; - vlc[1] = inter_table; - - // generate encoding vlc lookup tables - // the lookup table idea is taken from the excellent fame project by Vivien Chapellier - for (i = 0; i < 4; i++) { - intra = i % 2; - last = i / 2; - - coeff_ptr = coeff_vlc[last + 2 * intra]; - - for (k = -2047; k < 2048; k++) { // level - int8_t *max_level_ptr = max_level[last + 2 * intra]; - int8_t *max_run_ptr = max_run[last + 2 * intra]; - - for (l = 0; l < 64; l++) { // run - int32_t level = k; - ptr_t run = l; - - if ((abs(level) <= max_level_ptr[run]) && (run <= (uint32_t) max_run_ptr[abs(level)])) { // level < max_level and run < max_run - - vlc[intra]->code = 0; - vlc[intra]->len = 0; - goto loop_end; - } else { - if (level > 0) // correct level - level -= max_level_ptr[run]; - else - level += max_level_ptr[run]; +#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 < 32 << intra; level++) + { +#ifdef BIGLUT + offset = LEVELOFFSET; +#else + offset = !intra * LEVELOFFSET; +#endif + coeff_VLC[intra][last][level + offset][run].len = 128; + } + } - if ((abs(level) <= max_level_ptr[run]) && - (run <= (uint32_t) max_run_ptr[abs(level)])) { + for (intra = 0; intra < 2; intra++) + for (i = 0; i < 102; i++) + { +#ifdef BIGLUT + offset = LEVELOFFSET; +#else + offset = !intra * LEVELOFFSET; +#endif + for (j = 0; j < 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; + } - vlc[intra]->code = 0x06; - vlc[intra]->len = 8; - goto loop_end; - } + coeff_VLC[intra][coeff_tab[intra][i].event.last][coeff_tab[intra][i].event.level + offset][coeff_tab[intra][i].event.run].code + = 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 + { + 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; + } + } - if (level > 0) // still here? - level += max_level_ptr[run]; // restore level + for (intra = 0; intra < 2; intra++) + for (last = 0; last < 2; last++) + for (run = 0; run < 63 + last; run++) + { + for (level = 1; level < 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]) + { + escape = ESCAPE1; + escape_len = 7 + 1; + run_esc = run; + } else - level -= max_level_ptr[run]; - - run -= max_run_ptr[abs(level)] + 1; // and change run - - if ((abs(level) <= max_level_ptr[run]) && - (run <= (uint32_t) max_run_ptr[abs(level)])) { + { + if (level <= max_level[intra][last][run_esc] && run_esc <= max_run[intra][last][level]) + { + escape = ESCAPE2; + escape_len = 7 + 2; + level_esc = level; + } + else + { +#ifndef BIGLUT + if (!intra) +#endif + { + 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; + } + continue; + } + } - vlc[intra]->code = 0x0e; - vlc[intra]->len = 9; - goto loop_end; + coeff_VLC[intra][last][level + offset][run].code + = (escape << coeff_VLC[intra][last][level_esc + offset][run_esc].len) + | 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 + { + 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; + coeff_VLC[intra][last][offset - level][run].len + = coeff_VLC[intra][last][level_esc + offset][run_esc].len + escape_len; } - run += max_run_ptr[abs(level)] + 1; } - vlc[intra]->code = - (uint32_t) ((l << 14) | (0x1e + last) << 20) | (1 << 13) | - ((k & 0xfff) << 1) | 1; - - vlc[intra]->len = 30; - vlc[intra]++; - continue; - - loop_end: - if (level != 0) { - vlc[intra]->code = - (vlc[intra]-> - code << (coeff_ptr[run][abs(level) - 1].len + - 1)) | (coeff_ptr[run][abs(level) - - 1].code << 1); - vlc[intra]->len = - (coeff_ptr[run][abs(level) - 1].len + 1) + - vlc[intra]->len; - - if (level < 0) - vlc[intra]->code += 1; +#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; } - - vlc[intra]++; +#else + 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...) */ - for (i = 0; i < 4096; i++) { - if (i >= 512) { - *vlc1 = DCT3Dtab3[(i >> 5) - 16]; - *vlc2 = DCT3Dtab0[(i >> 5) - 16]; - } else if (i >= 128) { - *vlc1 = DCT3Dtab4[(i >> 2) - 32]; - *vlc2 = DCT3Dtab1[(i >> 2) - 32]; - } else if (i >= 8) { - *vlc1 = DCT3Dtab5[i - 8]; - *vlc2 = DCT3Dtab2[i - 8]; - } else { - *vlc1 = ERRtab[i]; - *vlc2 = ERRtab[i]; + sprite_trajectory_code[0+16384].code = 0; + sprite_trajectory_code[0+16384].len = 0; + for (k=0;k<14;k++) + { + int limit = (1<code, vlc->len); } else { - vlc += 64 * 4095; + vlc += 64 * 4096; BitstreamPutBits(bs, vlc->code, vlc->len); break; } @@ -279,9 +373,124 @@ } +#else -static void -CodeBlockIntra(const FRAMEINFO * frame, +static __inline void +CodeCoeffInter(Bitstream * bs, + const int16_t qcoeff[64], + const uint16_t * zigzag) +{ + uint32_t i, run, prev_run, code, len; + int32_t level, prev_level, level_shifted; + + i = 0; + run = 0; + + while (!(level = qcoeff[zigzag[i++]])) + run++; + + prev_level = level; + prev_run = run; + run = 0; + + while (i < 64) + { + if ((level = qcoeff[zigzag[i++]]) != 0) + { + level_shifted = prev_level + 32; + if (!(level_shifted & -64)) + { + code = coeff_VLC[0][0][level_shifted][prev_run].code; + len = coeff_VLC[0][0][level_shifted][prev_run].len; + } + else + { + code = (ESCAPE3 << 21) | (prev_run << 14) | (1 << 13) | ((prev_level & 0xfff) << 1) | 1; + len = 30; + } + BitstreamPutBits(bs, code, len); + prev_level = level; + prev_run = run; + run = 0; + } + else + run++; + } + + level_shifted = prev_level + 32; + if (!(level_shifted & -64)) + { + code = coeff_VLC[0][1][level_shifted][prev_run].code; + len = coeff_VLC[0][1][level_shifted][prev_run].len; + } + else + { + code = (ESCAPE3 << 21) | (1 << 20) | (prev_run << 14) | (1 << 13) | ((prev_level & 0xfff) << 1) | 1; + len = 30; + } + BitstreamPutBits(bs, code, len); +} + +static __inline void +CodeCoeffIntra(Bitstream * bs, + const int16_t qcoeff[64], + const uint16_t * zigzag) +{ + uint32_t i, abs_level, run, prev_run, code, len; + int32_t level, prev_level; + + i = 1; + run = 0; + + while (!(level = qcoeff[zigzag[i++]])) + run++; + + prev_level = level; + prev_run = run; + run = 0; + + while (i < 64) + { + if ((level = qcoeff[zigzag[i++]]) != 0) + { + 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; + if (len != 128) + code |= (prev_level < 0); + else + { + code = (ESCAPE3 << 21) | (prev_run << 14) | (1 << 13) | ((prev_level & 0xfff) << 1) | 1; + len = 30; + } + BitstreamPutBits(bs, code, len); + prev_level = level; + prev_run = run; + run = 0; + } + else + run++; + } + + 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; + if (len != 128) + code |= (prev_level < 0); + else + { + code = (ESCAPE3 << 21) | (1 << 20) | (prev_run << 14) | (1 << 13) | ((prev_level & 0xfff) << 1) | 1; + len = 30; + } + BitstreamPutBits(bs, code, len); +} + +#endif + +static __inline void +CodeBlockIntra(const FRAMEINFO * const frame, const MACROBLOCK * pMB, int16_t qcoeff[6 * 64], Bitstream * bs, @@ -330,10 +539,17 @@ dcc_tab[qcoeff[i * 64 + 0] + 255].len); if (pMB->cbp & (1 << (5 - i))) { + const uint16_t *scan_table = + frame->global_flags & XVID_ALTERNATESCAN ? + scan_tables[2] : scan_tables[pMB->acpred_directions[i]]; + bits = BitstreamPos(bs); - CodeCoeff(bs, &qcoeff[i * 64], intra_table, - scan_tables[pMB->acpred_directions[i]], 1); +#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; @@ -344,7 +560,7 @@ static void -CodeBlockInter(const FRAMEINFO * frame, +CodeBlockInter(const FRAMEINFO * const frame, const MACROBLOCK * pMB, int16_t qcoeff[6 * 64], Bitstream * bs, @@ -361,6 +577,9 @@ 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 + // write cbpy BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len); @@ -372,13 +591,13 @@ if (frame->global_flags & XVID_INTERLACING) { if (pMB->cbp) { BitstreamPutBit(bs, pMB->field_dct); - DEBUG1("codep: field_dct: ", pMB->field_dct); + DPRINTF(DPRINTF_MB,"codep: field_dct: %i", 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); - DEBUG1("codep: field_pred: ", pMB->field_pred); + DPRINTF(DPRINTF_MB,"codep: field_pred: %i", pMB->field_pred); // write field prediction references if (pMB->field_pred) { @@ -387,37 +606,45 @@ } } } - // code motion vector(s) - for (i = 0; i < (pMB->mode == MODE_INTER4V ? 4 : 1); i++) { - CodeVector(bs, pMB->pmvs[i].x, frame->fcode, pStat); - CodeVector(bs, pMB->pmvs[i].y, frame->fcode, pStat); - } + // 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); + CodeVector(bs, pMB->pmvs[i].y, frame->fcode, pStat); + } bits = BitstreamPos(bs); // code block coeffs for (i = 0; i < 6; i++) if (pMB->cbp & (1 << (5 - i))) - CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_tables[0], 0); + { + const uint16_t *scan_table = + frame->global_flags & XVID_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; pStat->iTextBits += bits; - } void -MBCoding(const FRAMEINFO * frame, +MBCoding(const FRAMEINFO * const frame, MACROBLOCK * pMB, int16_t qcoeff[6 * 64], Bitstream * bs, Statistics * pStat) { - - if (frame->coding_type == P_VOP) { - BitstreamPutBit(bs, 0); // 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 @@ -425,14 +652,14 @@ } - +/* +// moved to mbcoding.h so that in can be 'static __inline' void MBSkip(Bitstream * bs) { BitstreamPutBit(bs, 1); // not coded - return; } - +*/ /*************************************************************** * bframe encoding start @@ -446,37 +673,22 @@ 3 0001b forward mc+q dbquant, mvdf */ -void +static __inline void put_bvop_mbtype(Bitstream * bs, int value) { switch (value) { - case 0: - BitstreamPutBit(bs, 1); - return; - - case 1: - BitstreamPutBit(bs, 0); - BitstreamPutBit(bs, 1); - return; - - case 2: - BitstreamPutBit(bs, 0); - BitstreamPutBit(bs, 0); - BitstreamPutBit(bs, 1); - return; - - case 3: - BitstreamPutBit(bs, 0); - BitstreamPutBit(bs, 0); - BitstreamPutBit(bs, 0); - BitstreamPutBit(bs, 1); - return; - - default:; // invalid! - + case MODE_FORWARD: + BitstreamPutBit(bs, 0); + case MODE_BACKWARD: + BitstreamPutBit(bs, 0); + case MODE_INTERPOLATE: + BitstreamPutBit(bs, 0); + case MODE_DIRECT: + BitstreamPutBit(bs, 1); + default: + break; } - } /* @@ -486,7 +698,7 @@ +2 11b */ -void +static __inline void put_bvop_dbquant(Bitstream * bs, int value) { @@ -517,9 +729,11 @@ const int32_t fcode, const int32_t bcode, Bitstream * bs, - Statistics * pStat) + Statistics * pStat, + int direction) { - int i; + int vcode = fcode; + unsigned int i; /* ------------------------------------------------------------------ when a block is skipped it is decoded DIRECT(0,0) @@ -549,24 +763,29 @@ put_bvop_dbquant(bs, 0); // todo: mb->dquant = 0 } - if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_FORWARD) { - CodeVector(bs, mb->pmvs[0].x, fcode, pStat); - CodeVector(bs, mb->pmvs[0].y, fcode, pStat); - } - - if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_BACKWARD) { - CodeVector(bs, mb->b_pmvs[0].x, bcode, pStat); - CodeVector(bs, mb->b_pmvs[0].y, bcode, pStat); - } - - if (mb->mode == MODE_DIRECT) { - CodeVector(bs, mb->deltamv.x, 1, pStat); /* fcode is always 1 for delta vector */ - CodeVector(bs, mb->deltamv.y, 1, pStat); /* prediction is always (0,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].y, vcode, pStat); + case MODE_BACKWARD: + vcode = bcode; + case MODE_FORWARD: + CodeVector(bs, mb->pmvs[0].x, vcode, pStat); + 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) + default: break; } 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 } } } @@ -623,7 +842,7 @@ uint32_t index; - index = CLIP(BitstreamShowBits(bs, 9), 256); + index = MIN(BitstreamShowBits(bs, 9), 256); BitstreamSkip(bs, mcbpc_inter_table[index].len); @@ -649,7 +868,7 @@ } -int +static __inline int get_mv_data(Bitstream * bs) { @@ -758,6 +977,87 @@ } +static __inline int +get_coeff(Bitstream * bs, + int *run, + int *last, + int intra, + int short_video_header) +{ + + uint32_t mode; + int32_t level; + REVERSE_EVENT *reverse_event; + + if (short_video_header) /* inter-VLCs will be used for both intra and inter blocks */ + intra = 0; + + if (BitstreamShowBits(bs, 7) != ESCAPE) { + reverse_event = &DCT3D[intra][BitstreamShowBits(bs, 12)]; + + if ((level = reverse_event->event.level) == 0) + goto error; + + *last = reverse_event->event.last; + *run = reverse_event->event.run; + + BitstreamSkip(bs, reverse_event->len); + + return BitstreamGetBits(bs, 1) ? -level : level; + } + + BitstreamSkip(bs, 7); + + if (short_video_header) { + /* escape mode 4 - H.263 type, only used if short_video_header = 1 */ + *last = BitstreamGetBit(bs); + *run = BitstreamGetBits(bs, 6); + level = BitstreamGetBits(bs, 8); + + if (level == 0 || level == 128) + DPRINTF(DPRINTF_ERROR, "Illegal LEVEL for ESCAPE mode 4: %d", level); + + return (level << 24) >> 24; + } + + mode = BitstreamShowBits(bs, 2); + + if (mode < 3) { + BitstreamSkip(bs, (mode == 2) ? 2 : 1); + + reverse_event = &DCT3D[intra][BitstreamShowBits(bs, 12)]; + + if ((level = reverse_event->event.level) == 0) + goto error; + + *last = reverse_event->event.last; + *run = reverse_event->event.run; + + BitstreamSkip(bs, reverse_event->len); + + if (mode < 2) /* first escape mode, level is offset */ + level += max_level[intra][*last][*run]; + else /* second escape mode, run is offset */ + *run += max_run[intra][*last][level] + 1; + + return BitstreamGetBits(bs, 1) ? -level : level; + } + + /* third escape mode - fixed length codes */ + BitstreamSkip(bs, 2); + *last = BitstreamGetBits(bs, 1); + *run = BitstreamGetBits(bs, 6); + BitstreamSkip(bs, 1); /* marker */ + level = BitstreamGetBits(bs, 12); + BitstreamSkip(bs, 1); /* marker */ + + return (level << 20) >> 20; + + error: + *run = VLC_ERROR; + return 0; +} + void get_intra_block(Bitstream * bs, int16_t * block, @@ -766,14 +1066,12 @@ { const uint16_t *scan = scan_tables[direction]; - int level; - int run; - int last; + int level, run, last; do { level = get_coeff(bs, &run, &last, 1, 0); if (run == -1) { - DEBUG("fatal: invalid run"); + DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); break; } coeff += run; @@ -782,8 +1080,8 @@ DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[coeff], level); //DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[coeff], level, BitstreamShowBits(bs, 32)); - if (level < -127 || level > 127) { - DEBUG1("warning: intra_overflow", level); + if (level < -2047 || level > 2047) { + DPRINTF(DPRINTF_ERROR,"warning: intra_overflow %i", level); } coeff++; } while (!last); @@ -792,10 +1090,11 @@ void get_inter_block(Bitstream * bs, - int16_t * block) + int16_t * block, + int direction) { - const uint16_t *scan = scan_tables[0]; + const uint16_t *scan = scan_tables[direction]; int p; int level; int run; @@ -805,7 +1104,7 @@ do { level = get_coeff(bs, &run, &last, 0, 0); if (run == -1) { - DEBUG("fatal: invalid run"); + DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); break; } p += run; @@ -815,8 +1114,8 @@ DPRINTF(DPRINTF_COEFF,"block[%i] %i", scan[p], level); // DPRINTF(DPRINTF_COEFF,"block[%i] %i %08x", scan[p], level, BitstreamShowBits(bs, 32)); - if (level < -127 || level > 127) { - DEBUG1("warning: inter_overflow", level); + if (level < -2047 || level > 2047) { + DPRINTF(DPRINTF_ERROR,"warning: inter overflow %i", level); } p++; } while (!last);