--- decoder.c 2002/03/28 20:57:24 1.7 +++ decoder.c 2002/05/03 00:41:22 1.14 @@ -1,46 +1,55 @@ /************************************************************************** * - * XVID MPEG-4 VIDEO CODEC - * decoder main + * XVID MPEG-4 VIDEO CODEC + * - Decoder main module - * - * This program 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. + * This program 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. * - * This program is xvid_free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the xvid_free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * 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. + * 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 xvid_free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + * 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 * *************************************************************************/ /************************************************************************** * - * History: + * History: * + * 02.05.2002 add B-frame decode support(have some problem); + * MinChen + * 22.04.2002 add some B-frame decode support; chenm001 + * 29.03.2002 interlacing fix - compensated block wasn't being used when + * reconstructing blocks, thus artifacts + * interlacing speedup - used transfers to re-interlace + * interlaced decoding should be as fast as progressive now * 26.03.2002 interlacing support - moved transfers outside decode loop - * 26.12.2001 decoder_mbinter: dequant/idct moved within if(coded) block - * 22.12.2001 block based interpolation - * 01.12.2001 inital version; (c)2001 peter ross + * 26.12.2001 decoder_mbinter: dequant/idct moved within if(coded) block + * 22.12.2001 lock based interpolation + * 01.12.2001 inital version; (c)2001 peter ross + * + * $Id: decoder.c,v 1.14 2002/05/03 00:41:22 chenm001 Exp $ * *************************************************************************/ #include -#include // memset +#include #include "xvid.h" #include "portab.h" @@ -55,7 +64,6 @@ #include "dct/fdct.h" #include "utils/mem_transfer.h" #include "image/interpolate8x8.h" -#include "utils/mbfunctions.h" #include "bitstream/mbcoding.h" #include "prediction/mbprediction.h" @@ -92,37 +100,75 @@ return XVID_ERR_MEMORY; } - if (image_create(&dec->refn, dec->edged_width, dec->edged_height)) + if (image_create(&dec->refn[0], dec->edged_width, dec->edged_height)) { image_destroy(&dec->cur, dec->edged_width, dec->edged_height); xvid_free(dec); return XVID_ERR_MEMORY; } + // add by chenm001 + // for support B-frame to reference last 2 frame + if (image_create(&dec->refn[1], dec->edged_width, dec->edged_height)) + { + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + if (image_create(&dec->refn[2], dec->edged_width, dec->edged_height)) + { + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } dec->mbs = xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, CACHE_LINE); if (dec->mbs == NULL) { image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + // add by chenm001 + // for skip MB flag + dec->last_mbs = xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, CACHE_LINE); + if (dec->last_mbs == NULL) + { + xvid_free(dec->mbs); + image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); xvid_free(dec); return XVID_ERR_MEMORY; } init_timer(); - create_vlc_tables(); + // add by chenm001 + // for support B-frame to save reference frame's time + dec->frames = -1; + dec->time = dec->time_base = dec->last_time_base = 0; + return XVID_ERR_OK; } int decoder_destroy(DECODER * dec) { + xvid_free(dec->last_mbs); xvid_free(dec->mbs); - image_destroy(&dec->refn, dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[0], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[1], dec->edged_width, dec->edged_height); + image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); image_destroy(&dec->cur, dec->edged_width, dec->edged_height); xvid_free(dec); - destroy_vlc_tables(); - write_timer(); return XVID_ERR_OK; } @@ -135,6 +181,8 @@ }; + + // decode an intra macroblock void decoder_mbintra(DECODER * dec, @@ -151,14 +199,16 @@ DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE); DECLARE_ALIGNED_MATRIX(data, 6, 64, int16_t, CACHE_LINE); - const uint32_t stride = dec->edged_width; + uint32_t stride = dec->edged_width; + uint32_t stride2 = stride / 2; + uint32_t next_block = stride * 8; uint32_t i; uint32_t iQuant = pMB->quant; uint8_t *pY_Cur, *pU_Cur, *pV_Cur; pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4); - pU_Cur = dec->cur.u + (y_pos << 3) * (stride >> 1) + (x_pos << 3); - pV_Cur = dec->cur.v + (y_pos << 3) * (stride >> 1) + (x_pos << 3); + pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3); + pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3); memset(block, 0, 6*64*sizeof(int16_t)); // clear @@ -224,20 +274,19 @@ stop_idct_timer(); } - start_timer(); if (dec->interlacing && pMB->field_dct) { - MBFieldToFrame(data); + next_block = stride; + stride *= 2; } - stop_interlacing_timer(); start_timer(); transfer_16to8copy(pY_Cur, &data[0*64], stride); transfer_16to8copy(pY_Cur + 8, &data[1*64], stride); - transfer_16to8copy(pY_Cur + 8 * stride, &data[2*64], stride); - transfer_16to8copy(pY_Cur + 8 + 8 * stride, &data[3*64], stride); - transfer_16to8copy(pU_Cur, &data[4*64], stride / 2); - transfer_16to8copy(pV_Cur, &data[5*64], stride / 2); + transfer_16to8copy(pY_Cur + next_block, &data[2*64], stride); + transfer_16to8copy(pY_Cur + 8 + next_block, &data[3*64], stride); + transfer_16to8copy(pU_Cur, &data[4*64], stride2); + transfer_16to8copy(pV_Cur, &data[5*64], stride2); stop_transfer_timer(); } @@ -267,16 +316,17 @@ DECLARE_ALIGNED_MATRIX(block,6, 64, int16_t, CACHE_LINE); DECLARE_ALIGNED_MATRIX(data, 6, 64, int16_t, CACHE_LINE); - const uint32_t stride = dec->edged_width; - const uint32_t stride2 = dec->edged_width / 2; + uint32_t stride = dec->edged_width; + uint32_t stride2 = stride / 2; + uint32_t next_block = stride * 8; uint32_t i; uint32_t iQuant = pMB->quant; uint8_t *pY_Cur, *pU_Cur, *pV_Cur; int uv_dx, uv_dy; pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4); - pU_Cur = dec->cur.u + (y_pos << 3) * (stride >> 1) + (x_pos << 3); - pV_Cur = dec->cur.v + (y_pos << 3) * (stride >> 1) + (x_pos << 3); + pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3); + pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3); if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) { @@ -297,12 +347,12 @@ } start_timer(); - interpolate8x8_switch(dec->cur.y, dec->refn.y, 16*x_pos, 16*y_pos , pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); - interpolate8x8_switch(dec->cur.y, dec->refn.y, 16*x_pos + 8, 16*y_pos , pMB->mvs[1].x, pMB->mvs[1].y, stride, rounding); - interpolate8x8_switch(dec->cur.y, dec->refn.y, 16*x_pos, 16*y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, rounding); - interpolate8x8_switch(dec->cur.y, dec->refn.y, 16*x_pos + 8, 16*y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, rounding); - interpolate8x8_switch(dec->cur.u, dec->refn.u, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, rounding); - interpolate8x8_switch(dec->cur.v, dec->refn.v, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos , pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos , pMB->mvs[1].x, pMB->mvs[1].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y, 16*x_pos + 8, 16*y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, rounding); + interpolate8x8_switch(dec->cur.u, dec->refn[0].u, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, rounding); + interpolate8x8_switch(dec->cur.v, dec->refn[0].v, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, rounding); stop_comp_timer(); for (i = 0; i < 6; i++) @@ -332,12 +382,11 @@ } } - start_timer(); - if (pMB->field_dct) + if (dec->interlacing && pMB->field_dct) { - MBFieldToFrame(data); + next_block = stride; + stride *= 2; } - stop_interlacing_timer(); start_timer(); if (cbp & 32) @@ -345,13 +394,13 @@ if (cbp & 16) transfer_16to8add(pY_Cur + 8, &data[1*64], stride); if (cbp & 8) - transfer_16to8add(pY_Cur + 8 * stride, &data[2*64], stride); + transfer_16to8add(pY_Cur + next_block, &data[2*64], stride); if (cbp & 4) - transfer_16to8add(pY_Cur + 8 + 8 * stride, &data[3*64], stride); + transfer_16to8add(pY_Cur + 8 + next_block, &data[3*64], stride); if (cbp & 2) - transfer_16to8add(pU_Cur, &data[4*64], stride / 2); + transfer_16to8add(pU_Cur, &data[4*64], stride2); if (cbp & 1) - transfer_16to8add(pV_Cur, &data[5*64], stride / 2); + transfer_16to8add(pV_Cur, &data[5*64], stride2); stop_transfer_timer(); } @@ -424,7 +473,7 @@ int range = (64 * scale_fac); VECTOR pmv[4]; - uint32_t psad[4]; + int32_t psad[4]; int mv_x, mv_y; int pmv_x, pmv_y; @@ -470,10 +519,8 @@ uint32_t x, y; - image_swap(&dec->cur, &dec->refn); - start_timer(); - image_setedges(&dec->refn, dec->edged_width, dec->edged_height, dec->width, dec->height, dec->interlacing); + image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height, dec->width, dec->height, dec->interlacing); stop_edges_timer(); for (y = 0; y < dec->mb_height; y++) @@ -482,7 +529,8 @@ { MACROBLOCK * mb = &dec->mbs[y*dec->mb_width + x]; - if (!BitstreamGetBit(bs)) // not_coded + //if (!(dec->mb_skip[y*dec->mb_width + x]=BitstreamGetBit(bs))) // not_coded + if (!(BitstreamGetBit(bs))) // not_coded { uint32_t mcbpc; uint32_t cbpc; @@ -580,7 +628,7 @@ else // not coded { - mb->mode = MODE_NOT_CODED; + mb->mode = MODE_NOT_CODED; mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = 0; mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = 0; @@ -589,27 +637,27 @@ start_timer(); transfer8x8_copy(dec->cur.y + (16*y)*dec->edged_width + (16*x), - dec->refn.y + (16*y)*dec->edged_width + (16*x), + dec->refn[0].y + (16*y)*dec->edged_width + (16*x), dec->edged_width); transfer8x8_copy(dec->cur.y + (16*y)*dec->edged_width + (16*x+8), - dec->refn.y + (16*y)*dec->edged_width + (16*x+8), + dec->refn[0].y + (16*y)*dec->edged_width + (16*x+8), dec->edged_width); transfer8x8_copy(dec->cur.y + (16*y+8)*dec->edged_width + (16*x), - dec->refn.y + (16*y+8)*dec->edged_width + (16*x), + dec->refn[0].y + (16*y+8)*dec->edged_width + (16*x), dec->edged_width); transfer8x8_copy(dec->cur.y + (16*y+8)*dec->edged_width + (16*x+8), - dec->refn.y + (16*y+8)*dec->edged_width + (16*x+8), + dec->refn[0].y + (16*y+8)*dec->edged_width + (16*x+8), dec->edged_width); transfer8x8_copy(dec->cur.u + (8*y)*dec->edged_width/2 + (8*x), - dec->refn.u + (8*y)*dec->edged_width/2 + (8*x), + dec->refn[0].u + (8*y)*dec->edged_width/2 + (8*x), dec->edged_width/2); transfer8x8_copy(dec->cur.v + (8*y)*dec->edged_width/2 + (8*x), - dec->refn.v + (8*y)*dec->edged_width/2 + (8*x), + dec->refn[0].v + (8*y)*dec->edged_width/2 + (8*x), dec->edged_width/2); stop_transfer_timer(); @@ -618,31 +666,465 @@ } } + +// add by MinChen +// decode B-frame motion vector +void get_b_motion_vector(DECODER *dec, Bitstream *bs, int x, int y, VECTOR * mv, int fcode, const VECTOR pmv) +{ + int scale_fac = 1 << (fcode - 1); + int high = (32 * scale_fac) - 1; + int low = ((-32) * scale_fac); + int range = (64 * scale_fac); + + int mv_x, mv_y; + int pmv_x, pmv_y; + + pmv_x = pmv.x; + pmv_y = pmv.y; + + mv_x = get_mv(bs, fcode); + mv_y = get_mv(bs, fcode); + + mv_x += pmv_x; + mv_y += pmv_y; + + if (mv_x < low) + { + mv_x += range; + } + else if (mv_x > high) + { + mv_x -= range; + } + + if (mv_y < low) + { + mv_y += range; + } + else if (mv_y > high) + { + mv_y -= range; + } + + mv->x = mv_x; + mv->y = mv_y; + +} + + +// add by MinChen +// decode an B-frame forward & backward inter macroblock +void decoder_bf_mbinter(DECODER * dec, + const MACROBLOCK * pMB, + const uint32_t x_pos, + const uint32_t y_pos, + const uint32_t cbp, + Bitstream * bs, + const uint32_t quant, + const uint8_t ref) +{ + + DECLARE_ALIGNED_MATRIX(block,6, 64, int16_t, CACHE_LINE); + DECLARE_ALIGNED_MATRIX(data, 6, 64, int16_t, CACHE_LINE); + + uint32_t stride = dec->edged_width; + uint32_t stride2 = stride / 2; + uint32_t next_block = stride * 8; + uint32_t i; + uint32_t iQuant = pMB->quant; + uint8_t *pY_Cur, *pU_Cur, *pV_Cur; + int uv_dx, uv_dy; + + pY_Cur = dec->cur.y + (y_pos << 4) * stride + (x_pos << 4); + pU_Cur = dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3); + pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3); + + if (!(pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) + { + uv_dx = pMB->mvs[0].x; + uv_dy = pMB->mvs[0].y; + + uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; + uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; + } + else + { + int sum; + sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; + uv_dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2) ); + + sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y; + uv_dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2) ); + } + + start_timer(); + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos, 16*y_pos , pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos + 8, 16*y_pos , pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos, 16*y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, 0); + interpolate8x8_switch(dec->cur.y, dec->refn[ref].y, 16*x_pos + 8, 16*y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, 0); + interpolate8x8_switch(dec->cur.u, dec->refn[ref].u, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, 0); + interpolate8x8_switch(dec->cur.v, dec->refn[ref].v, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, 0); + stop_comp_timer(); + + for (i = 0; i < 6; i++) + { + if (cbp & (1 << (5-i))) // coded + { + memset(&block[i*64], 0, 64 * sizeof(int16_t)); // clear + + start_timer(); + get_inter_block(bs, &block[i*64]); + stop_coding_timer(); + + start_timer(); + if (dec->quant_type == 0) + { + dequant_inter(&data[i*64], &block[i*64], iQuant); + } + else + { + dequant4_inter(&data[i*64], &block[i*64], iQuant); + } + stop_iquant_timer(); + + start_timer(); + idct(&data[i*64]); + stop_idct_timer(); + } + } + + if (dec->interlacing && pMB->field_dct) + { + next_block = stride; + stride *= 2; + } + + start_timer(); + if (cbp & 32) + transfer_16to8add(pY_Cur, &data[0*64], stride); + if (cbp & 16) + transfer_16to8add(pY_Cur + 8, &data[1*64], stride); + if (cbp & 8) + transfer_16to8add(pY_Cur + next_block, &data[2*64], stride); + if (cbp & 4) + transfer_16to8add(pY_Cur + 8 + next_block, &data[3*64], stride); + if (cbp & 2) + transfer_16to8add(pU_Cur, &data[4*64], stride2); + if (cbp & 1) + transfer_16to8add(pV_Cur, &data[5*64], stride2); + stop_transfer_timer(); +} + + +// add by MinChen +// decode an B-frame direct & inter macroblock +void decoder_bf_interpolate_mbinter(DECODER * dec, + IMAGE forward, IMAGE backward, + const MACROBLOCK * pMB, + const uint32_t x_pos, + const uint32_t y_pos, + Bitstream * bs) +{ + + DECLARE_ALIGNED_MATRIX(block,6, 64, int16_t, CACHE_LINE); + DECLARE_ALIGNED_MATRIX(data, 6, 64, int16_t, CACHE_LINE); + + uint32_t stride = dec->edged_width; + uint32_t stride2 = stride / 2; + uint32_t next_block = stride * 8; + uint32_t iQuant = pMB->quant; + int uv_dx, uv_dy; + int b_uv_dx, b_uv_dy; + + if ((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) + { + uv_dx = pMB->mvs[0].x; + uv_dy = pMB->mvs[0].y; + + uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; + uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; + + b_uv_dx = pMB->b_mvs[0].x; + b_uv_dy = pMB->b_mvs[0].y; + + b_uv_dx = (uv_dx & 3) ? (uv_dx >> 1) | 1 : uv_dx / 2; + b_uv_dy = (uv_dy & 3) ? (uv_dy >> 1) | 1 : uv_dy / 2; + } + else + { + int sum; + sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; + uv_dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2) ); + + sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y; + uv_dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2) ); + + sum = pMB->b_mvs[0].x + pMB->b_mvs[1].x + pMB->b_mvs[2].x + pMB->b_mvs[3].x; + b_uv_dx = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2) ); + + sum = pMB->b_mvs[0].y + pMB->b_mvs[1].y + pMB->b_mvs[2].y + pMB->b_mvs[3].y; + b_uv_dy = (sum == 0 ? 0 : SIGN(sum) * (roundtab[ABS(sum) % 16] + (ABS(sum) / 16) * 2) ); + } + + + start_timer(); + + interpolate8x8_switch(dec->cur.y, forward.y, 16*x_pos, 16*y_pos , pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + interpolate8x8_switch(dec->cur.y, forward.y, 16*x_pos + 8, 16*y_pos , pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); + interpolate8x8_switch(dec->cur.y, forward.y, 16*x_pos, 16*y_pos + 8, pMB->mvs[2].x, pMB->mvs[2].y, stride, 0); + interpolate8x8_switch(dec->cur.y, forward.y, 16*x_pos + 8, 16*y_pos + 8, pMB->mvs[3].x, pMB->mvs[3].y, stride, 0); + interpolate8x8_switch(dec->cur.u, forward.u, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, 0); + interpolate8x8_switch(dec->cur.v, forward.v, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2, 0); + + interpolate8x8_switch(dec->refn[2].y, backward.y, 16*x_pos, 16*y_pos , pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); + interpolate8x8_switch(dec->refn[2].y, backward.y, 16*x_pos + 8, 16*y_pos , pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, 0); + interpolate8x8_switch(dec->refn[2].y, backward.y, 16*x_pos, 16*y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y, stride, 0); + interpolate8x8_switch(dec->refn[2].y, backward.y, 16*x_pos + 8, 16*y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y, stride, 0); + interpolate8x8_switch(dec->refn[2].u, backward.u, 8*x_pos, 8*y_pos, b_uv_dx, b_uv_dy, stride2, 0); + interpolate8x8_switch(dec->refn[2].v, backward.v, 8*x_pos, 8*y_pos, b_uv_dx, b_uv_dy, stride2, 0); + + interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16*x_pos, 16*y_pos , stride); + interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16*x_pos + 8, 16*y_pos , stride); + interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16*x_pos, 16*y_pos + 8, stride); + interpolate8x8_c(dec->cur.y, dec->refn[2].y, 16*x_pos + 8, 16*y_pos + 8, stride); + interpolate8x8_c(dec->cur.u, dec->refn[2].u, 8*x_pos, 8*y_pos, stride2); + interpolate8x8_c(dec->cur.v, dec->refn[2].v, 8*x_pos, 8*y_pos, stride2); + +/* + interpolate8x8_c(dec->cur.y, backward.y, 16*x_pos, 16*y_pos , pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride); + interpolate8x8_c(dec->cur.y, backward.y, 16*x_pos + 8, 16*y_pos , pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride); + interpolate8x8_c(dec->cur.y, backward.y, 16*x_pos, 16*y_pos + 8, pMB->b_mvs[2].x, pMB->b_mvs[2].y, stride); + interpolate8x8_c(dec->cur.y, backward.y, 16*x_pos + 8, 16*y_pos + 8, pMB->b_mvs[3].x, pMB->b_mvs[3].y, stride); + interpolate8x8_c(dec->cur.u, backward.u, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2); + interpolate8x8_c(dec->cur.v, backward.v, 8*x_pos, 8*y_pos, uv_dx, uv_dy, stride2); +*/ + stop_comp_timer(); + + +} + + +// add by MinChen +// for decode B-frame dbquant +int32_t __inline get_dbquant(Bitstream * bs) +{ + if (!BitstreamGetBit(bs)) // '0' + return(0); + else if (!BitstreamGetBit(bs)) // '10' + return(-2); + else + return(2); // '11' +} + +// add by MinChen +// for decode B-frame mb_type +// bit ret_value +// 1 0 +// 01 1 +// 001 2 +// 0001 3 +int32_t __inline get_mbtype(Bitstream * bs) +{ + int32_t mb_type=0; + for(;mb_type<=3 && (!BitstreamGetBit(bs));mb_type++); + if (mb_type<=3) + return(mb_type); + else + return(-1); +} + +void decoder_bframe(DECODER * dec, Bitstream * bs, int quant, int fcode_forward, int fcode_backward) +{ + + uint32_t x, y; + VECTOR mv, zeromv; + + start_timer(); + image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height, dec->width, dec->height, dec->interlacing); + //image_setedges(&dec->refn[1], dec->edged_width, dec->edged_height, dec->width, dec->height, dec->interlacing); + stop_edges_timer(); + + for (y = 0; y < dec->mb_height; y++) + { + for (x = 0; x < dec->mb_width; x++) + { + MACROBLOCK * mb = &dec->mbs[y*dec->mb_width + x]; + MACROBLOCK * last_mb = &dec->last_mbs[y*dec->mb_width + x]; + + // the last P_VOP is skip macroblock ? + + if (last_mb->mode == MODE_NOT_CODED){ + DEBUG("Skip MB in B-frame!"); + + // copy macroblock directly from ref to cur + start_timer(); + transfer8x8_copy(dec->cur.y + (16*y)*dec->edged_width + (16*x), + dec->refn[0].y + (16*y)*dec->edged_width + (16*x), + dec->edged_width); + transfer8x8_copy(dec->cur.y + (16*y)*dec->edged_width + (16*x+8), + dec->refn[0].y + (16*y)*dec->edged_width + (16*x+8), + dec->edged_width); + transfer8x8_copy(dec->cur.y + (16*y+8)*dec->edged_width + (16*x), + dec->refn[0].y + (16*y+8)*dec->edged_width + (16*x), + dec->edged_width); + transfer8x8_copy(dec->cur.y + (16*y+8)*dec->edged_width + (16*x+8), + dec->refn[0].y + (16*y+8)*dec->edged_width + (16*x+8), + dec->edged_width); + transfer8x8_copy(dec->cur.u + (8*y)*dec->edged_width/2 + (8*x), + dec->refn[0].u + (8*y)*dec->edged_width/2 + (8*x), + dec->edged_width/2); + transfer8x8_copy(dec->cur.v + (8*y)*dec->edged_width/2 + (8*x), + dec->refn[0].v + (8*y)*dec->edged_width/2 + (8*x), + dec->edged_width/2); + stop_transfer_timer(); + + DEBUG("skip MB in B-frame!"); + continue; + } + + if (!BitstreamGetBit(bs)){ // modb=='0' + uint8_t modb2=BitstreamGetBit(bs); + + mb->mb_type = get_mbtype(bs); + + if (!modb2){ // modb=='00' + mb->cbp = BitstreamGetBits(bs,6); + } else { + mb->cbp = 0; + } + if (mb->mb_type && mb->cbp){ + quant += get_dbquant(bs); + + if (quant > 31) + { + quant = 31; + } + else if (mb->quant < 1) + { + quant = 1; + } + } + mb->quant = quant; + } else { + mb->mb_type = MODE_DIRECT_NONE_MV; + mb->cbp = 0; + } + + mb->mb_type = MODE_INTER; + mb->mvs[0].x=mb->mvs[0].y=zeromv.x = zeromv.y = mv.x = mv.y = 0; + //DEBUG1("Switch bm_type=",mb->mb_type); + + switch(mb->mb_type) + { + case MODE_DIRECT: + get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], 1, zeromv); + + case MODE_DIRECT_NONE_MV: + { // Because this file is a C file not C++ so I use '{' to define var + const int32_t TRB=dec->time_pp-dec->time_bp, + TRD=dec->time_pp; + int i; + for(i=0;i<4;i++){ + mb->mvs[i].x = (TRB * last_mb->mvs[i].x)/TRD+mb->mvs[0].x; + mb->b_mvs[i].x = (mb->mvs[0].x==0)?((TRB-TRD)*last_mb->mvs[i].x)/TRD:mb->mvs[i].x-last_mb->mvs[i].x; + mb->mvs[i].y = (TRB * last_mb->mvs[i].y)/TRD+mb->mvs[0].y; + mb->b_mvs[i].y = (mb->mvs[0].y==0)?((TRB-TRD)*last_mb->mvs[i].y)/TRD:mb->mvs[i].y-last_mb->mvs[i].y; + + //DEBUG2("B-direct MVF=",mb->mvs[i].x,mb->mvs[i].y); + //DEBUG2("B-direct MVB=",mb->b_mvs[i].x,mb->b_mvs[i].y); + } + //DEBUG("B-frame Direct!\n"); + } + mb->mode = MODE_INTER4V; + decoder_bf_interpolate_mbinter(dec, dec->refn[1], dec->refn[0], mb, x, y, bs); + break; + + case MODE_INTERPOLATE: + get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], fcode_forward, dec->p_fmv); + dec->p_fmv.x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; + dec->p_fmv.y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = mb->mvs[0].y; + + get_b_motion_vector(dec, bs, x, y, &mb->b_mvs[0], fcode_backward, dec->p_bmv); + dec->p_bmv.x = mb->b_mvs[1].x = mb->b_mvs[2].x = mb->b_mvs[3].x = mb->b_mvs[0].x; + dec->p_bmv.y = mb->b_mvs[1].y = mb->b_mvs[2].y = mb->b_mvs[3].y = mb->b_mvs[0].y; + + mb->mode = MODE_INTER4V; + decoder_bf_interpolate_mbinter(dec, dec->refn[1], dec->refn[0], mb, x, y, bs); + //DEBUG("B-frame Bidir!\n"); + break; + + case MODE_BACKWARD: + get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], fcode_backward, dec->p_bmv); + dec->p_bmv.x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; + dec->p_bmv.y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = mb->mvs[0].y; + decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, quant, 0); + //DEBUG("B-frame Backward!\n"); + break; + + case MODE_FORWARD: + get_b_motion_vector(dec, bs, x, y, &mb->mvs[0], fcode_forward, dec->p_fmv); + dec->p_fmv.x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; + dec->p_fmv.y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = mb->mvs[0].y; + decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, quant, 1); + DEBUG("B-frame Forward!\n"); + break; + + default: + DEBUG1("Not support B-frame mb_type =",mb->mb_type); + } + + } // end of FOR + } +} + +// swap two MACROBLOCK array +void mb_swap(MACROBLOCK *mb1, MACROBLOCK *mb2) +{ + MACROBLOCK *temp=mb1; + mb1=mb2; + mb2=temp; +} + int decoder_decode(DECODER * dec, XVID_DEC_FRAME * frame) { Bitstream bs; uint32_t rounding; uint32_t quant; - uint32_t fcode; + uint32_t fcode_forward; + uint32_t fcode_backward; uint32_t intra_dc_threshold; + uint32_t vop_type; start_global_timer(); BitstreamInit(&bs, frame->bitstream, frame->length); - switch (BitstreamReadHeaders(&bs, dec, &rounding, &quant, &fcode, &intra_dc_threshold)) + // add by chenm001 + // for support B-frame to reference last 2 frame + dec->frames ++; + vop_type=BitstreamReadHeaders(&bs, dec, &rounding, &quant, &fcode_forward, &fcode_backward, &intra_dc_threshold); + + dec->p_bmv.x=dec->p_bmv.y=dec->p_fmv.y=dec->p_fmv.y=0; // init pred vector to 0 + switch (vop_type) { case P_VOP : - decoder_pframe(dec, &bs, rounding, quant, fcode, intra_dc_threshold); + decoder_pframe(dec, &bs, rounding, quant, fcode_forward, intra_dc_threshold); + DEBUG1("P_VOP Time=",dec->time); break; case I_VOP : - //DEBUG1("",intra_dc_threshold); decoder_iframe(dec, &bs, quant, intra_dc_threshold); + DEBUG1("I_VOP Time=",dec->time); break; - case B_VOP : // ignore + case B_VOP : + if (dec->time_pp > dec->time_bp){ + decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward); + DEBUG1("B_VOP Time=",dec->time); + } else { + DEBUG("broken B-frame!"); + } break; case N_VOP : // vop not coded @@ -654,11 +1136,25 @@ frame->length = BitstreamPos(&bs) / 8; - start_timer(); - image_output(&dec->cur, dec->width, dec->height, dec->edged_width, - frame->image, frame->stride, frame->colorspace); - stop_conv_timer(); - + if (dec->frames >= 1){ + start_timer(); + if ((vop_type == I_VOP || vop_type == P_VOP)) + { + image_output(&dec->refn[1], dec->width, dec->height, dec->edged_width, + frame->image, frame->stride, frame->colorspace); + } else if (vop_type == B_VOP) { + image_output(&dec->cur, dec->width, dec->height, dec->edged_width, + frame->image, frame->stride, frame->colorspace); + } + stop_conv_timer(); + } + if (vop_type==I_VOP || vop_type==P_VOP){ + image_swap(&dec->refn[0], &dec->refn[1]); + image_swap(&dec->cur, &dec->refn[0]); + // swap MACROBLOCK + mb_swap(dec->mbs, dec->last_mbs); + } + emms(); stop_global_timer();