--- mbcoding.c 2003/01/04 04:23:53 1.25.2.8 +++ mbcoding.c 2003/01/05 16:54:36 1.37 @@ -1,54 +1,58 @@ - /****************************************************************************** - * * - * 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 + * - Macro Block coding functions - + * + * Copyright(C) 2002 Michael Militzer + * + * This file is part of XviD, a free MPEG-4 video encoder/decoder + * + * 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. + * + * 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 + * + * Under section 8 of the GNU General Public License, the copyright + * holders of XVID explicitly forbid distribution in the following + * countries: + * + * - Japan + * - United States of America + * + * Linking XviD statically or dynamically with other modules is making a + * combined work based on XviD. Thus, the terms and conditions of the + * GNU General Public License cover the whole combination. + * + * As a special exception, the copyright holders of XviD give you + * permission to link XviD with independent modules that communicate with + * XviD solely through the VFW1.1 and DShow interfaces, regardless of the + * license terms of these independent modules, and to copy and distribute + * the resulting combined work under terms of your choice, provided that + * every copy of the combined work is accompanied by a complete copy of + * the source code of XviD (the version of XviD used to produce the + * combined work), being distributed under the terms of the GNU General + * Public License plus this exception. An independent module is a module + * which is not derived from or based on XviD. + * + * Note that people who make modified versions of XviD are not obligated + * to grant this special exception for their modified versions; it is + * their choice whether to do so. The GNU General Public License gives + * permission to release a modified version without this exception; this + * exception also makes it possible to release a modified version which + * carries forward this exception. + * + * $Id: mbcoding.c,v 1.37 2003/01/05 16:54:36 edgomez Exp $ + * + ****************************************************************************/ #include #include "../portab.h" @@ -62,181 +66,192 @@ #define ABS(X) (((X)>0)?(X):-(X)) #define CLIP(X,A) (X > A) ? (A) : (X) -VLC intra_table[4*2048*64]; -VLC inter_table[4*2048*64]; - -VLC DCT3Dintra[4096]; -VLC DCT3Dinter[4096]; - -/* 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); +/*#define _BIGLUT_*/ - BitstreamPutBits(bs, code2, len2); - if (len) BitstreamPutBits(bs, code, len); -} - -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; -} +#ifdef _BIGLUT_ +#define LEVELOFFSET 2048 +#else +#define LEVELOFFSET 32 +#endif + +/***************************************************************************** + * Local data + ****************************************************************************/ + +static REVERSE_EVENT DCT3D[2][4096]; + +#ifdef _BIGLUT_ +static VLC coeff_VLC[2][2][4096][64]; +VLC *intra_table, *inter_table; +#else +static VLC coeff_VLC[2][2][64][64]; +#endif + +/***************************************************************************** + * Vector Length Coding Initialization + ****************************************************************************/ void init_vlc_tables(void) { + uint32_t i, j, intra, last, run, offset; + int32_t level; + VLC coeff_VLC_temp[2][2][64][64]; + +#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; - 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]; - - if ((abs(level) <= max_level_ptr[run]) && - (run <= (uint32_t) max_run_ptr[abs(level)])) { - - vlc[intra]->code = 0x06; - vlc[intra]->len = 8; - goto loop_end; - } - - if (level > 0) // still here? - level += max_level_ptr[run]; // restore level - 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)])) { - - vlc[intra]->code = 0x0e; - vlc[intra]->len = 9; - goto loop_end; - } - 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; + 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_temp[intra][last][level][run].len = 128; + coeff_VLC[intra][last][level + offset][run].len = 128; } - - vlc[intra]++; - } - } - } - - 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]; } - vlc1++; - vlc2++; - } - DCT3D[0] = DCT3Dinter; - DCT3D[1] = DCT3Dintra; - - -/* 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++) - { - int limit = (1< max_level[intra][last][run])) + if (coeff_VLC_temp[intra][last][level - max_level[intra][last][run]][run].len != 128 + && coeff_VLC[intra][last][level + offset][run].len == 128) + { + coeff_VLC[intra][last][level + offset][run].code + = (ESCAPE1 << coeff_VLC_temp[intra][last][level - max_level[intra][last][run]][run].len) + | coeff_VLC_temp[intra][last][level - max_level[intra][last][run]][run].code; + coeff_VLC[intra][last][level + offset][run].len + = coeff_VLC_temp[intra][last][level - max_level[intra][last][run]][run].len + 7 + 1; +#ifndef _BIGLUT_ + if (!intra) +#endif + { + coeff_VLC[intra][last][offset - level][run].code + = (ESCAPE1 << coeff_VLC_temp[intra][last][level - max_level[intra][last][run]][run].len) + | coeff_VLC_temp[intra][last][level - max_level[intra][last][run]][run].code | 1; + coeff_VLC[intra][last][offset - level][run].len + = coeff_VLC_temp[intra][last][level - max_level[intra][last][run]][run].len + 7 + 1; + } + } + if (run > max_run[intra][last][level]) + if (coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].len != 128 + && coeff_VLC[intra][last][level + offset][run].len == 128) + /*use the lower test instead of the upper to use shorter escape codes when possible : + if (coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].len + 7 + 2 + < coeff_VLC[intra][last][level + offset][run].len)*/ + { + coeff_VLC[intra][last][level + offset][run].code + = (ESCAPE2 << coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].len) + | coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].code; + coeff_VLC[intra][last][level + offset][run].len + = coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].len + 7 + 2; +#ifndef _BIGLUT_ + if (!intra) +#endif + { + coeff_VLC[intra][last][offset - level][run].code + = (ESCAPE2 << coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].len) + | coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].code | 1; + coeff_VLC[intra][last][offset - level][run].len + = coeff_VLC_temp[intra][last][level][run - 1 - max_run[intra][last][level]].len + 7 + 2; + } + } +#ifndef _BIGLUT_ + if (!intra) +#endif + if (coeff_VLC[intra][last][level + offset][run].len == 128) + { + 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; + } + } +#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) + { + 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 + } } +/***************************************************************************** + * Local inlined functions for MB coding + ****************************************************************************/ + static __inline void CodeVector(Bitstream * bs, int32_t value, @@ -292,6 +307,7 @@ } +#ifdef __BIGLUT_ static __inline void CodeCoeff(Bitstream * bs, @@ -312,18 +328,18 @@ j++; do { - vlc = table + 64 * 2047 + (v << 6) + j - last; + vlc = table + 64 * 2048 + (v << 6) + j - last; last = ++j; - // count zeroes + /* count zeroes */ while (j < 64 && (v = qcoeff[zigzag[j]]) == 0) j++; - // write code + /* write code */ if (j != 64) { BitstreamPutBits(bs, vlc->code, vlc->len); } else { - vlc += 64 * 4095; + vlc += 64 * 4096; BitstreamPutBits(bs, vlc->code, vlc->len); break; } @@ -331,9 +347,128 @@ } +#else static __inline void -CodeBlockIntra(const FRAMEINFO * const frame, +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 + +/***************************************************************************** + * Local functions + ****************************************************************************/ + +static void +CodeBlockIntra(const FRAMEINFO * frame, const MACROBLOCK * pMB, int16_t qcoeff[6 * 64], Bitstream * bs, @@ -344,7 +479,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, @@ -355,24 +490,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, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len); - // write dquant + /* write dquant */ if (pMB->mode == MODE_INTRA_Q) BitstreamPutBits(bs, pMB->dquant, 2); - // write 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, @@ -382,14 +517,14 @@ 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_table, 1); - +#ifdef _BIGLUT_ + CodeCoeff(bs, &qcoeff[i * 64], intra_table, + scan_tables[pMB->acpred_directions[i]], 1); +#else + CodeCoeffIntra(bs, &qcoeff[i * 64], scan_tables[pMB->acpred_directions[i]]); +#endif bits = BitstreamPos(bs) - bits; pStat->iTextBits += bits; } @@ -399,7 +534,7 @@ static void -CodeBlockInter(const FRAMEINFO * const frame, +CodeBlockInter(const FRAMEINFO * frame, const MACROBLOCK * pMB, int16_t qcoeff[6 * 64], Bitstream * bs, @@ -408,88 +543,78 @@ int32_t i; uint32_t bits, mcbpc, cbpy; - int mcsel=0; 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) ) - { - if (frame->quarterpel) { - if ( (pMB->qmvs[0].x == frame->GMC_MV.x) && (pMB->qmvs[0].y == frame->GMC_MV.y) ) - mcsel=1; - } else { - if ( (pMB->mvs[0].x == frame->GMC_MV.x) && (pMB->mvs[0].y == frame->GMC_MV.y) ) - mcsel=1; - } - BitstreamPutBit(bs, mcsel); // mcsel: '0'=local motion, '1'=GMC - } - - // write cbpy + /* write cbpy */ BitstreamPutBits(bs, cbpy_tab[cbpy].code, cbpy_tab[cbpy].len); - // write dquant + /* write dquant */ if (pMB->mode == MODE_INTER_Q) BitstreamPutBits(bs, pMB->dquant, 2); - // interlacing + /* interlacing */ if (frame->global_flags & XVID_INTERLACING) { if (pMB->cbp) { BitstreamPutBit(bs, pMB->field_dct); - DPRINTF(DPRINTF_MB,"codep: field_dct: %i", pMB->field_dct); + DPRINTF(DPRINTF_DEBUG, "codep: field_dct: %d", 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(DPRINTF_MB,"codep: field_pred: %i", pMB->field_pred); + DPRINTF(DPRINTF_DEBUG, "codep: field_pred: %d", 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 - if (mcsel==0) - 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) */ + 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 + /* code block coeffs */ for (i = 0; i < 6; i++) if (pMB->cbp & (1 << (5 - i))) - { - const uint16_t *scan_table = - frame->global_flags & XVID_ALTERNATESCAN ? - scan_tables[2] : scan_tables[0]; - - CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_table, 0); - } +#ifdef _BIGLUT_ + CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_tables[0], 0); +#else + CodeCoeffInter(bs, &qcoeff[i * 64], scan_tables[0]); +#endif bits = BitstreamPos(bs) - bits; pStat->iTextBits += bits; + } +/***************************************************************************** + * Macro Block bitstream encoding functions + ****************************************************************************/ void -MBCoding(const FRAMEINFO * const frame, +MBCoding(const FRAMEINFO * frame, MACROBLOCK * pMB, int16_t qcoeff[6 * 64], Bitstream * bs, Statistics * pStat) { - if (frame->coding_type != I_VOP) - BitstreamPutBit(bs, 0); // not_coded - + + if (frame->coding_type == P_VOP) { + BitstreamPutBit(bs, 0); /* coded */ + } + if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) CodeBlockIntra(frame, pMB, qcoeff, bs, pStat); else @@ -497,151 +622,25 @@ } -/* -// 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 */ + return; } -*/ -/*************************************************************** - * bframe encoding start - ***************************************************************/ +/***************************************************************************** + * decoding stuff starts here + ****************************************************************************/ /* - mbtype - 0 1b direct(h263) mvdb - 1 01b interpolate mc+q dbquant, mvdf, mvdb - 2 001b backward mc+q dbquant, mvdb - 3 0001b forward mc+q dbquant, mvdf -*/ - -static __inline void -put_bvop_mbtype(Bitstream * bs, - int value) -{ - switch (value) { - 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; - } -} - -/* - dbquant - -2 10b - 0 0b - +2 11b -*/ - -static __inline void -put_bvop_dbquant(Bitstream * bs, - int value) -{ - switch (value) { - case 0: - BitstreamPutBit(bs, 0); - return; - - case -2: - BitstreamPutBit(bs, 1); - BitstreamPutBit(bs, 0); - return; - - case 2: - BitstreamPutBit(bs, 1); - BitstreamPutBit(bs, 1); - return; + * For IVOP addbits == 0 + * For PVOP addbits == fcode - 1 + * For BVOP addbits == max(fcode,bcode) - 1 + * returns true or false + */ - default:; // invalid - } -} - - - -void -MBCodingBVOP(const MACROBLOCK * mb, - const int16_t qcoeff[6 * 64], - const int32_t fcode, - const int32_t bcode, - Bitstream * bs, - Statistics * pStat, - int direction) -{ - int vcode = fcode; - unsigned int i; - -/* ------------------------------------------------------------------ - 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 - return; - } - - BitstreamPutBit(bs, 0); // not skipped - - if (mb->cbp == 0) { - BitstreamPutBit(bs, 1); // cbp == 0 - } else { - BitstreamPutBit(bs, 0); // cbp == xxx - } - - put_bvop_mbtype(bs, mb->mode); - - if (mb->cbp) { - BitstreamPutBits(bs, mb->cbp, 6); - } - - if (mb->mode != MODE_DIRECT && mb->cbp != 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].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))) { - CodeCoeff(bs, &qcoeff[i * 64], inter_table, scan_tables[direction], 0); - } - } -} - - - -/*************************************************************** - * decoding stuff starts here * - ***************************************************************/ - - -// 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) { @@ -709,7 +708,7 @@ } -static __inline int +int get_mv_data(Bitstream * bs) { @@ -818,6 +817,95 @@ } +/***************************************************************************** + * Local inlined function to "decode" written vlc codes + ****************************************************************************/ + +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; +} + +/***************************************************************************** + * MB reading functions + ****************************************************************************/ + void get_intra_block(Bitstream * bs, int16_t * block, @@ -826,22 +914,24 @@ { const uint16_t *scan = scan_tables[direction]; - int level, run, last; + int level; + int run; + int last; do { level = get_coeff(bs, &run, &last, 1, 0); if (run == -1) { - DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); + DPRINTF(DPRINTF_DEBUG, "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(DPRINTF_COEFF,"block[%i] %i %08x", scan[coeff], level, BitstreamShowBits(bs, 32)); */ if (level < -2047 || level > 2047) { - DPRINTF(DPRINTF_ERROR,"warning: intra_overflow %i", level); + DPRINTF(DPRINTF_DEBUG, "warning: intra_overflow: %d", level); } coeff++; } while (!last); @@ -850,11 +940,10 @@ void get_inter_block(Bitstream * bs, - int16_t * block, - int direction) + int16_t * block) { - const uint16_t *scan = scan_tables[direction]; + const uint16_t *scan = scan_tables[0]; int p; int level; int run; @@ -864,7 +953,7 @@ do { level = get_coeff(bs, &run, &last, 0, 0); if (run == -1) { - DPRINTF(DPRINTF_ERROR,"fatal: invalid run"); + DPRINTF(DPRINTF_ERROR, "fatal: invalid run"); break; } p += run; @@ -872,10 +961,9 @@ 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)); if (level < -2047 || level > 2047) { - DPRINTF(DPRINTF_ERROR,"warning: inter overflow %i", level); + DPRINTF(DPRINTF_DEBUG, "warning: inter_overflow: %d", level); } p++; } while (!last);