--- encoder.c 2002/12/13 11:54:17 1.76.2.30 +++ encoder.c 2003/04/08 11:04:06 1.98 @@ -26,24 +26,10 @@ * 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.76.2.30 2002/12/13 11:54:17 syskin Exp $ + * $Id: encoder.c,v 1.98 2003/04/08 11:04:06 syskin Exp $ * ****************************************************************************/ - #include #include #include @@ -73,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 @@ -118,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. * ****************************************************************************/ @@ -130,7 +116,6 @@ { Encoder *pEnc; int i; - pParam->handle = NULL; ENC_CHECK(pParam); @@ -230,7 +215,7 @@ pEnc->bitrate = pParam->rc_bitrate; - pEnc->iFrameNum = 0; + pEnc->iFrameNum = -1; pEnc->mbParam.iMaxKeyInterval = pParam->max_key_interval; /* try to allocate frame memory */ @@ -255,9 +240,8 @@ /* try to allocate image memory */ -#ifdef _DEBUG_PSNR - image_null(&pEnc->sOriginal); -#endif + if (pParam->global & XVID_GLOBAL_EXTRASTATS) + image_null(&pEnc->sOriginal); image_null(&pEnc->f_refh); image_null(&pEnc->f_refv); @@ -271,12 +255,12 @@ 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 + 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, @@ -320,11 +304,17 @@ 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 */ pEnc->mbParam.global = pParam->global; + + /* B Frames specific init */ pEnc->mbParam.max_bframes = pParam->max_bframes; pEnc->mbParam.bquant_ratio = pParam->bquant_ratio; pEnc->mbParam.bquant_offset = pParam->bquant_offset; @@ -375,7 +365,6 @@ pEnc->queue = NULL; - if (pEnc->mbParam.max_bframes > 0) { int n; @@ -428,7 +417,6 @@ xvid_err_memory5: - if (pEnc->mbParam.max_bframes > 0) { for (i = 0; i < pEnc->mbParam.max_bframes; i++) { @@ -449,21 +437,22 @@ 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); } xvid_err_memory3: -#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); + } image_destroy(&pEnc->f_refh, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); @@ -487,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); @@ -508,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 * ****************************************************************************/ @@ -516,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++) { @@ -547,7 +540,7 @@ } xvid_free(pEnc->bframes); - + } /* All images, reference, current etc ... */ @@ -574,10 +567,10 @@ image_destroy(&pEnc->f_refhv, pEnc->mbParam.edged_width, pEnc->mbParam.edged_height); -#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 */ @@ -595,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; } @@ -621,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)); @@ -649,10 +647,10 @@ /* 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; - + if (intra < 0) return -1; + if (intra == 1) return I_VOP; + if (intra == 2) return B_VOP; + return P_VOP; } @@ -662,28 +660,24 @@ * 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, mode; + uint32_t bits; + int mode = -1; /* Just to shut up compiler warning */ int input_valid = 1; int bframes_count = 0; -#ifdef _DEBUG_PSNR - float psnr; - char temp[128]; -#endif - ENC_CHECK(pEnc); ENC_CHECK(pFrame); ENC_CHECK(pFrame->image); @@ -713,23 +707,32 @@ 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(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); @@ -737,10 +740,25 @@ FrameCodeB(pEnc, pEnc->bframes[pEnc->bframenum_head], &bs, &bits); pEnc->bframenum_head++; - BitstreamPad(&bs); + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); 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; + } + + emms(); + + if (pFrame->quant == 0) { + RateControlUpdate(&pEnc->rate_control, pEnc->current->quant, + pFrame->length, pFrame->intra); + } + if (input_valid) queue_image(pEnc, pFrame); @@ -753,29 +771,43 @@ 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); - BitstreamPad(&bs); - tmp = pEnc->current->seconds; pEnc->current->seconds = 0; /* force time_base = 0 */ + BitstreamWriteVopHeader(&bs, &pEnc->mbParam, pEnc->current, 0); pEnc->current->seconds = tmp; + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); 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; + } + + emms(); + + if (pFrame->quant == 0) { + RateControlUpdate(&pEnc->rate_control, pEnc->current->quant, + pFrame->length, pFrame->intra); + } + if (input_valid) queue_image(pEnc, pFrame); @@ -791,8 +823,8 @@ if (pEnc->bframenum_dx50bvop != -1) { - SWAP(pEnc->current, pEnc->reference); - SWAP(pEnc->current, pEnc->bframes[pEnc->bframenum_dx50bvop]); + 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"); @@ -806,7 +838,7 @@ } else if (input_valid) { - SWAP(pEnc->current, pEnc->reference); + SWAP(FRAMEINFO *, pEnc->current, pEnc->reference); start_timer(); if (image_input @@ -818,7 +850,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]); @@ -831,8 +868,8 @@ } } 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; @@ -849,12 +886,47 @@ 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) { + /* + * 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 { + + 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; + } + } pFrame->length = BitstreamLength(&bs); + emms(); + return XVID_ERR_OK; } @@ -862,7 +934,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); @@ -886,15 +958,15 @@ inc_frame_num(pEnc); -#ifdef _DEBUG_PSNR - image_copy(&pEnc->sOriginal, &pEnc->current->image, - pEnc->mbParam.edged_width, pEnc->mbParam.height); -#endif + if (pFrame->general & XVID_EXTRASTATS) + { image_copy(&pEnc->sOriginal, &pEnc->current->image, + pEnc->mbParam.edged_width, pEnc->mbParam.height); + } 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); } @@ -925,13 +997,10 @@ pMB->dquant = iDQtab[temp_dquants[OFFSET(x, y)] + 2]; } - #undef OFFSET } - xvid_free(temp_dquants); } - } /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% @@ -940,15 +1009,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++, 0 /*pFrame->bframe_threshold*/); } if (mode == I_VOP) { @@ -973,27 +1041,26 @@ 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) { pEnc->bframenum_tail--; pEnc->bframenum_dx50bvop = pEnc->bframenum_tail; - SWAP(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 BVOP->PVOP"); } FrameCodeP(pEnc, &bs, &bits, 1, 0); bframes_count = 0; - pFrame->intra = 0; - + } else { FrameCodeI(pEnc, &bs, &bits); @@ -1013,9 +1080,9 @@ /* * 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 || 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 */ @@ -1023,7 +1090,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"); } @@ -1049,7 +1116,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 { @@ -1059,19 +1126,19 @@ 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); /* 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++; -// bframe report by koepi + /* bframe report by koepi */ pFrame->intra = 2; pFrame->length = 0; @@ -1079,7 +1146,7 @@ goto bvop_loop; } - BitstreamPad(&bs); + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); if (pResult) { @@ -1088,20 +1155,27 @@ 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); @@ -1120,9 +1194,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 @@ -1135,10 +1209,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(); @@ -1147,7 +1219,7 @@ 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; @@ -1169,10 +1241,15 @@ 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(); @@ -1249,7 +1326,7 @@ } if (pFrame->intra < 0) { - if ((pEnc->iFrameNum == 0) + if ((pEnc->iFrameNum == -1) || ((pEnc->mbParam.iMaxKeyInterval > 0) && (pEnc->iFrameNum >= pEnc->mbParam.iMaxKeyInterval))) { pFrame->intra = FrameCodeI(pEnc, &bs, &bits); @@ -1265,9 +1342,12 @@ } + /* Relic from OpenDivX - now disabled BitstreamPutBits(&bs, 0xFFFF, 16); BitstreamPutBits(&bs, 0xFFFF, 16); - BitstreamPad(&bs); + */ + + BitstreamPadAlways(&bs); pFrame->length = BitstreamLength(&bs); if (pResult) { @@ -1284,15 +1364,15 @@ 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); + } pEnc->iFrameNum++; @@ -1357,9 +1437,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); @@ -1374,20 +1453,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; @@ -1401,12 +1477,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; @@ -1417,7 +1491,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; @@ -1458,7 +1532,7 @@ if (intra) { if (!hint->rawhints) { - BitstreamPad(&bs); + BitstreamPadAlways(&bs); hint->hintlength = BitstreamLength(&bs); } return; @@ -1549,12 +1623,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; @@ -1563,16 +1636,9 @@ BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); - /* XXX: move this stuff to BitstreamWriteVolHeader */ -#define DIVX501B481P "DivX501b481p" - if ((pEnc->mbParam.global & XVID_GLOBAL_PACKED)) { - BitstreamWriteUserData(bs, DIVX501B481P, strlen(DIVX501B481P)); - } - -#define XVID_ID "XviD" XVID_BS_VERSION - BitstreamWriteUserData(bs, XVID_ID, strlen(XVID_ID)); - set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); + + BitstreamPadAlways(bs); BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); *pBits = BitstreamPos(bs); @@ -1607,8 +1673,9 @@ 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); + 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(); @@ -1620,13 +1687,15 @@ 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, @@ -1646,7 +1715,7 @@ int x, y, k; int iSearchRange; int bIntra, skip_possible; - + /* IMAGE *pCurrent = &pEnc->current->image; */ IMAGE *pRef = &pEnc->reference->image; @@ -1656,7 +1725,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); @@ -1682,121 +1750,175 @@ stop_inter_timer(); } - if (pEnc->current->global_flags & XVID_GMC) { -// printf("Global Motion = %d %d quarterpel=%d\n", pEnc->current->GMC_MV.x, pEnc->current->GMC_MV.y,pEnc->current->quarterpel); - DPRINTF(DPRINTF_HEADER, "Global Motion = %d %d quarterpel=%d\n", pEnc->current->GMC_MV.x, pEnc->current->GMC_MV.y,pEnc->current->quarterpel); - pEnc->current->coding_type = S_VOP; - } else - pEnc->current->coding_type = P_VOP; - + 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->GMC_MV.x == 0) && (pEnc->current->GMC_MV.y == 0) ) - pEnc->current->coding_type = P_VOP; /* no global motion -> no 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, + &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); - if (vol_header) - BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); - + } set_timecodes(pEnc->current,pEnc->reference,pEnc->mbParam.fbase); + if (vol_header) + { BitstreamWriteVolHeader(bs, &pEnc->mbParam, pEnc->current); + BitstreamPadAlways(bs); + } + BitstreamWriteVopHeader(bs, &pEnc->mbParam, pEnc->current, 1); *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; + 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->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; - } + 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 */ - if (pMB->mode != MODE_NOT_CODED) - pMB->cbp = - MBTransQuantInter(&pEnc->mbParam, pEnc->current, pMB, x, y, - dct_codes, qcoeff); + 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 { - CodeIntraMB(pEnc, pMB); - MBTransQuantIntra(&pEnc->mbParam, pEnc->current, pMB, x, y, - dct_codes, qcoeff); + pMB->mcsel = 0; /* just a precaution */ } start_timer(); - MBPrediction(pEnc->current, x, y, pEnc->mbParam.mb_width, qcoeff); - stop_prediction_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; - if (pMB->mode == MODE_INTRA || pMB->mode == MODE_INTRA_Q) { - pEnc->current->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) { + pMB->field_pred = 0; + + if (pMB->mode != MODE_NOT_CODED) + { pMB->cbp = + MBTransQuantInter(&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(); /* Finished processing the MB, now check if to CODE or SKIP */ - skip_possible = (pMB->cbp == 0) & (pMB->mode == MODE_INTER) & + skip_possible = (pMB->cbp == 0) && (pMB->mode == MODE_INTER) && (pMB->dquant == NO_CHANGE); - - if(pEnc->mbParam.m_quarterpel) - { skip_possible &= (pMB->qmvs[0].x == pEnc->current->GMC_MV.x) & (pMB->qmvs[0].y == pEnc->current->GMC_MV.y); - } - else - { skip_possible &= (pMB->mvs[0].x == pEnc->current->GMC_MV.x) & (pMB->mvs[0].y == pEnc->current->GMC_MV.y); + + 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 */ - int bSkip = 1; 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; @@ -1804,51 +1926,88 @@ 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) - { - VECTOR predMV; - if(pEnc->mbParam.m_quarterpel) { - predMV = get_qpmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = pMB->qmvs[0].x - predMV.x; /* with GMC, qmvs doesn't have to be (0,0)! */ - pMB->pmvs[0].y = pMB->qmvs[0].y - predMV.y; - } - else { - predMV = get_pmv2(pEnc->current->mbs, pEnc->mbParam.mb_width, 0, x, y, 0); - pMB->pmvs[0].x = pMB->mvs[0].x - predMV.x; /* with GMC, mvs doesn't have to be (0,0)! */ - pMB->pmvs[0].y = pMB->mvs[0].y - predMV.y; + + 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 */ } - pMB->mode = MODE_INTER; - pMB->cbp = 0; - MBCoding(pEnc->current, pMB, qcoeff, bs, &pEnc->current->sStat); - } - else - { - pMB->mode = MODE_NOT_CODED; - MBSkip(bs); } - + /* 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 { - 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->current->sStat); + 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); } + + 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); + 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(); @@ -1865,14 +2024,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; @@ -1881,7 +2040,7 @@ 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); + 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) { @@ -1893,7 +2052,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; @@ -1908,21 +2067,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 */ } @@ -1932,8 +2091,8 @@ 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; IMAGE *f_ref = &pEnc->reference->image; @@ -1954,8 +2113,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); @@ -1965,7 +2124,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); @@ -1977,21 +2136,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; @@ -2011,9 +2170,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; } @@ -2026,13 +2185,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 */ } } @@ -2048,7 +2207,7 @@ emms(); - // TODO: dynamic fcode/bcode ??? + /* TODO: dynamic fcode/bcode ??? */ *pBits = BitstreamPos(bs) - *pBits; @@ -2060,18 +2219,3 @@ } #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); - } - } -*/