--- trunk/xvidcore/src/encoder.c 2002/07/21 14:05:38 325 +++ branches/dev-api-3/xvidcore/src/encoder.c 2002/09/23 20:36:02 530 @@ -39,10 +39,11 @@ * MinChen * 14.04.2002 added FrameCodeB() * - * $Id: encoder.c,v 1.61 2002-07-21 14:05:38 edgomez Exp $ + * $Id: encoder.c,v 1.76.2.1 2002-09-23 20:36:01 chl Exp $ * ****************************************************************************/ + #include #include #include @@ -55,6 +56,7 @@ #include "image/image.h" #ifdef BFRAMES #include "image/font.h" +#include "motion/sad.h" #endif #include "motion/motion.h" #include "bitstream/cbp.h" @@ -68,9 +70,6 @@ #include "quant/quant_matrix.h" #include "utils/mem_align.h" -#ifdef _SMP -#include "motion/smp_motion_est.h" -#endif /***************************************************************************** * Local macros ****************************************************************************/ @@ -92,12 +91,10 @@ bool force_inter, bool vol_header); -#ifdef BFRAMES static void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, Bitstream * bs, uint32_t * pBits); -#endif /***************************************************************************** * Local data @@ -236,10 +233,6 @@ 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 */ @@ -274,11 +267,11 @@ #ifdef _DEBUG_PSNR image_null(&pEnc->sOriginal); #endif -#ifdef BFRAMES + image_null(&pEnc->f_refh); image_null(&pEnc->f_refv); image_null(&pEnc->f_refhv); -#endif + image_null(&pEnc->current->image); image_null(&pEnc->reference->image); image_null(&pEnc->vInterH); @@ -293,7 +286,7 @@ pEnc->mbParam.edged_height) < 0) goto xvid_err_memory3; #endif -#ifdef BFRAMES + if (image_create (&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) @@ -306,7 +299,7 @@ (&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) goto xvid_err_memory3; -#endif + if (image_create (&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) @@ -339,7 +332,6 @@ /* B Frames specific init */ -#ifdef BFRAMES pEnc->global = pParam->global; pEnc->mbParam.max_bframes = pParam->max_bframes; @@ -422,8 +414,8 @@ pEnc->mbParam.m_seconds = 0; pEnc->mbParam.m_ticks = 0; pEnc->m_framenum = 0; - pEnc->last_pframe = 1; -#endif + pEnc->last_pframe = 0; + pEnc->last_sync = 0; pParam->handle = (void *) pEnc; @@ -442,7 +434,7 @@ /* * We handle all XVID_ERR_MEMORY here, this makes the code lighter */ -#ifdef BFRAMES + xvid_err_memory5: @@ -476,22 +468,18 @@ xvid_free(pEnc->bframes); } -#endif - xvid_err_memory3: #ifdef _DEBUG_PSNR image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); #endif -#ifdef BFRAMES image_destroy(&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); -#endif image_destroy(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); @@ -536,14 +524,11 @@ int encoder_destroy(Encoder * pEnc) { -#ifdef BFRAMES int i; -#endif ENC_CHECK(pEnc); /* B Frames specific */ -#ifdef BFRAMES if (pEnc->mbParam.max_bframes > 0) { for (i = 0; i < pEnc->mbParam.max_bframes; i++) { @@ -573,7 +558,6 @@ xvid_free(pEnc->bframes); } -#endif /* All images, reference, current etc ... */ @@ -591,14 +575,14 @@ pEnc->mbParam.edged_height); image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); -#ifdef BFRAMES + image_destroy(&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); image_destroy(&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); -#endif + #ifdef _DEBUG_PSNR image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); @@ -618,20 +602,22 @@ } -#ifdef BFRAMES -void inc_frame_num(Encoder * pEnc) +static __inline void inc_frame_num(Encoder * pEnc) { - pEnc->iFrameNum++; pEnc->mbParam.m_ticks += pEnc->mbParam.fincr; - pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks / pEnc->mbParam.fbase; pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase; + if (pEnc->mbParam.m_ticks < pEnc->last_sync) + pEnc->mbParam.m_seconds = 1; + // more than 1 second since last I or P is not supported. + else + pEnc->mbParam.m_seconds = 0; + } -#endif -#ifdef BFRAMES -void queue_image(Encoder * pEnc, XVID_ENC_FRAME * pFrame) +static __inline void +queue_image(Encoder * pEnc, XVID_ENC_FRAME * pFrame) { if (pEnc->queue_size >= pEnc->mbParam.max_bframes) { @@ -654,10 +640,9 @@ pEnc->queue_size++; pEnc->queue_tail = (pEnc->queue_tail + 1) % pEnc->mbParam.max_bframes; } -#endif -#ifdef BFRAMES + /***************************************************************************** * IPB frame encoder entry point * @@ -824,7 +809,7 @@ pFrame->intra = 0; - BitstreamPutBits(&bs, 0x7f, 8); + BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); // write N_VOP BitstreamPad(&bs); pFrame->length = BitstreamLength(&bs); @@ -838,11 +823,6 @@ pEnc->flush_bframes = 0; - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - * Well there was a separation here so i put it in ANSI C - * comment style :-) - * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - emms(); // only inc frame num, adapt quant, etc. if we havent seen it before @@ -853,12 +833,12 @@ else pEnc->current->quant = pFrame->quant; - if (pEnc->current->quant < 1) +/* if (pEnc->current->quant < 1) pEnc->current->quant = 1; if (pEnc->current->quant > 31) pEnc->current->quant = 31; - +*/ pEnc->current->global_flags = pFrame->general; pEnc->current->motion_flags = pFrame->motion; @@ -1005,10 +985,6 @@ * This will be coded as a Bidirectional Frame */ - 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); - if ((pEnc->global & XVID_GLOBAL_DEBUG)) { image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "BVOP"); } @@ -1020,6 +996,18 @@ } else { pEnc->current->quant = pFrame->bquant; } + if (pEnc->current->quant < 1) + pEnc->current->quant = 1; + + if (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); + + /* store frame into bframe buffer & swap ref back to current */ SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); @@ -1034,6 +1022,8 @@ goto bvop_loop; } + pEnc->iFrameNum++; + BitstreamPad(&bs); pFrame->length = BitstreamLength(&bs); @@ -1069,8 +1059,6 @@ return XVID_ERR_OK; } -#endif - /***************************************************************************** @@ -1108,10 +1096,8 @@ pEnc->current->global_flags = pFrame->general; pEnc->current->motion_flags = pFrame->motion; -#ifdef BFRAMES pEnc->current->seconds = pEnc->mbParam.m_seconds; pEnc->current->ticks = pEnc->mbParam.m_ticks; -#endif pEnc->mbParam.hint = &pFrame->hint; start_timer(); @@ -1241,12 +1227,8 @@ DEBUG(temp); #endif -#ifdef BFRAMES inc_frame_num(pEnc); -#else pEnc->iFrameNum++; -#endif - stop_global_timer(); write_timer(); @@ -1497,12 +1479,11 @@ pEnc->current->coding_type = I_VOP; BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); -#ifdef BFRAMES + #define DIVX501B481P "DivX501b481p" if ((pEnc->global & XVID_GLOBAL_PACKED)) { BitstreamWriteUserData(bs, DIVX501B481P, strlen(DIVX501B481P)); } -#endif BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); *pBits = BitstreamPos(bs); @@ -1526,6 +1507,11 @@ stop_prediction_timer(); start_timer(); + if (pEnc->current->global_flags & XVID_GREYSCALE) + { pMB->cbp &= 0x3C; /* keep only bits 5-2 */ + qcoeff[4*64+0]=0; /* zero, because for INTRA MBs DC value is saved */ + qcoeff[5*64+0]=0; + } MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); stop_coding_timer(); } @@ -1538,6 +1524,9 @@ pEnc->sStat.iMvCount = 0; pEnc->mbParam.m_fcode = 2; + pEnc->last_pframe = pEnc->current->ticks; + pEnc->last_sync = pEnc->current->ticks; + if (pEnc->current->global_flags & XVID_HINTEDME_GET) { HintedMEGet(pEnc, 1); } @@ -1547,6 +1536,7 @@ #define INTRA_THRESHOLD 0.5 +#define BFRAME_SKIP_THRESHHOLD 30 static int FrameCodeP(Encoder * pEnc, @@ -1561,7 +1551,7 @@ DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE); int iLimit; - uint32_t x, y; + int x, y, k; int iSearchRange; int bIntra; @@ -1597,27 +1587,20 @@ start_timer(); if (pEnc->current->global_flags & XVID_HINTEDME_SET) { HintedMESet(pEnc, &bIntra); + if (bIntra == 0) MotionEstimationHinted(&pEnc->mbParam, pEnc->current, pEnc->reference, + &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV); + } 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, + bIntra = + MotionEstimation(&pEnc->mbParam, pEnc->current, pEnc->reference, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, iLimit); } stop_motion_timer(); - if (bIntra == 1) { - return FrameCodeI(pEnc, bs, pBits); - } + if (bIntra == 1) return FrameCodeI(pEnc, bs, pBits); pEnc->current->coding_type = P_VOP; @@ -1628,10 +1611,8 @@ *pBits = BitstreamPos(bs); - pEnc->sStat.iTextBits = 0; - pEnc->sStat.iMvSum = 0; - pEnc->sStat.iMvCount = 0; - pEnc->sStat.kblks = pEnc->sStat.mblks = pEnc->sStat.ublks = 0; + pEnc->sStat.iTextBits = pEnc->sStat.iMvSum = pEnc->sStat.iMvCount = + pEnc->sStat.kblks = pEnc->sStat.mblks = pEnc->sStat.ublks = 0; for (y = 0; y < pEnc->mbParam.mb_height; y++) { for (x = 0; x < pEnc->mbParam.mb_width; x++) { @@ -1665,9 +1646,10 @@ pMB->field_pred = 0; - pMB->cbp = - MBTransQuantInter(&pEnc->mbParam, pEnc->current, pMB, x, y, - dct_codes, qcoeff); + if (pMB->mode != MODE_NOT_CODED) + pMB->cbp = + MBTransQuantInter(&pEnc->mbParam, pEnc->current, pMB, x, y, + dct_codes, qcoeff); } else { CodeIntraMB(pEnc, pMB); MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, @@ -1684,12 +1666,54 @@ pMB->mvs[1].x || pMB->mvs[1].y || pMB->mvs[2].x || pMB->mvs[2].y || pMB->mvs[3].x || pMB->mvs[3].y) { pEnc->sStat.mblks++; - } else { + } else { pEnc->sStat.ublks++; - } + } start_timer(); - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); + + /* Finished processing the MB, now check if to CODE or SKIP */ + + if ((pMB->mode == MODE_NOT_CODED) || + (pMB->cbp == 0 && pMB->mode == MODE_INTER && pMB->mvs[0].x == 0 && + pMB->mvs[0].y == 0 && pMB->dquant == NO_CHANGE)) { + +/* This is a candidate for SKIPping, but check intermediate B-frames first */ + + int bSkip = 1; + pMB->mode = MODE_NOT_CODED; + + for (k=pEnc->bframenum_head; k< pEnc->bframenum_tail; k++) + { + int iSAD; + iSAD = sad16(pEnc->reference->image.y + 16*y*pEnc->mbParam.edged_width + 16*x, + 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; + break; + } + } + if (!bSkip) + { + VECTOR predMV; + 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->mode = MODE_INTER; + pMB->cbp = 0; + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); + } + else MBSkip(bs); + + } else { + if (pEnc->current->global_flags & XVID_GREYSCALE) + { pMB->cbp &= 0x3C; /* keep only bits 5-2 */ + qcoeff[4*64+0]=0; /* zero, because DC for INTRA MBs DC value is saved */ + qcoeff[5*64+0]=0; + } + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); + } + stop_coding_timer(); } } @@ -1726,7 +1750,7 @@ #ifdef BFRAMES /* frame drop code */ // DPRINTF(DPRINTF_DEBUG, "kmu %i %i %i", pEnc->sStat.kblks, pEnc->sStat.mblks, pEnc->sStat.ublks); - if (pEnc->sStat.kblks + pEnc->sStat.mblks <= + if (pEnc->sStat.kblks + pEnc->sStat.mblks < (pEnc->frame_drop_ratio * pEnc->mbParam.mb_width * pEnc->mbParam.mb_height) / 100) { pEnc->sStat.kblks = pEnc->sStat.mblks = 0; @@ -1749,17 +1773,15 @@ *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->time_pp = ((int32_t)pEnc->mbParam.fbase - (int32_t)pEnc->last_pframe + (int32_t)pEnc->current->ticks) % + (int32_t)pEnc->mbParam.fbase; + pEnc->last_pframe = pEnc->current->ticks; - pEnc->last_pframe = pEnc->mbParam.m_ticks; -#endif return 0; // inter } -#ifdef BFRAMES -static void +static __inline void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, Bitstream * bs, @@ -1768,8 +1790,6 @@ int16_t dct_codes[6 * 64]; int16_t qcoeff[6 * 64]; uint32_t x, y; - VECTOR forward; - VECTOR backward; IMAGE *f_ref = &pEnc->reference->image; IMAGE *b_ref = &pEnc->current->image; @@ -1810,7 +1830,7 @@ start_timer(); MotionEstimationBVOP(&pEnc->mbParam, frame, - ((int32_t)pEnc->mbParam.fbase + (int32_t)pEnc->mbParam.m_ticks + 1 - (int32_t)pEnc->last_pframe) % pEnc->mbParam.fbase, + ((int32_t)pEnc->mbParam.fbase + pEnc->last_pframe - frame->ticks) % pEnc->mbParam.fbase, pEnc->time_pp, pEnc->reference->mbs, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, @@ -1837,64 +1857,33 @@ for (y = 0; y < pEnc->mbParam.mb_height; y++) { - // reset prediction - - forward.x = 0; - forward.y = 0; - backward.x = 0; - backward.y = 0; - for (x = 0; x < pEnc->mbParam.mb_width; x++) { - MACROBLOCK *f_mb = - &pEnc->reference->mbs[x + y * pEnc->mbParam.mb_width]; - MACROBLOCK *b_mb = - &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; - MACROBLOCK *mb = &frame->mbs[x + y * pEnc->mbParam.mb_width]; + MACROBLOCK * const mb = &frame->mbs[x + y * pEnc->mbParam.mb_width]; // decoder ignores mb when refence block is INTER(0,0), CBP=0 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 + //mb->mvs[0].x = mb->mvs[0].y = mb->cbp = 0; continue; } - MBMotionCompensationBVOP(&pEnc->mbParam, mb, x, y, &frame->image, + if (mb->mode != MODE_DIRECT_NONE_MV) { + MBMotionCompensationBVOP(&pEnc->mbParam, mb, x, y, &frame->image, f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, dct_codes); - mb->quant = frame->quant; - mb->cbp = - MBTransQuantInter(&pEnc->mbParam, frame, mb, x, y, dct_codes, - qcoeff); - //mb->cbp = MBTransQuantBVOP(&pEnc->mbParam, x, y, dct_codes, qcoeff, &frame->image, frame->quant); - - - if ((mb->mode == MODE_INTERPOLATE || mb->mode == MODE_DIRECT) - && mb->cbp == 0 && mb->mvs[0].x == 0 && mb->mvs[0].y == 0) { - mb->mode = MODE_DIRECT_NONE_MV; // skipped - } - - if (mb->mode == MODE_INTERPOLATE || mb->mode == MODE_FORWARD) { - mb->pmvs[0].x = mb->mvs[0].x - forward.x; - mb->pmvs[0].y = mb->mvs[0].y - forward.y; - forward.x = mb->mvs[0].x; - forward.y = mb->mvs[0].y; - } + 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_INTERPOLATE || mb->mode == MODE_BACKWARD) { - mb->b_pmvs[0].x = mb->b_mvs[0].x - backward.x; - mb->b_pmvs[0].y = mb->b_mvs[0].y - backward.y; - backward.x = mb->b_mvs[0].x; - backward.y = mb->b_mvs[0].y; + 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 + } } -// 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 @@ -1920,4 +1909,18 @@ } #endif } -#endif + + +/* in case internal output is needed somewhere... */ +/* { + FILE *filehandle; + filehandle=fopen("last-b.pgm","wb"); + if (filehandle) + { + fprintf(filehandle,"P5\n\n"); // + fprintf(filehandle,"%d %d 255\n",pEnc->mbParam.edged_width,pEnc->mbParam.edged_height); + fwrite(frame->image.y,pEnc->mbParam.edged_width,pEnc->mbParam.edged_height,filehandle); + fclose(filehandle); + } + } +*/