--- trunk/xvidcore/src/encoder.c 2002/06/24 09:53:18 238 +++ trunk/xvidcore/src/encoder.c 2002/07/20 22:30:30 322 @@ -32,12 +32,14 @@ * * History * - * 20.06.2002 bframe patch + * 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.48 2002-06-24 09:53:17 suxen_drol Exp $ + * $Id: encoder.c,v 1.59 2002-07-20 22:30:30 albeu Exp $ * ****************************************************************************/ @@ -66,6 +68,9 @@ #include "quant/quant_matrix.h" #include "utils/mem_align.h" +#ifdef _SMP +#include "motion/smp_motion_est.h" +#endif /***************************************************************************** * Local macros ****************************************************************************/ @@ -207,7 +212,6 @@ if (pParam->max_key_interval == 0) pParam->max_key_interval = 10 * pParam->fincr / pParam->fbase; - pEnc = (Encoder *) xvid_malloc(sizeof(Encoder), CACHE_LINE); if (pEnc == NULL) return XVID_ERR_MEMORY; @@ -232,6 +236,10 @@ pEnc->mbParam.m_quant_type = H263_QUANT; +#ifdef _SMP + pEnc->mbParam.num_threads = MIN(pParam->num_threads, MAXNUMTHREADS); +#endif + pEnc->sStat.fMvPrevSigma = -1; /* Fill rate control parameters */ @@ -413,6 +421,7 @@ pEnc->mbParam.m_seconds = 0; pEnc->mbParam.m_ticks = 0; pEnc->m_framenum = 0; + pEnc->last_pframe = 1; #endif pParam->handle = (void *) pEnc; @@ -625,11 +634,11 @@ { if (pEnc->queue_size >= pEnc->mbParam.max_bframes) { - DPRINTF("FATAL: QUEUE FULL"); + DPRINTF(DPRINTF_DEBUG,"FATAL: QUEUE FULL"); return; } - DPRINTF("*** QUEUE bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + DPRINTF(DPRINTF_DEBUG,"*** QUEUE 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); @@ -697,7 +706,7 @@ * frame as a pframe */ - DPRINTF("*** BFRAME (final frame) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + DPRINTF(DPRINTF_DEBUG,"*** BFRAME (final frame) 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); @@ -716,7 +725,7 @@ } - DPRINTF("*** BFRAME (flush) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + 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); @@ -738,11 +747,10 @@ if ((pEnc->global & XVID_GLOBAL_PACKED)) { - DPRINTF("*** EMPTY bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + 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); - BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); BitstreamPad(&bs); BitstreamPutBits(&bs, 0x7f, 8); @@ -809,11 +817,10 @@ } else if (BitstreamPos(&bs) == 0) { - DPRINTF("*** SKIP bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + DPRINTF(DPRINTF_DEBUG,"*** SKIP 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); - pFrame->intra = 0; BitstreamPutBits(&bs, 0x7f, 8); @@ -916,7 +923,7 @@ * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop != -1 || + if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || pEnc->bframenum_dx50bvop >= 0 || (pFrame->intra < 0 && pEnc->iMaxKeyInterval > 0 && pEnc->iFrameNum >= pEnc->iMaxKeyInterval) || image_mad(&pEnc->reference->image, &pEnc->current->image, @@ -926,7 +933,7 @@ * This will be coded as an Intra Frame */ - DPRINTF("*** IFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + 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); @@ -950,14 +957,16 @@ pFrame->intra = 0; } else { - pEnc->bframenum_dx50bvop = -1; + FrameCodeI(pEnc, &bs, &bits); pFrame->intra = 1; + + pEnc->bframenum_dx50bvop = -1; } pEnc->flush_bframes = 1; - if ((pEnc->global & XVID_GLOBAL_PACKED)) { + if ((pEnc->global & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) { BitstreamPad(&bs); input_valid = 0; goto ipvop_loop; @@ -972,7 +981,7 @@ * This will be coded as a Predicted Frame */ - DPRINTF("*** PFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + 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); @@ -995,7 +1004,7 @@ * This will be coded as a Bidirectional Frame */ - DPRINTF("*** BFRAME (store) bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + DPRINTF(DPRINTF_DEBUG,"*** BFRAME (store) 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); @@ -1312,9 +1321,8 @@ &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; MVBLOCKHINT *bhint = &hint->mvhint.block[x + y * pEnc->mbParam.mb_width]; - VECTOR pred[4]; + VECTOR pred; VECTOR tmp; - int32_t dummy[4]; int vec; pMB->mode = @@ -1334,14 +1342,13 @@ tmp.x -= (tmp.x >= high) ? high * 2 : 0; tmp.y -= (tmp.y >= high) ? high * 2 : 0; - get_pmvdata(pEnc->current->mbs, x, y, pEnc->mbParam.mb_width, - 0, pred, dummy); + pred = get_pmv2(pEnc->current->mbs,pEnc->mbParam.mb_width,0,x,y,0); for (vec = 0; vec < 4; ++vec) { pMB->mvs[vec].x = tmp.x; pMB->mvs[vec].y = tmp.y; - pMB->pmvs[vec].x = pMB->mvs[0].x - pred[0].x; - pMB->pmvs[vec].y = pMB->mvs[0].y - pred[0].y; + pMB->pmvs[vec].x = pMB->mvs[0].x - pred.x; + pMB->pmvs[vec].y = pMB->mvs[0].y - pred.y; } } else if (pMB->mode == MODE_INTER4V) { for (vec = 0; vec < 4; ++vec) { @@ -1354,13 +1361,12 @@ tmp.x -= (tmp.x >= high) ? high * 2 : 0; tmp.y -= (tmp.y >= high) ? high * 2 : 0; - get_pmvdata(pEnc->current->mbs, x, y, - pEnc->mbParam.mb_width, vec, pred, dummy); + pred = get_pmv2(pEnc->current->mbs,pEnc->mbParam.mb_width,0,x,y,vec); pMB->mvs[vec].x = tmp.x; pMB->mvs[vec].y = tmp.y; - pMB->pmvs[vec].x = pMB->mvs[vec].x - pred[0].x; - pMB->pmvs[vec].y = pMB->mvs[vec].y - pred[0].y; + 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 { @@ -1557,7 +1563,7 @@ uint32_t x, y; int iSearchRange; int bIntra; - + /* IMAGE *pCurrent = &pEnc->current->image; */ IMAGE *pRef = &pEnc->reference->image; @@ -1591,10 +1597,20 @@ if (pEnc->current->global_flags & XVID_HINTEDME_SET) { HintedMESet(pEnc, &bIntra); } else { + +#ifdef _SMP + if (pEnc->mbParam.num_threads > 1) + bIntra = + SMP_MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference, + &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, + iLimit); + else +#endif 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(); @@ -1708,6 +1724,11 @@ *pBits = BitstreamPos(bs) - *pBits; +#ifdef BFRAMES + pEnc->time_pp = ((int32_t)pEnc->mbParam.fbase - (int32_t)pEnc->last_pframe + (int32_t)pEnc->mbParam.m_ticks) % (int32_t)pEnc->mbParam.fbase; + + pEnc->last_pframe = pEnc->mbParam.m_ticks; +#endif return 0; // inter } @@ -1728,6 +1749,18 @@ IMAGE *f_ref = &pEnc->reference->image; IMAGE *b_ref = &pEnc->current->image; +#ifdef BFRAMES_DEC_DEBUG + FILE *fp; + static char first=0; +#define BFRAME_DEBUG if (!first && fp){ \ + fprintf(fp,"Y=%3d X=%3d MB=%2d CBP=%02X\n",y,x,mb->mode,mb->cbp); \ + } + + if (!first){ + fp=fopen("C:\\XVIDDBGE.TXT","w"); + } +#endif + // forward image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, @@ -1751,7 +1784,10 @@ stop_inter_timer(); start_timer(); - MotionEstimationBVOP(&pEnc->mbParam, frame, pEnc->reference->mbs, f_ref, + MotionEstimationBVOP(&pEnc->mbParam, frame, + ((int32_t)pEnc->mbParam.fbase + (int32_t)pEnc->mbParam.m_ticks + 1 - (int32_t)pEnc->last_pframe) % pEnc->mbParam.fbase, + pEnc->time_pp, + pEnc->reference->mbs, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, pEnc->current->mbs, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV); @@ -1794,6 +1830,11 @@ if (mb->mode == MODE_NOT_CODED) { mb->mvs[0].x = 0; mb->mvs[0].y = 0; + + mb->cbp = 0; +#ifdef BFRAMES_DEC_DEBUG + BFRAME_DEBUG +#endif continue; } @@ -1812,7 +1853,7 @@ if ((mb->mode == MODE_INTERPOLATE || mb->mode == MODE_DIRECT) && mb->cbp == 0 && mb->mvs[0].x == 0 && mb->mvs[0].y == 0) { - mb->mode = 5; // skipped + mb->mode = MODE_DIRECT_NONE_MV; // skipped } if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_FORWARD) { @@ -1830,6 +1871,9 @@ } // DPRINTF("%05i : [%i %i] M=%i CBP=%i MVS=%i,%i forward=%i,%i", pEnc->m_framenum, x, y, mb->mode, mb->cbp, mb->mvs[0].x, mb->mvs[0].y, forward.x, forward.y); +#ifdef BFRAMES_DEC_DEBUG + BFRAME_DEBUG +#endif start_timer(); MBCodingBVOP(mb, qcoeff, frame->fcode, frame->bcode, bs, &pEnc->sStat); @@ -1842,5 +1886,13 @@ // TODO: dynamic fcode/bcode ??? *pBits = BitstreamPos(bs) - *pBits; + +#ifdef BFRAMES_DEC_DEBUG + if (!first){ + first=1; + if (fp) + fclose(fp); + } +#endif } #endif