--- trunk/xvidcore/src/encoder.c 2002/06/22 07:23:10 233 +++ trunk/xvidcore/src/encoder.c 2003/03/04 10:55:21 903 @@ -26,18 +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 - * - * 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.45 2002-06-22 07:23:10 suxen_drol Exp $ + * $Id: encoder.c,v 1.96 2003-03-04 10:55:21 syskin Exp $ * ****************************************************************************/ @@ -51,6 +40,8 @@ #include "global.h" #include "utils/timer.h" #include "image/image.h" +#include "image/font.h" +#include "motion/sad.h" #include "motion/motion.h" #include "bitstream/cbp.h" #include "utils/mbfunctions.h" @@ -68,7 +59,7 @@ ****************************************************************************/ #define ENC_CHECK(X) if(!(X)) return XVID_ERR_FORMAT -#define SWAP(A,B) { void * tmp = A; A = B; B = tmp; } +#define SWAP(_T_,A,B) { _T_ tmp = A; A = B; B = tmp; } /***************************************************************************** * Local function prototypes @@ -84,12 +75,10 @@ bool force_inter, bool vol_header); -#ifdef BFRAMES static void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, Bitstream * bs, uint32_t * pBits); -#endif /***************************************************************************** * Local data @@ -104,13 +93,6 @@ }; -static void __inline -image_null(IMAGE * image) -{ - image->y = image->u = image->v = NULL; -} - - /***************************************************************************** * Encoder creation * @@ -122,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. * ****************************************************************************/ @@ -134,7 +116,6 @@ { Encoder *pEnc; int i; - pParam->handle = NULL; ENC_CHECK(pParam); @@ -201,10 +182,9 @@ /* 1 keyframe each 10 seconds */ - if (pParam->max_key_interval == 0) + 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; @@ -229,14 +209,14 @@ pEnc->mbParam.m_quant_type = H263_QUANT; - pEnc->sStat.fMvPrevSigma = -1; + pEnc->fMvPrevSigma = -1; /* Fill rate control parameters */ pEnc->bitrate = pParam->rc_bitrate; - pEnc->iFrameNum = 0; - pEnc->iMaxKeyInterval = pParam->max_key_interval; + pEnc->iFrameNum = -1; + pEnc->mbParam.iMaxKeyInterval = pParam->max_key_interval; /* try to allocate frame memory */ @@ -260,14 +240,13 @@ /* try to allocate image memory */ -#ifdef _DEBUG_PSNR - image_null(&pEnc->sOriginal); -#endif -#ifdef BFRAMES + if (pParam->global & XVID_GLOBAL_EXTRASTATS) + image_null(&pEnc->sOriginal); + 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); @@ -276,13 +255,13 @@ image_null(&pEnc->vInterHV); image_null(&pEnc->vInterHVf); -#ifdef _DEBUG_PSNR - if (image_create - (&pEnc->sOriginal, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height) < 0) - goto xvid_err_memory3; -#endif -#ifdef BFRAMES + if (pParam->global & XVID_GLOBAL_EXTRASTATS) + { if (image_create + (&pEnc->sOriginal, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height) < 0) + goto xvid_err_memory3; + } + if (image_create (&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height) < 0) @@ -295,7 +274,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) @@ -325,14 +304,21 @@ pEnc->mbParam.edged_height) < 0) goto xvid_err_memory3; +/* Create full bitplane for GMC, this might be wasteful */ + if (image_create + (&pEnc->vGMC, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height) < 0) + goto xvid_err_memory3; + - /* B Frames specific init */ -#ifdef BFRAMES + pEnc->mbParam.global = pParam->global; - pEnc->packed = pParam->packed; + /* B Frames specific init */ pEnc->mbParam.max_bframes = pParam->max_bframes; - pEnc->bquant_ratio = pParam->bquant_ratio; + pEnc->mbParam.bquant_ratio = pParam->bquant_ratio; + pEnc->mbParam.bquant_offset = pParam->bquant_offset; + pEnc->mbParam.frame_drop_ratio = pParam->frame_drop_ratio; pEnc->bframes = NULL; if (pEnc->mbParam.max_bframes > 0) { @@ -375,10 +361,10 @@ pEnc->bframenum_head = 0; pEnc->bframenum_tail = 0; pEnc->flush_bframes = 0; + pEnc->bframenum_dx50bvop = -1; pEnc->queue = NULL; - if (pEnc->mbParam.max_bframes > 0) { int n; @@ -405,10 +391,11 @@ pEnc->queue_tail = 0; pEnc->queue_size = 0; + pEnc->mbParam.m_stamp = 0; - pEnc->mbParam.m_seconds = 0; - pEnc->mbParam.m_ticks = 0; -#endif + pEnc->m_framenum = 0; + pEnc->current->stamp = 0; + pEnc->reference->stamp = 0; pParam->handle = (void *) pEnc; @@ -427,9 +414,8 @@ /* * We handle all XVID_ERR_MEMORY here, this makes the code lighter */ -#ifdef BFRAMES - xvid_err_memory5: + xvid_err_memory5: if (pEnc->mbParam.max_bframes > 0) { @@ -451,32 +437,29 @@ 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); } -#endif - xvid_err_memory3: -#ifdef _DEBUG_PSNR - image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, - pEnc->mbParam.edged_height); -#endif -#ifdef BFRAMES + if (pEnc->mbParam.global & XVID_GLOBAL_EXTRASTATS) + { image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + } + 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); @@ -493,6 +476,11 @@ image_destroy(&pEnc->vInterHVf, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); +/* destroy GMC image */ + image_destroy(&pEnc->vGMC, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + + xvid_err_memory2: xvid_free(pEnc->current->mbs); xvid_free(pEnc->reference->mbs); @@ -514,32 +502,28 @@ * successful encoder_create call. * * Returned values (for now only one returned value) : - * - XVID_ERR_OK - no errors + * - XVID_ERR_OK - no errors * ****************************************************************************/ 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++) { - + 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++) { @@ -556,9 +540,8 @@ } xvid_free(pEnc->bframes); - + } -#endif /* All images, reference, current etc ... */ @@ -576,18 +559,18 @@ 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); -#endif + + if (pEnc->mbParam.global & XVID_GLOBAL_EXTRASTATS) + { image_destroy(&pEnc->sOriginal, pEnc->mbParam.edged_width, + pEnc->mbParam.edged_height); + } /* Encoder structure */ @@ -603,29 +586,23 @@ } -#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; - if (pEnc->mbParam.m_ticks > pEnc->mbParam.fbase) { - pEnc->mbParam.m_seconds = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase; - pEnc->mbParam.m_ticks = pEnc->mbParam.m_ticks % pEnc->mbParam.fbase; - } + pEnc->current->stamp = pEnc->mbParam.m_stamp; /* first frame is zero */ + pEnc->mbParam.m_stamp += pEnc->mbParam.fincr; } -#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) { - 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); @@ -633,41 +610,73 @@ start_timer(); if (image_input (&pEnc->queue[pEnc->queue_tail], pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace)) + pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING)) 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; } -#endif + +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 */ + +/* fprintf(stderr,"WriteVop: %d - %d \n", + ((int32_t)pCur->stamp / time_base), ((int32_t)pRef->stamp / time_base)); + fprintf(stderr,"set_timecodes: VOP %1d stamp=%lld ref_stamp=%lld base=%d\n", + pCur->coding_type, pCur->stamp, pRef->stamp, time_base); + fprintf(stderr,"set_timecodes: VOP %1d seconds=%d ticks=%d (ref-sec=%d ref-tick=%d)\n", + pCur->coding_type, pCur->seconds, pCur->ticks, pRef->seconds, pRef->ticks); + +*/ +} + + + +/* convert pFrame->intra to coding_type */ +static int intra2coding_type(int intra) +{ + if (intra < 0) return -1; + if (intra == 1) return I_VOP; + if (intra == 2) return B_VOP; + + return P_VOP; +} + -#ifdef BFRAMES /***************************************************************************** * 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 = -1; /* Just to shut up compiler warning */ int input_valid = 1; - -#ifdef _DEBUG_PSNR - float psnr; - char temp[128]; -#endif + int bframes_count = 0; ENC_CHECK(pEnc); ENC_CHECK(pFrame); @@ -693,62 +702,103 @@ * 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); pEnc->bframenum_tail--; - SWAP(pEnc->current, pEnc->reference); + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); + SWAP(FRAMEINFO *, pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); FrameCodeP(pEnc, &bs, &bits, 1, 0); + bframes_count = 0; - BitstreamPad(&bs); + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); pFrame->intra = 0; + + emms(); + + if (pResult) { + pResult->quant = pEnc->current->quant; + pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); + pResult->kblks = pEnc->current->sStat.kblks; + pResult->mblks = pEnc->current->sStat.mblks; + pResult->ublks = pEnc->current->sStat.ublks; + } + return XVID_ERR_OK; } - - 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); FrameCodeB(pEnc, pEnc->bframes[pEnc->bframenum_head], &bs, &bits); pEnc->bframenum_head++; - BitstreamPad(&bs); + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); - pFrame->intra = 0; + pFrame->intra = 2; + + if (pResult) { + pResult->quant = pEnc->current->quant; + pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); + pResult->kblks = pEnc->current->sStat.kblks; + pResult->mblks = pEnc->current->sStat.mblks; + pResult->ublks = pEnc->current->sStat.ublks; + } if (input_valid) queue_image(pEnc, pFrame); + emms(); + return XVID_ERR_OK; } if (pEnc->bframenum_head > 0) { pEnc->bframenum_head = pEnc->bframenum_tail = 0; - if (pEnc->packed) { - - DPRINTF("*** EMPTY bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + /* 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 + 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 */ BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); - BitstreamPad(&bs); - BitstreamPutBits(&bs, 0x7f, 8); + pEnc->current->seconds = tmp; + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); - pFrame->intra = 0; + pFrame->intra = 4; + + if (pResult) { + pResult->quant = pEnc->current->quant; + pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); + pResult->kblks = pEnc->current->sStat.kblks; + pResult->mblks = pEnc->current->sStat.mblks; + pResult->ublks = pEnc->current->sStat.ublks; + } if (input_valid) queue_image(pEnc, pFrame); + emms(); + return XVID_ERR_OK; } } @@ -756,18 +806,42 @@ bvop_loop: - if (input_valid) { + if (pEnc->bframenum_dx50bvop != -1) + { + + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); + 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"); + } - SWAP(pEnc->current, pEnc->reference); + if (input_valid) + { + queue_image(pEnc, pFrame); + input_valid = 0; + } + + } else if (input_valid) { + + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); start_timer(); if (image_input (&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace)) + pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING)) + { + emms(); return XVID_ERR_FORMAT; + } 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]); @@ -780,248 +854,335 @@ } } else if (pEnc->queue_size > 0) { - - SWAP(pEnc->current, pEnc->reference); + + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); image_swap(&pEnc->current->image, &pEnc->queue[pEnc->queue_head]); pEnc->queue_head = (pEnc->queue_head + 1) % pEnc->mbParam.max_bframes; pEnc->queue_size--; - } else if (BitstreamPos(&bs) == 0) { + } else { + + /* if nothing was encoded, write an 'ignore this frame' flag + to the bitstream */ + + 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); + /* 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) { + /* + * We must decide what to put there because i know some apps + * are storing statistics about quantizers and just do + * stats[quant]++ or stats[quant-1]++ + * transcode is one of these app with its 2pass module + */ + + /* + * For now i prefer 31 than 0 that could lead to a segfault + * in transcode + */ + pResult->quant = 31; + + pResult->hlength = 0; + pResult->kblks = 0; + pResult->mblks = 0; + pResult->ublks = 0; + } + } else { - pFrame->intra = 0; + if (pResult) { + pResult->quant = pEnc->current->quant; + pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); + pResult->kblks = pEnc->current->sStat.kblks; + pResult->mblks = pEnc->current->sStat.mblks; + pResult->ublks = pEnc->current->sStat.ublks; + } + + } - BitstreamPutBits(&bs, 0x7f, 8); - BitstreamPad(&bs); pFrame->length = BitstreamLength(&bs); - - return XVID_ERR_OK; - } else { + emms(); - pFrame->length = BitstreamLength(&bs); return XVID_ERR_OK; } pEnc->flush_bframes = 0; - /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - * Well there was a separation here so i put it in ANSI C - * comment style :-) - * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - -//$$ SWAP(pEnc->current, pEnc->reference); - emms(); - if (pFrame->quant == 0) - pEnc->current->quant = RateControlGetQ(&pEnc->rate_control, 0); - else - pEnc->current->quant = pFrame->quant; - - if (pEnc->current->quant < 1) - pEnc->current->quant = 1; + /* only inc frame num, adapt quant, etc. if we havent seen it before */ + if (pEnc->bframenum_dx50bvop < 0 ) + { + mode = intra2coding_type(pFrame->intra); + if (pFrame->quant == 0) + pEnc->current->quant = RateControlGetQ(&pEnc->rate_control, 0); + else + pEnc->current->quant = pFrame->quant; + +/* 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; + + /* ToDo : dynamic fcode (in both directions) */ + pEnc->current->fcode = pEnc->mbParam.m_fcode; + pEnc->current->bcode = pEnc->mbParam.m_fcode; - if (pEnc->current->quant > 31) - pEnc->current->quant = 31; + inc_frame_num(pEnc); - pEnc->current->global_flags = pFrame->general; - pEnc->current->motion_flags = pFrame->motion; - pEnc->current->seconds = pEnc->mbParam.m_seconds; - pEnc->current->ticks = pEnc->mbParam.m_ticks; - /* ToDo : dynamic fcode (in both directions) */ - pEnc->current->fcode = pEnc->mbParam.m_fcode; - pEnc->current->bcode = pEnc->mbParam.m_fcode; + if (pFrame->general & XVID_EXTRASTATS) + { image_copy(&pEnc->sOriginal, &pEnc->current->image, + pEnc->mbParam.edged_width, pEnc->mbParam.height); + } -//$$$ start_timer(); -//$$$ if (image_input -//$$$ (&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, -//$$$ pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace)) -//$$$ return XVID_ERR_FORMAT; -//$$$ stop_conv_timer(); - -#ifdef _DEBUG_PSNR - image_copy(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.height); -#endif + emms(); - emms(); + if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { + 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); + } /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * Luminance masking * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ - if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { - int *temp_dquants = - (int *) xvid_malloc(pEnc->mbParam.mb_width * + if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { + int *temp_dquants = + (int *) xvid_malloc(pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * sizeof(int), CACHE_LINE); - pEnc->current->quant = - adaptive_quantization(pEnc->current->image.y, + pEnc->current->quant = + adaptive_quantization(pEnc->current->image.y, pEnc->mbParam.edged_width, temp_dquants, pEnc->current->quant, pEnc->current->quant, 2 * pEnc->current->quant, pEnc->mbParam.mb_width, pEnc->mbParam.mb_height); - for (y = 0; y < pEnc->mbParam.mb_height; y++) { + for (y = 0; y < pEnc->mbParam.mb_height; y++) { #define OFFSET(x,y) ((x) + (y)*pEnc->mbParam.mb_width) - for (x = 0; x < pEnc->mbParam.mb_width; x++) { - MACROBLOCK *pMB = &pEnc->current->mbs[OFFSET(x, y)]; - - pMB->dquant = iDQtab[temp_dquants[OFFSET(x, y)] + 2]; - } + for (x = 0; x < pEnc->mbParam.mb_width; x++) { + MACROBLOCK *pMB = &pEnc->current->mbs[OFFSET(x, y)]; + pMB->dquant = iDQtab[temp_dquants[OFFSET(x, y)] + 2]; + } #undef OFFSET - + } + xvid_free(temp_dquants); } - - xvid_free(temp_dquants); } /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% * ivop/pvop/bvop selection * %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% */ + pEnc->iFrameNum++; + if (pEnc->iFrameNum == 0 || pEnc->bframenum_dx50bvop >= 0 || + (mode < 0 && pEnc->mbParam.iMaxKeyInterval > 0 && + pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval)) { + mode = I_VOP; + } else { + mode = MEanalysis(&pEnc->reference->image, pEnc->current, + &pEnc->mbParam, pEnc->mbParam.iMaxKeyInterval, + (/*mode < 0*/1/*hack*/) ? pEnc->iFrameNum : 0, + bframes_count++, pFrame->bframe_threshold); + } - if (pEnc->iFrameNum == 0 || pFrame->intra == 1 || - (pFrame->intra < 0 && pEnc->iMaxKeyInterval > 0 && - pEnc->iFrameNum >= pEnc->iMaxKeyInterval) - || image_mad(&pEnc->reference->image, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.width, - pEnc->mbParam.height) > 30) { + if (mode == I_VOP) { /* * This will be coded as an Intra Frame */ + if ((pEnc->current->global_flags & XVID_QUARTERPEL)) + pEnc->mbParam.m_quarterpel = 1; + else + pEnc->mbParam.m_quarterpel = 0; - DPRINTF("*** IFRAME bf: head=%i tail=%i queue: head=%i tail=%i size=%i", + if (pEnc->current->global_flags & XVID_MPEGQUANT) pEnc->mbParam.m_quant_type = MPEG4_QUANT; + + if ((pEnc->current->global_flags & XVID_CUSTOM_QMATRIX) > 0) { + if (pFrame->quant_intra_matrix != NULL) + set_intra_matrix(pFrame->quant_intra_matrix); + if (pFrame->quant_inter_matrix != NULL) + set_inter_matrix(pFrame->quant_inter_matrix); + } + + + 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"); + } - FrameCodeI(pEnc, &bs, &bits); + /* when we reach an iframe in DX50BVOP mode, encode the last bframe as a pframe */ - pFrame->intra = 1; - pEnc->flush_bframes = 1; + if ((pEnc->mbParam.global & XVID_GLOBAL_DX50BVOP) && pEnc->bframenum_tail > 0) { - inc_frame_num(pEnc); + pEnc->bframenum_tail--; + pEnc->bframenum_dx50bvop = pEnc->bframenum_tail; - if (pEnc->packed) { - BitstreamPad(&bs); + 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 BVOP->PVOP"); + } + FrameCodeP(pEnc, &bs, &bits, 1, 0); + bframes_count = 0; + pFrame->intra = 0; + + } else { + + FrameCodeI(pEnc, &bs, &bits); + bframes_count = 0; + pFrame->intra = 1; + + pEnc->bframenum_dx50bvop = -1; + } + + pEnc->flush_bframes = 1; + + if ((pEnc->mbParam.global & XVID_GLOBAL_PACKED) && pEnc->bframenum_tail > 0) { + BitstreamPadAlways(&bs); input_valid = 0; goto ipvop_loop; } /* * NB : sequences like "IIBB" decode fine with msfdam but, - * go screwy with divx 5.00 + * go screwy with divx 5.00 */ - } else if (pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { + } else if (mode == P_VOP || mode == S_VOP || pEnc->bframenum_tail >= pEnc->mbParam.max_bframes) { /* * 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); + + if ((pEnc->mbParam.global & XVID_GLOBAL_DEBUG)) { + image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "PVOP"); + } FrameCodeP(pEnc, &bs, &bits, 1, 0); + bframes_count = 0; pFrame->intra = 0; pEnc->flush_bframes = 1; - inc_frame_num(pEnc); - - if (pEnc->packed) { - BitstreamPad(&bs); + if ((pEnc->mbParam.global & XVID_GLOBAL_PACKED) && (pEnc->bframenum_tail > 0)) { + BitstreamPadAlways(&bs); input_valid = 0; goto ipvop_loop; } - } else { + } else { /* mode == B_VOP */ /* * This will be coded as a Bidirectional Frame */ - DPRINTF("*** 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->mbParam.global & XVID_GLOBAL_DEBUG)) { + image_printf(&pEnc->current->image, pEnc->mbParam.edged_width, pEnc->mbParam.height, 5, 200, "BVOP"); + } if (pFrame->bquant < 1) { - pEnc->current->quant = - ((pEnc->reference->quant + - pEnc->current->quant) * pEnc->bquant_ratio) / 200; + pEnc->current->quant = ((((pEnc->reference->quant + pEnc->current->quant) * + pEnc->mbParam.bquant_ratio) / 2) + pEnc->mbParam.bquant_offset)/100; + } else { pEnc->current->quant = pFrame->bquant; } + if (pEnc->current->quant < 1) + pEnc->current->quant = 1; + else 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]); - SWAP(pEnc->current, pEnc->reference); + SWAP(FRAMEINFO *, pEnc->current, pEnc->bframes[pEnc->bframenum_tail]); + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); pEnc->bframenum_tail++; - pFrame->intra = 0; + /* bframe report by koepi */ + pFrame->intra = 2; pFrame->length = 0; - inc_frame_num(pEnc); - input_valid = 0; goto bvop_loop; } - BitstreamPad(&bs); + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); if (pResult) { pResult->quant = pEnc->current->quant; - pResult->hlength = pFrame->length - (pEnc->sStat.iTextBits / 8); - pResult->kblks = pEnc->sStat.kblks; - pResult->mblks = pEnc->sStat.mblks; - pResult->ublks = pEnc->sStat.ublks; + pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); + pResult->kblks = pEnc->current->sStat.kblks; + pResult->mblks = pEnc->current->sStat.mblks; + pResult->ublks = pEnc->current->sStat.ublks; + + if (pFrame->general & XVID_EXTRASTATS) + { pResult->sse_y = + plane_sse( pEnc->sOriginal.y, pEnc->current->image.y, + pEnc->mbParam.edged_width, pEnc->mbParam.width, + pEnc->mbParam.height); + + pResult->sse_u = + plane_sse( pEnc->sOriginal.u, pEnc->current->image.u, + pEnc->mbParam.edged_width/2, pEnc->mbParam.width/2, + pEnc->mbParam.height/2); + + 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); + } } emms(); -#ifdef _DEBUG_PSNR - psnr = - image_psnr(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.width, - pEnc->mbParam.height); - - snprintf(temp, 127, "PSNR: %f\n", psnr); - DEBUG(temp); -#endif - if (pFrame->quant == 0) { RateControlUpdate(&pEnc->rate_control, pEnc->current->quant, pFrame->length, pFrame->intra); } - stop_global_timer(); write_timer(); + emms(); return XVID_ERR_OK; } -#endif - /***************************************************************************** * "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 @@ -1034,10 +1195,8 @@ uint32_t bits; uint16_t write_vol_header = 0; -#ifdef _DEBUG_PSNR float psnr; - uint8_t temp[128]; -#endif + char temp[128]; start_global_timer(); @@ -1046,27 +1205,37 @@ ENC_CHECK(pFrame->bitstream); ENC_CHECK(pFrame->image); - SWAP(pEnc->current, pEnc->reference); + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); 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; + inc_frame_num(pEnc); + + /* disable alternate scan flag if interlacing is not enabled */ + if ((pEnc->current->global_flags & XVID_ALTERNATESCAN) && + !(pEnc->current->global_flags & XVID_INTERLACING)) + { + pEnc->current->global_flags -= XVID_ALTERNATESCAN; + } + start_timer(); if (image_input (&pEnc->current->image, pEnc->mbParam.width, pEnc->mbParam.height, - pEnc->mbParam.edged_width, pFrame->image, pFrame->colorspace) < 0) + pEnc->mbParam.edged_width, pFrame->image, pFrame->stride, pFrame->colorspace, pFrame->general & XVID_INTERLACING) < 0) return XVID_ERR_FORMAT; stop_conv_timer(); -#ifdef _DEBUG_PSNR - image_copy(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.height); -#endif + 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); + } emms(); @@ -1078,6 +1247,11 @@ pEnc->current->quant = pFrame->quant; } + if ((pEnc->current->global_flags & XVID_QUARTERPEL)) + pEnc->mbParam.m_quarterpel = 1; + else + pEnc->mbParam.m_quarterpel = 0; + if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { int *temp_dquants = (int *) xvid_malloc(pEnc->mbParam.mb_width * @@ -1138,9 +1312,9 @@ } if (pFrame->intra < 0) { - if ((pEnc->iFrameNum == 0) - || ((pEnc->iMaxKeyInterval > 0) - && (pEnc->iFrameNum >= pEnc->iMaxKeyInterval))) { + if ((pEnc->iFrameNum == -1) + || ((pEnc->mbParam.iMaxKeyInterval > 0) + && (pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval))) { pFrame->intra = FrameCodeI(pEnc, &bs, &bits); } else { pFrame->intra = FrameCodeP(pEnc, &bs, &bits, 0, write_vol_header); @@ -1154,17 +1328,20 @@ } + /* Relic from OpenDivX - now disabled BitstreamPutBits(&bs, 0xFFFF, 16); BitstreamPutBits(&bs, 0xFFFF, 16); - BitstreamPad(&bs); + */ + + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); if (pResult) { pResult->quant = pEnc->current->quant; - pResult->hlength = pFrame->length - (pEnc->sStat.iTextBits / 8); - pResult->kblks = pEnc->sStat.kblks; - pResult->mblks = pEnc->sStat.mblks; - pResult->ublks = pEnc->sStat.ublks; + pResult->hlength = pFrame->length - (pEnc->current->sStat.iTextBits / 8); + pResult->kblks = pEnc->current->sStat.kblks; + pResult->mblks = pEnc->current->sStat.mblks; + pResult->ublks = pEnc->current->sStat.ublks; } emms(); @@ -1173,22 +1350,17 @@ RateControlUpdate(&pEnc->rate_control, pEnc->current->quant, pFrame->length, pFrame->intra); } -#ifdef _DEBUG_PSNR - psnr = - image_psnr(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.width, - pEnc->mbParam.height); + if (pFrame->general & XVID_EXTRASTATS) + { + psnr = + image_psnr(&pEnc->sOriginal, &pEnc->current->image, + pEnc->mbParam.edged_width, pEnc->mbParam.width, + pEnc->mbParam.height); - snprintf(temp, 127, "PSNR: %f\n", psnr); - DEBUG(temp); -#endif + snprintf(temp, 127, "PSNR: %f\n", psnr); + } -#ifdef BFRAMES - inc_frame_num(pEnc); -#else pEnc->iFrameNum++; -#endif - stop_global_timer(); write_timer(); @@ -1251,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); @@ -1264,57 +1435,49 @@ &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 = - (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; - 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) { - 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; - 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 + } else /* intra / stuffing / not_coded */ { for (vec = 0; vec < 4; ++vec) { pMB->mvs[vec].x = pMB->mvs[vec].y = 0; @@ -1355,7 +1518,7 @@ if (intra) { if (!hint->rawhints) { - BitstreamPad(&bs); + BitstreamPadAlways(&bs); hint->hintlength = BitstreamLength(&bs); } return; @@ -1430,34 +1593,48 @@ Bitstream * bs, uint32_t * pBits) { + int mb_width = pEnc->mbParam.mb_width; + int mb_height = pEnc->mbParam.mb_height; DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE); DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE); uint16_t x, y; + if ((pEnc->current->global_flags & XVID_REDUCED)) + { + mb_width = (pEnc->mbParam.width + 31) / 32; + mb_height = (pEnc->mbParam.height + 31) / 32; + + /* 16x16->8x8 downsample requires 1 additional edge pixel*/ + /* XXX: setedges is overkill */ + start_timer(); + 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; + pEnc->current->quarterpel = pEnc->mbParam.m_quarterpel; pEnc->current->coding_type = I_VOP; BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); -#ifdef BFRAMES -#define DIVX501B481P "DivX501b481p" - if (pEnc->packed) { - BitstreamWriteUserData(bs, DIVX501B481P, strlen(DIVX501B481P)); - } -#endif + + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); + + BitstreamPadAlways(bs); BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); *pBits = BitstreamPos(bs); - pEnc->sStat.iTextBits = 0; - pEnc->sStat.kblks = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height; - pEnc->sStat.mblks = pEnc->sStat.ublks = 0; + pEnc->current->sStat.iTextBits = 0; + pEnc->current->sStat.kblks = mb_width * mb_height; + pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0; - for (y = 0; y < pEnc->mbParam.mb_height; y++) - for (x = 0; x < pEnc->mbParam.mb_width; x++) { + for (y = 0; y < mb_height; y++) + for (x = 0; x < mb_width; x++) { MACROBLOCK *pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; @@ -1471,28 +1648,40 @@ stop_prediction_timer(); start_timer(); - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); + 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->current->sStat); stop_coding_timer(); } + if ((pEnc->current->global_flags & XVID_REDUCED)) + { + 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); + } emms(); *pBits = BitstreamPos(bs) - *pBits; - pEnc->sStat.fMvPrevSigma = -1; - pEnc->sStat.iMvSum = 0; - pEnc->sStat.iMvCount = 0; + pEnc->fMvPrevSigma = -1; pEnc->mbParam.m_fcode = 2; if (pEnc->current->global_flags & XVID_HINTEDME_GET) { HintedMEGet(pEnc, 1); } - return 1; // intra + return 1; /* intra */ } #define INTRA_THRESHOLD 0.5 +#define BFRAME_SKIP_THRESHHOLD 30 + +/* FrameCodeP also handles S(GMC)-VOPs */ static int FrameCodeP(Encoder * pEnc, Bitstream * bs, @@ -1505,294 +1694,514 @@ DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE); DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE); + int mb_width = pEnc->mbParam.mb_width; + int mb_height = pEnc->mbParam.mb_height; + int iLimit; - uint32_t x, y; + int x, y, k; int iSearchRange; - int bIntra; + int bIntra, skip_possible; /* IMAGE *pCurrent = &pEnc->current->image; */ IMAGE *pRef = &pEnc->reference->image; + if ((pEnc->current->global_flags & XVID_REDUCED)) + { + mb_width = (pEnc->mbParam.width + 31) / 32; + 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, - pEnc->current->global_flags & XVID_INTERLACING); + pEnc->mbParam.width, pEnc->mbParam.height); stop_edges_timer(); pEnc->mbParam.m_rounding_type = 1 - pEnc->mbParam.m_rounding_type; pEnc->current->rounding_type = pEnc->mbParam.m_rounding_type; + pEnc->current->quarterpel = pEnc->mbParam.m_quarterpel; pEnc->current->fcode = pEnc->mbParam.m_fcode; if (!force_inter) - iLimit = - (int) (pEnc->mbParam.mb_width * pEnc->mbParam.mb_height * - INTRA_THRESHOLD); + iLimit = (int)(mb_width * mb_height * INTRA_THRESHOLD); else - iLimit = pEnc->mbParam.mb_width * pEnc->mbParam.mb_height + 1; + iLimit = mb_width * mb_height + 1; if ((pEnc->current->global_flags & XVID_HALFPEL)) { start_timer(); image_interpolate(pRef, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, + pEnc->mbParam.m_quarterpel, pEnc->current->rounding_type); stop_inter_timer(); } + pEnc->current->coding_type = P_VOP; + start_timer(); - if (pEnc->current->global_flags & XVID_HINTEDME_SET) { + if (pEnc->current->global_flags & XVID_HINTEDME_SET) HintedMESet(pEnc, &bIntra); - } else { + 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 (bIntra == 1) return FrameCodeI(pEnc, bs, pBits); - pEnc->current->coding_type = P_VOP; + 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, + &pEnc->current->gmc_data); + 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->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); + } BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); *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->current->sStat.iTextBits = pEnc->current->sStat.iMvSum = pEnc->current->sStat.iMvCount = + pEnc->current->sStat.kblks = pEnc->current->sStat.mblks = pEnc->current->sStat.ublks = 0; - for (y = 0; y < pEnc->mbParam.mb_height; y++) { - for (x = 0; x < pEnc->mbParam.mb_width; x++) { + + for (y = 0; y < mb_height; y++) { + for (x = 0; x < mb_width; x++) { MACROBLOCK *pMB = &pEnc->current->mbs[x + y * pEnc->mbParam.mb_width]; +/* Mode decision: Check, if the block should be INTRA / INTER or GMC-coded */ +/* For a start, leave INTRA decision as is, only choose only between INTER/GMC - gruel, 9.1.2002 */ + bIntra = (pMB->mode == MODE_INTRA) || (pMB->mode == MODE_INTRA_Q); - if (!bIntra) { + if (bIntra) { + CodeIntraMB(pEnc, pMB); + MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, + dct_codes, qcoeff); + start_timer(); - MBMotionCompensation(pMB, x, y, &pEnc->reference->image, - &pEnc->vInterH, &pEnc->vInterV, - &pEnc->vInterHV, &pEnc->current->image, - dct_codes, pEnc->mbParam.width, - pEnc->mbParam.height, - pEnc->mbParam.edged_width, - pEnc->current->rounding_type); - stop_comp_timer(); - - if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { - if (pMB->dquant != NO_CHANGE) { - pMB->mode = MODE_INTER_Q; - pEnc->current->quant += DQtab[pMB->dquant]; - if (pEnc->current->quant > 31) - pEnc->current->quant = 31; - else if (pEnc->current->quant < 1) - pEnc->current->quant = 1; - } + MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff); + stop_prediction_timer(); + + pEnc->current->sStat.kblks++; + + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); + 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->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); + + iSAD += sad8(pEnc->current->image.v + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, + pEnc->vGMC.v + 8*y*(pEnc->mbParam.edged_width/2) + 8*x, pEnc->mbParam.edged_width/2); } - pMB->quant = pEnc->current->quant; - pMB->field_pred = 0; + if (iSAD <= pMB->sad16) { /* mode decision GMC */ - pMB->cbp = + if (pEnc->mbParam.m_quarterpel) + pMB->qmvs[0] = pMB->qmvs[1] = pMB->qmvs[2] = pMB->qmvs[3] = pMB->amv; + else + pMB->mvs[0] = pMB->mvs[1] = pMB->mvs[2] = pMB->mvs[3] = pMB->amv; + + pMB->mode = MODE_INTER; + pMB->mcsel = 1; + pMB->sad16 = iSAD; + } else { + pMB->mcsel = 0; + } + } else { + pMB->mcsel = 0; /* just a precaution */ + } + + start_timer(); + MBMotionCompensation(pMB, x, y, &pEnc->reference->image, + &pEnc->vInterH, &pEnc->vInterV, + &pEnc->vInterHV, &pEnc->vGMC, + &pEnc->current->image, + dct_codes, pEnc->mbParam.width, + pEnc->mbParam.height, + pEnc->mbParam.edged_width, + pEnc->mbParam.m_quarterpel, + (pEnc->current->global_flags & XVID_REDUCED), + pEnc->current->rounding_type); + + stop_comp_timer(); + + if ((pEnc->current->global_flags & XVID_LUMIMASKING)) { + if (pMB->dquant != NO_CHANGE) { + pMB->mode = MODE_INTER_Q; + pEnc->current->quant += DQtab[pMB->dquant]; + if (pEnc->current->quant > 31) + pEnc->current->quant = 31; + else if (pEnc->current->quant < 1) + pEnc->current->quant = 1; + } + } + pMB->quant = pEnc->current->quant; + + pMB->field_pred = 0; + + 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, - dct_codes, qcoeff); } + if (pMB->cbp || pMB->mvs[0].x || pMB->mvs[0].y || + 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->current->sStat.mblks++; + } else { + pEnc->current->sStat.ublks++; + } + start_timer(); - MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff); - stop_prediction_timer(); - if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) { - pEnc->sStat.kblks++; - } else if (pMB->cbp || pMB->mvs[0].x || pMB->mvs[0].y || - 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++; + /* 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 + skip_possible &= ( (pMB->mvs[0].x == 0) && (pMB->mvs[0].y == 0) ); + } + + if ( (pMB->mode == MODE_NOT_CODED) || (skip_possible)) { + +/* This is a candidate for SKIPping, but for P-VOPs check intermediate B-frames first */ + + if (pEnc->current->coding_type == P_VOP) /* special rule for P-VOP's SKIP */ + { + int bSkip = 1; + + 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) { /* 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; + } + 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->mode = MODE_INTER; + pMB->cbp = 0; + MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); + stop_coding_timer(); + + continue; /* next MB */ + } + } + /* do SKIP */ + + pMB->mode = MODE_NOT_CODED; + MBSkip(bs); + stop_coding_timer(); + continue; /* next MB */ + } + /* ordinary case: normal coded INTER/INTER4V block */ + + 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; + } + + 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; + 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 { - pEnc->sStat.ublks++; + 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; + 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); } - start_timer(); - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->sStat); + + if (pMB->mode == MODE_INTER4V) + { int k; + for (k=1;k<4;k++) + { + 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; + 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; + 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(); + } } + if ((pEnc->current->global_flags & XVID_REDUCED)) + { + 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); + } + emms(); if (pEnc->current->global_flags & XVID_HINTEDME_GET) { HintedMEGet(pEnc, 0); } - if (pEnc->sStat.iMvCount == 0) - pEnc->sStat.iMvCount = 1; + if (pEnc->current->sStat.iMvCount == 0) + pEnc->current->sStat.iMvCount = 1; - fSigma = (float) sqrt((float) pEnc->sStat.iMvSum / pEnc->sStat.iMvCount); + fSigma = (float) sqrt((float) pEnc->current->sStat.iMvSum / pEnc->current->sStat.iMvCount); iSearchRange = 1 << (3 + pEnc->mbParam.m_fcode); if ((fSigma > iSearchRange / 3) - && (pEnc->mbParam.m_fcode <= 3)) // 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->sStat.fMvPrevSigma >= 0) - && (pEnc->sStat.fMvPrevSigma < iSearchRange / 6) - && (pEnc->mbParam.m_fcode >= 2)) // minimum search range 16 + && (pEnc->fMvPrevSigma >= 0) + && (pEnc->fMvPrevSigma < iSearchRange / 6) + && (pEnc->mbParam.m_fcode >= (2 + pEnc->mbParam.m_quarterpel))) /* minimum search range 16 */ { pEnc->mbParam.m_fcode--; iSearchRange /= 2; } - pEnc->sStat.fMvPrevSigma = fSigma; + pEnc->fMvPrevSigma = fSigma; + + /* frame drop code */ + DPRINTF(DPRINTF_DEBUG, "kmu %i %i %i", pEnc->current->sStat.kblks, pEnc->current->sStat.mblks, pEnc->current->sStat.ublks); + if (pEnc->current->sStat.kblks + pEnc->current->sStat.mblks < + (pEnc->mbParam.frame_drop_ratio * mb_width * mb_height) / 100) + { + pEnc->current->sStat.kblks = pEnc->current->sStat.mblks = 0; + pEnc->current->sStat.ublks = mb_width * mb_height; + + BitstreamReset(bs); + + set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); + BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 0); + + /* 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; + pEnc->current->quarterpel = pEnc->reference->quarterpel; + pEnc->current->fcode = pEnc->reference->fcode; + pEnc->current->bcode = pEnc->reference->bcode; + image_copy(&pEnc->current->image, &pEnc->reference->image, pEnc->mbParam.edged_width, pEnc->mbParam.height); + memcpy(pEnc->current->mbs, pEnc->reference->mbs, sizeof(MACROBLOCK) * mb_width * mb_height); + } + + /* XXX: debug + { + char s[100]; + sprintf(s, "\\%05i_cur.pgm", pEnc->m_framenum); + 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, + pEnc->mbParam.edged_width, + pEnc->mbParam.width, pEnc->mbParam.height, s); + } + */ + *pBits = BitstreamPos(bs) - *pBits; - return 0; // inter + return 0; /* inter */ } -#ifdef BFRAMES static void FrameCodeB(Encoder * pEnc, FRAMEINFO * frame, Bitstream * bs, uint32_t * pBits) { - int16_t dct_codes[6 * 64]; - int16_t qcoeff[6 * 64]; + DECLARE_ALIGNED_MATRIX(dct_codes, 6, 64, int16_t, CACHE_LINE); + DECLARE_ALIGNED_MATRIX(qcoeff, 6, 64, int16_t, CACHE_LINE); uint32_t x, y; - VECTOR forward; - VECTOR backward; IMAGE *f_ref = &pEnc->reference->image; IMAGE *b_ref = &pEnc->current->image; - // forward +#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); \ + } + + pEnc->current->global_flags &= ~XVID_REDUCED; /* reduced resoltion not yet supported */ + + if (!first){ + fp=fopen("C:\\XVIDDBGE.TXT","w"); + } +#endif + + frame->quarterpel = pEnc->mbParam.m_quarterpel; + + /* forward */ image_setedges(f_ref, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, pEnc->mbParam.width, - pEnc->mbParam.height, - frame->global_flags & XVID_INTERLACING); + pEnc->mbParam.height); start_timer(); image_interpolate(f_ref, &pEnc->f_refh, &pEnc->f_refv, &pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - 0); + 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, - frame->global_flags & XVID_INTERLACING); + pEnc->mbParam.height); start_timer(); image_interpolate(b_ref, &pEnc->vInterH, &pEnc->vInterV, &pEnc->vInterHV, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height, - 0); + pEnc->mbParam.m_quarterpel, 0); stop_inter_timer(); start_timer(); - MotionEstimationBVOP(&pEnc->mbParam, frame, 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->mbs, b_ref, &pEnc->vInterH, + 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; + + set_timecodes(frame, pEnc->reference,pEnc->mbParam.fbase); BitstreamWriteVopHeader(bs, &pEnc->mbParam, frame, 1); *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; + frame->sStat.iTextBits = 0; + frame->sStat.iMvSum = 0; + frame->sStat.iMvCount = 0; + frame->sStat.kblks = frame->sStat.mblks = frame->sStat.ublks = 0; 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]; + 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 = 0; - mb->mvs[0].y = 0; + /* 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 = 5; // 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 */ + } } -// printf("[%i %i] M=%i CBP=%i MVX=%i MVY=%i %i,%i %i,%i\n", x, y, pMB->mode, pMB->cbp, pMB->mvs[0].x, bmb->pmvs[0].x, bmb->pmvs[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); + &frame->sStat, direction); stop_coding_timer(); } } emms(); - // TODO: dynamic fcode/bcode ??? + /* TODO: dynamic fcode/bcode ??? */ *pBits = BitstreamPos(bs) - *pBits; -} + +#ifdef BFRAMES_DEC_DEBUG + if (!first){ + first=1; + if (fp) + fclose(fp); + } #endif +}