--- decoder.c 2002/11/07 10:28:15 1.37.2.8 +++ decoder.c 2003/02/22 08:49:44 1.49.2.1 @@ -1,16 +1,9 @@ -/************************************************************************** +/***************************************************************************** * * XVID MPEG-4 VIDEO CODEC - * - Decoder main module - + * - Decoder 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 file is part of XviD, a free MPEG-4 video encoder/decoder * * 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 @@ -26,39 +19,11 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - *************************************************************************/ - -/************************************************************************** - * - * History: - * - * 15.07.2002 fix a bug in B-frame decode at DIRECT mode - * MinChen - * 10.07.2002 added BFRAMES_DEC_DEBUG support - * Fix a little bug for low_delay flage - * MinChen - * 28.06.2002 added basic resync support to iframe/pframe_decode() - * 22.06.2002 added primative N_VOP support - * #define BFRAMES_DEC now enables Minchen's bframe decoder - * 08.05.2002 add low_delay support for B_VOP decode - * MinChen - * 05.05.2002 fix some B-frame decode problem - * 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 lock based interpolation - * 01.12.2001 inital version; (c)2001 peter ross + * $Id: decoder.c,v 1.49.2.1 2003/02/22 08:49:44 suxen_drol Exp $ * - * $Id: decoder.c,v 1.37.2.8 2002/11/07 10:28:15 suxen_drol Exp $ - * - *************************************************************************/ + ****************************************************************************/ +#include #include #include @@ -68,6 +33,7 @@ #include "xvid.h" #include "portab.h" +#include "global.h" #include "decoder.h" #include "bitstream/bitstream.h" @@ -79,6 +45,8 @@ #include "dct/fdct.h" #include "utils/mem_transfer.h" #include "image/interpolate8x8.h" +#include "image/reduced.h" +#include "image/font.h" #include "bitstream/mbcoding.h" #include "prediction/mbprediction.h" @@ -94,12 +62,13 @@ decoder_resize(DECODER * dec) { /* free existing */ - + 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); - image_destroy(&dec->refh, dec->edged_width, dec->edged_height); - image_destroy(&dec->cur, dec->edged_width, dec->edged_height); + image_destroy(&dec->tmp, dec->edged_width, dec->edged_height); + image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height); + + image_destroy(&dec->gmc, dec->edged_width, dec->edged_height); if (dec->last_mbs) xvid_free(dec->last_mbs); @@ -107,7 +76,6 @@ xvid_free(dec->mbs); /* realloc */ - dec->mb_width = (dec->width + 15) / 16; dec->mb_height = (dec->height + 15) / 16; @@ -125,15 +93,14 @@ return XVID_ERR_MEMORY; } - // add by chenm001 - // for support B-frame to reference last 2 frame + /* 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)) { + if (image_create(&dec->tmp, 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); @@ -141,11 +108,21 @@ return XVID_ERR_MEMORY; } - if (image_create(&dec->refh, dec->edged_width, dec->edged_height)) { + if (image_create(&dec->qtmp, 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); - image_destroy(&dec->refn[2], dec->edged_width, dec->edged_height); + image_destroy(&dec->tmp, dec->edged_width, dec->edged_height); + xvid_free(dec); + return XVID_ERR_MEMORY; + } + + if (image_create(&dec->gmc, dec->edged_width, dec->edged_height)) { + image_destroy(&dec->qtmp, 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); + image_destroy(&dec->tmp, dec->edged_width, dec->edged_height); xvid_free(dec); return XVID_ERR_MEMORY; } @@ -157,15 +134,14 @@ 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); - image_destroy(&dec->refh, dec->edged_width, dec->edged_height); + image_destroy(&dec->tmp, dec->edged_width, dec->edged_height); + image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height); xvid_free(dec); return XVID_ERR_MEMORY; } memset(dec->mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); - // add by chenm001 - // for skip MB flag + /* For skip MB flag */ dec->last_mbs = xvid_malloc(sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height, CACHE_LINE); @@ -174,57 +150,64 @@ 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); - image_destroy(&dec->refh, dec->edged_width, dec->edged_height); + image_destroy(&dec->tmp, dec->edged_width, dec->edged_height); + image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height); xvid_free(dec); return XVID_ERR_MEMORY; } memset(dec->last_mbs, 0, sizeof(MACROBLOCK) * dec->mb_width * dec->mb_height); - return XVID_ERR_OK; + return 0; } int -decoder_create(XVID_DEC_PARAM * param) +decoder_create(xvid_dec_create_t * create) { DECODER *dec; + if (XVID_MAJOR(create->version) != 1) /* v1.x.x */ + return XVID_ERR_VERSION; + dec = xvid_malloc(sizeof(DECODER), CACHE_LINE); if (dec == NULL) { return XVID_ERR_MEMORY; } memset(dec, 0, sizeof(DECODER)); - param->handle = dec; + create->handle = dec; - dec->width = param->width; - dec->height = param->height; + dec->width = create->width; + dec->height = create->height; image_null(&dec->cur); image_null(&dec->refn[0]); image_null(&dec->refn[1]); - image_null(&dec->refn[2]); - image_null(&dec->refh); + image_null(&dec->tmp); + image_null(&dec->qtmp); + + /* image based GMC */ + image_null(&dec->gmc); + dec->mbs = NULL; dec->last_mbs = NULL; init_timer(); - // add by chenm001 - // for support B-frame to save reference frame's time - dec->frames = -1; + /* For B-frame support (used to save reference frame's time */ + dec->frames = 0; dec->time = dec->time_base = dec->last_time_base = 0; dec->low_delay = 0; + dec->packed_mode = 0; dec->fixed_dimensions = (dec->width > 0 && dec->height > 0); if (dec->fixed_dimensions) return decoder_resize(dec); else - return XVID_ERR_OK; + return 0; } @@ -233,15 +216,19 @@ { xvid_free(dec->last_mbs); xvid_free(dec->mbs); + + /* image based GMC */ + image_destroy(&dec->gmc, 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->refh, dec->edged_width, dec->edged_height); + image_destroy(&dec->tmp, dec->edged_width, dec->edged_height); + image_destroy(&dec->qtmp, dec->edged_width, dec->edged_height); image_destroy(&dec->cur, dec->edged_width, dec->edged_height); xvid_free(dec); write_timer(); - return XVID_ERR_OK; + return 0; } @@ -253,8 +240,7 @@ -// decode an intra macroblock - +/* decode an intra macroblock */ void decoder_mbintra(DECODER * dec, MACROBLOCK * pMB, @@ -265,7 +251,8 @@ Bitstream * bs, const uint32_t quant, const uint32_t intra_dc_threshold, - const unsigned int bound) + const unsigned int bound, + const int reduced_resolution) { DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE); @@ -278,11 +265,17 @@ 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) * stride2 + (x_pos << 3); - pV_Cur = dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3); + if (reduced_resolution) { + pY_Cur = dec->cur.y + (y_pos << 5) * stride + (x_pos << 5); + pU_Cur = dec->cur.u + (y_pos << 4) * stride2 + (x_pos << 4); + pV_Cur = dec->cur.v + (y_pos << 4) * stride2 + (x_pos << 4); + }else{ + 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); + } - memset(block, 0, 6 * 64 * sizeof(int16_t)); // clear + memset(block, 0, 6 * 64 * sizeof(int16_t)); /* clear */ for (i = 0; i < 6; i++) { uint32_t iDcScaler = get_dc_scaler(iQuant, i < 4); @@ -305,7 +298,7 @@ dc_dif = dc_size ? get_dc_dif(bs, dc_size) : 0; if (dc_size > 8) { - BitstreamSkip(bs, 1); // marker + BitstreamSkip(bs, 1); /* marker */ } block[i * 64 + 0] = dc_dif; @@ -317,7 +310,7 @@ } start_timer(); - if (cbp & (1 << (5 - i))) // coded + if (cbp & (1 << (5 - i))) /* coded */ { int direction = dec->alternate_vertical_scan ? 2 : pMB->acpred_directions[i]; @@ -341,6 +334,7 @@ start_timer(); idct(&data[i * 64]); stop_idct_timer(); + } if (dec->interlacing && pMB->field_dct) { @@ -349,34 +343,42 @@ } start_timer(); - transfer_16to8copy(pY_Cur, &data[0 * 64], stride); - transfer_16to8copy(pY_Cur + 8, &data[1 * 64], stride); - 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); + + if (reduced_resolution) + { + next_block*=2; + copy_upsampled_8x8_16to8(pY_Cur, &data[0 * 64], stride); + copy_upsampled_8x8_16to8(pY_Cur + 16, &data[1 * 64], stride); + copy_upsampled_8x8_16to8(pY_Cur + next_block, &data[2 * 64], stride); + copy_upsampled_8x8_16to8(pY_Cur + 16 + next_block, &data[3 * 64], stride); + copy_upsampled_8x8_16to8(pU_Cur, &data[4 * 64], stride2); + copy_upsampled_8x8_16to8(pV_Cur, &data[5 * 64], stride2); + }else{ + transfer_16to8copy(pY_Cur, &data[0 * 64], stride); + transfer_16to8copy(pY_Cur + 8, &data[1 * 64], stride); + 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(); } - -#define SIGN(X) (((X)>0)?1:-1) -#define ABS(X) (((X)>0)?(X):-(X)) - -// decode an inter macroblock - +/* decode an inter macroblock */ void decoder_mbinter(DECODER * dec, const MACROBLOCK * pMB, const uint32_t x_pos, const uint32_t y_pos, - const uint32_t acpred_flag, + const uint32_t fcode, const uint32_t cbp, Bitstream * bs, const uint32_t quant, - const uint32_t rounding) + const uint32_t rounding, + const int reduced_resolution) { DECLARE_ALIGNED_MATRIX(block, 6, 64, int16_t, CACHE_LINE); @@ -384,108 +386,144 @@ uint32_t stride = dec->edged_width; uint32_t stride2 = stride / 2; - uint32_t next_block = stride * 8; + uint32_t next_block = stride * (reduced_resolution ? 16 : 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; + int uv_dx, uv_dy; + VECTOR mv[4]; /* local copy of mvs */ - if (dec->quarterpel) - { - uv_dx /= 2; - uv_dy /= 2; + if (reduced_resolution) { + pY_Cur = dec->cur.y + (y_pos << 5) * stride + (x_pos << 5); + pU_Cur = dec->cur.u + (y_pos << 4) * stride2 + (x_pos << 4); + pV_Cur = dec->cur.v + (y_pos << 4) * stride2 + (x_pos << 4); + for (i = 0; i < 4; i++) { + mv[i].x = RRV_MV_SCALEUP(pMB->mvs[i].x); + mv[i].y = RRV_MV_SCALEUP(pMB->mvs[i].y); } + } else { + 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); + for (i = 0; i < 4; i++) + mv[i] = pMB->mvs[i]; + } + + if (pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q) { + uv_dx = mv[0].x / (1 + dec->quarterpel); + uv_dy = mv[0].y / (1 + dec->quarterpel); + uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3]; uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3]; start_timer(); - if(dec->quarterpel) { - interpolate16x16_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, - dec->refh.y + 128, 16*x_pos, 16*y_pos, - pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); - } - else { - 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); + if (reduced_resolution) + { + interpolate32x32_switch(dec->cur.y, dec->refn[0].y, 32*x_pos, 32*y_pos, + mv[0].x, mv[0].y, stride, rounding); + interpolate16x16_switch(dec->cur.u, dec->refn[0].u, 16 * x_pos, 16 * y_pos, + uv_dx, uv_dy, stride2, rounding); + interpolate16x16_switch(dec->cur.v, dec->refn[0].v, 16 * x_pos, 16 * y_pos, + uv_dx, uv_dy, stride2, rounding); + } + else + { + if(dec->quarterpel) { + interpolate16x16_quarterpel(dec->cur.y, dec->refn[0].y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos, + mv[0].x, mv[0].y, stride, rounding); + } + else { + interpolate16x16_switch(dec->cur.y, dec->refn[0].y, 16*x_pos, 16*y_pos, + mv[0].x, mv[0].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); + 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(); - } else { + } else { /* MODE_INTER4V */ int sum; if(dec->quarterpel) - sum = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2); + sum = (mv[0].x / 2) + (mv[1].x / 2) + (mv[2].x / 2) + (mv[3].x / 2); else - sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; + sum = mv[0].x + mv[1].x + mv[2].x + mv[3].x; uv_dx = (sum >> 3) + roundtab_76[sum & 0xf]; if(dec->quarterpel) - sum = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2); + sum = (mv[0].y / 2) + (mv[1].y / 2) + (mv[2].y / 2) + (mv[3].y / 2); else - sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y; + sum = mv[0].y + mv[1].y + mv[2].y + mv[3].y; uv_dy = (sum >> 3) + roundtab_76[sum & 0xf]; start_timer(); - if(dec->quarterpel) { - interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, - dec->refh.y + 128, 16*x_pos, 16*y_pos, - pMB->mvs[0].x, pMB->mvs[0].y, stride, rounding); - interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, - dec->refh.y + 128, 16*x_pos + 8, 16*y_pos, - pMB->mvs[1].x, pMB->mvs[1].y, stride, rounding); - interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, - dec->refh.y + 128, 16*x_pos, 16*y_pos + 8, - pMB->mvs[2].x, pMB->mvs[2].y, stride, rounding); - interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y, dec->refh.y, dec->refh.y + 64, - dec->refh.y + 128, 16*x_pos + 8, 16*y_pos + 8, - pMB->mvs[3].x, pMB->mvs[3].y, stride, rounding); - } - else { - 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); - } + if (reduced_resolution) + { + interpolate16x16_switch(dec->cur.y, dec->refn[0].y, 32*x_pos, 32*y_pos, + mv[0].x, mv[0].y, stride, rounding); + interpolate16x16_switch(dec->cur.y, dec->refn[0].y , 32*x_pos + 16, 32*y_pos, + mv[1].x, mv[1].y, stride, rounding); + interpolate16x16_switch(dec->cur.y, dec->refn[0].y , 32*x_pos, 32*y_pos + 16, + mv[2].x, mv[2].y, stride, rounding); + interpolate16x16_switch(dec->cur.y, dec->refn[0].y , 32*x_pos + 16, 32*y_pos + 16, + mv[3].x, mv[3].y, stride, rounding); + interpolate16x16_switch(dec->cur.u, dec->refn[0].u , 16 * x_pos, 16 * y_pos, + uv_dx, uv_dy, stride2, rounding); + interpolate16x16_switch(dec->cur.v, dec->refn[0].v , 16 * x_pos, 16 * y_pos, + uv_dx, uv_dy, stride2, 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); + /* set_block(pY_Cur, stride, 32, 32, 127); */ + } + else + { + if(dec->quarterpel) { + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos, + mv[0].x, mv[0].y, stride, rounding); + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos, + mv[1].x, mv[1].y, stride, rounding); + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos + 8, + mv[2].x, mv[2].y, stride, rounding); + interpolate8x8_quarterpel(dec->cur.y, dec->refn[0].y , dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8, + mv[3].x, mv[3].y, stride, rounding); + } + else { + interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos, 16*y_pos, + mv[0].x, mv[0].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos + 8, 16*y_pos, + mv[1].x, mv[1].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos, 16*y_pos + 8, + mv[2].x, mv[2].y, stride, rounding); + interpolate8x8_switch(dec->cur.y, dec->refn[0].y , 16*x_pos + 8, 16*y_pos + 8, + mv[3].x, mv[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++) { int direction = dec->alternate_vertical_scan ? 2 : 0; - if (cbp & (1 << (5 - i))) // coded + if (cbp & (1 << (5 - i))) /* coded */ { - memset(&block[i * 64], 0, 64 * sizeof(int16_t)); // clear + memset(&block[i * 64], 0, 64 * sizeof(int16_t)); /* clear */ start_timer(); get_inter_block(bs, &block[i * 64], direction); @@ -511,6 +549,137 @@ } start_timer(); + if (reduced_resolution) + { + if (cbp & 32) + add_upsampled_8x8_16to8(pY_Cur, &data[0 * 64], stride); + if (cbp & 16) + add_upsampled_8x8_16to8(pY_Cur + 16, &data[1 * 64], stride); + if (cbp & 8) + add_upsampled_8x8_16to8(pY_Cur + next_block, &data[2 * 64], stride); + if (cbp & 4) + add_upsampled_8x8_16to8(pY_Cur + 16 + next_block, &data[3 * 64], stride); + if (cbp & 2) + add_upsampled_8x8_16to8(pU_Cur, &data[4 * 64], stride2); + if (cbp & 1) + add_upsampled_8x8_16to8(pV_Cur, &data[5 * 64], stride2); + } + else + { + 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(); +} + +static __inline int gmc_sanitize(int value, int quarterpel, int fcode) +{ + int length = 1 << (fcode+4); + +/* if (quarterpel) value *= 2; */ + + if (value < -length) + return -length; + else if (value >= length) + return length-1; + else return value; +} + + +static void +decoder_mbgmc(DECODER * dec, + MACROBLOCK * const pMB, + const uint32_t x_pos, + const uint32_t y_pos, + const uint32_t fcode, + const uint32_t cbp, + Bitstream * bs, + const uint32_t quant, + const uint32_t rounding, + const int reduced_resolution) /* no reduced res support */ +{ + + 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 = stride / 2; + const uint32_t next_block = stride * (reduced_resolution ? 16 : 8); + uint32_t i; + const uint32_t iQuant = pMB->quant; + uint8_t *const pY_Cur=dec->cur.y + (y_pos << 4) * stride + (x_pos << 4); + uint8_t *const pU_Cur=dec->cur.u + (y_pos << 3) * stride2 + (x_pos << 3); + uint8_t *const pV_Cur=dec->cur.v + (y_pos << 3) * stride2 + (x_pos << 3); + + pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv; + + start_timer(); + +/* this is where the calculations are done */ + + { + pMB->amv = generate_GMCimageMB(&dec->gmc_data, &dec->refn[0], x_pos, y_pos, + stride, stride2, dec->quarterpel, rounding, &dec->cur); + + pMB->amv.x = gmc_sanitize(pMB->amv.x, dec->quarterpel, fcode); + pMB->amv.y = gmc_sanitize(pMB->amv.y, dec->quarterpel, fcode); + } + pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv; + +/* + transfer16x16_copy(pY_Cur, dec->gmc.y + (y_pos << 4)*stride + (x_pos << 4), stride); + transfer8x8_copy(pU_Cur, dec->gmc.u + (y_pos << 3)*stride2 + (x_pos << 3), stride2); + transfer8x8_copy(pV_Cur, dec->gmc.v + (y_pos << 3)*stride2 + (x_pos << 3), stride2); +*/ + + + stop_transfer_timer(); + + if (!cbp) return; + + for (i = 0; i < 6; i++) { + int direction = dec->alternate_vertical_scan ? 2 : 0; + + 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], direction); + 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(); + } + } + +/* interlace + GMC is this possible ??? */ +/* + 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) @@ -536,13 +705,13 @@ { uint32_t bound; uint32_t x, y; - int mb_width = dec->mb_width; - int mb_height = dec->mb_height; + uint32_t mb_width = dec->mb_width; + uint32_t mb_height = dec->mb_height; if (reduced_resolution) { - mb_width /= 2; - mb_height /= 2; + mb_width = (dec->width + 31) / 32; + mb_height = (dec->height + 31) / 32; } bound = 0; @@ -563,8 +732,8 @@ { bound = read_video_packet_header(bs, dec, 0, &quant, NULL, NULL, &intra_dc_threshold); - x = bound % dec->mb_width; - y = bound / dec->mb_width; + x = bound % mb_width; + y = bound / mb_width; } mb = &dec->mbs[y * dec->mb_width + x]; @@ -595,15 +764,15 @@ if (dec->interlacing) { mb->field_dct = BitstreamGetBit(bs); - DEBUG1("deci: field_dct: ", mb->field_dct); + DPRINTF(DPRINTF_MB,"deci: field_dct: %i", mb->field_dct); } decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, - intra_dc_threshold, bound); + intra_dc_threshold, bound, reduced_resolution); } if(dec->out_frm) - output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,0,y,dec->mb_width); + output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,0,y,mb_width); } } @@ -615,7 +784,7 @@ int x, int y, int k, - VECTOR * mv, + VECTOR * ret_mv, int fcode, const int bound) { @@ -626,51 +795,39 @@ int range = (64 * scale_fac); VECTOR pmv; - int mv_x, mv_y; + VECTOR mv; pmv = get_pmv2(dec->mbs, dec->mb_width, bound, x, y, k); - mv_x = get_mv(bs, fcode); - mv_y = get_mv(bs, fcode); + mv.x = get_mv(bs, fcode); + mv.y = get_mv(bs, fcode); - DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i)", mv_x, mv_y, pmv.x, pmv.y); + DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", mv.x, mv.y, pmv.x, pmv.y, mv.x+pmv.x, mv.y+pmv.y); - mv_x += pmv.x; - mv_y += pmv.y; + 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.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; + if (mv.y < low) { + mv.y += range; + } else if (mv.y > high) { + mv.y -= range; } - mv->x = mv_x; - mv->y = mv_y; + ret_mv->x = mv.x; + ret_mv->y = mv.y; } -static __inline int gmc_sanitize(int value, int quarterpel, int fcode) -{ - int length = 1 << (fcode+4); - - if (quarterpel) value *= 2; - - if (value < -length) - return -length; - else if (value >= length) - return length-1; - else return value; -} -/* for P_VOP set gmc_mv to NULL */ +/* for P_VOP set gmc_warp to NULL */ void decoder_pframe(DECODER * dec, Bitstream * bs, @@ -679,26 +836,59 @@ int quant, int fcode, int intra_dc_threshold, - VECTOR * gmc_mv) + const WARPPOINTS *const gmc_warp) { uint32_t x, y; uint32_t bound; int cp_mb, st_mb; + uint32_t mb_width = dec->mb_width; + uint32_t mb_height = dec->mb_height; + + if (reduced_resolution) + { + mb_width = (dec->width + 31) / 32; + mb_height = (dec->height + 31) / 32; + } start_timer(); image_setedges(&dec->refn[0], dec->edged_width, dec->edged_height, dec->width, dec->height); stop_edges_timer(); + if (gmc_warp) + { + + /* accuracy: 0==1/2, 1=1/4, 2=1/8, 3=1/16 */ + if ( (dec->sprite_warping_accuracy != 3) || (dec->sprite_warping_points != 2) ) + { + fprintf(stderr,"Wrong GMC parameters acc=%d(-> 1/%d), %d!!!\n", + dec->sprite_warping_accuracy,(2<sprite_warping_accuracy), + dec->sprite_warping_points); + } + + generate_GMCparameters( dec->sprite_warping_points, + (2 << dec->sprite_warping_accuracy), gmc_warp, + dec->width, dec->height, &dec->gmc_data); + +/* image warping is done block-based in decoder_mbgmc(), now */ +/* + generate_GMCimage(&dec->gmc_data, &dec->refn[0], + mb_width, mb_height, + dec->edged_width, dec->edged_width/2, + fcode, dec->quarterpel, 0, + rounding, dec->mbs, &dec->gmc); +*/ + } + bound = 0; - for (y = 0; y < dec->mb_height; y++) { + for (y = 0; y < mb_height; y++) { cp_mb = st_mb = 0; - for (x = 0; x < dec->mb_width; x++) { + for (x = 0; x < mb_width; x++) { MACROBLOCK *mb; - // skip stuffing + /* skip stuffing */ while (BitstreamShowBits(bs, 10) == 1) BitstreamSkip(bs, 10); @@ -706,15 +896,15 @@ { bound = read_video_packet_header(bs, dec, fcode - 1, &quant, &fcode, NULL, &intra_dc_threshold); - x = bound % dec->mb_width; - y = bound / dec->mb_width; + x = bound % mb_width; + y = bound / mb_width; } mb = &dec->mbs[y * dec->mb_width + x]; DPRINTF(DPRINTF_MB, "macroblock (%i,%i) %08x", x, y, BitstreamShowBits(bs, 32)); - //if (!(dec->mb_skip[y*dec->mb_width + x]=BitstreamGetBit(bs))) // not_coded - if (!(BitstreamGetBit(bs))) // not_coded + /* if (!(dec->mb_skip[y*dec->mb_width + x]=BitstreamGetBit(bs))) */ /* not_coded */ + if (!(BitstreamGetBit(bs))) /* block _is_ coded */ { uint32_t mcbpc; uint32_t cbpc; @@ -722,7 +912,7 @@ uint32_t cbpy; uint32_t cbp; uint32_t intra; - int mcsel = 0; // mcsel: '0'=local motion, '1'=GMC + int mcsel = 0; /* mcsel: '0'=local motion, '1'=GMC */ cp_mb++; mcbpc = get_mcbpc_inter(bs); @@ -739,13 +929,13 @@ acpred_flag = BitstreamGetBit(bs); } - if (gmc_mv && (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q)) + if (gmc_warp && (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q)) { mcsel = BitstreamGetBit(bs); } cbpy = get_cbpy(bs, intra); - DPRINTF(DPRINTF_MB, "cbpy %i", cbpy); + DPRINTF(DPRINTF_MB, "cbpy %i mcsel %i ", cbpy,mcsel); cbp = (cbpy << 2) | cbpc; @@ -765,30 +955,30 @@ if (dec->interlacing) { if (cbp || intra) { mb->field_dct = BitstreamGetBit(bs); - DEBUG1("decp: field_dct: ", mb->field_dct); + DPRINTF(DPRINTF_MB,"decp: field_dct: %i", mb->field_dct); } if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { mb->field_pred = BitstreamGetBit(bs); - DEBUG1("decp: field_pred: ", mb->field_pred); + DPRINTF(DPRINTF_MB, "decp: field_pred: %i", mb->field_pred); if (mb->field_pred) { mb->field_for_top = BitstreamGetBit(bs); - DEBUG1("decp: field_for_top: ", mb->field_for_top); + DPRINTF(DPRINTF_MB,"decp: field_for_top: %i", mb->field_for_top); mb->field_for_bot = BitstreamGetBit(bs); - DEBUG1("decp: field_for_bot: ", mb->field_for_bot); + DPRINTF(DPRINTF_MB,"decp: field_for_bot: %i", mb->field_for_bot); } } } + + if (mcsel) { + decoder_mbgmc(dec, mb, x, y, fcode, cbp, bs, quant, + rounding, reduced_resolution); + continue; - if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { - - if (mcsel) - { - mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = gmc_sanitize(gmc_mv[0].x, dec->quarterpel, fcode); - mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = gmc_sanitize(gmc_mv[0].y, dec->quarterpel, fcode); + } else if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { - } else if (dec->interlacing && mb->field_pred) { + if (dec->interlacing && mb->field_pred) { get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode, bound); get_motion_vector(dec, bs, x, y, 0, &mb->mvs[1], @@ -796,10 +986,7 @@ } else { get_motion_vector(dec, bs, x, y, 0, &mb->mvs[0], fcode, bound); - mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = - mb->mvs[0].x; - mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = - mb->mvs[0].y; + mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = mb->mvs[0]; } } else if (mb->mode == MODE_INTER4V ) { @@ -807,70 +994,76 @@ get_motion_vector(dec, bs, x, y, 1, &mb->mvs[1], fcode, bound); get_motion_vector(dec, bs, x, y, 2, &mb->mvs[2], fcode, bound); get_motion_vector(dec, bs, x, y, 3, &mb->mvs[3], fcode, bound); - } else // MODE_INTRA, MODE_INTRA_Q + } else /* MODE_INTRA, MODE_INTRA_Q */ { 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; decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, - intra_dc_threshold, bound); + intra_dc_threshold, bound, reduced_resolution); continue; } - decoder_mbinter(dec, mb, x, y, acpred_flag, cbp, bs, quant, - rounding); + decoder_mbinter(dec, mb, x, y, fcode, cbp, bs, quant, + rounding, reduced_resolution); - } - else if (gmc_mv) /* not coded S_VOP macroblock */ + } + else if (gmc_warp) /* a not coded S(GMC)-VOP macroblock */ { - mb->mode = MODE_NOT_CODED; - mb->mvs[0].x = mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = gmc_sanitize(gmc_mv[0].x, dec->quarterpel, fcode); - mb->mvs[0].y = mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = gmc_sanitize(gmc_mv[0].y, dec->quarterpel, fcode); - decoder_mbinter(dec, mb, x, y, 0, 0, bs, quant, rounding); + mb->mode = MODE_NOT_CODED_GMC; + + start_timer(); + + decoder_mbgmc(dec, mb, x, y, fcode, 0x00, bs, quant, + rounding, reduced_resolution); + + stop_transfer_timer(); + + if(dec->out_frm && cp_mb > 0) { + output_slice(&dec->cur, dec->edged_width,dec->width,dec->out_frm,st_mb,y,cp_mb); + cp_mb = 0; + } + st_mb = x+1; } else /* not coded P_VOP macroblock */ { 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; - // copy macroblock directly from ref to cur + /* 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); + if (reduced_resolution) + { + transfer32x32_copy(dec->cur.y + (32*y)*dec->edged_width + (32*x), + dec->refn[0].y + (32*y)*dec->edged_width + (32*x), + dec->edged_width); + + transfer16x16_copy(dec->cur.u + (16*y)*dec->edged_width/2 + (16*x), + dec->refn[0].u + (16*y)*dec->edged_width/2 + (16*x), + dec->edged_width/2); + + transfer16x16_copy(dec->cur.v + (16*y)*dec->edged_width/2 + (16*x), + dec->refn[0].v + (16*y)*dec->edged_width/2 + (16*x), + dec->edged_width/2); + } + else + { + transfer16x16_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.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(); @@ -887,8 +1080,7 @@ } -// add by MinChen -// decode B-frame motion vector +/* decode B-frame motion vector */ void get_b_motion_vector(DECODER * dec, Bitstream * bs, @@ -932,8 +1124,7 @@ } -// add by MinChen -// decode an B-frame forward & backward inter macroblock +/* decode an B-frame forward & backward inter macroblock */ void decoder_bf_mbinter(DECODER * dec, const MACROBLOCK * pMB, @@ -965,35 +1156,49 @@ 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; + if (dec->quarterpel) + { + uv_dx /= 2; + uv_dy /= 2; + } + + uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3]; + uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3]; } 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)); + if(dec->quarterpel) + sum = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2); + else + sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; + + uv_dx = (sum >> 3) + roundtab_76[sum & 0xf]; + + if(dec->quarterpel) + sum = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2); + else + sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y; + + uv_dy = (sum >> 3) + roundtab_76[sum & 0xf]; } 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); + if(dec->quarterpel) { + interpolate16x16_quarterpel(dec->cur.y, dec->refn[ref].y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + } + else { + 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, @@ -1003,9 +1208,9 @@ for (i = 0; i < 6; i++) { int direction = dec->alternate_vertical_scan ? 2 : 0; - if (cbp & (1 << (5 - i))) // coded + if (cbp & (1 << (5 - i))) /* coded */ { - memset(&block[i * 64], 0, 64 * sizeof(int16_t)); // clear + memset(&block[i * 64], 0, 64 * sizeof(int16_t)); /* clear */ start_timer(); get_inter_block(bs, &block[i * 64], direction); @@ -1046,8 +1251,7 @@ stop_transfer_timer(); } -// add by MinChen -// decode an B-frame direct & inter macroblock +/* decode an B-frame direct & inter macroblock */ void decoder_bf_interpolate_mbinter(DECODER * dec, IMAGE forward, @@ -1080,117 +1284,173 @@ 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; + if (dec->quarterpel) + { + uv_dx /= 2; + uv_dy /= 2; + + b_uv_dx /= 2; + b_uv_dy /= 2; + } + + uv_dx = (uv_dx >> 1) + roundtab_79[uv_dx & 0x3]; + uv_dy = (uv_dy >> 1) + roundtab_79[uv_dy & 0x3]; + + b_uv_dx = (b_uv_dx >> 1) + roundtab_79[b_uv_dx & 0x3]; + b_uv_dy = (b_uv_dy >> 1) + roundtab_79[b_uv_dy & 0x3]; } 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)); + if(dec->quarterpel) + sum = (pMB->mvs[0].x / 2) + (pMB->mvs[1].x / 2) + (pMB->mvs[2].x / 2) + (pMB->mvs[3].x / 2); + else + sum = pMB->mvs[0].x + pMB->mvs[1].x + pMB->mvs[2].x + pMB->mvs[3].x; + + uv_dx = (sum >> 3) + roundtab_76[sum & 0xf]; + + if(dec->quarterpel) + sum = (pMB->mvs[0].y / 2) + (pMB->mvs[1].y / 2) + (pMB->mvs[2].y / 2) + (pMB->mvs[3].y / 2); + else + sum = pMB->mvs[0].y + pMB->mvs[1].y + pMB->mvs[2].y + pMB->mvs[3].y; + + uv_dy = (sum >> 3) + roundtab_76[sum & 0xf]; + + + if(dec->quarterpel) + sum = (pMB->b_mvs[0].x / 2) + (pMB->b_mvs[1].x / 2) + (pMB->b_mvs[2].x / 2) + (pMB->b_mvs[3].x / 2); + else + 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 >> 3) + roundtab_76[sum & 0xf]; + + if(dec->quarterpel) + sum = (pMB->b_mvs[0].y / 2) + (pMB->b_mvs[1].y / 2) + (pMB->b_mvs[2].y / 2) + (pMB->b_mvs[3].y / 2); + else + 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 >> 3) + roundtab_76[sum & 0xf]; } 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); + if(dec->quarterpel) { + if((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) + interpolate16x16_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + else { + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos, + pMB->mvs[0].x, pMB->mvs[0].y, stride, 0); + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos, + pMB->mvs[1].x, pMB->mvs[1].y, stride, 0); + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos + 8, + pMB->mvs[2].x, pMB->mvs[2].y, stride, 0); + interpolate8x8_quarterpel(dec->cur.y, forward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8, + pMB->mvs[3].x, pMB->mvs[3].y, stride, 0); + } + } + else { + 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, + if(dec->quarterpel) { + if((pMB->mode == MODE_INTER || pMB->mode == MODE_INTER_Q)) + interpolate16x16_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos, + pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); + else { + interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos, + pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); + interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos, + pMB->b_mvs[1].x, pMB->b_mvs[1].y, stride, 0); + interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos, 16*y_pos + 8, + pMB->b_mvs[2].x, pMB->b_mvs[2].y, stride, 0); + interpolate8x8_quarterpel(dec->tmp.y, backward.y, dec->qtmp.y, dec->qtmp.y + 64, + dec->qtmp.y + 128, 16*x_pos + 8, 16*y_pos + 8, + pMB->b_mvs[3].x, pMB->b_mvs[3].y, stride, 0); + } + } + else { + interpolate8x8_switch(dec->tmp.y, backward.y, 16 * x_pos, 16 * y_pos, + pMB->b_mvs[0].x, pMB->b_mvs[0].y, stride, 0); + interpolate8x8_switch(dec->tmp.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->tmp.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->tmp.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->tmp.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, + interpolate8x8_switch(dec->tmp.v, backward.v, 8 * x_pos, 8 * y_pos, b_uv_dx, b_uv_dy, stride2, 0); interpolate8x8_avg2(dec->cur.y + (16 * y_pos * stride) + 16 * x_pos, dec->cur.y + (16 * y_pos * stride) + 16 * x_pos, - dec->refn[2].y + (16 * y_pos * stride) + 16 * x_pos, - stride, 0); + dec->tmp.y + (16 * y_pos * stride) + 16 * x_pos, + stride, 1, 8); interpolate8x8_avg2(dec->cur.y + (16 * y_pos * stride) + 16 * x_pos + 8, dec->cur.y + (16 * y_pos * stride) + 16 * x_pos + 8, - dec->refn[2].y + (16 * y_pos * stride) + 16 * x_pos + 8, - stride, 0); + dec->tmp.y + (16 * y_pos * stride) + 16 * x_pos + 8, + stride, 1, 8); interpolate8x8_avg2(dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos, dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos, - dec->refn[2].y + ((16 * y_pos + 8) * stride) + 16 * x_pos, - stride, 0); + dec->tmp.y + ((16 * y_pos + 8) * stride) + 16 * x_pos, + stride, 1, 8); interpolate8x8_avg2(dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, dec->cur.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, - dec->refn[2].y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, - stride, 0); + dec->tmp.y + ((16 * y_pos + 8) * stride) + 16 * x_pos + 8, + stride, 1, 8); interpolate8x8_avg2(dec->cur.u + (8 * y_pos * stride2) + 8 * x_pos, dec->cur.u + (8 * y_pos * stride2) + 8 * x_pos, - dec->refn[2].u + (8 * y_pos * stride2) + 8 * x_pos, - stride2, 0); + dec->tmp.u + (8 * y_pos * stride2) + 8 * x_pos, + stride2, 1, 8); interpolate8x8_avg2(dec->cur.v + (8 * y_pos * stride2) + 8 * x_pos, dec->cur.v + (8 * y_pos * stride2) + 8 * x_pos, - dec->refn[2].v + (8 * y_pos * stride2) + 8 * x_pos, - stride2, 0); + dec->tmp.v + (8 * y_pos * stride2) + 8 * x_pos, + stride2, 1, 8); stop_comp_timer(); for (i = 0; i < 6; i++) { int direction = dec->alternate_vertical_scan ? 2 : 0; - if (cbp & (1 << (5 - i))) // coded + if (cbp & (1 << (5 - i))) /* coded */ { - memset(&block[i * 64], 0, 64 * sizeof(int16_t)); // clear + memset(&block[i * 64], 0, 64 * sizeof(int16_t)); /* clear */ start_timer(); get_inter_block(bs, &block[i * 64], direction); @@ -1232,26 +1492,26 @@ } -// add by MinChen -// for decode B-frame dbquant +/* for decode B-frame dbquant */ int32_t __inline get_dbquant(Bitstream * bs) { - if (!BitstreamGetBit(bs)) // '0' + if (!BitstreamGetBit(bs)) /* '0' */ return (0); - else if (!BitstreamGetBit(bs)) // '10' + else if (!BitstreamGetBit(bs)) /* '10' */ return (-2); - else - return (2); // '11' + else /* '11' */ + return (2); } -// add by MinChen -// for decode B-frame mb_type -// bit ret_value -// 1 0 -// 01 1 -// 001 2 -// 0001 3 +/* + * For decode B-frame mb_type + * bit ret_value + * 1 0 + * 01 1 + * 001 2 + * 0001 3 + */ int32_t __inline get_mbtype(Bitstream * bs) { @@ -1300,7 +1560,7 @@ #endif for (y = 0; y < dec->mb_height; y++) { - // Initialize Pred Motion Vector + /* Initialize Pred Motion Vector */ dec->p_fmv = dec->p_bmv = zeromv; for (x = 0; x < dec->mb_width; x++) { MACROBLOCK *mb = &dec->mbs[y * dec->mb_width + x]; @@ -1310,9 +1570,14 @@ mb->b_mvs[0] = mb->b_mvs[1] = mb->b_mvs[2] = mb->b_mvs[3] = mb->mvs[0] = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = zeromv; - // the last P_VOP is skip macroblock ? + /* + * skip if the co-located P_VOP macroblock is not coded + * if not codec in co-located S_VOP macroblock is _not_ + * automatically skipped + */ + if (last_mb->mode == MODE_NOT_CODED) { - //DEBUG2("Skip MB in B-frame at (X,Y)=!",x,y); + /* DEBUG2("Skip MB in B-frame at (X,Y)=!",x,y); */ mb->cbp = 0; #ifdef BFRAMES_DEC_DEBUG mb->mb_type = MODE_NOT_CODED; @@ -1320,19 +1585,21 @@ #endif mb->mb_type = MODE_FORWARD; mb->quant = last_mb->quant; - //mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; - //mb->mvs[1].y = mb->mvs[2].y = mb->mvs[3].y = mb->mvs[0].y; + /* + mb->mvs[1].x = mb->mvs[2].x = mb->mvs[3].x = mb->mvs[0].x; + 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, mb->quant, 1); continue; } - if (!BitstreamGetBit(bs)) { // modb=='0' + if (!BitstreamGetBit(bs)) { /* modb=='0' */ const uint8_t modb2 = BitstreamGetBit(bs); mb->mb_type = get_mbtype(bs); - if (!modb2) { // modb=='00' + if (!modb2) { /* modb=='00' */ mb->cbp = BitstreamGetBits(bs, 6); } else { mb->cbp = 0; @@ -1353,7 +1620,7 @@ mb->quant = quant; mb->mode = MODE_INTER4V; - //DEBUG1("Switch bm_type=",mb->mb_type); + /* DEBUG1("Switch bm_type=",mb->mb_type); */ #ifdef BFRAMES_DEC_DEBUG BFRAME_DEBUG @@ -1382,7 +1649,7 @@ / TRD : mb->mvs[i].y - last_mb->mvs[i].y); } - //DEBUG("B-frame Direct!\n"); + /* DEBUG("B-frame Direct!\n"); */ } decoder_bf_interpolate_mbinter(dec, dec->refn[1], dec->refn[0], mb, x, y, bs); @@ -1400,7 +1667,7 @@ decoder_bf_interpolate_mbinter(dec, dec->refn[1], dec->refn[0], mb, x, y, bs); - //DEBUG("B-frame Bidir!\n"); + /* DEBUG("B-frame Bidir!\n"); */ break; case MODE_BACKWARD: @@ -1410,7 +1677,7 @@ mb->mode = MODE_INTER; decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, quant, 0); - //DEBUG("B-frame Backward!\n"); + /* DEBUG("B-frame Backward!\n"); */ break; case MODE_FORWARD: @@ -1420,15 +1687,15 @@ mb->mode = MODE_INTER; decoder_bf_mbinter(dec, mb, x, y, mb->cbp, bs, quant, 1); - //DEBUG("B-frame Forward!\n"); + /* DEBUG("B-frame Forward!\n"); */ break; default: - DEBUG1("Not support B-frame mb_type =", mb->mb_type); + DPRINTF(DPRINTF_ERROR,"Not support B-frame mb_type = %i", mb->mb_type); } - - } // end of FOR + } /* End of for */ } + #ifdef BFRAMES_DEC_DEBUG if (!first){ first=1; @@ -1438,7 +1705,7 @@ #endif } -// swap two MACROBLOCK array +/* swap two MACROBLOCK array */ void mb_swap(MACROBLOCK ** mb1, MACROBLOCK ** mb2) @@ -1449,9 +1716,29 @@ *mb2 = temp; } + +/* perform post processing if necessary, and output the image */ +void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs, + xvid_dec_frame_t * frame, xvid_dec_stats_t * stats, int coding_type) +{ + + + image_output(img, dec->width, dec->height, + dec->edged_width, (uint8_t**)frame->output.plane, frame->output.stride, + frame->output.csp, dec->interlacing); + + if (stats) + { + stats->type = coding2type(coding_type); + stats->data.vop.time_base = (int)dec->time_base; + stats->data.vop.time_increment = 0; //XXX: todo + } +} + + int decoder_decode(DECODER * dec, - XVID_DEC_FRAME * frame, XVID_DEC_STATS * stats) + xvid_dec_frame_t * frame, xvid_dec_stats_t * stats) { Bitstream bs; @@ -1461,170 +1748,220 @@ uint32_t fcode_forward; uint32_t fcode_backward; uint32_t intra_dc_threshold; - VECTOR gmc_mv[5]; - uint32_t vop_type; + WARPPOINTS gmc_warp; + int coding_type; + int success, output, seen_something; + + if (XVID_MAJOR(frame->version) != 1 || (stats && XVID_MAJOR(stats->version) != 1)) /* v1.x.x */ + return XVID_ERR_VERSION; start_global_timer(); - dec->out_frm = (frame->colorspace == XVID_CSP_EXTERN) ? frame->image : NULL; + dec->low_delay_default = (frame->general & XVID_LOWDELAY); + if ((frame->general & XVID_DISCONTINUITY)) + dec->frames = 0; + dec->out_frm = (frame->output.csp == XVID_CSP_SLICE) ? &frame->output : NULL; + + if (frame->length < 0) /* decoder flush */ + { + /* if not decoding "low_delay/packed", and this isn't low_delay and + we have a reference frame, then outout the reference frame */ + if (!(dec->low_delay_default && dec->packed_mode) && !dec->low_delay && dec->frames>0) + { + decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type); + }else{ + if (stats) stats->type = XVID_TYPE_NOTHING; + } + + emms(); + stop_global_timer(); + return 0; + } BitstreamInit(&bs, frame->bitstream, frame->length); -#ifdef BFRAMES_DEC - // XXX: 0x7f is only valid whilst decoding vfw xvid/divx5 avi's - if(BitstreamShowBits(&bs, 8) == 0x7f) + /* XXX: 0x7f is only valid whilst decoding vfw xvid/divx5 avi's */ + if(dec->low_delay_default && frame->length == 1 && BitstreamShowBits(&bs, 8) == 0x7f) { - if (stats) - stats->notify = XVID_DEC_VOP; - frame->length = 1; - image_output(&dec->cur, dec->width, dec->height, dec->edged_width, - frame->image, frame->stride, frame->colorspace, dec->interlacing); - return XVID_ERR_OK; + image_output(&dec->refn[0], dec->width, dec->height, dec->edged_width, + (uint8_t**)frame->output.plane, frame->output.stride, frame->output.csp, dec->interlacing); + if (stats) stats->type = XVID_TYPE_NOTHING; + emms(); + return 1; /* one byte consumed */ } -#endif - // add by chenm001 - // for support B-frame to reference last 2 frame - dec->frames++; - -xxx: - vop_type = - BitstreamReadHeaders(&bs, dec, &rounding, &reduced_resolution, - &quant, &fcode_forward, &fcode_backward, &intra_dc_threshold, gmc_mv); + success = 0; + output = 0; + seen_something = 0; + +repeat: + + coding_type = BitstreamReadHeaders(&bs, dec, &rounding, &reduced_resolution, + &quant, &fcode_forward, &fcode_backward, &intra_dc_threshold, &gmc_warp); - DPRINTF(DPRINTF_HEADER, "vop_type=%i", vop_type); + DPRINTF(DPRINTF_HEADER, "coding_type=%i, packed=%i, time=%lli, time_pp=%i, time_bp=%i", + coding_type, dec->packed_mode, dec->time, dec->time_pp, dec->time_bp); - if (vop_type == -2 || vop_type == -3) + if (coding_type == -1) /* nothing */ { - if (vop_type == -3) + if (success) goto done; + if (stats) stats->type = XVID_TYPE_NOTHING; + emms(); + return BitstreamPos(&bs)/8; + } + + if (coding_type == -2 || coding_type == -3) /* vol and/or resize */ + { + if (coding_type == -3) decoder_resize(dec); if (stats) { - stats->notify = XVID_DEC_VOL; + stats->type = XVID_TYPE_VOL; stats->data.vol.general = 0; - if (dec->interlacing) - stats->data.vol.general |= XVID_INTERLACING; + /*XXX: if (dec->interlacing) + stats->data.vol.general |= ++INTERLACING; */ stats->data.vol.width = dec->width; stats->data.vol.height = dec->height; - stats->data.vol.aspect_ratio = dec->aspect_ratio; + stats->data.vol.par = dec->aspect_ratio; stats->data.vol.par_width = dec->par_width; stats->data.vol.par_height = dec->par_height; - frame->length = BitstreamPos(&bs) / 8; - return XVID_ERR_OK; + emms(); + return BitstreamPos(&bs)/8; /* number of bytes consumed */ } - goto xxx; + goto repeat; } - dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0; // init pred vector to 0 + 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, reduced_resolution, quant, - fcode_forward, intra_dc_threshold, NULL); -#ifdef BFRAMES_DEC - DEBUG1("P_VOP Time=", dec->time); -#endif - break; - case I_VOP: - decoder_iframe(dec, &bs, reduced_resolution, quant, intra_dc_threshold); -#ifdef BFRAMES_DEC - DEBUG1("I_VOP Time=", dec->time); -#endif - break; + /* packed_mode: special-N_VOP treament */ + if (dec->packed_mode && coding_type == N_VOP) + { + if (dec->low_delay_default && dec->frames > 0) + { + decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type); + output = 1; + } + /* ignore otherwise */ + } + else if (coding_type != B_VOP) + { + switch(coding_type) + { + case I_VOP : + decoder_iframe(dec, &bs, reduced_resolution, quant, intra_dc_threshold); + break; + case P_VOP : + decoder_pframe(dec, &bs, rounding, reduced_resolution, quant, + fcode_forward, intra_dc_threshold, NULL); + break; + case S_VOP : + decoder_pframe(dec, &bs, rounding, reduced_resolution, quant, + fcode_forward, intra_dc_threshold, &gmc_warp); + break; + case N_VOP : + // XXX: not_coded vops are not used for forward prediction + // we should not swap(last_mbs,mbs) + image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); + break; + } - case B_VOP: -#ifdef BFRAMES_DEC - if (dec->time_pp > dec->time_bp) { - DEBUG1("B_VOP Time=", dec->time); - decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward); - } else { - DEBUG("broken B-frame!"); + if (reduced_resolution) + { + image_deblock_rrv(&dec->cur, dec->edged_width, dec->mbs, + (dec->width + 31) / 32, (dec->height + 31) / 32, dec->mb_width, + 16, 0); } -#else - image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); -#endif - break; - case S_VOP : - decoder_pframe(dec, &bs, rounding, reduced_resolution, quant, - fcode_forward, intra_dc_threshold, gmc_mv); - break; - - case N_VOP: // vop not coded - // when low_delay==0, N_VOP's should interpolate between the past and future frames - image_copy(&dec->cur, &dec->refn[0], dec->edged_width, dec->height); -#ifdef BFRAMES_DEC - DEBUG1("N_VOP Time=", dec->time); -#endif - break; + /* note: for packed_mode, output is performed when the special-N_VOP is decoded */ + if (!(dec->low_delay_default && dec->packed_mode)) + { + if (dec->low_delay) + { + decoder_output(dec, &dec->cur, dec->mbs, frame, stats, coding_type); + output = 1; + } + else if (dec->frames > 0) /* is the reference frame valid? */ + { + /* output the reference frame */ + decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type); + output = 1; + } + } - default: - if (stats) - stats->notify = 0; - return XVID_ERR_FAIL; - } + image_swap(&dec->refn[0], &dec->refn[1]); + image_swap(&dec->cur, &dec->refn[0]); + mb_swap(&dec->mbs, &dec->last_mbs); + dec->last_reduced_resolution = reduced_resolution; + dec->last_coding_type = coding_type; -#ifdef BFRAMES_DEC_DEBUG - if (frame->length != BitstreamPos(&bs) / 8){ - DEBUG2("InLen/UseLen",frame->length, BitstreamPos(&bs) / 8); - } -#endif - frame->length = BitstreamPos(&bs) / 8; + dec->frames++; + seen_something = 1; + }else{ /* B_VOP */ -#ifdef BFRAMES_DEC - // test if no B_VOP - if (dec->low_delay || dec->frames == 0) { -#endif - image_output(&dec->cur, dec->width, dec->height, dec->edged_width, - frame->image, frame->stride, frame->colorspace, dec->interlacing); + if (dec->low_delay) + { + DPRINTF(DPRINTF_ERROR, "warning: bvop found in low_delay==1 stream"); + dec->low_delay = 1; + } -#ifdef BFRAMES_DEC - } else { - if (dec->frames >= 1) { - start_timer(); - if ((vop_type == I_VOP || vop_type == P_VOP || vop_type == S_VOP)) { - image_output(&dec->refn[0], dec->width, dec->height, - dec->edged_width, frame->image, frame->stride, - frame->colorspace, dec->interlacing); - } else if (vop_type == B_VOP) { - image_output(&dec->cur, dec->width, dec->height, - dec->edged_width, frame->image, frame->stride, - frame->colorspace, dec->interlacing); - } - stop_conv_timer(); + if (dec->frames < 2) + { + /* attemping to decode a bvop without atleast 2 reference frames */ + image_printf(&dec->cur, dec->edged_width, dec->height, 16, 16, + "broken b-frame, mising ref frames"); + }else if (dec->time_pp <= dec->time_bp) { + /* this occurs when dx50_bvop_compatibility==0 sequences are + decoded in vfw. */ + image_printf(&dec->cur, dec->edged_width, dec->height, 16, 16, + "broken b-frame, tpp=%i tbp=%i", dec->time_pp, dec->time_bp); + }else{ + decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward); } + + decoder_output(dec, &dec->cur, dec->mbs, frame, stats, coding_type); + output = 1; + dec->frames++; } -#endif - if (vop_type == I_VOP || vop_type == P_VOP || vop_type == S_VOP) { - image_swap(&dec->refn[0], &dec->refn[1]); - image_swap(&dec->cur, &dec->refn[0]); + BitstreamByteAlign(&bs); - // swap MACROBLOCK - // the Divx will not set the low_delay flage some times - // so follow code will wrong to not swap at that time - // this will broken bitstream! so I'm change it, - // But that is not the best way! can anyone tell me how - // to do another way? - // 18-07-2002 MinChen - //if (!dec->low_delay && vop_type == P_VOP) - if (vop_type == P_VOP) - mb_swap(&dec->mbs, &dec->last_mbs); + /* low_delay_default mode: repeat in packed_mode */ + if (dec->low_delay_default && dec->packed_mode && output == 0 && success == 0) + { + success = 1; + goto repeat; } - if (stats) +done : + + /* low_delay_default mode: if we've gotten here without outputting anything, + then output the recently decoded frame, or print an error message */ + if (dec->low_delay_default && output == 0) { - stats->notify = XVID_DEC_VOP; - stats->data.vop.time_base = (int)dec->time_base; - stats->data.vop.time_increment = 0; //XXX: todo + if (dec->packed_mode && seen_something) + { + /* output the recently decoded frame */ + decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type); + } + else + { + image_clear(&dec->cur, dec->width, dec->height, dec->edged_width, 0, 128, 128); + image_printf(&dec->cur, dec->edged_width, dec->height, 16, 16, + "warning: nothing to output"); + image_printf(&dec->cur, dec->edged_width, dec->height, 16, 64, + "bframe decoder lag"); + + decoder_output(dec, &dec->cur, NULL, frame, stats, P_VOP); + if (stats) stats->type = XVID_TYPE_NOTHING; + + } } emms(); - stop_global_timer(); - return XVID_ERR_OK; + return BitstreamPos(&bs) / 8; /* number of bytes consumed */ }