--- decoder.c 2003/02/19 21:59:30 1.49 +++ decoder.c 2003/10/03 15:49:21 1.49.2.14 @@ -3,23 +3,24 @@ * XVID MPEG-4 VIDEO CODEC * - Decoder Module - * - * This file is part of XviD, a free MPEG-4 video encoder/decoder + * Copyright(C) 2002 MinChen + * 2002-2003 Peter Ross * - * This program is free software; you can redistribute it and/or modify + * 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 + * 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 + * 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 + * along with this program ; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * $Id: decoder.c,v 1.49 2003/02/19 21:59:30 edgomez Exp $ + * $Id: decoder.c,v 1.49.2.14 2003/10/03 15:49:21 syskin Exp $ * ****************************************************************************/ @@ -53,6 +54,7 @@ #include "utils/timer.h" #include "utils/emms.h" #include "motion/motion.h" +#include "motion/gmc.h" #include "image/image.h" #include "image/colorspace.h" @@ -70,7 +72,7 @@ image_destroy(&dec->gmc, dec->edged_width, dec->edged_height); - if (dec->last_mbs) + if (dec->last_mbs) xvid_free(dec->last_mbs); if (dec->mbs) xvid_free(dec->mbs); @@ -158,25 +160,28 @@ 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_VERSION_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]); @@ -204,7 +209,7 @@ if (dec->fixed_dimensions) return decoder_resize(dec); else - return XVID_ERR_OK; + return 0; } @@ -225,7 +230,7 @@ xvid_free(dec); write_timer(); - return XVID_ERR_OK; + return 0; } @@ -301,7 +306,7 @@ block[i * 64 + 0] = dc_dif; start_coeff = 1; - DPRINTF(DPRINTF_COEFF,"block[0] %i", dc_dif); + DPRINTF(XVID_DEBUG_COEFF,"block[0] %i\n", dc_dif); } else { start_coeff = 0; } @@ -406,12 +411,12 @@ 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]; @@ -447,7 +452,7 @@ } else { /* MODE_INTER4V */ int sum; - + if(dec->quarterpel) sum = (mv[0].x / 2) + (mv[1].x / 2) + (mv[2].x / 2) + (mv[3].x / 2); else @@ -471,7 +476,7 @@ 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, + 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); @@ -479,7 +484,7 @@ uv_dx, uv_dy, stride2, rounding); /* set_block(pY_Cur, stride, 32, 32, 127); */ - } + } else { if(dec->quarterpel) { @@ -503,7 +508,7 @@ 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, + 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); } @@ -579,19 +584,6 @@ 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, @@ -621,18 +613,27 @@ 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); + + { NEW_GMC_DATA * gmc_data = &dec->new_gmc_data; + + gmc_data->predict_16x16(gmc_data, + dec->cur.y + y_pos*16*stride + x_pos*16, dec->refn[0].y, + stride, stride, x_pos, y_pos, rounding); + + gmc_data->predict_8x8(gmc_data, + dec->cur.u + y_pos*8*stride2 + x_pos*8, dec->refn[0].u, + dec->cur.v + y_pos*8*stride2 + x_pos*8, dec->refn[0].v, + stride2, stride2, x_pos, y_pos, rounding); + + gmc_data->get_average_mv(gmc_data, &pMB->amv, x_pos, y_pos, dec->quarterpel); 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); @@ -641,7 +642,7 @@ stop_transfer_timer(); - + if (!cbp) return; for (i = 0; i < 6; i++) { @@ -704,7 +705,7 @@ uint32_t x, y; uint32_t mb_width = dec->mb_width; uint32_t mb_height = dec->mb_height; - + if (reduced_resolution) { mb_width = (dec->width + 31) / 32; @@ -727,14 +728,14 @@ if (check_resync_marker(bs, 0)) { - bound = read_video_packet_header(bs, dec, 0, + bound = read_video_packet_header(bs, dec, 0, &quant, NULL, NULL, &intra_dc_threshold); 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)); + DPRINTF(XVID_DEBUG_MB, "macroblock (%i,%i) %08x\n", x, y, BitstreamShowBits(bs, 32)); mcbpc = get_mcbpc_intra(bs); mb->mode = mcbpc & 7; @@ -761,7 +762,7 @@ if (dec->interlacing) { mb->field_dct = BitstreamGetBit(bs); - DPRINTF(DPRINTF_MB,"deci: field_dct: %i", mb->field_dct); + DPRINTF(XVID_DEBUG_MB,"deci: field_dct: %i\n", mb->field_dct); } decoder_mbintra(dec, mb, x, y, acpred_flag, cbp, bs, quant, @@ -799,7 +800,7 @@ mv.x = get_mv(bs, fcode); mv.y = get_mv(bs, fcode); - 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); + DPRINTF(XVID_DEBUG_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)\n", mv.x, mv.y, pmv.x, pmv.y, mv.x+pmv.x, mv.y+pmv.y); mv.x += pmv.x; mv.y += pmv.y; @@ -841,7 +842,7 @@ 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; @@ -854,28 +855,20 @@ 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", +/* { + fprintf(stderr,"GMC parameters acc=%d(-> 1/%d), %d pts!!!\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); -*/ + generate_GMCparameters( dec->sprite_warping_points, + dec->sprite_warping_accuracy, gmc_warp, + dec->width, dec->height, &dec->new_gmc_data); + +/* image warping is done block-based in decoder_mbgmc(), now */ } bound = 0; @@ -891,14 +884,14 @@ if (check_resync_marker(bs, fcode - 1)) { - bound = read_video_packet_header(bs, dec, fcode - 1, + bound = read_video_packet_header(bs, dec, fcode - 1, &quant, &fcode, NULL, &intra_dc_threshold); 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)); + DPRINTF(XVID_DEBUG_MB, "macroblock (%i,%i) %08x\n", x, y, BitstreamShowBits(bs, 32)); /* if (!(dec->mb_skip[y*dec->mb_width + x]=BitstreamGetBit(bs))) */ /* not_coded */ if (!(BitstreamGetBit(bs))) /* block _is_ coded */ @@ -915,59 +908,56 @@ mcbpc = get_mcbpc_inter(bs); mb->mode = mcbpc & 7; cbpc = (mcbpc >> 4); - - DPRINTF(DPRINTF_MB, "mode %i", mb->mode); - DPRINTF(DPRINTF_MB, "cbpc %i", cbpc); + + DPRINTF(XVID_DEBUG_MB, "mode %i\n", mb->mode); + DPRINTF(XVID_DEBUG_MB, "cbpc %i\n", cbpc); acpred_flag = 0; intra = (mb->mode == MODE_INTRA || mb->mode == MODE_INTRA_Q); - if (intra) { - acpred_flag = BitstreamGetBit(bs); - } - if (gmc_warp && (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q)) - { mcsel = BitstreamGetBit(bs); - } + + if (intra) + acpred_flag = BitstreamGetBit(bs); cbpy = get_cbpy(bs, intra); - DPRINTF(DPRINTF_MB, "cbpy %i mcsel %i ", cbpy,mcsel); + DPRINTF(XVID_DEBUG_MB, "cbpy %i mcsel %i \n", cbpy,mcsel); cbp = (cbpy << 2) | cbpc; if (mb->mode == MODE_INTER_Q || mb->mode == MODE_INTRA_Q) { int dquant = dquant_table[BitstreamGetBits(bs, 2)]; - DPRINTF(DPRINTF_MB, "dquant %i", dquant); + DPRINTF(XVID_DEBUG_MB, "dquant %i\n", dquant); quant += dquant; if (quant > 31) { quant = 31; } else if (quant < 1) { quant = 1; } - DPRINTF(DPRINTF_MB, "quant %i", quant); + DPRINTF(XVID_DEBUG_MB, "quant %i\n", quant); } mb->quant = quant; if (dec->interlacing) { - if (cbp || intra) { + if ((cbp || intra) && !mcsel) { mb->field_dct = BitstreamGetBit(bs); - DPRINTF(DPRINTF_MB,"decp: field_dct: %i", mb->field_dct); + DPRINTF(XVID_DEBUG_MB,"decp: field_dct: %i\n", mb->field_dct); } if (mb->mode == MODE_INTER || mb->mode == MODE_INTER_Q) { mb->field_pred = BitstreamGetBit(bs); - DPRINTF(DPRINTF_MB, "decp: field_pred: %i", mb->field_pred); + DPRINTF(XVID_DEBUG_MB, "decp: field_pred: %i\n", mb->field_pred); if (mb->field_pred) { mb->field_for_top = BitstreamGetBit(bs); - DPRINTF(DPRINTF_MB,"decp: field_for_top: %i", mb->field_for_top); + DPRINTF(XVID_DEBUG_MB,"decp: field_for_top: %i\n", mb->field_for_top); mb->field_for_bot = BitstreamGetBit(bs); - DPRINTF(DPRINTF_MB,"decp: field_for_bot: %i", mb->field_for_bot); + DPRINTF(XVID_DEBUG_MB,"decp: field_for_bot: %i\n", mb->field_for_bot); } } } - + if (mcsel) { decoder_mbgmc(dec, mb, x, y, fcode, cbp, bs, quant, rounding, reduced_resolution); @@ -1036,7 +1026,7 @@ 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->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), @@ -1050,7 +1040,7 @@ 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->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), @@ -1061,7 +1051,7 @@ dec->refn[0].v + (8*y)*dec->edged_width/2 + (8*x), dec->edged_width/2); } - + stop_transfer_timer(); if(dec->out_frm && cp_mb > 0) { @@ -1192,7 +1182,7 @@ 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, + 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); } @@ -1568,7 +1558,7 @@ mb->mvs[0] = mb->mvs[1] = mb->mvs[2] = mb->mvs[3] = zeromv; /* - * skip if the co-located P_VOP macroblock is not coded + * skip if the co-located P_VOP macroblock is not coded * if not codec in co-located S_VOP macroblock is _not_ * automatically skipped */ @@ -1610,6 +1600,26 @@ quant = 1; } } + + if (dec->interlacing) { + if (mb->cbp) { + mb->field_dct = BitstreamGetBit(bs); + DPRINTF(XVID_DEBUG_MB,"decp: field_dct: %i\n", mb->field_dct); + } + + if (mb->mb_type) { + mb->field_pred = BitstreamGetBit(bs); + DPRINTF(XVID_DEBUG_MB, "decp: field_pred: %i\n", mb->field_pred); + + if (mb->field_pred) { + mb->field_for_top = BitstreamGetBit(bs); + DPRINTF(XVID_DEBUG_MB,"decp: field_for_top: %i\n", mb->field_for_top); + mb->field_for_bot = BitstreamGetBit(bs); + DPRINTF(XVID_DEBUG_MB,"decp: field_for_bot: %i\n", mb->field_for_bot); + } + } + } + } else { mb->mb_type = MODE_DIRECT_NONE_MV; mb->cbp = 0; @@ -1628,7 +1638,7 @@ get_b_motion_vector(dec, bs, x, y, &mv, 1, zeromv); case MODE_DIRECT_NONE_MV: - { + { const int64_t TRB = dec->time_pp - dec->time_bp, TRD = dec->time_pp; int i; @@ -1688,7 +1698,7 @@ break; default: - DPRINTF(DPRINTF_ERROR,"Not support B-frame mb_type = %i", mb->mb_type); + DPRINTF(XVID_DEBUG_ERROR,"Not support B-frame mb_type = %i\n", mb->mb_type); } } /* End of for */ } @@ -1702,42 +1712,30 @@ #endif } -/* swap two MACROBLOCK array */ -void -mb_swap(MACROBLOCK ** mb1, - MACROBLOCK ** mb2) -{ - MACROBLOCK *temp = *mb1; - - *mb1 = *mb2; - *mb2 = temp; -} /* perform post processing if necessary, and output the image */ -void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs, - const XVID_DEC_FRAME * frame, int pp_disable) +void decoder_output(DECODER * dec, IMAGE * img, MACROBLOCK * mbs, + xvid_dec_frame_t * frame, xvid_dec_stats_t * stats, int coding_type) { - if ((frame->general & (XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV)) && !pp_disable) /* post process */ - { - /* note: image is stored to tmp */ - image_copy(&dec->tmp, img, dec->edged_width, dec->height); - image_deblock_rrv(&dec->tmp, dec->edged_width, - mbs, dec->mb_width, dec->mb_height, dec->mb_width, - 8, frame->general); - img = &dec->tmp; - } image_output(img, dec->width, dec->height, - dec->edged_width, frame->image, frame->stride, - frame->colorspace, dec->interlacing); + 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; @@ -1748,41 +1746,36 @@ uint32_t fcode_backward; uint32_t intra_dc_threshold; WARPPOINTS gmc_warp; - int vop_type; - int success = 0; - int output = 0; - int seen_something = 0; + int coding_type; + int success, output, seen_something; - start_global_timer(); + if (XVID_VERSION_MAJOR(frame->version) != 1 || (stats && XVID_VERSION_MAJOR(stats->version) != 1)) /* v1.x.x */ + return XVID_ERR_VERSION; - dec->low_delay_default = (frame->general & XVID_DEC_LOWDELAY); - dec->out_frm = (frame->colorspace == XVID_CSP_EXTERN) ? frame->image : NULL; + start_global_timer(); - if ((frame->general & XVID_DEC_DISCONTINUITY)) + 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 */ { + int ret; /* 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->mbs, frame, dec->last_reduced_resolution); - output = 1; - } - - frame->length = 0; - if (stats) - { - stats->notify = output ? XVID_DEC_VOP : XVID_DEC_NOTHING; - stats->data.vop.time_base = (int)dec->time_base; - stats->data.vop.time_increment = 0; /* XXX: todo */ - } + 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); + dec->frames = 0; + ret = 0; + }else{ + if (stats) stats->type = XVID_TYPE_NOTHING; + ret = XVID_ERR_END; + } emms(); - stop_global_timer(); - return XVID_ERR_OK; + return ret; } BitstreamInit(&bs, frame->bitstream, frame->length); @@ -1790,82 +1783,85 @@ /* 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->refn[0], dec->width, dec->height, dec->edged_width, - frame->image, frame->stride, frame->colorspace, dec->interlacing); + (uint8_t**)frame->output.plane, frame->output.stride, frame->output.csp, dec->interlacing); + if (stats) stats->type = XVID_TYPE_NOTHING; emms(); - return XVID_ERR_OK; + return 1; /* one byte consumed */ } + success = 0; + output = 0; + seen_something = 0; + repeat: - vop_type = BitstreamReadHeaders(&bs, dec, &rounding, &reduced_resolution, + coding_type = BitstreamReadHeaders(&bs, dec, &rounding, &reduced_resolution, &quant, &fcode_forward, &fcode_backward, &intra_dc_threshold, &gmc_warp); - DPRINTF(DPRINTF_HEADER, "vop_type=%i, packed=%i, time=%lli, time_pp=%i, time_bp=%i", - vop_type, dec->packed_mode, dec->time, dec->time_pp, dec->time_bp); + DPRINTF(XVID_DEBUG_HEADER, "coding_type=%i, packed=%i, time=%lli, time_pp=%i, time_bp=%i\n", + coding_type, dec->packed_mode, dec->time, dec->time_pp, dec->time_bp); - if (vop_type == -1) + if (coding_type == -1) /* nothing */ { if (success) goto done; + if (stats) stats->type = XVID_TYPE_NOTHING; emms(); - return XVID_ERR_FAIL; + return BitstreamPos(&bs)/8; } - if (vop_type == -2 || vop_type == -3) + if (coding_type == -2 || coding_type == -3) /* vol and/or resize */ { - if (vop_type == -3) + 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; emms(); - return XVID_ERR_OK; + return BitstreamPos(&bs)/8; /* number of bytes consumed */ } goto repeat; - } + } dec->p_bmv.x = dec->p_bmv.y = dec->p_fmv.y = dec->p_fmv.y = 0; /* init pred vector to 0 */ - /* packed_mode: special-N_VOP treament */ - if (dec->packed_mode && vop_type == N_VOP) + 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, dec->last_reduced_resolution); + decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type); output = 1; } /* ignore otherwise */ } - else if (vop_type != B_VOP) + else if (coding_type != B_VOP) { - switch(vop_type) + 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, + 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, + 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; } @@ -1874,7 +1870,7 @@ { image_deblock_rrv(&dec->cur, dec->edged_width, dec->mbs, (dec->width + 31) / 32, (dec->height + 31) / 32, dec->mb_width, - 16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV); + 16, 0); } /* note: for packed_mode, output is performed when the special-N_VOP is decoded */ @@ -1882,21 +1878,22 @@ { if (dec->low_delay) { - decoder_output(dec, &dec->cur, dec->mbs, frame, reduced_resolution); + 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, dec->last_reduced_resolution); + decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type); output = 1; } } image_swap(&dec->refn[0], &dec->refn[1]); image_swap(&dec->cur, &dec->refn[0]); - mb_swap(&dec->mbs, &dec->last_mbs); + SWAP(MACROBLOCK *, dec->mbs, dec->last_mbs); dec->last_reduced_resolution = reduced_resolution; + dec->last_coding_type = coding_type; dec->frames++; seen_something = 1; @@ -1905,7 +1902,7 @@ if (dec->low_delay) { - DPRINTF(DPRINTF_ERROR, "warning: bvop found in low_delay==1 stream"); + DPRINTF(XVID_DEBUG_ERROR, "warning: bvop found in low_delay==1 stream\n"); dec->low_delay = 1; } @@ -1915,7 +1912,7 @@ 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 + /* 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); @@ -1923,7 +1920,7 @@ decoder_bframe(dec, &bs, quant, fcode_forward, fcode_backward); } - decoder_output(dec, &dec->cur, dec->mbs, frame, reduced_resolution); + decoder_output(dec, &dec->cur, dec->mbs, frame, stats, coding_type); output = 1; dec->frames++; } @@ -1946,8 +1943,7 @@ if (dec->packed_mode && seen_something) { /* output the recently decoded frame */ - decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, dec->last_reduced_resolution); - output = 1; + decoder_output(dec, &dec->refn[0], dec->last_mbs, frame, stats, dec->last_coding_type); } else { @@ -1957,22 +1953,14 @@ image_printf(&dec->cur, dec->edged_width, dec->height, 16, 64, "bframe decoder lag"); - decoder_output(dec, &dec->cur, NULL, frame, 1 /*disable pp*/); + decoder_output(dec, &dec->cur, NULL, frame, stats, P_VOP); + if (stats) stats->type = XVID_TYPE_NOTHING; + } } - frame->length = BitstreamPos(&bs) / 8; - - if (stats) - { - stats->notify = output ? XVID_DEC_VOP : XVID_DEC_NOTHING; - stats->data.vop.time_base = (int)dec->time_base; - stats->data.vop.time_increment = 0; /* XXX: todo */ - } - emms(); - stop_global_timer(); - return XVID_ERR_OK; + return BitstreamPos(&bs) / 8; /* number of bytes consumed */ }