--- encoder.c 2003/02/15 15:22:17 1.91 +++ encoder.c 2003/03/04 10:55:21 1.96 @@ -26,20 +26,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - ****************************************************************************/ - -/***************************************************************************** - * - * History - * - * 10.07.2002 added BFRAMES_DEC_DEBUG support - * MinChen - * 20.06.2002 bframe patch - * 08.05.2002 fix some problem in DEBUG mode; - * MinChen - * 14.04.2002 added FrameCodeB() - * - * $Id: encoder.c,v 1.91 2003/02/15 15:22:17 edgomez Exp $ + * $Id: encoder.c,v 1.96 2003/03/04 10:55:21 syskin Exp $ * ****************************************************************************/ @@ -72,7 +59,7 @@ ****************************************************************************/ #define ENC_CHECK(X) if(!(X)) return XVID_ERR_FORMAT -#define SWAP(_T_,A,B) { _T_ tmp = A; A = B; B = tmp; } +#define SWAP(_T_,A,B) { _T_ tmp = A; A = B; B = tmp; } /***************************************************************************** * Local function prototypes @@ -117,10 +104,10 @@ * and cleaning code. * * Returned values : - * - XVID_ERR_OK - no errors - * - XVID_ERR_MEMORY - the libc could not allocate memory, the function - * cleans the structure before exiting. - * pParam->handle is also set to NULL. + * - XVID_ERR_OK - no errors + * - XVID_ERR_MEMORY - the libc could not allocate memory, the function + * cleans the structure before exiting. + * pParam->handle is also set to NULL. * ****************************************************************************/ @@ -129,7 +116,6 @@ { Encoder *pEnc; int i; - pParam->handle = NULL; ENC_CHECK(pParam); @@ -379,7 +365,6 @@ pEnc->queue = NULL; - if (pEnc->mbParam.max_bframes > 0) { int n; @@ -432,7 +417,6 @@ xvid_err_memory5: - if (pEnc->mbParam.max_bframes > 0) { for (i = 0; i < pEnc->mbParam.max_bframes; i++) { @@ -453,12 +437,12 @@ image_destroy(&pEnc->bframes[i]->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); - + xvid_free(pEnc->bframes[i]->mbs); - + xvid_free(pEnc->bframes[i]); - } + } xvid_free(pEnc->bframes); } @@ -518,7 +502,7 @@ * successful encoder_create call. * * Returned values (for now only one returned value) : - * - XVID_ERR_OK - no errors + * - XVID_ERR_OK - no errors * ****************************************************************************/ @@ -526,21 +510,20 @@ encoder_destroy(Encoder * pEnc) { int i; - + ENC_CHECK(pEnc); /* B Frames specific */ if (pEnc->mbParam.max_bframes > 0) { for (i = 0; i < pEnc->mbParam.max_bframes; i++) { - + image_destroy(&pEnc->queue[i], pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); } xvid_free(pEnc->queue); } - if (pEnc->mbParam.max_bframes > 0) { for (i = 0; i < pEnc->mbParam.max_bframes; i++) { @@ -557,7 +540,7 @@ } xvid_free(pEnc->bframes); - + } /* All images, reference, current etc ... */ @@ -605,7 +588,7 @@ static __inline void inc_frame_num(Encoder * pEnc) { - pEnc->current->stamp = pEnc->mbParam.m_stamp; // first frame is zero + pEnc->current->stamp = pEnc->mbParam.m_stamp; /* first frame is zero */ pEnc->mbParam.m_stamp += pEnc->mbParam.fincr; } @@ -631,18 +614,23 @@ return; stop_conv_timer(); + if ((pFrame->general & XVID_CHROMAOPT)) { + image_chroma_optimize(&pEnc->queue[pEnc->queue_tail], + pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width); + } + pEnc->queue_size++; pEnc->queue_tail = (pEnc->queue_tail + 1) % pEnc->mbParam.max_bframes; } -static __inline void +static __inline void set_timecodes(FRAMEINFO* pCur,FRAMEINFO *pRef, int32_t time_base) { pCur->ticks = (int32_t)pCur->stamp % time_base; pCur->seconds = ((int32_t)pCur->stamp / time_base) - ((int32_t)pRef->stamp / time_base) ; - - //HEAVY DEBUG OUTPUT remove when timecodes prove to be stable + + /* HEAVY DEBUG OUTPUT remove when timecodes prove to be stable */ /* fprintf(stderr,"WriteVop: %d - %d \n", ((int32_t)pCur->stamp / time_base), ((int32_t)pRef->stamp / time_base)); @@ -672,20 +660,20 @@ * IPB frame encoder entry point * * Returned values : - * - XVID_ERR_OK - no errors - * - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong - * format + * - XVID_ERR_OK - no errors + * - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong + * format ****************************************************************************/ int encoder_encode_bframes(Encoder * pEnc, - XVID_ENC_FRAME * pFrame, - XVID_ENC_STATS * pResult) + XVID_ENC_FRAME * pFrame, + XVID_ENC_STATS * pResult) { uint16_t x, y; Bitstream bs; uint32_t bits; - int mode; + int mode = -1; /* Just to shut up compiler warning */ int input_valid = 1; int bframes_count = 0; @@ -744,7 +732,7 @@ return XVID_ERR_OK; } - + DPRINTF(DPRINTF_DEBUG,"*** BFRAME (flush) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); @@ -776,20 +764,18 @@ pEnc->bframenum_head = pEnc->bframenum_tail = 0; /* write an empty marker to the bitstream. - for divx5 decoder compatibility, this marker must consist - of a not-coded p-vop, with a time_base of zero, and time_increment + of a not-coded p-vop, with a time_base of zero, and time_increment indentical to the future-referece frame. */ if ((pEnc->mbParam.global & XVID_GLOBAL_PACKED)) { int tmp; - + DPRINTF(DPRINTF_DEBUG,"*** EMPTY bf: head=%i tail=%i queue: head=%i tail=%i size=%i", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - tmp = pEnc->current->seconds; pEnc->current->seconds = 0; /* force time_base = 0 */ @@ -824,7 +810,7 @@ { SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); - SWAP(FRAMEINFO *, pEnc->current, pEnc->bframes[pEnc->bframenum_dx50bvop]); + SWAP(FRAMEINFO *, pEnc->current, pEnc->bframes[pEnc->bframenum_dx50bvop]); if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 100, "DX50 IVOP"); @@ -850,7 +836,12 @@ } stop_conv_timer(); - // queue input frame, and dequue next image + if ((pFrame->general & XVID_CHROMAOPT)) { + image_chroma_optimize(&pEnc->current->image, + pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width); + } + + /* queue input frame, and dequue next image */ if (pEnc->queue_size > 0) { image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_tail]); @@ -863,7 +854,7 @@ } } else if (pEnc->queue_size > 0) { - + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_head]); @@ -881,7 +872,10 @@ pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - // BitstreamPutBits(&bs, 0x7f, 8); + /* That disabled line of code was supposed to inform VirtualDub + * that the frame was a dummy delay frame - now disabled (thx god :-) + */ + //BitstreamPutBits(&bs, 0x7f, 8); pFrame->intra = 5; if (pResult) { @@ -903,7 +897,6 @@ pResult->mblks = 0; pResult->ublks = 0; } - } else { if (pResult) { @@ -927,7 +920,7 @@ emms(); - // only inc frame num, adapt quant, etc. if we havent seen it before + /* only inc frame num, adapt quant, etc. if we havent seen it before */ if (pEnc->bframenum_dx50bvop < 0 ) { mode = intra2coding_type(pFrame->intra); @@ -959,7 +952,7 @@ emms(); if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { - image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 5, + image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 5, "%i if:%i st:%i", pEnc->m_framenum++, pEnc->iFrameNum, pEnc->current->stamp); } @@ -990,13 +983,10 @@ pMB->dquant = iDQtab[temp_dquants[OFFSET(x, y)] + 2]; } - #undef OFFSET } - xvid_free(temp_dquants); } - } /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -1005,15 +995,14 @@ pEnc->iFrameNum++; if (pEnc->iFrameNum == 0 || pEnc->bframenum_dx50bvop >= 0 || - (mode < 0 && pEnc->mbParam.iMaxKeyInterval > 0 && - pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval)) - { + (mode < 0 && pEnc->mbParam.iMaxKeyInterval > 0 && + pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval)) { mode = I_VOP; - }else{ + } else { mode = MEanalysis(&pEnc->reference->image, pEnc->current, &pEnc->mbParam, pEnc->mbParam.iMaxKeyInterval, - (mode < 0) ? pEnc->iFrameNum : 0, - bframes_count++); + (/*mode < 0*/1/*hack*/) ? pEnc->iFrameNum : 0, + bframes_count++, pFrame->bframe_threshold); } if (mode == I_VOP) { @@ -1038,12 +1027,12 @@ DPRINTF(DPRINTF_DEBUG,"*** IFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - + if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "IVOP"); } - // when we reach an iframe in DX50BVOP mode, encode the last bframe as a pframe + /* when we reach an iframe in DX50BVOP mode, encode the last bframe as a pframe */ if ((pEnc->mbParam.global & XVID_GLOBAL_DX50BVOP) && pEnc->bframenum_tail > 0) { @@ -1077,7 +1066,7 @@ /* * NB : sequences like "IIBB" decode fine with msfdam but, - * go screwy with divx 5.00 + * go screwy with divx 5.00 */ } else if (mode == P_VOP || mode == S_VOP || pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { /* @@ -1087,7 +1076,7 @@ DPRINTF(DPRINTF_DEBUG,"*** PFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size); - + if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "PVOP"); } @@ -1113,7 +1102,7 @@ } if (pFrame->bquant < 1) { - pEnc->current->quant = ((((pEnc->reference->quant + pEnc->current->quant) * + pEnc->current->quant = ((((pEnc->reference->quant + pEnc->current->quant) * pEnc->mbParam.bquant_ratio) / 2) + pEnc->mbParam.bquant_offset)/100; } else { @@ -1123,8 +1112,8 @@ if (pEnc->current->quant < 1) pEnc->current->quant = 1; else if (pEnc->current->quant > 31) - pEnc->current->quant = 31; - + pEnc->current->quant = 31; + DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) bf: head=%i tail=%i queue: head=%i tail=%i size=%i quant=%i\n", pEnc->bframenum_head, pEnc->bframenum_tail, pEnc->queue_head, pEnc->queue_tail, pEnc->queue_size,pEnc->current->quant); @@ -1135,7 +1124,7 @@ pEnc->bframenum_tail++; -// bframe report by koepi + /* bframe report by koepi */ pFrame->intra = 2; pFrame->length = 0; @@ -1167,7 +1156,7 @@ pResult->sse_v = plane_sse( pEnc->sOriginal.v, pEnc->current->image.v, pEnc->mbParam.edged_width/2, pEnc->mbParam.width/2, - pEnc->mbParam.height/2); + pEnc->mbParam.height/2); } } @@ -1191,9 +1180,9 @@ * "original" IP frame encoder entry point * * Returned values : - * - XVID_ERR_OK - no errors - * - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong - * format + * - XVID_ERR_OK - no errors + * - XVID_ERR_FORMAT - the image subsystem reported the image had a wrong + * format ****************************************************************************/ int @@ -1207,7 +1196,7 @@ uint16_t write_vol_header = 0; float psnr; - uint8_t temp[128]; + char temp[128]; start_global_timer(); @@ -1238,6 +1227,11 @@ return XVID_ERR_FORMAT; stop_conv_timer(); + if ((pFrame->general & XVID_CHROMAOPT)) { + image_chroma_optimize(&pEnc->current->image, + pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.edged_width); + } + if (pFrame->general & XVID_EXTRASTATS) { image_copy(&pEnc->sOriginal, &pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height); @@ -1334,8 +1328,11 @@ } -// BitstreamPutBits(&bs, 0xFFFF, 16); -// BitstreamPutBits(&bs, 0xFFFF, 16); + /* Relic from OpenDivX - now disabled + BitstreamPutBits(&bs, 0xFFFF, 16); + BitstreamPutBits(&bs, 0xFFFF, 16); + */ + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); @@ -1359,7 +1356,7 @@ image_psnr(&pEnc->sOriginal, &pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.width, pEnc->mbParam.height); - + snprintf(temp, 127, "PSNR: %f\n", psnr); } @@ -1426,9 +1423,8 @@ return; } - pEnc->current->fcode = - (hint->rawhints) ? hint->mvhint.fcode : BitstreamGetBits(&bs, - FCODEBITS); + pEnc->current->fcode = (hint->rawhints) ? + (uint32_t)hint->mvhint.fcode : BitstreamGetBits(&bs, FCODEBITS); length = pEnc->current->fcode + 5; high = 1 << (length - 1); @@ -1443,20 +1439,17 @@ VECTOR tmp; int vec; - pMB->mode = - (hint->rawhints) ? bhint->mode : BitstreamGetBits(&bs, - MODEBITS); + pMB->mode = (hint->rawhints) ? + (uint32_t)bhint->mode : BitstreamGetBits(&bs, MODEBITS); pMB->mode = (pMB->mode == MODE_INTER_Q) ? MODE_INTER : pMB->mode; pMB->mode = (pMB->mode == MODE_INTRA_Q) ? MODE_INTRA : pMB->mode; if (pMB->mode == MODE_INTER) { - tmp.x = - (hint->rawhints) ? bhint->mvs[0].x : BitstreamGetBits(&bs, - length); - tmp.y = - (hint->rawhints) ? bhint->mvs[0].y : BitstreamGetBits(&bs, - length); + tmp.x = (hint->rawhints) ? + bhint->mvs[0].x : (int)BitstreamGetBits(&bs, length); + tmp.y = (hint->rawhints) ? + bhint->mvs[0].y : (int)BitstreamGetBits(&bs, length); tmp.x -= (tmp.x >= high) ? high * 2 : 0; tmp.y -= (tmp.y >= high) ? high * 2 : 0; @@ -1470,12 +1463,10 @@ } } else if (pMB->mode == MODE_INTER4V) { for (vec = 0; vec < 4; ++vec) { - tmp.x = - (hint->rawhints) ? bhint->mvs[vec]. - x : BitstreamGetBits(&bs, length); - tmp.y = - (hint->rawhints) ? bhint->mvs[vec]. - y : BitstreamGetBits(&bs, length); + tmp.x = (hint->rawhints) ? + bhint->mvs[vec].x : (int)BitstreamGetBits(&bs, length); + tmp.y = (hint->rawhints) ? + bhint->mvs[vec].y : (int)BitstreamGetBits(&bs, length); tmp.x -= (tmp.x >= high) ? high * 2 : 0; tmp.y -= (tmp.y >= high) ? high * 2 : 0; @@ -1486,7 +1477,7 @@ pMB->pmvs[vec].x = pMB->mvs[vec].x - pred.x; pMB->pmvs[vec].y = pMB->mvs[vec].y - pred.y; } - } else // intra / stuffing / not_coded + } else /* intra / stuffing / not_coded */ { for (vec = 0; vec < 4; ++vec) { pMB->mvs[vec].x = pMB->mvs[vec].y = 0; @@ -1618,12 +1609,11 @@ /* 16x16->8x8 downsample requires 1 additional edge pixel*/ /* XXX: setedges is overkill */ start_timer(); - image_setedges(&pEnc->current->image, + image_setedges(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height); stop_edges_timer(); } - pEnc->iFrameNum = 0; pEnc->mbParam.m_rounding_type = 1; pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type; @@ -1669,7 +1659,7 @@ if ((pEnc->current->global_flags & XVID_REDUCED)) { - image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, + image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width, 16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV); } @@ -1683,7 +1673,7 @@ HintedMEGet(pEnc, 1); } - return 1; // intra + return 1; /* intra */ } @@ -1711,7 +1701,7 @@ int x, y, k; int iSearchRange; int bIntra, skip_possible; - + /* IMAGE *pCurrent = &pEnc->current->image; */ IMAGE *pRef = &pEnc->reference->image; @@ -1721,7 +1711,6 @@ mb_height = (pEnc->mbParam.height + 31) / 32; } - start_timer(); image_setedges(pRef, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height); @@ -1748,40 +1737,40 @@ } pEnc->current->coding_type = P_VOP; - + start_timer(); if (pEnc->current->global_flags & XVID_HINTEDME_SET) HintedMESet(pEnc, &bIntra); else bIntra = MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference, - &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, - iLimit); + &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, + iLimit); stop_motion_timer(); if (bIntra == 1) return FrameCodeI(pEnc, bs, pBits); - if ( ( pEnc->current->global_flags & XVID_GMC ) + if ( ( pEnc->current->global_flags & XVID_GMC ) && ( (pEnc->current->warp.duv[1].x != 0) || (pEnc->current->warp.duv[1].y != 0) ) ) { pEnc->current->coding_type = S_VOP; - generate_GMCparameters( 2, 16, &pEnc->current->warp, - pEnc->mbParam.width, pEnc->mbParam.height, + generate_GMCparameters( 2, 16, &pEnc->current->warp, + pEnc->mbParam.width, pEnc->mbParam.height, &pEnc->current->gmc_data); - generate_GMCimage(&pEnc->current->gmc_data, &pEnc->reference->image, + generate_GMCimage(&pEnc->current->gmc_data, &pEnc->reference->image, pEnc->mbParam.mb_width, pEnc->mbParam.mb_height, - pEnc->mbParam.edged_width, pEnc->mbParam.edged_width/2, - pEnc->mbParam.m_fcode, pEnc->mbParam.m_quarterpel, 0, + pEnc->mbParam.edged_width, pEnc->mbParam.edged_width/2, + pEnc->mbParam.m_fcode, pEnc->mbParam.m_quarterpel, 0, pEnc->current->rounding_type, pEnc->current->mbs, &pEnc->vGMC); } set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); if (vol_header) - { BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); + { BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); BitstreamPadAlways(bs); } @@ -1789,7 +1778,7 @@ *pBits = BitstreamPos(bs); - pEnc->current->sStat.iTextBits = pEnc->current->sStat.iMvSum = pEnc->current->sStat.iMvCount = + pEnc->current->sStat.iTextBits = pEnc->current->sStat.iMvSum = pEnc->current->sStat.iMvCount = pEnc->current->sStat.kblks = pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0; @@ -1818,13 +1807,13 @@ stop_coding_timer(); continue; } - + if (pEnc->current->coding_type == S_VOP) { int32_t iSAD = sad16(pEnc->current->image.y + 16*y*pEnc->mbParam.edged_width + 16*x, - pEnc->vGMC.y + 16*y*pEnc->mbParam.edged_width + 16*x, + pEnc->vGMC.y + 16*y*pEnc->mbParam.edged_width + 16*x, pEnc->mbParam.edged_width, 65536); - + if (pEnc->current->motion_flags & PMV_CHROMA16) { iSAD += sad8(pEnc->current->image.u + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, pEnc->vGMC.u + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, pEnc->mbParam.edged_width/2); @@ -1853,7 +1842,7 @@ start_timer(); MBMotionCompensation(pMB, x, y, &pEnc->reference->image, &pEnc->vInterH, &pEnc->vInterV, - &pEnc->vInterHV, &pEnc->vGMC, + &pEnc->vInterHV, &pEnc->vGMC, &pEnc->current->image, dct_codes, pEnc->mbParam.width, pEnc->mbParam.height, @@ -1891,20 +1880,20 @@ } else { pEnc->current->sStat.ublks++; } - + start_timer(); /* Finished processing the MB, now check if to CODE or SKIP */ skip_possible = (pMB->cbp == 0) && (pMB->mode == MODE_INTER) && (pMB->dquant == NO_CHANGE); - + if (pEnc->current->coding_type == S_VOP) skip_possible &= (pMB->mcsel == 1); else if (pEnc->current->coding_type == P_VOP) { if (pEnc->mbParam.m_quarterpel) skip_possible &= ( (pMB->qmvs[0].x == 0) && (pMB->qmvs[0].y == 0) ); - else + else skip_possible &= ( (pMB->mvs[0].x == 0) && (pMB->mvs[0].y == 0) ); } @@ -1914,8 +1903,8 @@ if (pEnc->current->coding_type == P_VOP) /* special rule for P-VOP's SKIP */ { - int bSkip = 1; - + int bSkip = 1; + for (k=pEnc->bframenum_head; k< pEnc->bframenum_tail; k++) { int iSAD; @@ -1923,21 +1912,21 @@ pEnc->bframes[k]->image.y + 16*y*pEnc->mbParam.edged_width + 16*x, pEnc->mbParam.edged_width,BFRAME_SKIP_THRESHHOLD); if (iSAD >= BFRAME_SKIP_THRESHHOLD * pMB->quant) - { bSkip = 0; + { bSkip = 0; break; } } - + if (!bSkip) { /* no SKIP, but trivial block */ if(pEnc->mbParam.m_quarterpel) { VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = - predMV.x; - pMB->pmvs[0].y = - predMV.y; + pMB->pmvs[0].x = - predMV.x; + pMB->pmvs[0].y = - predMV.y; } else { VECTOR predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = - predMV.x; - pMB->pmvs[0].y = - predMV.y; + pMB->pmvs[0].x = - predMV.x; + pMB->pmvs[0].y = - predMV.y; } pMB->mode = MODE_INTER; pMB->cbp = 0; @@ -1964,13 +1953,13 @@ if(pEnc->mbParam.m_quarterpel) { VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = pMB->qmvs[0].x - predMV.x; - pMB->pmvs[0].y = pMB->qmvs[0].y - predMV.y; + pMB->pmvs[0].x = pMB->qmvs[0].x - predMV.x; + pMB->pmvs[0].y = pMB->qmvs[0].y - predMV.y; DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y); } else { VECTOR predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = pMB->mvs[0].x - predMV.x; - pMB->pmvs[0].y = pMB->mvs[0].y - predMV.y; + pMB->pmvs[0].x = pMB->mvs[0].x - predMV.x; + pMB->pmvs[0].y = pMB->mvs[0].y - predMV.y; DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[0].x, pMB->pmvs[0].y, predMV.x, predMV.y, pMB->mvs[0].x, pMB->mvs[0].y); } @@ -1981,19 +1970,19 @@ { if(pEnc->mbParam.m_quarterpel) { VECTOR predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, k); - pMB->pmvs[k].x = pMB->qmvs[k].x - predMV.x; - pMB->pmvs[k].y = pMB->qmvs[k].y - predMV.y; + pMB->pmvs[k].x = pMB->qmvs[k].x - predMV.x; + pMB->pmvs[k].y = pMB->qmvs[k].y - predMV.y; DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[k].x, pMB->pmvs[k].y, predMV.x, predMV.y, pMB->mvs[k].x, pMB->mvs[k].y); } else { VECTOR predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, k); - pMB->pmvs[k].x = pMB->mvs[k].x - predMV.x; - pMB->pmvs[k].y = pMB->mvs[k].y - predMV.y; + pMB->pmvs[k].x = pMB->mvs[k].x - predMV.x; + pMB->pmvs[k].y = pMB->mvs[k].y - predMV.y; DPRINTF(DPRINTF_MV,"mv_diff (%i,%i) pred (%i,%i) result (%i,%i)", pMB->pmvs[k].x, pMB->pmvs[k].y, predMV.x, predMV.y, pMB->mvs[k].x, pMB->mvs[k].y); } } } - + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); stop_coding_timer(); @@ -2002,7 +1991,7 @@ if ((pEnc->current->global_flags & XVID_REDUCED)) { - image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, + image_deblock_rrv(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->current->mbs, mb_width, mb_height, pEnc->mbParam.mb_width, 16, XVID_DEC_DEBLOCKY|XVID_DEC_DEBLOCKUV); } @@ -2021,14 +2010,14 @@ iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode); if ((fSigma > iSearchRange / 3) - && (pEnc->mbParam.m_fcode <= (3 + pEnc->mbParam.m_quarterpel))) // maximum search range 128 + && (pEnc->mbParam.m_fcode <= (3 + pEnc->mbParam.m_quarterpel))) /* maximum search range 128 */ { pEnc->mbParam.m_fcode++; iSearchRange *= 2; } else if ((fSigma < iSearchRange / 6) && (pEnc->fMvPrevSigma >= 0) && (pEnc->fMvPrevSigma < iSearchRange / 6) - && (pEnc->mbParam.m_fcode >= (2 + pEnc->mbParam.m_quarterpel))) // minimum search range 16 + && (pEnc->mbParam.m_fcode >= (2 + pEnc->mbParam.m_quarterpel))) /* minimum search range 16 */ { pEnc->mbParam.m_fcode--; iSearchRange /= 2; @@ -2049,7 +2038,7 @@ set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 0); - // copy reference frame details into the current frame + /* copy reference frame details into the current frame */ pEnc->current->quant = pEnc->reference->quant; pEnc->current->motion_flags = pEnc->reference->motion_flags; pEnc->current->rounding_type = pEnc->reference->rounding_type; @@ -2064,21 +2053,21 @@ { char s[100]; sprintf(s, "\\%05i_cur.pgm", pEnc->m_framenum); - image_dump_yuvpgm(&pEnc->current->image, + image_dump_yuvpgm(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.width, pEnc->mbParam.height, s); - + sprintf(s, "\\%05i_ref.pgm", pEnc->m_framenum); - image_dump_yuvpgm(&pEnc->reference->image, + image_dump_yuvpgm(&pEnc->reference->image, pEnc->mbParam.edged_width, pEnc->mbParam.width, pEnc->mbParam.height, s); - } + } */ *pBits = BitstreamPos(bs) - *pBits; - return 0; // inter + return 0; /* inter */ } @@ -2110,8 +2099,8 @@ #endif frame->quarterpel = pEnc->mbParam.m_quarterpel; - - // forward + + /* forward */ image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height); @@ -2121,7 +2110,7 @@ pEnc->mbParam.m_quarterpel, 0); stop_inter_timer(); - // backward + /* backward */ image_setedges(b_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, pEnc->mbParam.height); @@ -2133,21 +2122,21 @@ start_timer(); - MotionEstimationBVOP(&pEnc->mbParam, frame, - ((int32_t)(pEnc->current->stamp - frame->stamp)), // time_bp - ((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), // time_pp - pEnc->reference->mbs, f_ref, + MotionEstimationBVOP(&pEnc->mbParam, frame, + ((int32_t)(pEnc->current->stamp - frame->stamp)), /* time_bp */ + ((int32_t)(pEnc->current->stamp - pEnc->reference->stamp)), /* time_pp */ + pEnc->reference->mbs, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, pEnc->current, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV); stop_motion_timer(); - - /*if (test_quant_type(&pEnc->mbParam, pEnc->current)) - { - BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type); - } */ + /* + if (test_quant_type(&pEnc->mbParam, pEnc->current)) { + BitstreamWriteVolHeader(bs, pEnc->mbParam.width, pEnc->mbParam.height, pEnc->mbParam.quant_type); + } + */ frame->coding_type = B_VOP; @@ -2167,9 +2156,9 @@ MACROBLOCK * const mb = &frame->mbs[x + y * pEnc->mbParam.mb_width]; int direction = pEnc->mbParam.global & XVID_ALTERNATESCAN ? 2 : 0; - // decoder ignores mb when refence block is INTER(0,0), CBP=0 + /* decoder ignores mb when refence block is INTER(0,0), CBP=0 */ if (mb->mode == MODE_NOT_CODED) { - //mb->mvs[0].x = mb->mvs[0].y = mb->cbp = 0; + /* mb->mvs[0].x = mb->mvs[0].y = mb->cbp = 0; */ continue; } @@ -2182,13 +2171,13 @@ if (mb->mode == MODE_DIRECT_NO4V) mb->mode = MODE_DIRECT; mb->quant = frame->quant; - + mb->cbp = MBTransQuantInterBVOP(&pEnc->mbParam, frame, mb, dct_codes, qcoeff); if ( (mb->mode == MODE_DIRECT) && (mb->cbp == 0) && (mb->pmvs[3].x == 0) && (mb->pmvs[3].y == 0) ) { - mb->mode = MODE_DIRECT_NONE_MV; // skipped + mb->mode = MODE_DIRECT_NONE_MV; /* skipped */ } } @@ -2204,7 +2193,7 @@ emms(); - // TODO: dynamic fcode/bcode ??? + /* TODO: dynamic fcode/bcode ??? */ *pBits = BitstreamPos(bs) - *pBits;